aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Header.jsx6
-rw-r--r--src/Panel.jsx5
-rw-r--r--src/TimePicker.jsx5
3 files changed, 13 insertions, 3 deletions
diff --git a/src/Header.jsx b/src/Header.jsx
index 91e8549..f6dd241 100644
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@ -22,6 +22,7 @@ class Header extends Component {
22 allowEmpty: PropTypes.bool, 22 allowEmpty: PropTypes.bool,
23 defaultOpenValue: PropTypes.object, 23 defaultOpenValue: PropTypes.object,
24 currentSelectPanel: PropTypes.string, 24 currentSelectPanel: PropTypes.string,
25 onKeyDown: PropTypes.func,
25 }; 26 };
26 27
27 constructor(props) { 28 constructor(props) {
@@ -122,9 +123,12 @@ class Header extends Component {
122 } 123 }
123 124
124 onKeyDown = (e) => { 125 onKeyDown = (e) => {
126 const { onEsc, onKeyDown } = this.props;
125 if (e.keyCode === 27) { 127 if (e.keyCode === 27) {
126 this.props.onEsc(); 128 onEsc();
127 } 129 }
130
131 onKeyDown(e);
128 } 132 }
129 133
130 onClear = () => { 134 onClear = () => {
diff --git a/src/Panel.jsx b/src/Panel.jsx
index 1953ad4..8a6c872 100644
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -40,6 +40,7 @@ class Panel extends Component {
40 onClear: PropTypes.func, 40 onClear: PropTypes.func,
41 use12Hours: PropTypes.bool, 41 use12Hours: PropTypes.bool,
42 addon: PropTypes.func, 42 addon: PropTypes.func,
43 onKeyDown: PropTypes.func,
43 }; 44 };
44 45
45 static defaultProps = { 46 static defaultProps = {
@@ -52,6 +53,7 @@ class Panel extends Component {
52 defaultOpenValue: moment(), 53 defaultOpenValue: moment(),
53 use12Hours: false, 54 use12Hours: false,
54 addon: noop, 55 addon: noop,
56 onKeyDown: noop,
55 }; 57 };
56 58
57 constructor(props) { 59 constructor(props) {
@@ -89,7 +91,7 @@ class Panel extends Component {
89 const { 91 const {
90 prefixCls, className, placeholder, disabledHours, disabledMinutes, 92 prefixCls, className, placeholder, disabledHours, disabledMinutes,
91 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond, 93 disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
92 format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, 94 format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, onKeyDown,
93 } = this.props; 95 } = this.props;
94 const { 96 const {
95 value, currentSelectPanel, 97 value, currentSelectPanel,
@@ -122,6 +124,7 @@ class Panel extends Component {
122 onChange={this.onChange} 124 onChange={this.onChange}
123 onClear={onClear} 125 onClear={onClear}
124 allowEmpty={allowEmpty} 126 allowEmpty={allowEmpty}
127 onKeyDown={onKeyDown}
125 /> 128 />
126 <Combobox 129 <Combobox
127 prefixCls={prefixCls} 130 prefixCls={prefixCls}
diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index 2c6a1f1..0b985dd 100644
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -46,6 +46,7 @@ export default class Picker extends Component {
46 name: PropTypes.string, 46 name: PropTypes.string,
47 autoComplete: PropTypes.string, 47 autoComplete: PropTypes.string,
48 use12Hours: PropTypes.bool, 48 use12Hours: PropTypes.bool,
49 onKeyDown: PropTypes.func,
49 }; 50 };
50 51
51 static defaultProps = { 52 static defaultProps = {
@@ -71,6 +72,7 @@ export default class Picker extends Component {
71 onClose: noop, 72 onClose: noop,
72 addon: noop, 73 addon: noop,
73 use12Hours: false, 74 use12Hours: false,
75 onKeyDown: noop,
74 }; 76 };
75 77
76 constructor(props) { 78 constructor(props) {
@@ -157,7 +159,7 @@ export default class Picker extends Component {
157 prefixCls, placeholder, disabledHours, 159 prefixCls, placeholder, disabledHours,
158 disabledMinutes, disabledSeconds, hideDisabledOptions, 160 disabledMinutes, disabledSeconds, hideDisabledOptions,
159 allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText, 161 allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
160 addon, use12Hours, 162 addon, use12Hours, onKeyDown,
161 } = this.props; 163 } = this.props;
162 return ( 164 return (
163 <Panel 165 <Panel
@@ -181,6 +183,7 @@ export default class Picker extends Component {
181 hideDisabledOptions={hideDisabledOptions} 183 hideDisabledOptions={hideDisabledOptions}
182 use12Hours={use12Hours} 184 use12Hours={use12Hours}
183 addon={addon} 185 addon={addon}
186 onKeyDown={onKeyDown}
184 /> 187 />
185 ); 188 );
186 } 189 }