12 files changed, 111 insertions, 32 deletions

diff --git a/.travis.yml b/.travis.yml
index e780b32..d2c1fdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ notifications:
   - yiminghe@gmail.com
 
 node_js:
-- 4.0.0
+- 6
 
 before_install:
 - |
diff --git a/HISTORY.md b/HISTORY.md
index 8cfc326..c6198f6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,16 @@
 
 ---
 
+2.2.0 / 2016-11-11
+---------------------------
+
+Add `showMinute` prop.
+
+2.1.0 / 2016-10-25
+---------------------------
+
+Add `addon` prop.
+
 2.0.0 / 2016-08-04
 ---------------------------
 
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..1f5a0d9
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-present yiminghe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 5d8822a..c994218 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,7 @@ API
 | value                   | moment                            | null                                          | current value                                                                              |
 | placeholder             | String                            | ''                                            | time input's placeholder                                                                   |
 | showHour                | Boolean                           | whether show hour                             |                                                                                            |
+| showMinute                | Boolean                         | whether show minute                             |                                                                                            |
 | showSecond              | Boolean                           | whether show second                           |                                                                                            |
 | format                  | String                            |                                               |                                                                                            |
 | disabledHours           | Function                          | disabled hour options                         |                                                                                            |
@@ -67,10 +68,10 @@ API
 | disabledSeconds         | Function                          | disabled second options                       |                                                                                            |
 | hideDisabledOptions     | Boolean                           | whether hide disabled options                 |                                                                                            |
 | onChange                | Function                          | null                                          | called when select a different value                                                       |
+| addon                   | Function                          | nothing                                       | called from timepicker panel to render some addon to its bottom, like an OK button. Receives panel instance as parameter, to be able to close it like `panel.close()`.|
 | placement               | String                            | bottomLeft                                    | one of ['left','right','top','bottom', 'topLeft', 'topRight', 'bottomLeft', 'bottomRight'] |
 | transitionName          | String                            | ''                                            |                                                                                            |
-| autoComplete            | String                            | 'yes'                                         | one of ['yes', 'no']                                                                       |
-
+| name                    | String                            | nothing                                       | sets the name of the generated input                                                       |
 
 ## Test Case
 
