Merge pull request #3656 from tintin1343/datepicker-time-issue

[Datepicker] Add a check to fetch current system date
mui · Mar 12, 2016 · 092f798 · 092f798
2 parents 7aeadea + 5847f99
commit 092f798
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/date-picker/date-picker.jsx b/src/date-picker/date-picker.jsx
@@ -187,7 +187,6 @@ const DatePicker = React.createClass({
   getInitialState() {
     return {
       date: this._isControlled() ? this._getControlledDate() : this.props.defaultDate,
-      dialogDate: new Date(),
       muiTheme: this.context.muiTheme || getMuiTheme(),
     };
   },
@@ -221,9 +220,20 @@ const DatePicker = React.createClass({
    * Open the date-picker dialog programmatically from a parent.
    */
   openDialog() {
-    this.setState({
-      dialogDate: this.getDate(),
-    }, this.refs.dialogWindow.show);
+    /**
+     * if the date is not selected then set it to new date
+     * (get the current system date while doing so)
+     * else set it to the currently selected date
+     */
+    if (this.state.date !== undefined) {
+      this.setState({
+        dialogDate: this.getDate(),
+      }, this.refs.dialogWindow.show);
+    } else {
+      this.setState({
+        dialogDate: new Date(),
+      }, this.refs.dialogWindow.show);
+    }
   },
 
   /**