3 files changed, 146 insertions, 11 deletions

diff --git a/src/Combobox.jsx b/src/Combobox.jsx
index 1eed4d2..ae53356 100644
--- a/src/Combobox.jsx
+++ b/src/Combobox.jsx
@@ -37,6 +37,7 @@ class Combobox extends Component {
     disabledSeconds: PropTypes.func,
     onCurrentSelectPanelChange: PropTypes.func,
     use12Hours: PropTypes.bool,
+    isAM: PropTypes.bool,
   };
 
   onItemChange = (type, itemValue) => {
@@ -45,7 +46,7 @@ class Combobox extends Component {
 
     if (type === 'hour') {
       if (use12Hours) {
-        if (this.isAM()) {
+        if (this.props.isAM) {
           value.hour(+itemValue % 12);
         } else {
           value.hour((+itemValue % 12) + 12);
@@ -156,7 +157,7 @@ class Combobox extends Component {
                           .map(c => format.match(/\sA/) ? c.toUpperCase() : c)
                           .map(c => ({ value: c }));
 
-    const selected = this.isAM() ? 0 : 1;
+    const selected = this.props.isAM ? 0 : 1;
 
     return (
       <Select
@@ -170,11 +171,6 @@ class Combobox extends Component {
     );
   }
 
-  isAM() {
-    const value = (this.props.value || this.props.defaultOpenValue);
-    return value.hour() >= 0 && value.hour() < 12;
-  }
-
   render() {
     const { prefixCls, defaultOpenValue } = this.props;
     const value = this.props.value || defaultOpenValue;
diff --git a/src/Panel.jsx b/src/Panel.jsx
index 1adb19a..648944d 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -93,9 +93,27 @@ class Panel extends Component {
     this.props.onEsc();
   }
 
+  disabledHours = () => {
+    const { use12Hours, disabledHours } = this.props;
+    let disabledOptions = disabledHours();
+    if (use12Hours && Array.isArray(disabledOptions)) {
+      if (this.isAM()) {
+        disabledOptions = disabledOptions.filter(h => h < 12).map(h => (h === 0 ? 12 : h));
+      } else {
+        disabledOptions = disabledOptions.map(h => (h === 12 ? 12 : h - 12));
+      }
+    }
+    return disabledOptions;
+  }
+
+  isAM() {
+    const value = (this.state.value || this.props.defaultOpenValue);
+    return value.hour() >= 0 && value.hour() < 12;
+  }
+
   render() {
     const {
-      prefixCls, className, placeholder, disabledHours, disabledMinutes,
+      prefixCls, className, placeholder, disabledMinutes,
       disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
       format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear,
       focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep, inputReadOnly,
@@ -103,7 +121,7 @@ class Panel extends Component {
     const {
       value, currentSelectPanel,
     } = this.state;
-    const disabledHourOptions = disabledHours();
+    const disabledHourOptions = this.disabledHours();
     const disabledMinuteOptions = disabledMinutes(value ? value.hour() : null);
     const disabledSecondOptions = disabledSeconds(value ? value.hour() : null,
       value ? value.minute() : null);
@@ -131,7 +149,7 @@ class Panel extends Component {
           hourOptions={hourOptions}
           minuteOptions={minuteOptions}
           secondOptions={secondOptions}
-          disabledHours={disabledHours}
+          disabledHours={this.disabledHours}
           disabledMinutes={disabledMinutes}
           disabledSeconds={disabledSeconds}
           onChange={this.onChange}
@@ -153,11 +171,12 @@ class Panel extends Component {
           hourOptions={hourOptions}
           minuteOptions={minuteOptions}
           secondOptions={secondOptions}
-          disabledHours={disabledHours}
+          disabledHours={this.disabledHours}
           disabledMinutes={disabledMinutes}
           disabledSeconds={disabledSeconds}
           onCurrentSelectPanelChange={this.onCurrentSelectPanelChange}
           use12Hours={use12Hours}
+          isAM={this.isAM()}
         />
         {addon(this)}
       </div>
diff --git a/tests/Select.spec.jsx b/tests/Select.spec.jsx
index 2a15e7c..f414c18 100644
--- a/tests/Select.spec.jsx
+++ b/tests/Select.spec.jsx
@@ -552,5 +552,125 @@ describe('Select', () => {
         done();
       });
     });
+
+    it('disabled correctly', done => {
+      let change;
+      const picker = renderPicker({
+        use12Hours: true,
+        format: undefined,
+        onChange(v) {
+          change = v;
+        },
+        disabledHours() {
+          return [0, 2, 6, 18, 12];
+        },
+        defaultValue: moment()
+          .hour(0)
+          .minute(0)
+          .second(0),
+        showSecond: false,
+      });
+      expect(picker.state.open).not.to.be.ok();
+      const input = TestUtils.scryRenderedDOMComponentsWithClass(picker, 'rc-time-picker-input')[0];
+      let header;
+      async.series(
+        [
+          next => {
+            expect(picker.state.open).to.be(false);
+
+            Simulate.click(input);
+            setTimeout(next, 100);
+          },
+          next => {
+            expect(picker.state.open).to.be(true);
+            header = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-input',
+            )[0];
+            expect(header).to.be.ok();
+            expect(header.value).to.be('12:00 am');
+            expect(input.value).to.be('12:00 am');
+
+            const selector = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-select',
+            )[0];
+            const option = selector.getElementsByTagName('li')[2];
+            Simulate.click(option);
+            setTimeout(next, 100);
+          },
+          next => {
+            expect(change).not.to.be.ok();
+            expect(header.value).to.be('12:00 am');
+            expect(input.value).to.be('12:00 am');
+            expect(picker.state.open).to.be.ok();
+
+            const selector = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-select',
+            )[0];
+            const option = selector.getElementsByTagName('li')[5];
+            Simulate.click(option);
+            setTimeout(next, 100);
+          },
+          next => {
+            expect(change).to.be.ok();
+            expect(change.hour()).to.be(5);
+            expect(header.value).to.be('5:00 am');
+            expect(input.value).to.be('5:00 am');
+            expect(picker.state.open).to.be.ok();
+
+            const selector = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-select',
+            )[2];
+            Simulate.click(selector.getElementsByTagName('li')[1]);
+
+            setTimeout(next, 200);
+            change = null;
+          },
+          next => {
+            expect(change).not.to.be.ok();
+            expect(header.value).to.be('5:00 pm');
+            expect(input.value).to.be('5:00 pm');
+            expect(picker.state.open).to.be.ok();
+
+            const selector = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-select',
+            )[0];
+            const option = selector.getElementsByTagName('li')[0];
+            Simulate.click(option);
+            setTimeout(next, 100);
+          },
+          next => {
+            expect(change).not.to.be.ok();
+            expect(header.value).to.be('5:00 pm');
+            expect(input.value).to.be('5:00 pm');
+            expect(picker.state.open).to.be.ok();
+
+            const selector = TestUtils.scryRenderedDOMComponentsWithClass(
+              picker.panelInstance,
+              'rc-time-picker-panel-select',
+            )[0];
+            const option = selector.getElementsByTagName('li')[5];
+            Simulate.click(option);
+            setTimeout(next, 100);
+          },
+          next => {
+            expect(change).to.be.ok();
+            expect(change.hour()).to.be(17);
+            expect(header.value).to.be('5:00 pm');
+            expect(input.value).to.be('5:00 pm');
+            expect(picker.state.open).to.be.ok();
+
+            next();
+          },
+        ],
+        () => {
+          done();
+        },
+      );
+    });
   });
 });