[TimePicker] Move state props access into componentWillMount for IE9/10

mui · Jul 4, 2016 · 782eaeb · 782eaeb
1 parent 2f20908
commit 782eaeb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/TimePicker/Clock.js b/src/TimePicker/Clock.js
@@ -20,10 +20,16 @@ class Clock extends Component {
   };
 
   state = {
-    selectedTime: this.props.initialTime || new Date(),
+    selectedTime: null,
     mode: 'hour',
   };
 
+  componentWillMount() {
+    this.setState({
+      selectedTime: this.props.initialTime,
+    });
+  }
+
   setMode = (mode) => {
     setTimeout(() => {
       this.setState({

diff --git a/src/TimePicker/ClockPointer.js b/src/TimePicker/ClockPointer.js
@@ -59,9 +59,15 @@ class ClockPointer extends Component {
   };
 
   state = {
-    inner: isInner(this.props),
+    inner: false,
   };
 
+  componentWillMount() {
+    this.setState({
+      inner: isInner(this.props),
+    });
+  }
+
   componentWillReceiveProps(nextProps) {
     this.setState({
       inner: isInner(nextProps),

diff --git a/src/TimePicker/TimePicker.js b/src/TimePicker/TimePicker.js
@@ -105,10 +105,16 @@ class TimePicker extends Component {
   };
 
   state = {
-    time: this.isControlled() ? this.getControlledTime() : this.props.defaultTime,
+    time: null,
     dialogTime: new Date(),
   };
 
+  componentWillMount() {
+    this.setState({
+      time: this.isControlled() ? this.getControlledTime() : this.props.defaultTime,
+    });
+  }
+
   componentWillReceiveProps(nextProps) {
     if (nextProps.value !== this.props.value) {
       this.setState({