From 956ea5778b131b376b297482541cd982303058a9 Mon Sep 17 00:00:00 2001
From: Javi Velasco <javier.velasco86@gmail.com>
Date: Wed, 16 Nov 2016 12:14:55 +0100
Subject: [PATCH] Fix #900

---
 components/time_picker/TimePickerDialog.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/time_picker/TimePickerDialog.js b/components/time_picker/TimePickerDialog.js
index c38d1986..17cd7cbc 100644
--- a/components/time_picker/TimePickerDialog.js
+++ b/components/time_picker/TimePickerDialog.js
@@ -44,9 +44,15 @@ const factory = (Dialog) => {
 
     state = {
       display: 'hours',
-      displayTime: this.props.value
+      displayTime: new Date(this.props.value.getTime())
     };
 
+    componentWillUpdate (nextProps) {
+      if (nextProps.value.getTime() !== this.state.displayTime.getTime()) {
+        this.setState({ displayTime: new Date(nextProps.value.getTime()) });
+      }
+    }
+
     componentDidUpdate (prevProps) {
       if (!prevProps.active && this.props.active) {
         setTimeout(this.refs.clock.handleCalculateShape, 1000);