Merge 0e4fd16 into 227e6ec

react-component · Aug 24, 2017 · 3081f79 · 3081f79
2 parents 227e6ec + 0e4fd16
commit 3081f79
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Header.jsx b/src/Header.jsx
@@ -22,6 +22,7 @@ class Header extends Component {
     allowEmpty: PropTypes.bool,
     defaultOpenValue: PropTypes.object,
     currentSelectPanel: PropTypes.string,
+    onKeyDown: PropTypes.func,
   };
 
   constructor(props) {
@@ -122,9 +123,12 @@ class Header extends Component {
   }
 
   onKeyDown = (e) => {
+    const { onEsc, onKeyDown } = this.props;
     if (e.keyCode === 27) {
-      this.props.onEsc();
+      onEsc();
     }
+
+    onKeyDown(e);
   }
 
   onClear = () => {

diff --git a/src/Panel.jsx b/src/Panel.jsx
@@ -40,6 +40,7 @@ class Panel extends Component {
     onClear: PropTypes.func,
     use12Hours: PropTypes.bool,
     addon: PropTypes.func,
+    onKeyDown: PropTypes.func,
   };
 
   static defaultProps = {
@@ -52,6 +53,7 @@ class Panel extends Component {
     defaultOpenValue: moment(),
     use12Hours: false,
     addon: noop,
+    onKeyDown: noop,
   };
 
   constructor(props) {
@@ -89,7 +91,7 @@ class Panel extends Component {
     const {
       prefixCls, className, placeholder, disabledHours, disabledMinutes,
       disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
-      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear,
+      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, onKeyDown,
     } = this.props;
     const {
       value, currentSelectPanel,
@@ -122,6 +124,7 @@ class Panel extends Component {
           onChange={this.onChange}
           onClear={onClear}
           allowEmpty={allowEmpty}
+          onKeyDown={onKeyDown}
         />
         <Combobox
           prefixCls={prefixCls}

diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
@@ -46,6 +46,7 @@ export default class Picker extends Component {
     name: PropTypes.string,
     autoComplete: PropTypes.string,
     use12Hours: PropTypes.bool,
+    onKeyDown: PropTypes.func,
   };
 
   static defaultProps = {
@@ -71,6 +72,7 @@ export default class Picker extends Component {
     onClose: noop,
     addon: noop,
     use12Hours: false,
+    onKeyDown: noop,
   };
 
   constructor(props) {
@@ -157,7 +159,7 @@ export default class Picker extends Component {
       prefixCls, placeholder, disabledHours,
       disabledMinutes, disabledSeconds, hideDisabledOptions,
       allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
-      addon, use12Hours,
+      addon, use12Hours, onKeyDown,
     } = this.props;
     return (
       <Panel
@@ -181,6 +183,7 @@ export default class Picker extends Component {
         hideDisabledOptions={hideDisabledOptions}
         use12Hours={use12Hours}
         addon={addon}
+        onKeyDown={onKeyDown}
       />
     );
   }