]> git.immae.eu Git - github/fretlink/time-picker.git/commitdiff
fix narrow className 2.3.3
authorafc163 <afc163@gmail.com>
Wed, 22 Mar 2017 07:52:29 +0000 (15:52 +0800)
committerafc163 <afc163@gmail.com>
Wed, 22 Mar 2017 07:52:29 +0000 (15:52 +0800)
package.json
src/TimePicker.jsx

index 6f7ad13d1aa3b4241dbe6d9b048c7615d8d77203..10b1df24c6ffe85982669dfd81deca41d73ea930 100644 (file)
@@ -1,6 +1,6 @@
 {
   "name": "rc-time-picker",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "React TimePicker",
   "keywords": [
     "react",
index 70653331185a61a7738d3383157806a45a4128e9..d94ed940baffa48ff9868ad9ce659509639e79f6 100644 (file)
@@ -206,10 +206,11 @@ const Picker = React.createClass({
       prefixCls, placeholder, placement, align,
       disabled, transitionName, style, className, showHour,
       showMinute, showSecond, getPopupContainer, name, autoComplete,
+      use12Hours,
     } = this.props;
     const { open, value } = this.state;
     let popupClassName;
-    if (!showHour || !showMinute || !showSecond) {
+    if ((!showHour || !showMinute || !showSecond) && !use12Hours) {
       popupClassName = `${prefixCls}-panel-narrow`;
     }
     return (