13 files changed, 257 insertions, 364 deletions

diff --git a/src/module/Combobox.jsx b/src/Combobox.jsx
index f1e7c5b..9d9da16 100644
--- a/src/module/Combobox.jsx
+++ b/src/Combobox.jsx
@@ -1,6 +1,5 @@
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
 import Select from './Select';
-import GregorianCalendar from 'gregorian-calendar';
 
 const formatOption = (option, disabledOptions) => {
   let value = `${option}`;
@@ -21,12 +20,12 @@ const formatOption = (option, disabledOptions) => {
 
 const Combobox = React.createClass({
   propTypes: {
-    formatter: PropTypes.object,
+    format: PropTypes.string,
+    defaultOpenValue: PropTypes.object,
     prefixCls: PropTypes.string,
     value: PropTypes.object,
     onChange: PropTypes.func,
     showHour: PropTypes.bool,
-    gregorianCalendarLocale: PropTypes.object,
     showSecond: PropTypes.bool,
     hourOptions: PropTypes.array,
     minuteOptions: PropTypes.array,
@@ -38,19 +37,14 @@ const Combobox = React.createClass({
   },
 
   onItemChange(type, itemValue) {
-    const { onChange } = this.props;
-    let value = this.props.value;
-    if (value) {
-      value = value.clone();
-    } else {
-      value = this.getNow().clone();
-    }
+    const { onChange, defaultOpenValue } = this.props;
+    const value = (this.props.value || defaultOpenValue).clone();
     if (type === 'hour') {
-      value.setHourOfDay(itemValue);
+      value.hour(itemValue);
     } else if (type === 'minute') {
-      value.setMinutes(itemValue);
+      value.minute(itemValue);
     } else {
-      value.setSeconds(itemValue);
+      value.second(itemValue);
     }
     onChange(value);
   },
@@ -79,9 +73,9 @@ const Combobox = React.createClass({
   },
 
   getMinuteSelect(minute) {
-    const { prefixCls, minuteOptions, disabledMinutes } = this.props;
-    const value = this.props.value || this.getNow();
-    const disabledOptions = disabledMinutes(value.getHourOfDay());
+    const { prefixCls, minuteOptions, disabledMinutes, defaultOpenValue } = this.props;
+    const value = this.props.value || defaultOpenValue;
+    const disabledOptions = disabledMinutes(value.hour());
 
     return (
       <Select
@@ -96,12 +90,12 @@ const Combobox = React.createClass({
   },
 
   getSecondSelect(second) {
-    const { prefixCls, secondOptions, disabledSeconds, showSecond } = this.props;
+    const { prefixCls, secondOptions, disabledSeconds, showSecond, defaultOpenValue } = this.props;
     if (!showSecond) {
       return null;
     }
-    const value = this.props.value || this.getNow();
-    const disabledOptions = disabledSeconds(value.getHourOfDay(), value.getMinutes());
+    const value = this.props.value || defaultOpenValue;
+    const disabledOptions = disabledSeconds(value.hour(), value.minute());
 
     return (
       <Select
@@ -115,24 +109,14 @@ const Combobox = React.createClass({
     );
   },
 
-  getNow() {
-    if (this.showNow) {
-      return this.showNow;
-    }
-    const value = new GregorianCalendar(this.props.gregorianCalendarLocale);
-    value.setTime(Date.now());
-    this.showNow = value;
-    return value;
-  },
-
   render() {
-    const { prefixCls } = this.props;
-    const value = this.props.value || this.getNow();
+    const { prefixCls, defaultOpenValue } = this.props;
+    const value = this.props.value || defaultOpenValue;
     return (
       <div className={`${prefixCls}-combobox`}>
-        {this.getHourSelect(value.getHourOfDay())}
-        {this.getMinuteSelect(value.getMinutes())}
-        {this.getSecondSelect(value.getSeconds())}
+        {this.getHourSelect(value.hour())}
+        {this.getMinuteSelect(value.minute())}
+        {this.getSecondSelect(value.second())}
       </div>
     );
   },
diff --git a/src/Header.jsx b/src/Header.jsx
new file mode 100644
index 0000000..4196ea9
--- /dev/null
+++ b/src/Header.jsx
@@ -0,0 +1,175 @@
+import React, { PropTypes } from 'react';
+import moment from 'moment';
+
+const Header = React.createClass({
+  propTypes: {
+    format: PropTypes.string,
+    prefixCls: PropTypes.string,
+    disabledDate: PropTypes.func,
+    placeholder: PropTypes.string,
+    clearText: PropTypes.string,
+    value: PropTypes.object,
+    hourOptions: PropTypes.array,
+    minuteOptions: PropTypes.array,
+    secondOptions: PropTypes.array,
+    disabledHours: PropTypes.func,
+    disabledMinutes: PropTypes.func,
+    disabledSeconds: PropTypes.func,
+    onChange: PropTypes.func,
+    onClear: PropTypes.func,
+    onEsc: PropTypes.func,
+    allowEmpty: PropTypes.bool,
+    defaultOpenValue: PropTypes.object,
+    currentSelectPanel: PropTypes.string,
+  },
+
+  getInitialState() {
+    const { value, format } = this.props;
+    return {
+      str: value && value.format(format) || '',
+      invalid: false,
+    };
+  },
+
+  componentWillReceiveProps(nextProps) {
+    const { value, format } = nextProps;
+    this.setState({
+      str: value && value.format(format) || '',
+      invalid: false,
+    });
+  },
+
+  onInputChange(event) {
+    const str = event.target.value;
+    this.setState({
+      str,
+    });
+    const {
+      format, hourOptions, minuteOptions, secondOptions,
+      disabledHours, disabledMinutes,
+      disabledSeconds, onChange, allowEmpty,
+    } = this.props;
+
+    if (str) {
+      const originalValue = this.props.value;
+      const value = this.getProtoValue().clone();
+      const parsed = moment(str, format, true);
+      if (!parsed.isValid()) {
+        this.setState({
+          invalid: true,
+        });
+        return;
+      }
+      value.hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
+
+      // if time value not allowed, response warning.
+      if (
+        hourOptions.indexOf(value.hour()) < 0 ||
+        minuteOptions.indexOf(value.minute()) < 0 ||
+        secondOptions.indexOf(value.second()) < 0
+      ) {
+        this.setState({
+          invalid: true,
+        });
+        return;
+      }
+
+      // if time value is disabled, response warning.
+      const disabledHourOptions = disabledHours();
+      const disabledMinuteOptions = disabledMinutes(value.hour());
+      const disabledSecondOptions = disabledSeconds(value.hour(), value.minute());
+      if (
+        (disabledHourOptions && disabledHourOptions.indexOf(value.hour()) >= 0) ||
+        (disabledMinuteOptions && disabledMinuteOptions.indexOf(value.minute()) >= 0) ||
+        (disabledSecondOptions && disabledSecondOptions.indexOf(value.second()) >= 0)
+      ) {
+        this.setState({
+          invalid: true,
+        });
+        return;
+      }
+
+      if (originalValue) {
+        if (
+          originalValue.hour() !== value.hour() ||
+          originalValue.minute() !== value.minute() ||
+          originalValue.second() !== value.second()
+        ) {
+          // keep other fields for rc-calendar
+          const changedValue = originalValue.clone();
+          changedValue.hour(value.hour());
+          changedValue.minute(value.minute());
+          changedValue.second(value.second());
+          onChange(changedValue);
+        }
+      } else if (originalValue !== value) {
+        onChange(value);
+      }
+    } else if (allowEmpty) {
+      onChange(null);
+    } else {
+      this.setState({
+        invalid: true,
+      });
+      return;
+    }
+
+    this.setState({
+      invalid: false,
+    });
+  },
+
+  onKeyDown(e) {
+    if (e.keyCode === 27) {
+      this.props.onEsc();
+    }
+  },
+
+  onClear() {
+    this.setState({ str: '' });
+    this.props.onClear();
+  },
+
+  getClearButton() {
+    const { prefixCls, allowEmpty } = this.props;
+    if (!allowEmpty) {
+      return null;
+    }
+    return (<a
+      className={`${prefixCls}-clear-btn`}
+      role="button"
+      title={this.props.clearText}
+      onMouseDown={this.onClear}
+    />);
+  },
+
+  getProtoValue() {
+    return this.props.value || this.props.defaultOpenValue;
+  },
+
+  getInput() {
+    const { prefixCls, placeholder } = this.props;
+    const { invalid, str } = this.state;
+    const invalidClass = invalid ? `${prefixCls}-input-invalid` : '';
+    return (<input
+      className={`${prefixCls}-input  ${invalidClass}`}
+      ref="input"
+      onKeyDown={this.onKeyDown}
+      value={str}
+      placeholder={placeholder}
+      onChange={this.onInputChange}
+    />);
+  },
+
+  render() {
+    const { prefixCls } = this.props;
+    return (
+      <div className={`${prefixCls}-input-wrap`}>
+        {this.getInput()}
+        {this.getClearButton()}
+      </div>
+    );
+  },
+});
+
+export default Header;
diff --git a/src/module/Panel.jsx b/src/Panel.jsx
index 137ec2f..f70cf38 100644
--- a/src/module/Panel.jsx
+++ b/src/Panel.jsx
@@ -1,7 +1,7 @@
-import React, {PropTypes} from 'react';
-import CommonMixin from '../mixin/CommonMixin';
+import React, { PropTypes } from 'react';
 import Header from './Header';
 import Combobox from './Combobox';
+import moment from 'moment';
 
 function noop() {
 }
@@ -18,12 +18,12 @@ function generateOptions(length, disabledOptions, hideDisabledOptions) {
 
 const Panel = React.createClass({
   propTypes: {
+    clearText: PropTypes.string,
     prefixCls: PropTypes.string,
+    defaultOpenValue: PropTypes.object,
     value: PropTypes.object,
-    locale: PropTypes.object,
     placeholder: PropTypes.string,
-    gregorianCalendarLocale: PropTypes.object,
-    formatter: PropTypes.object,
+    format: PropTypes.string,
     disabledHours: PropTypes.func,
     disabledMinutes: PropTypes.func,
     disabledSeconds: PropTypes.func,
@@ -36,13 +36,12 @@ const Panel = React.createClass({
     onClear: PropTypes.func,
   },
 
-  mixins: [CommonMixin],
-
   getDefaultProps() {
     return {
       prefixCls: 'rc-time-picker-panel',
       onChange: noop,
       onClear: noop,
+      defaultOpenValue: moment(),
     };
   },
 
@@ -76,11 +75,18 @@ const Panel = React.createClass({
   },
 
   render() {
-    const { locale, prefixCls, placeholder, disabledHours, disabledMinutes, disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showSecond, formatter, gregorianCalendarLocale } = this.props;
-    const value = this.state.value;
+    const {
+      prefixCls, placeholder, disabledHours, disabledMinutes,
+      disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showSecond,
+      format, defaultOpenValue, clearText, onEsc,
+    } = this.props;
+    const {
+      value, currentSelectPanel,
+    } = this.state;
     const disabledHourOptions = disabledHours();
-    const disabledMinuteOptions = disabledMinutes(value ? value.getHourOfDay() : null);
-    const disabledSecondOptions = disabledSeconds(value ? value.getHourOfDay() : null, value ? value.getMinutes() : null);
+    const disabledMinuteOptions = disabledMinutes(value ? value.hour() : null);
+    const disabledSecondOptions = disabledSeconds(value ? value.hour() : null,
+      value ? value.minute() : null);
     const hourOptions = generateOptions(24, disabledHourOptions, hideDisabledOptions);
     const minuteOptions = generateOptions(60, disabledMinuteOptions, hideDisabledOptions);
     const secondOptions = generateOptions(60, disabledSecondOptions, hideDisabledOptions);
@@ -88,13 +94,13 @@ const Panel = React.createClass({
     return (
       <div className={`${prefixCls}-inner`}>
         <Header
+          clearText={clearText}
           prefixCls={prefixCls}
-          gregorianCalendarLocale={gregorianCalendarLocale}
-          locale={locale}
+          defaultOpenValue={defaultOpenValue}
           value={value}
-          currentSelectPanel={this.state.currentSelectPanel}
-          onEsc={this.props.onEsc}
-          formatter={formatter}
+          currentSelectPanel={currentSelectPanel}
+          onEsc={onEsc}
+          format={format}
           placeholder={placeholder}
           hourOptions={hourOptions}
           minuteOptions={minuteOptions}
@@ -109,8 +115,8 @@ const Panel = React.createClass({
         <Combobox
           prefixCls={prefixCls}
           value={value}
-          gregorianCalendarLocale={gregorianCalendarLocale}
-          formatter={formatter}
+          defaultOpenValue={defaultOpenValue}
+          format={format}
           onChange={this.onChange}
           showHour={showHour}
           showSecond={showSecond}
diff --git a/src/module/Select.jsx b/src/Select.jsx
index 2ab9e61..e25bb29 100644
--- a/src/module/Select.jsx
+++ b/src/Select.jsx
@@ -1,4 +1,4 @@
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
 import ReactDom from 'react-dom';
 import classnames from 'classnames';
 
@@ -26,7 +26,6 @@ const Select = React.createClass({
   propTypes: {
     prefixCls: PropTypes.string,
     options: PropTypes.array,
-    gregorianCalendarLocale: PropTypes.object,
     selectedIndex: PropTypes.number,
     type: PropTypes.string,
     onSelect: PropTypes.func,
@@ -61,7 +60,14 @@ const Select = React.createClass({
       if (!item.disabled) {
         onclick = this.onSelect.bind(this, +item.value);
       }
-      return <li className={cls} key={index} onClick={onclick} disabled={item.disabled}>{item.value}</li>;
+      return (<li
+        className={cls}
+        key={index}
+        onClick={onclick}
+        disabled={item.disabled}
+      >
+        {item.value}
+      </li>);
     });
   },
 
@@ -86,8 +92,10 @@ const Select = React.createClass({
     const { prefixCls } = this.props;
 
     return (
-      <div className={`${prefixCls}-select`}
-           onMouseEnter={this.props.onMouseEnter}>
+      <div
+        className={`${prefixCls}-select`}
+        onMouseEnter={this.props.onMouseEnter}
+      >
         <ul ref="list">{this.getOptions()}</ul>
       </div>
     );
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index 86faa71..58f6ea1 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -1,9 +1,8 @@
 import React, { PropTypes } from 'react';
 import Trigger from 'rc-trigger';
-import Panel from './module/Panel';
-import placements from './util/placements';
-import CommonMixin from './mixin/CommonMixin';
-import { getFormatter } from './util/index';
+import Panel from './Panel';
+import placements from './placements';
+import moment from 'moment';
 
 function noop() {
 }
@@ -15,8 +14,9 @@ function refFn(field, component) {
 const Picker = React.createClass({
   propTypes: {
     prefixCls: PropTypes.string,
-    locale: PropTypes.object,
+    clearText: PropTypes.string,
     value: PropTypes.object,
+    defaultOpenValue: PropTypes.object,
     disabled: PropTypes.bool,
     allowEmpty: PropTypes.bool,
     defaultValue: PropTypes.object,
@@ -27,7 +27,7 @@ const Picker = React.createClass({
     transitionName: PropTypes.string,
     getPopupContainer: PropTypes.func,
     placeholder: PropTypes.string,
-    formatter: PropTypes.any,
+    format: PropTypes.string,
     showHour: PropTypes.bool,
     style: PropTypes.object,
     className: PropTypes.string,
@@ -41,15 +41,15 @@ const Picker = React.createClass({
     onClose: PropTypes.func,
   },
 
-  mixins: [CommonMixin],
-
   getDefaultProps() {
     return {
+      clearText: 'clear',
       prefixCls: 'rc-time-picker',
       defaultOpen: false,
       style: {},
       className: '',
       align: {},
+      defaultOpenValue: moment(),
       allowEmpty: true,
       showHour: true,
       showSecond: true,
@@ -118,56 +118,40 @@ const Picker = React.createClass({
     this.props.onChange(value);
   },
 
-  getFormatter() {
-    const formatter = this.props.formatter;
-    const locale = this.props.locale;
-    if (formatter) {
-      if (formatter === this.lastFormatter) {
-        return this.normalFormatter;
-      }
-      this.normalFormatter = getFormatter(formatter, locale);
-      this.lastFormatter = formatter;
-      return this.normalFormatter;
+  getFormat() {
+    const format = this.props.format;
+    if (format) {
+      return format;
     }
     if (!this.props.showSecond) {
-      if (!this.notShowSecondFormatter) {
-        this.notShowSecondFormatter = getFormatter('HH:mm', locale);
-      }
-      return this.notShowSecondFormatter;
+      return 'HH:mm';
     }
     if (!this.props.showHour) {
-      if (!this.notShowHourFormatter) {
-        this.notShowHourFormatter = getFormatter('mm:ss', locale);
-      }
-      return this.notShowHourFormatter;
+      return 'mm:ss';
     }
-    if (!this.normalFormatter) {
-      this.normalFormatter = getFormatter('HH:mm:ss', locale);
-    }
-    return this.normalFormatter;
+    return 'HH:mm:ss';
   },
 
   getPanelElement() {
     const {
-      prefixCls, defaultValue, locale, placeholder, disabledHours,
+      prefixCls, placeholder, disabledHours,
       disabledMinutes, disabledSeconds, hideDisabledOptions,
-      allowEmpty, showHour, showSecond,
+      allowEmpty, showHour, showSecond, defaultOpenValue, clearText,
     } = this.props;
     return (
       <Panel
+        clearText={clearText}
         prefixCls={`${prefixCls}-panel`}
         ref={this.savePanelRef}
         value={this.state.value}
         onChange={this.onPanelChange}
-        gregorianCalendarLocale={locale.calendar}
         onClear={this.onPanelClear}
-        defaultValue={defaultValue}
+        defaultOpenValue={defaultOpenValue}
         showHour={showHour}
         onEsc={this.onEsc}
         showSecond={showSecond}
-        locale={locale}
         allowEmpty={allowEmpty}
-        formatter={this.getFormatter()}
+        format={this.getFormat()}
         placeholder={placeholder}
         disabledHours={disabledHours}
         disabledMinutes={disabledMinutes}
@@ -195,7 +179,11 @@ const Picker = React.createClass({
   },
 
   render() {
-    const { prefixCls, placeholder, placement, align, disabled, transitionName, style, className, showHour, showSecond, getPopupContainer } = this.props;
+    const {
+      prefixCls, placeholder, placement, align,
+      disabled, transitionName, style, className, showHour,
+      showSecond, getPopupContainer,
+    } = this.props;
     const { open, value } = this.state;
     let popupClassName;
     if (!showHour || !showSecond) {
@@ -222,7 +210,7 @@ const Picker = React.createClass({
             ref="picker" type="text" placeholder={placeholder}
             readOnly
             onKeyDown={this.onKeyDown}
-            disabled={disabled} value={value && this.getFormatter().format(value) || ''}
+            disabled={disabled} value={value && value.format(this.getFormat()) || ''}
           />
           <span className={`${prefixCls}-icon`}/>
         </span>
diff --git a/src/locale/en_US.js b/src/locale/en_US.js
deleted file mode 100644
index 506f4c9..0000000
--- a/src/locale/en_US.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import enUs from 'gregorian-calendar-format/lib/locale/en_US';
-import enUsCalendar from 'gregorian-calendar/lib/locale/en_US';
-
-export default {
-  clear: 'Clear',
-  format: enUs,
-  calendar: enUsCalendar,
-};
diff --git a/src/locale/ru_RU.js b/src/locale/ru_RU.js
deleted file mode 100644
index 86746ea..0000000
--- a/src/locale/ru_RU.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import ruRu from 'gregorian-calendar-format/lib/locale/ru_RU';
-import ruRuCalendar from 'gregorian-calendar/lib/locale/ru_RU';
-
-export default {
-  clear: 'Очистить',
-  format: ruRu,
-  calendar: ruRuCalendar,
-};
diff --git a/src/locale/zh_CN.js b/src/locale/zh_CN.js
deleted file mode 100644
index 1e977be..0000000
--- a/src/locale/zh_CN.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import zhCn from 'gregorian-calendar-format/lib/locale/zh_CN';
-import zhCnCalendar from 'gregorian-calendar/lib/locale/zh_CN';
-
-export default {
-  clear: '清除',
-  format: zhCn,
-  calendar: zhCnCalendar,
-};
diff --git a/src/mixin/CommonMixin.js b/src/mixin/CommonMixin.js
deleted file mode 100644
index be080fd..0000000
--- a/src/mixin/CommonMixin.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {PropTypes} from 'react';
-import enUs from '../locale/en_US';
-
-export default {
-  propTypes: {
-    prefixCls: PropTypes.string,
-    locale: PropTypes.object,
-  },
-
-  getDefaultProps() {
-    return {
-      locale: enUs,
-    };
-  },
-};
diff --git a/src/module/Header.jsx b/src/module/Header.jsx
deleted file mode 100644
index a926e98..0000000
--- a/src/module/Header.jsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import React, { PropTypes } from 'react';
-import createSelection from '../util/selection';
-
-const Header = React.createClass({
-  propTypes: {
-    formatter: PropTypes.object,
-    prefixCls: PropTypes.string,
-    gregorianCalendarLocale: PropTypes.object,
-    locale: PropTypes.object,
-    disabledDate: PropTypes.func,
-    placeholder: PropTypes.string,
-    value: PropTypes.object,
-    hourOptions: PropTypes.array,
-    minuteOptions: PropTypes.array,
-    secondOptions: PropTypes.array,
-    disabledHours: PropTypes.func,
-    disabledMinutes: PropTypes.func,
-    disabledSeconds: PropTypes.func,
-    onChange: PropTypes.func,
-    onClear: PropTypes.func,
-    onEsc: PropTypes.func,
-    allowEmpty: PropTypes.bool,
-    currentSelectPanel: PropTypes.string,
-  },
-
-  getInitialState() {
-    const value = this.props.value;
-    return {
-      str: value && this.props.formatter.format(value) || '',
-      invalid: false,
-    };
-  },
-
-  componentDidMount() {
-    this.timer = setTimeout(this.selectRange, 0);
-  },
-
-  componentWillReceiveProps(nextProps) {
-    const value = nextProps.value;
-    this.setState({
-      str: value && nextProps.formatter.format(value) || '',
-      invalid: false,
-    });
-  },
-
-  componentDidUpdate() {
-    this.timer = setTimeout(this.selectRange, 0);
-  },
-
-  componentWillUnmount() {
-    clearTimeout(this.timer);
-  },
-
-  onInputChange(event) {
-    const str = event.target.value;
-    this.setState({
-      str,
-    });
-    let value = null;
-    const { formatter, gregorianCalendarLocale, hourOptions, minuteOptions, secondOptions, disabledHours, disabledMinutes, disabledSeconds, onChange, allowEmpty } = this.props;
-
-    if (str) {
-      const originalValue = this.props.value;
-      try {
-        value = formatter.parse(str, {
-          locale: gregorianCalendarLocale,
-          obeyCount: true,
-        });
-      } catch (ex) {
-        this.setState({
-          invalid: true,
-        });
-        return;
-      }
-
-      if (value) {
-        // if time value not allowed, response warning.
-        if (
-          hourOptions.indexOf(value.getHourOfDay()) < 0 ||
-          minuteOptions.indexOf(value.getMinutes()) < 0 ||
-          secondOptions.indexOf(value.getSeconds()) < 0
-        ) {
-          this.setState({
-            invalid: true,
-          });
-          return;
-        }
-
-        // if time value is disabled, response warning.
-        const disabledHourOptions = disabledHours();
-        const disabledMinuteOptions = disabledMinutes(value.getHourOfDay());
-        const disabledSecondOptions = disabledSeconds(value.getHourOfDay(), value.getMinutes());
-        if (
-          (disabledHourOptions && disabledHourOptions.indexOf(value.getHourOfDay()) >= 0) ||
-          (disabledMinuteOptions && disabledMinuteOptions.indexOf(value.getMinutes()) >= 0) ||
-          (disabledSecondOptions && disabledSecondOptions.indexOf(value.getSeconds()) >= 0)
-        ) {
-          this.setState({
-            invalid: true,
-          });
-          return;
-        }
-
-        if (originalValue && value) {
-          if (
-            originalValue.getHourOfDay() !== value.getHourOfDay() ||
-            originalValue.getMinutes() !== value.getMinutes() ||
-            originalValue.getSeconds() !== value.getSeconds()
-          ) {
-            // keep other fields for rc-calendar
-            const changedValue = originalValue.clone();
-            changedValue.setHourOfDay(value.getHourOfDay());
-            changedValue.setMinutes(value.getMinutes());
-            changedValue.setSeconds(value.getSeconds());
-            onChange(changedValue);
-          }
-        } else if (originalValue !== value) {
-          onChange(value);
-        }
-      } else {
-        this.setState({
-          invalid: true,
-        });
-        return;
-      }
-    } else if (allowEmpty) {
-      onChange(null);
-    } else {
-      this.setState({
-        invalid: true,
-      });
-      return;
-    }
-
-    this.setState({
-      invalid: false,
-    });
-  },
-
-  onKeyDown(e) {
-    if (e.keyCode === 27) {
-      this.props.onEsc();
-    }
-  },
-
-  onClear() {
-    this.setState({ str: '' });
-    this.props.onClear();
-  },
-
-  getClearButton() {
-    const { locale, prefixCls, allowEmpty } = this.props;
-    if (!allowEmpty) {
-      return null;
-    }
-    return <a className={`${prefixCls}-clear-btn`} role="button" title={locale.clear} onMouseDown={this.onClear}/>;
-  },
-
-  getInput() {
-    const { prefixCls, placeholder } = this.props;
-    const { invalid, str } = this.state;
-    const invalidClass = invalid ? `${prefixCls}-input-invalid` : '';
-    return (<input
-      className={`${prefixCls}-input  ${invalidClass}`}
-      ref="input"
-      onKeyDown={this.onKeyDown}
-      value={str}
-      placeholder={placeholder} onChange={this.onInputChange}
-    />);
-  },
-
-  selectRange() {
-    this.refs.input.select();
-    if (this.props.currentSelectPanel && this.refs.input.value) {
-      let selectionRangeStart = 0;
-      let selectionRangeEnd = 0;
-      if (this.props.currentSelectPanel === 'hour') {
-        selectionRangeStart = 0;
-        selectionRangeEnd = this.refs.input.value.indexOf(':');
-      } else if (this.props.currentSelectPanel === 'minute') {
-        selectionRangeStart = this.refs.input.value.indexOf(':') + 1;
-        selectionRangeEnd = this.refs.input.value.lastIndexOf(':');
-      } else if (this.props.currentSelectPanel === 'second') {
-        selectionRangeStart = this.refs.input.value.lastIndexOf(':') + 1;
-        selectionRangeEnd = this.refs.input.value.length;
-      }
-      if (selectionRangeEnd - selectionRangeStart === 2) {
-        createSelection(this.refs.input, selectionRangeStart, selectionRangeEnd);
-      }
-    }
-  },
-
-  render() {
-    const { prefixCls } = this.props;
-    return (
-      <div className={`${prefixCls}-input-wrap`}>
-        {this.getInput()}
-        {this.getClearButton()}
-      </div>
-    );
-  },
-});
-
-export default Header;
diff --git a/src/util/placements.js b/src/placements.js
index 6760286..6760286 100644
--- a/src/util/placements.js
+++ b/src/placements.js
diff --git a/src/util/index.js b/src/util/index.js
deleted file mode 100644
index 5bc0a78..0000000
--- a/src/util/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import DateTimeFormat from 'gregorian-calendar-format';
-
-export function getFormatter(format, locale) {
-  if (typeof format === 'string') {
-    return new DateTimeFormat(format, locale.format);
-  }
-  return format;
-}
diff --git a/src/util/selection.js b/src/util/selection.js
deleted file mode 100644
index 395901e..0000000
--- a/src/util/selection.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export default function createSelection(field, start, end) {
-  if (field.createTextRange) {
-    const selRange = field.createTextRange();
-    selRange.collapse(true);
-    selRange.moveStart('character', start);
-    selRange.moveEnd('character', end);
-    selRange.select();
-    field.focus();
-  } else if (field.setSelectionRange) {
-    field.focus();
-    field.setSelectionRange(start, end);
-  } else if (typeof field.selectionStart !== 'undefined') {
-    field.selectionStart = start;
-    field.selectionEnd = end;
-    field.focus();
-  }
-}