Fixes palantir#1402 time picker change clears data picker

cathyxz · Aug 20, 2017 · 3635ee6 · 3635ee6
1 parent 6aff221
commit 3635ee6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/packages/datetime/examples/dateTimePickerExample.tsx b/packages/datetime/examples/dateTimePickerExample.tsx
@@ -30,4 +30,5 @@ export class DateTimePickerExample extends BaseExample<{ date: Date }> {
     }
 
     private handleDateChange = (date: Date) => this.setState({ date });
+
 }
diff --git a/packages/datetime/src/dateTimePicker.tsx b/packages/datetime/src/dateTimePicker.tsx
@@ -96,14 +96,16 @@ export class DateTimePicker extends AbstractComponent<IDateTimePickerProps, IDat
     }
 
     public componentWillReceiveProps(nextProps: IDatePickerProps) {
-        if (nextProps.value != null) {
-            this.setState({
-                dateValue: nextProps.value,
-                timeValue: nextProps.value,
-            });
-        } else {
-            // clear only the date to remove the selected-date style in the calendar
-            this.setState({ dateValue: null });
+        if (this.props.value != nextProps.value) {
+            if (nextProps.value != null) {
+                this.setState({
+                    dateValue: nextProps.value,
+                    timeValue: nextProps.value,
+                });
+            } else {
+                // clear only the date to remove the selected-date style in the calendar
+                this.setState({ dateValue: null });
+            }
         }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,5 @@ export class DateTimePickerExample extends BaseExample<{ date: Date }> {
		}

		private handleDateChange = (date: Date) => this.setState({ date });

		}