Merge pull request #4625 from hhaidar/fix-ie-props-access

[IE] Move state props access into componentWillMount for IE9/10
mui · Jul 6, 2016 · 7bf116d · 7bf116d
2 parents ed9f346 + 5a03dfa
commit 7bf116d
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 7 deletions.
diff --git a/src/DatePicker/DateDisplay.js b/src/DatePicker/DateDisplay.js
@@ -80,10 +80,16 @@ class DateDisplay extends Component {
   };
 
   state = {
-    selectedYear: !this.props.monthDaySelected,
+    selectedYear: false,
     transitionDirection: 'up',
   };
 
+  componentWillMount() {
+    if (!this.props.monthDaySelected) {
+      this.setState({selectedYear: true});
+    }
+  }
+
   componentWillReceiveProps(nextProps) {
     if (nextProps.selectedDate !== this.props.selectedDate) {
       const direction = nextProps.selectedDate > this.props.selectedDate ? 'up' : 'down';

diff --git a/src/Table/Table.js b/src/Table/Table.js
@@ -139,9 +139,15 @@ class Table extends Component {
   };
 
   state = {
-    allRowsSelected: this.props.allRowsSelected,
+    allRowsSelected: false,
   };
 
+  componentWillMount() {
+    if (this.props.allRowsSelected) {
+      this.setState({allRowsSelected: true});
+    }
+  }
+
   isScrollbarVisible() {
     const tableDivHeight = this.refs.tableDiv.clientHeight;
     const tableBodyHeight = this.refs.tableBody.clientHeight;

diff --git a/src/Table/TableBody.js b/src/Table/TableBody.js
@@ -121,9 +121,13 @@ class TableBody extends Component {
   };
 
   state = {
-    selectedRows: this.calculatePreselectedRows(this.props),
+    selectedRows: [],
   };
 
+  componentWillMount() {
+    this.setState({selectedRows: this.calculatePreselectedRows(this.props)});
+  }
+
   componentWillReceiveProps(nextProps) {
     if (this.props.allRowsSelected && !nextProps.allRowsSelected) {
       this.setState({

diff --git a/src/TextField/EnhancedTextarea.js b/src/TextField/EnhancedTextarea.js
@@ -56,9 +56,15 @@ class EnhancedTextarea extends Component {
   };
 
   state = {
-    height: this.props.rows * rowsHeight,
+    height: null,
   };
 
+  componentWillMount() {
+    this.setState({
+      height: this.props.rows * rowsHeight,
+    });
+  }
+
   componentDidMount() {
     this.syncHeightWithShadow();
   }

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 || new Date(),
+    });
+  }
+
   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({