diff options
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/TimePicker.jsx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 6f7ad13..10b1df2 100644 --- a/package.json +++ b/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "rc-time-picker", | 2 | "name": "rc-time-picker", |
3 | "version": "2.3.2", | 3 | "version": "2.3.3", |
4 | "description": "React TimePicker", | 4 | "description": "React TimePicker", |
5 | "keywords": [ | 5 | "keywords": [ |
6 | "react", | 6 | "react", |
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx index 7065333..d94ed94 100644 --- a/src/TimePicker.jsx +++ b/src/TimePicker.jsx | |||
@@ -206,10 +206,11 @@ const Picker = React.createClass({ | |||
206 | prefixCls, placeholder, placement, align, | 206 | prefixCls, placeholder, placement, align, |
207 | disabled, transitionName, style, className, showHour, | 207 | disabled, transitionName, style, className, showHour, |
208 | showMinute, showSecond, getPopupContainer, name, autoComplete, | 208 | showMinute, showSecond, getPopupContainer, name, autoComplete, |
209 | use12Hours, | ||
209 | } = this.props; | 210 | } = this.props; |
210 | const { open, value } = this.state; | 211 | const { open, value } = this.state; |
211 | let popupClassName; | 212 | let popupClassName; |
212 | if (!showHour || !showMinute || !showSecond) { | 213 | if ((!showHour || !showMinute || !showSecond) && !use12Hours) { |
213 | popupClassName = `${prefixCls}-panel-narrow`; | 214 | popupClassName = `${prefixCls}-panel-narrow`; |
214 | } | 215 | } |
215 | return ( | 216 | return ( |