TimePicker autoOk prop

tyfoo · Oct 21, 2015 · 69d47fa · 69d47fa
1 parent 5f83108
commit 69d47fa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/time-picker/clock.jsx b/src/time-picker/clock.jsx
@@ -11,6 +11,8 @@ const Clock = React.createClass({
   mixins: [StylePropable],
 
   propTypes: {
+    onChangeMinutes: React.PropTypes.func,
+    onChangeHours: React.PropTypes.func,
     initialTime: React.PropTypes.object,
     mode: React.PropTypes.oneOf(['hour', 'minute']),
     format: React.PropTypes.oneOf(['ampm', '24hr']),
@@ -148,12 +150,17 @@ const Clock = React.createClass({
     this.setState({
       selectedTime: time,
     });
-
+
+    let { onChangeHours } = this.props;
+
     if (finished) {
       setTimeout(() => {
         this.setState({
           mode: 'minute',
         });
+        if (typeof(onChangeHours === 'function')) {
+          onChangeHours(time);
+        }
       }, 100);
     }
   },
@@ -164,6 +171,11 @@ const Clock = React.createClass({
     this.setState({
       selectedTime: time,
     });
+
+    let { onChangeMinutes } = this.props;
+    if (typeof(onChangeMinutes === 'function')) {
+        onChangeMinutes(time);
+      }
   },
 
   getSelectedTime() {

diff --git a/src/time-picker/time-picker-dialog.jsx b/src/time-picker/time-picker-dialog.jsx
@@ -17,6 +17,7 @@ const TimePickerDialog = React.createClass({
   },
 
   propTypes: {
+    autoOk: React.PropTypes.bool,
     initialTime: React.PropTypes.object,
     onAccept: React.PropTypes.func,
     onShow: React.PropTypes.func,
@@ -61,6 +62,7 @@ const TimePickerDialog = React.createClass({
       initialTime,
       onAccept,
       format,
+      autoOk,
       ...other,
     } = this.props;
 
@@ -89,7 +91,9 @@ const TimePickerDialog = React.createClass({
         secondary={true}
         onTouchTap={this._handleOKTouchTap} />,
     ];
-
+
+    let onClockChangeMinutes = (autoOk === true ? this._handleOKTouchTap : undefined);
+
     return (
       <Dialog {...other}
         ref="dialogWindow"
@@ -103,7 +107,8 @@ const TimePickerDialog = React.createClass({
         <Clock
           ref="clock"
           format={format}
-          initialTime={initialTime} />
+          initialTime={initialTime}
+          onChangeMinutes={onClockChangeMinutes} />
       </Dialog>
     );
   },

diff --git a/src/time-picker/time-picker.jsx b/src/time-picker/time-picker.jsx
@@ -15,6 +15,7 @@ const TimePicker = React.createClass({
   mixins: [StylePropable, WindowListenable],
 
   propTypes: {
+    autoOk: React.PropTypes.bool,
     defaultTime: React.PropTypes.object,
     format: React.PropTypes.oneOf(['ampm', '24hr']),
     pedantic: React.PropTypes.bool,
@@ -76,6 +77,7 @@ const TimePicker = React.createClass({
 
   render() {
     let {
+      autoOk,
       format,
       onFocus,
       onTouchTap,
@@ -104,7 +106,8 @@ const TimePicker = React.createClass({
           onAccept={this._handleDialogAccept}
           onShow={onShow}
           onDismiss={onDismiss}
-          format={format} />
+          format={format}
+          autoOk={autoOk} />
       </div>
     );
   },