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

Merge branch 'master' into picker-step
---

cc2dca8a2bb0bf3b820903043be2586fb413c458
diff --cc src/Panel.jsx
index 468eb37,8a6c872..4e09b57
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@@ -39,10 -39,8 +39,11 @@@ class Panel extends Component 
      showSecond: PropTypes.bool,
      onClear: PropTypes.func,
      use12Hours: PropTypes.bool,
 +    hourStep: PropTypes.number,
 +    minuteStep: PropTypes.number,
 +    secondStep: PropTypes.number,
      addon: PropTypes.func,
+     onKeyDown: PropTypes.func,
    };
  
    static defaultProps = {
@@@ -92,8 -91,7 +94,8 @@@
      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,
 +      hourStep, minuteStep, secondStep,
      } = this.props;
      const {
        value, currentSelectPanel,
diff --cc src/TimePicker.jsx
index 85dc3e2,271515d..5f2239a
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@@ -46,9 -48,7 +48,10 @@@ export default class Picker extends Com
      name: PropTypes.string,
      autoComplete: PropTypes.string,
      use12Hours: PropTypes.bool,
 +    hourStep: PropTypes.number,
 +    minuteStep: PropTypes.number,
 +    secondStep: PropTypes.number,
+     onKeyDown: PropTypes.func,
    };
  
    static defaultProps = {
@@@ -160,7 -163,7 +166,7 @@@
        prefixCls, placeholder, disabledHours,
        disabledMinutes, disabledSeconds, hideDisabledOptions,
        allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
-       addon, use12Hours, hourStep, minuteStep, secondStep,
 -      addon, use12Hours, onKeyDown,
++      addon, use12Hours, onKeyDown, hourStep, minuteStep, secondStep,
      } = this.props;
      return (
        <Panel
@@@ -183,10 -186,8 +189,11 @@@
          disabledSeconds={disabledSeconds}
          hideDisabledOptions={hideDisabledOptions}
          use12Hours={use12Hours}
 +        hourStep={hourStep}
 +        minuteStep={minuteStep}
 +        secondStep={secondStep}
          addon={addon}
+         onKeyDown={onKeyDown}
        />
      );
    }