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

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

f0ac29c61df164ab3e867ef86137faa13d85a87f
diff --cc README.md
index 26e05fc,0698d7d..27a1aae
--- a/README.md
+++ b/README.md
@@@ -77,9 -77,7 +77,10 @@@ AP
  | name                    | String                            | - | sets the name of the generated input |
  | onOpen                  | Function({ open })                |   | when TimePicker panel is opened      |
  | onClose                 | Function({ open })                |   | when TimePicker panel is opened      |
 +| hourStep                | Number                            | 1 | interval between hours in picker  |
 +| minuteStep              | Number                            | 1 | interval between minutes in picker  |
 +| secondStep              | Number                            | 1 | interval between seconds in picker  |
+ | focusOnOpen             | Boolean                           | false | automatically focus the input when the picker opens |
  
  ## Test Case
  
diff --cc src/Panel.jsx
index 4e09b57,957c021..a1b7c77
--- 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,
+     focusOnOpen: PropTypes.bool,
      onKeyDown: PropTypes.func,
    };
  
@@@ -94,8 -92,7 +95,8 @@@
      const {
        prefixCls, className, placeholder, disabledHours, disabledMinutes,
        disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
-       format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, onKeyDown,
-       hourStep, minuteStep, secondStep,
 -      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear, focusOnOpen, onKeyDown,
++      format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear,
++      focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep,
      } = this.props;
      const {
        value, currentSelectPanel,
diff --cc src/TimePicker.jsx
index 5f2239a,70327d7..c7ff80a
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@@ -48,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,
+     focusOnOpen: PropTypes.bool,
      onKeyDown: PropTypes.func,
    };
  
@@@ -166,7 -165,7 +168,7 @@@
        prefixCls, placeholder, disabledHours,
        disabledMinutes, disabledSeconds, hideDisabledOptions,
        allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
-       addon, use12Hours, onKeyDown, hourStep, minuteStep, secondStep,
 -      addon, use12Hours, focusOnOpen, onKeyDown,
++      addon, use12Hours, focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep,
      } = this.props;
      return (
        <Panel
@@@ -189,10 -188,8 +191,11 @@@
          disabledSeconds={disabledSeconds}
          hideDisabledOptions={hideDisabledOptions}
          use12Hours={use12Hours}
 +        hourStep={hourStep}
 +        minuteStep={minuteStep}
 +        secondStep={secondStep}
          addon={addon}
+         focusOnOpen={focusOnOpen}
          onKeyDown={onKeyDown}
        />
      );