aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Panel.jsx
diff options
context:
space:
mode:
author偏右 <afc163@gmail.com>2017-10-22 16:24:17 +0800
committerGitHub <noreply@github.com>2017-10-22 16:24:17 +0800
commit78598cc9f8608fc8bb1830d3384c8e7fd032eb3f (patch)
treed015484db93d83f9ea17fbe6b5602cd9936d37c8 /src/Panel.jsx
parentbcb307b79a2481bad496085b75b701bf864adc6d (diff)
parentb6767d8a08ccfc52836e09e3a0886a5cf225b93f (diff)
downloadtime-picker-78598cc9f8608fc8bb1830d3384c8e7fd032eb3f.tar.gz
time-picker-78598cc9f8608fc8bb1830d3384c8e7fd032eb3f.tar.zst
time-picker-78598cc9f8608fc8bb1830d3384c8e7fd032eb3f.zip
Merge branch 'master' into focus-on-open
Diffstat (limited to 'src/Panel.jsx')
-rw-r--r--src/Panel.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Panel.jsx b/src/Panel.jsx
index deeba52..957c021 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -41,6 +41,7 @@ class Panel extends Component {
41 use12Hours: PropTypes.bool, 41 use12Hours: PropTypes.bool,
42 addon: PropTypes.func, 42 addon: PropTypes.func,
43 focusOnOpen: PropTypes.bool, 43 focusOnOpen: PropTypes.bool,
44 onKeyDown: PropTypes.func,
44 }; 45 };
45 46
46 static defaultProps = { 47 static defaultProps = {
@@ -53,6 +54,7 @@ class Panel extends Component {
53 defaultOpenValue: moment(), 54 defaultOpenValue: moment(),
54 use12Hours: false, 55 use12Hours: false,
55 addon: noop, 56 addon: noop,
57 onKeyDown: noop,
56 }; 58 };
57 59
58 constructor(props) { 60 constructor(props) {
@@ -90,7 +92,7 @@ class Panel extends Component {
90 const { 92 const {
91 prefixCls, className, placeholder, disabledHours, disabledMinutes, 93 prefixCls, className, placeholder, disabledHours, disabledMinutes,
92 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond, 94 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
93 format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen, 95 format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen, onKeyDown,
94 } = this.props; 96 } = this.props;
95 const { 97 const {
96 value, currentSelectPanel, 98 value, currentSelectPanel,
@@ -124,6 +126,7 @@ class Panel extends Component {
124 onClear={onClear} 126 onClear={onClear}
125 allowEmpty={allowEmpty} 127 allowEmpty={allowEmpty}
126 focusOnOpen={focusOnOpen} 128 focusOnOpen={focusOnOpen}
129 onKeyDown={onKeyDown}
127 /> 130 />
128 <Combobox 131 <Combobox
129 prefixCls={prefixCls} 132 prefixCls={prefixCls}