From: 偏右 <afc163@gmail.com>
Date: Sun, 22 Oct 2017 08:24:17 +0000 (+0800)
Subject: Merge branch 'master' into focus-on-open
X-Git-Tag: 3.0.0~5^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=78598cc9f8608fc8bb1830d3384c8e7fd032eb3f;p=github%2Ffretlink%2Ftime-picker.git

Merge branch 'master' into focus-on-open
---

78598cc9f8608fc8bb1830d3384c8e7fd032eb3f
diff --cc src/Header.jsx
index 6bed557,f6dd241..1520d25
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@@ -22,7 -22,7 +22,8 @@@ class Header extends Component 
      allowEmpty: PropTypes.bool,
      defaultOpenValue: PropTypes.object,
      currentSelectPanel: PropTypes.string,
 +    focusOnOpen: PropTypes.bool,
+     onKeyDown: PropTypes.func,
    };
  
    constructor(props) {
diff --cc src/Panel.jsx
index deeba52,8a6c872..957c021
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@@ -40,7 -40,7 +40,8 @@@ class Panel extends Component 
      onClear: PropTypes.func,
      use12Hours: PropTypes.bool,
      addon: PropTypes.func,
 +    focusOnOpen: PropTypes.bool,
+     onKeyDown: PropTypes.func,
    };
  
    static defaultProps = {
@@@ -90,7 -91,7 +92,7 @@@
      const {
        prefixCls, className, placeholder, disabledHours, disabledMinutes,
        disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
-       format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen,
 -      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, onKeyDown,
++      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen, onKeyDown,
      } = this.props;
      const {
        value, currentSelectPanel,
@@@ -123,7 -124,7 +125,8 @@@
            onChange={this.onChange}
            onClear={onClear}
            allowEmpty={allowEmpty}
 +          focusOnOpen={focusOnOpen}
+           onKeyDown={onKeyDown}
          />
          <Combobox
            prefixCls={prefixCls}
diff --cc src/TimePicker.jsx
index e017527,271515d..70327d7
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@@ -46,7 -48,7 +48,8 @@@ export default class Picker extends Com
      name: PropTypes.string,
      autoComplete: PropTypes.string,
      use12Hours: PropTypes.bool,
 +    focusOnOpen: PropTypes.bool,
+     onKeyDown: PropTypes.func,
    };
  
    static defaultProps = {
@@@ -70,9 -72,11 +73,12 @@@
      onChange: noop,
      onOpen: noop,
      onClose: noop,
+     onFocus: noop,
+     onBlur: noop,
      addon: noop,
      use12Hours: false,
 +    focusOnOpen: false,
+     onKeyDown: noop,
    };
  
    constructor(props) {
@@@ -159,7 -163,7 +165,7 @@@
        prefixCls, placeholder, disabledHours,
        disabledMinutes, disabledSeconds, hideDisabledOptions,
        allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
-       addon, use12Hours, focusOnOpen,
 -      addon, use12Hours, onKeyDown,
++      addon, use12Hours, focusOnOpen, onKeyDown,
      } = this.props;
      return (
        <Panel
@@@ -183,7 -187,7 +189,8 @@@
          hideDisabledOptions={hideDisabledOptions}
          use12Hours={use12Hours}
          addon={addon}
 +        focusOnOpen={focusOnOpen}
+         onKeyDown={onKeyDown}
        />
      );
    }