diff --git a/examples/format.html b/examples/format.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/examples/format.html
diff --git a/examples/format.js b/examples/format.js
new file mode 100644
index 0000000..c9a9539
--- /dev/null
+++ b/examples/format.js
@@ -0,0 +1,26 @@
+import 'rc-time-picker/assets/index.less';
+import React from 'react';
+import ReactDom from 'react-dom';
+import moment from 'moment';
+import TimePicker from 'rc-time-picker';
+
+const App = React.createClass({
+  render() {
+    return (
+      <div>
+        <TimePicker defaultValue={moment()} showHour={false} />
+        <TimePicker defaultValue={moment()} showMinute={false} />
+        <TimePicker defaultValue={moment()} showSecond={false} />
+
+        <TimePicker defaultValue={moment()} showMinute={false} showSecond={false} />
+        <TimePicker defaultValue={moment()} showHour={false} showSecond={false}/>
+        <TimePicker defaultValue={moment()} showHour={false} showMinute={false} />
+      </div>
+    );
+  },
+});
+
+ReactDom.render(
+  <App />,
+  document.getElementById('__react-content')
+);
diff --git a/package.json b/package.json
index 4690f1e..1a4d828 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-time-picker",
-  "version": "2.0.0",
+  "version": "2.2.1",
   "description": "React TimePicker",
   "keywords": [
     "react",
diff --git a/src/Combobox.jsx b/src/Combobox.jsx
index 9d9da16..013617c 100644
--- a/src/Combobox.jsx
+++ b/src/Combobox.jsx
@@ -26,6 +26,7 @@ const Combobox = React.createClass({
     value: PropTypes.object,
     onChange: PropTypes.func,
     showHour: PropTypes.bool,
+    showMinute: PropTypes.bool,
     showSecond: PropTypes.bool,
     hourOptions: PropTypes.array,
     minuteOptions: PropTypes.array,
@@ -73,7 +74,10 @@ const Combobox = React.createClass({
   },
 
   getMinuteSelect(minute) {
-    const { prefixCls, minuteOptions, disabledMinutes, defaultOpenValue } = this.props;
+    const { prefixCls, minuteOptions, disabledMinutes, defaultOpenValue, showMinute } = this.props;
+    if (!showMinute) {
+      return null;
+    }
     const value = this.props.value || defaultOpenValue;
     const disabledOptions = disabledMinutes(value.hour());
 
diff --git a/src/Header.jsx b/src/Header.jsx
index 4196ea9..2ef9827 100644
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@ -151,14 +151,16 @@ const Header = React.createClass({
     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}
-    />);
+    return (
+      <input
+        className={`${prefixCls}-input  ${invalidClass}`}
+        ref="input"
+        onKeyDown={this.onKeyDown}
+        value={str}
+        placeholder={placeholder}
+        onChange={this.onInputChange}
+      />
+    );
   },
 
   render() {
diff --git a/src/Panel.jsx b/src/Panel.jsx
index f70cf38..fddea1c 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -2,6 +2,7 @@ import React, { PropTypes } from 'react';
 import Header from './Header';
 import Combobox from './Combobox';
 import moment from 'moment';
+import classNames from 'classnames';
 
 function noop() {
 }
@@ -20,6 +21,7 @@ const Panel = React.createClass({
   propTypes: {
     clearText: PropTypes.string,
     prefixCls: PropTypes.string,
+    className: PropTypes.string,
     defaultOpenValue: PropTypes.object,
     value: PropTypes.object,
     placeholder: PropTypes.string,
@@ -32,8 +34,10 @@ const Panel = React.createClass({
     onEsc: PropTypes.func,
     allowEmpty: PropTypes.bool,
     showHour: PropTypes.bool,
+    showMinute: PropTypes.bool,
     showSecond: PropTypes.bool,
     onClear: PropTypes.func,
+    addon: PropTypes.func,
   },
 
   getDefaultProps() {
@@ -41,7 +45,11 @@ const Panel = React.createClass({
       prefixCls: 'rc-time-picker-panel',
       onChange: noop,
       onClear: noop,
+      disabledHours: noop,
+      disabledMinutes: noop,
+      disabledSeconds: noop,
       defaultOpenValue: moment(),
+      addon: noop,
     };
   },
 
@@ -74,11 +82,15 @@ const Panel = React.createClass({
     this.setState({ currentSelectPanel });
   },
 
+  close() {
+    this.props.onEsc();
+  },
+
   render() {
     const {
-      prefixCls, placeholder, disabledHours, disabledMinutes,
-      disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showSecond,
-      format, defaultOpenValue, clearText, onEsc,
+      prefixCls, className, placeholder, disabledHours, disabledMinutes,
+      disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
+      format, defaultOpenValue, clearText, onEsc, addon,
     } = this.props;
     const {
       value, currentSelectPanel,
@@ -92,7 +104,7 @@ const Panel = React.createClass({
     const secondOptions = generateOptions(60, disabledSecondOptions, hideDisabledOptions);
 
     return (
-      <div className={`${prefixCls}-inner`}>
+      <div className={classNames({ [`${prefixCls}-inner`]: true, [className]: !!className })}>
         <Header
           clearText={clearText}
           prefixCls={prefixCls}
@@ -119,6 +131,7 @@ const Panel = React.createClass({
           format={format}
           onChange={this.onChange}
           showHour={showHour}
+          showMinute={showMinute}
           showSecond={showSecond}
           hourOptions={hourOptions}
           minuteOptions={minuteOptions}
@@ -128,6 +141,7 @@ const Panel = React.createClass({
           disabledSeconds={disabledSeconds}
           onCurrentSelectPanelChange={this.onCurrentSelectPanelChange}
         />
+        {addon(this)}
       </div>
     );
   },
diff --git a/src/Select.jsx b/src/Select.jsx
index e25bb29..238a776 100644
--- a/src/Select.jsx
+++ b/src/Select.jsx
@@ -75,6 +75,9 @@ const Select = React.createClass({
     // move to selected item
     const select = ReactDom.findDOMNode(this);
     const list = ReactDom.findDOMNode(this.refs.list);
+    if (!list) {
+      return;
+    }
     let index = this.props.selectedIndex;
     if (index < 0) {
       index = 0;
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index da0c57b..7d2395d 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -29,9 +29,10 @@ const Picker = React.createClass({
     placeholder: PropTypes.string,
     format: PropTypes.string,
     showHour: PropTypes.bool,
+    showMinute: PropTypes.bool,
+    showSecond: PropTypes.bool,
     style: PropTypes.object,
     className: PropTypes.string,
-    showSecond: PropTypes.bool,
     disabledHours: PropTypes.func,
     disabledMinutes: PropTypes.func,
     disabledSeconds: PropTypes.func,
@@ -39,6 +40,8 @@ const Picker = React.createClass({
     onChange: PropTypes.func,
     onOpen: PropTypes.func,
     onClose: PropTypes.func,
+    addon: PropTypes.func,
+    name: PropTypes.string,
     autoComplete: PropTypes.string,
   },
 
@@ -53,6 +56,7 @@ const Picker = React.createClass({
       defaultOpenValue: moment(),
       allowEmpty: true,
       showHour: true,
+      showMinute: true,
       showSecond: true,
       disabledHours: noop,
       disabledMinutes: noop,
@@ -62,11 +66,12 @@ const Picker = React.createClass({
       onChange: noop,
       onOpen: noop,
       onClose: noop,
-      autoComplete: 'yes',
+      addon: noop,
     };
   },
 
   getInitialState() {
+    this.saveInputRef = refFn.bind(this, 'picker');
     this.savePanelRef = refFn.bind(this, 'panelInstance');
     const { defaultOpen, defaultValue, open = defaultOpen, value = defaultValue } = this.props;
     return {
@@ -102,7 +107,7 @@ const Picker = React.createClass({
 
   onEsc() {
     this.setOpen(false);
-    this.refs.picker.focus();
+    this.picker.focus();
   },
 
   onKeyDown(e) {
@@ -121,24 +126,23 @@ const Picker = React.createClass({
   },
 
   getFormat() {
-    const format = this.props.format;
+    const { format, showHour, showMinute, showSecond } = this.props;
     if (format) {
       return format;
     }
-    if (!this.props.showSecond) {
-      return 'HH:mm';
-    }
-    if (!this.props.showHour) {
-      return 'mm:ss';
-    }
-    return 'HH:mm:ss';
+    return [
+      showHour ? 'HH' : '',
+      showMinute ? 'mm' : '',
+      showSecond ? 'ss' : '',
+    ].filter(item => !!item).join(':');
   },
 
   getPanelElement() {
     const {
       prefixCls, placeholder, disabledHours,
       disabledMinutes, disabledSeconds, hideDisabledOptions,
-      allowEmpty, showHour, showSecond, defaultOpenValue, clearText,
+      allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
+      addon,
     } = this.props;
     return (
       <Panel
@@ -150,8 +154,9 @@ const Picker = React.createClass({
         onClear={this.onPanelClear}
         defaultOpenValue={defaultOpenValue}
         showHour={showHour}
-        onEsc={this.onEsc}
+        showMinute={showMinute}
         showSecond={showSecond}
+        onEsc={this.onEsc}
         allowEmpty={allowEmpty}
         format={this.getFormat()}
         placeholder={placeholder}
@@ -159,6 +164,7 @@ const Picker = React.createClass({
         disabledMinutes={disabledMinutes}
         disabledSeconds={disabledSeconds}
         hideDisabledOptions={hideDisabledOptions}
+        addon={addon}
       />
     );
   },
@@ -184,11 +190,12 @@ const Picker = React.createClass({
     const {
       prefixCls, placeholder, placement, align,
       disabled, transitionName, style, className, showHour,
+      showMinute, showSecond, getPopupContainer, name,
       showSecond, getPopupContainer, autoComplete,
     } = this.props;
     const { open, value } = this.state;
     let popupClassName;
-    if (!showHour || !showSecond) {
+    if (!showHour || !showMinute || !showSecond) {
       popupClassName = `${prefixCls}-panel-narrow`;
     }
     return (
@@ -209,7 +216,10 @@ const Picker = React.createClass({
         <span className={`${prefixCls} ${className}`} style={style}>
           <input
             className={`${prefixCls}-input`}
-            ref="picker" type="text" placeholder={placeholder}
+            ref={this.saveInputRef}
+            type="text"
+            placeholder={placeholder}
+            name={name}
             readOnly
             onKeyDown={this.onKeyDown}
             disabled={disabled} value={value && value.format(this.getFormat()) || ''}