Merge pull request #41 from react-component/fix-react-15.5-warning

[github/fretlink/time-picker.git] / src / Combobox.jsx

diff --git a/src/Combobox.jsx b/src/Combobox.jsx
index e31b7fdac95201008653478b831d1725dc7127a1..1eed4d295e90efabb1400cb869ec19aa8db4f87f 100644 (file)
--- a/src/Combobox.jsx
+++ b/src/Combobox.jsx
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import Select from './Select';
 
 const formatOption = (option, disabledOptions) => {
@@ -18,8 +19,8 @@ const formatOption = (option, disabledOptions) => {
   };
 };
 
-const Combobox = React.createClass({
-  propTypes: {
+class Combobox extends Component {
+  static propTypes = {
     format: PropTypes.string,
     defaultOpenValue: PropTypes.object,
     prefixCls: PropTypes.string,
@@ -35,19 +36,19 @@ const Combobox = React.createClass({
     disabledMinutes: PropTypes.func,
     disabledSeconds: PropTypes.func,
     onCurrentSelectPanelChange: PropTypes.func,
-    show12Hours: PropTypes.bool,
-  },
+    use12Hours: PropTypes.bool,
+  };
 
-  onItemChange(type, itemValue) {
-    const { onChange, defaultOpenValue, show12Hours } = this.props;
+  onItemChange = (type, itemValue) => {
+    const { onChange, defaultOpenValue, use12Hours } = this.props;
     const value = (this.props.value || defaultOpenValue).clone();
 
     if (type === 'hour') {
-      if (show12Hours) {
-        if (value.hour() > 12 || !value.hour()) {
-          value.hour(+itemValue + 12);
+      if (use12Hours) {
+        if (this.isAM()) {
+          value.hour(+itemValue % 12);
         } else {
-          value.hour(+itemValue);
+          value.hour((+itemValue % 12) + 12);
         }
       } else {
         value.hour(+itemValue);
@@ -55,16 +56,14 @@ const Combobox = React.createClass({
     } else if (type === 'minute') {
       value.minute(+itemValue);
     } else if (type === 'ampm') {
-      if (show12Hours) {
-        if (itemValue === 'PM' && value.hour() <= 12) {
-          value.hour(value.hour() + 12);
+      const ampm = itemValue.toUpperCase();
+      if (use12Hours) {
+        if (ampm === 'PM' && value.hour() < 12) {
+          value.hour((value.hour() % 12) + 12);
         }
 
-        if (itemValue === 'AM') {
-          if (!value.hour()) {
-            value.hour(12);
-          } else
-          if (value.hour() > 12) {
+        if (ampm === 'AM') {
+          if (value.hour() >= 12) {
             value.hour(value.hour() - 12);
           }
         }
@@ -73,34 +72,26 @@ const Combobox = React.createClass({
       value.second(+itemValue);
     }
     onChange(value);
-  },
+  }
 
-  onEnterSelectPanel(range) {
+  onEnterSelectPanel = (range) => {
     this.props.onCurrentSelectPanelChange(range);
-  },
+  }
 
   getHourSelect(hour) {
-    const { prefixCls, hourOptions, disabledHours, showHour, show12Hours } = this.props;
+    const { prefixCls, hourOptions, disabledHours, showHour, use12Hours } = this.props;
     if (!showHour) {
       return null;
     }
     const disabledOptions = disabledHours();
-    let hourAdj;
-    if (show12Hours) {
-      if (hour > 12) {
-        hourAdj = hour - 12;
-      } else {
-        hourAdj = hour || 12;
-      }
-    } else {
-      hourAdj = hour;
-    }
-
     let hourOptionsAdj;
-    if (show12Hours) {
-      hourOptionsAdj = hourOptions.filter(h => h <= 12 && h > 0);
+    let hourAdj;
+    if (use12Hours) {
+      hourOptionsAdj = [12].concat(hourOptions.filter(h => h < 12 && h > 0));
+      hourAdj = (hour % 12) || 12;
     } else {
       hourOptionsAdj = hourOptions;
+      hourAdj = hour;
     }
 
     return (
@@ -113,7 +104,7 @@ const Combobox = React.createClass({
         onMouseEnter={this.onEnterSelectPanel.bind(this, 'hour')}
       />
     );
-  },
+  }
 
   getMinuteSelect(minute) {
     const { prefixCls, minuteOptions, disabledMinutes, defaultOpenValue, showMinute } = this.props;
@@ -133,7 +124,7 @@ const Combobox = React.createClass({
         onMouseEnter={this.onEnterSelectPanel.bind(this, 'minute')}
       />
     );
-  },
+  }
 
   getSecondSelect(second) {
     const { prefixCls, secondOptions, disabledSeconds, showSecond, defaultOpenValue } = this.props;
@@ -153,16 +144,19 @@ const Combobox = React.createClass({
         onMouseEnter={this.onEnterSelectPanel.bind(this, 'second')}
       />
     );
-  },
+  }
 
   getAMPMSelect() {
-    const { prefixCls, show12Hours, defaultOpenValue } = this.props;
-    if (!show12Hours) {
+    const { prefixCls, use12Hours, format } = this.props;
+    if (!use12Hours) {
       return null;
     }
-    const value = this.props.value || defaultOpenValue;
-    const AMPMOptions = [{ value: 'AM' }, { value: 'PM' }];
-    const selected = (!value.hour() || value.hour() > 12) ? 1 : 0;
+
+    const AMPMOptions = ['am', 'pm'] // If format has A char, then we should uppercase AM/PM
+                          .map(c => format.match(/\sA/) ? c.toUpperCase() : c)
+                          .map(c => ({ value: c }));
+
+    const selected = this.isAM() ? 0 : 1;
 
     return (
       <Select
@@ -174,7 +168,12 @@ const Combobox = React.createClass({
         onMouseEnter={this.onEnterSelectPanel.bind(this, 'ampm')}
       />
     );
-  },
+  }
+
+  isAM() {
+    const value = (this.props.value || this.props.defaultOpenValue);
+    return value.hour() >= 0 && value.hour() < 12;
+  }
 
   render() {
     const { prefixCls, defaultOpenValue } = this.props;
@@ -187,7 +186,7 @@ const Combobox = React.createClass({
         {this.getAMPMSelect(value.hour())}
       </div>
     );
-  },
-});
+  }
+}
 
 export default Combobox;