Merge pull request #87 from vahnag/master

Fixes #75: Disabled Hours for 12 hour picker

diff --git a/HISTORY.md b/HISTORY.md
index 7445600ffa89a9fde5ba4f1312ce2b7d1b32e4ed..f44ba30c96199daf10e4ecc3ce4adf9f770ac706 100644 (file)
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # History
 
+3.3.0 / 2019-02-8
+---------------------------
+
+- Add `inputReadOnly`
+
 3.2.0 / 2017-11-15
 ---------------------------
 

diff --git a/README.md b/README.md
index 27a1aae44b73b2e4e0ec886d0b309c7012a8d61c..3baa0ce1a59cdd0b044afbbc0b3e9d5712358022 100644 (file)
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ API
 | 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 |
+| inputReadOnly             | Boolean                           | false | set input to read only |
 
 ## Test Case
 

diff --git a/examples/12hours.js b/examples/12hours.js
index 72d6950027d997da0fabf0870889e4057585106a..6281210960ea0d24a44944f8c097837b53671e0f 100644 (file)
--- a/examples/12hours.js
+++ b/examples/12hours.js
@@ -25,6 +25,7 @@ ReactDom.render(
     onChange={onChange}
     format={format}
     use12Hours
+    inputReadOnly
   />,
   document.getElementById('__react-content')
 );

diff --git a/package.json b/package.json
index abc1f8f0df155740480a5baf310fdd8ceb3832a5..80cb6f2dd87d898d145d0b8aee0f4817827e4c49 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rc-time-picker",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "React TimePicker",
   "keywords": [
     "react",

diff --git a/src/Header.jsx b/src/Header.jsx
index 1520d25e3008b371efc66bebfe620d2cf5df4034..21d557edb2c02591589fcaa4234a053728df7a7f 100644 (file)
--- a/src/Header.jsx
+++ b/src/Header.jsx
@@ -10,6 +10,7 @@ class Header extends Component {
     placeholder: PropTypes.string,
     clearText: PropTypes.string,
     value: PropTypes.object,
+    inputReadOnly: PropTypes.bool,
     hourOptions: PropTypes.array,
     minuteOptions: PropTypes.array,
     secondOptions: PropTypes.array,
@@ -26,6 +27,10 @@ class Header extends Component {
     onKeyDown: PropTypes.func,
   };
 
+  static defaultProps = {
+    inputReadOnly: false,
+  }
+
   constructor(props) {
     super(props);
     const { value, format } = props;
@@ -166,7 +171,7 @@ class Header extends Component {
   }
 
   getInput() {
-    const { prefixCls, placeholder } = this.props;
+    const { prefixCls, placeholder, inputReadOnly } = this.props;
     const { invalid, str } = this.state;
     const invalidClass = invalid ? `${prefixCls}-input-invalid` : '';
     return (
@@ -177,6 +182,7 @@ class Header extends Component {
         value={str}
         placeholder={placeholder}
         onChange={this.onInputChange}
+        readOnly={!!inputReadOnly}
       />
     );
   }

diff --git a/src/Panel.jsx b/src/Panel.jsx
index a1b7c77a9cdd1ae19f28b892e2bc979141dc23f1..1adb19a27c32ac122f4425e414b25a39917fc781 100644 (file)
--- a/src/Panel.jsx
+++ b/src/Panel.jsx
@@ -27,6 +27,7 @@ class Panel extends Component {
     value: PropTypes.object,
     placeholder: PropTypes.string,
     format: PropTypes.string,
+    inputReadOnly: PropTypes.bool,
     disabledHours: PropTypes.func,
     disabledMinutes: PropTypes.func,
     disabledSeconds: PropTypes.func,
@@ -58,6 +59,7 @@ class Panel extends Component {
     use12Hours: false,
     addon: noop,
     onKeyDown: noop,
+    inputReadOnly: false,
   };
 
   constructor(props) {
@@ -96,7 +98,7 @@ class Panel extends Component {
       prefixCls, className, placeholder, disabledHours, disabledMinutes,
       disabledSeconds, hideDisabledOptions, allowEmpty, showHour, showMinute, showSecond,
       format, defaultOpenValue, clearText, onEsc, addon, use12Hours, onClear,
-      focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep,
+      focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep, inputReadOnly,
     } = this.props;
     const {
       value, currentSelectPanel,
@@ -137,6 +139,7 @@ class Panel extends Component {
           allowEmpty={allowEmpty}
           focusOnOpen={focusOnOpen}
           onKeyDown={onKeyDown}
+          inputReadOnly={inputReadOnly}
         />
         <Combobox
           prefixCls={prefixCls}

diff --git a/src/TimePicker.jsx b/src/TimePicker.jsx
index e3c5a79fd6e232f675151318000b4c174110c633..7659bc721d6630efe74339ecd211171202daad72 100644 (file)
--- a/src/TimePicker.jsx
+++ b/src/TimePicker.jsx
@@ -18,6 +18,7 @@ export default class Picker extends Component {
     clearText: PropTypes.string,
     value: PropTypes.object,
     defaultOpenValue: PropTypes.object,
+    inputReadOnly: PropTypes.bool,
     disabled: PropTypes.bool,
     allowEmpty: PropTypes.bool,
     defaultValue: PropTypes.object,
@@ -60,6 +61,7 @@ export default class Picker extends Component {
     clearText: 'clear',
     prefixCls: 'rc-time-picker',
     defaultOpen: false,
+    inputReadOnly: false,
     style: {},
     className: '',
     popupClassName: '',
@@ -167,7 +169,7 @@ export default class Picker extends Component {
   getPanelElement() {
     const {
       prefixCls, placeholder, disabledHours,
-      disabledMinutes, disabledSeconds, hideDisabledOptions,
+      disabledMinutes, disabledSeconds, hideDisabledOptions, inputReadOnly,
       allowEmpty, showHour, showMinute, showSecond, defaultOpenValue, clearText,
       addon, use12Hours, focusOnOpen, onKeyDown, hourStep, minuteStep, secondStep,
     } = this.props;
@@ -177,6 +179,7 @@ export default class Picker extends Component {
         prefixCls={`${prefixCls}-panel`}
         ref={this.savePanelRef}
         value={this.state.value}
+        inputReadOnly={inputReadOnly}
         onChange={this.onPanelChange}
         onClear={this.onPanelClear}
         defaultOpenValue={defaultOpenValue}