Release rc.10

docs/src/Examples/Demo/BasicDatePicker.jsx

@@ -26,6 +26,7 @@ export default class BasicDatePicker extends PureComponent {
 
         <div className="picker">
           <DatePicker
+            autoOk
             label="Clearable"
             clearable
             disableFuture

docs/src/Examples/Demo/TimePickerBasic.jsx

@@ -17,6 +17,7 @@ export default class BasicUsage extends PureComponent {
       <Fragment>
         <div className="picker">
           <TimePicker
+            autoOk
             label="12 hours"
             value={selectedDate}
             onChange={this.handleDateChange}

lib/src/DatePicker/Calendar.jsx

@@ -42,6 +42,10 @@ export class Calendar extends Component {
     shouldDisableDate: () => false,
   };
 
+  state = {
+    currentMonth: this.props.utils.getStartOfMonth(this.props.date),
+  };
+
   static getDerivedStateFromProps(nextProps, state) {
     if (!nextProps.utils.isEqual(nextProps.date, state.lastDate)) {
       return {
@@ -53,10 +57,6 @@ export class Calendar extends Component {
     return null;
   }
 
-  state = {
-    currentMonth: this.props.utils.getStartOfMonth(this.props.date),
-  };
-
   componentDidMount() {
     const {
       date, minDate, maxDate, utils, disableFuture, disablePast,
@@ -81,7 +81,7 @@ export class Calendar extends Component {
     const withHours = utils.setHours(day, utils.getHours(date));
     const withMinutes = utils.setMinutes(withHours, utils.getMinutes(date));
 
-    this.props.onChange(withMinutes, false);
+    this.props.onChange(withMinutes);
   };
 
   handleChangeMonth = (newMonth) => {

lib/src/DatePicker/DatePickerWrapper.jsx

@@ -39,6 +39,7 @@ export const DatePickerWrapper = (props) => {
           handleDismiss,
           handleSetTodayDate,
           handleTextFieldChange,
+          isAccepted,
         }) => (
           <ModalWrapper
             disableFuture={disableFuture}
@@ -54,6 +55,7 @@ export const DatePickerWrapper = (props) => {
             onSetToday={handleSetTodayDate}
             ref={forwardedRef}
             value={value}
+            isAccepted={isAccepted}
             {...other}
           >
             <DatePicker

lib/src/DateTimePicker/DateTimePickerWrapper.jsx

@@ -45,6 +45,7 @@ export const DateTimePickerWrapper = (props) => {
           handleDismiss,
           handleSetTodayDate,
           handleTextFieldChange,
+          isAccepted,
           pick12hOr24hFormat,
         }) => (
           <ModalWrapper
@@ -61,6 +62,7 @@ export const DateTimePickerWrapper = (props) => {
             onDismiss={handleDismiss}
             onSetToday={handleSetTodayDate}
             value={value}
+            isAccepted={isAccepted}
             {...other}
           >
             <DateTimePicker

lib/src/TimePicker/TimePickerWrapper.jsx

@@ -22,6 +22,7 @@ export const TimePickerWrapper = (props) => {
           handleDismiss,
           handleSetTodayDate,
           handleTextFieldChange,
+          isAccepted,
           pick12hOr24hFormat,
         }) => (
           <ModalWrapper
@@ -33,6 +34,7 @@ export const TimePickerWrapper = (props) => {
             onChange={handleTextFieldChange}
             onDismiss={handleDismiss}
             onSetToday={handleSetTodayDate}
+            isAccepted={isAccepted}
             {...other}
           >
             <TimePicker

lib/src/_shared/BasePicker.jsx

@@ -17,6 +17,7 @@ export const BasePickerHoc = compose(
   withUtils(),
   setDisplayName('BasePicker'),
   withState('date', 'changeDate', getValidDateOrCurrent),
+  withState('isAccepted', 'handleAcceptedChange', false),
   lifecycle({
     componentDidUpdate(prevProps) {
       if (prevProps.value !== this.props.value) {
@@ -46,10 +47,13 @@ export const BasePickerHoc = compose(
       autoOk,
       changeDate,
       onChange,
+      handleAcceptedChange,
     }) => (newDate, isFinish = true) => {
       changeDate(newDate, () => {
         if (isFinish && autoOk) {
           onChange(newDate);
+          // pass down accept true, and make it false in the next tick
+          handleAcceptedChange(true, () => handleAcceptedChange(false));
         }
       });
     },

lib/src/wrappers/ModalWrapper.jsx

@@ -40,6 +40,7 @@ export default class ModalWrapper extends PureComponent {
     onSetToday: PropTypes.func,
     children: PropTypes.node.isRequired,
     dialogContentClassName: PropTypes.string,
+    isAccepted: PropTypes.bool.isRequired,
   }
 
   static defaultProps = {
@@ -66,6 +67,17 @@ export default class ModalWrapper extends PureComponent {
     open: false,
   }
 
+  static getDerivedStateFromProps(nextProps) {
+    // only if accept = true close the dialog
+    if (nextProps.isAccepted) {
+      return {
+        open: false,
+      };
+    }
+
+    return null;
+  }
+
   handleKeyDown = (event) => {
     switch (keycode(event)) {
       case 'enter':
@@ -140,6 +152,7 @@ export default class ModalWrapper extends PureComponent {
       onOpen,
       onClose,
       onSetToday,
+      isAccepted,
       ...other
     } = this.props;