aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/TimePicker.jsx
diff options
context:
space:
mode:
author偏右 <afc163@gmail.com>2017-10-22 16:38:04 +0800
committerGitHub <noreply@github.com>2017-10-22 16:38:04 +0800
commitf0ac29c61df164ab3e867ef86137faa13d85a87f (patch)
tree6b1baa2373001870fa00310da36d46b21e8a43c8 /src/TimePicker.jsx
parentcc2dca8a2bb0bf3b820903043be2586fb413c458 (diff)
parent8a116e355bfabda48537be06d21cf01fdceaa8b7 (diff)
downloadtime-picker-f0ac29c61df164ab3e867ef86137faa13d85a87f.tar.gz
time-picker-f0ac29c61df164ab3e867ef86137faa13d85a87f.tar.zst
time-picker-f0ac29c61df164ab3e867ef86137faa13d85a87f.zip
Merge branch 'master' into picker-step
Diffstat (limited to 'src/TimePicker.jsx')
-rw-r--r--src/TimePicker.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index 5f2239a..c7ff80a 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -51,6 +51,7 @@ export default class Picker extends Component {
51 hourStep: PropTypes.number, 51 hourStep: PropTypes.number,
52 minuteStep: PropTypes.number, 52 minuteStep: PropTypes.number,
53 secondStep: PropTypes.number, 53 secondStep: PropTypes.number,
54 focusOnOpen: PropTypes.bool,
54 onKeyDown: PropTypes.func, 55 onKeyDown: PropTypes.func,
55 }; 56 };
56 57
@@ -79,6 +80,7 @@ export default class Picker extends Component {
79 onBlur: noop, 80 onBlur: noop,
80 addon: noop, 81 addon: noop,
81 use12Hours: false, 82 use12Hours: false,
83 focusOnOpen: false,
82 onKeyDown: noop, 84 onKeyDown: noop,
83 }; 85 };
84 86
@@ -166,7 +168,7 @@ export default class Picker extends Component {
166 prefixCls, placeholder, disabledHours, 168 prefixCls, placeholder, disabledHours,
167 disabledMinutes, disabledSeconds, hideDisabledOptions, 169 disabledMinutes, disabledSeconds, hideDisabledOptions,
168 allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, 170 allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
169 addon, use12Hours, onKeyDown, hourStep, minuteStep, secondStep, 171 addon, use12Hours, focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep,
170 } = this.props; 172 } = this.props;
171 return ( 173 return (
172 <Panel 174 <Panel
@@ -193,6 +195,7 @@ export default class Picker extends Component {
193 minuteStep={minuteStep} 195 minuteStep={minuteStep}
194 secondStep={secondStep} 196 secondStep={secondStep}
195 addon={addon} 197 addon={addon}
198 focusOnOpen={focusOnOpen}
196 onKeyDown={onKeyDown} 199 onKeyDown={onKeyDown}
197 /> 200 />
198 ); 201 );