Merge pull request #4596 from nathanmarks/fix-ie9-10-issues

[ListItem][RadioButtonGroup] Fix error with props access in state assignment for ie9/10
mui · Jul 1, 2016 · 2741ca5 · 2741ca5
2 parents 6041d9c + 43d1c0e
commit 2741ca5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/List/ListItem.js b/src/List/ListItem.js
@@ -293,12 +293,18 @@ class ListItem extends Component {
   state = {
     hovered: false,
     isKeyboardFocused: false,
-    open: this.props.initiallyOpen,
+    open: false,
     rightIconButtonHovered: false,
     rightIconButtonKeyboardFocused: false,
     touch: false,
   };
 
+  componentWillMount() {
+    if (this.props.initiallyOpen) {
+      this.setState({open: true});
+    }
+  }
+
   shouldComponentUpdate(nextProps, nextState, nextContext) {
     return (
       !shallowEqual(this.props, nextProps) ||

diff --git a/src/RadioButton/RadioButtonGroup.js b/src/RadioButton/RadioButtonGroup.js
@@ -57,7 +57,7 @@ class RadioButtonGroup extends Component {
 
   state = {
     numberCheckedRadioButtons: 0,
-    selected: this.props.valueSelected || this.props.defaultSelected || '',
+    selected: '',
   };
 
   componentWillMount() {
@@ -67,7 +67,10 @@ class RadioButtonGroup extends Component {
       if (this.hasCheckAttribute(option)) cnt++;
     }, this);
 
-    this.setState({numberCheckedRadioButtons: cnt});
+    this.setState({
+      numberCheckedRadioButtons: cnt,
+      selected: this.props.valueSelected || this.props.defaultSelected || '',
+    });
   }
 
   componentWillReceiveProps(nextProps) {