RadioButtonGroup can handle non-RadioButton children; resolves mui#2225

bshyong · Mar 7, 2016 · ef459ae · ef459ae
1 parent 133f660
commit ef459ae
Showing 1 changed file with 33 additions and 21 deletions.
diff --git a/src/radio-button-group.jsx b/src/radio-button-group.jsx
@@ -116,6 +116,38 @@ const RadioButtonGroup = React.createClass({
     }
   },
 
+  _radioButtonMapFunc(option) {
+    if (option.props.children === undefined) {
+      let {
+        name,
+        value,
+        label,
+        onCheck,
+        ...other,
+      } = option.props;
+      if (option.type.displayName === 'RadioButton') {
+        return <RadioButton
+          {...other}
+          ref={option.props.value}
+          name={this.props.name}
+          key={option.props.value}
+          value={option.props.value}
+          label={option.props.label}
+          labelPosition={this.props.labelPosition}
+          onCheck={this._onChange}
+          checked={option.props.value === this.state.selected}/>;
+      }
+    }
+
+    return {
+      ...option,
+      props: {
+        ...option.props,
+        children: React.Children.map(option.props.children, this.radioButtonMapFunc, this)
+      }
+    }
+  },
+
   handleChange(event, newSelection) {
     this._updateRadioButtons(newSelection);
 
@@ -143,27 +175,7 @@ const RadioButtonGroup = React.createClass({
     } = this.state.muiTheme;
 
     const options = React.Children.map(this.props.children, (option) => {
-      const {
-        name,
-        value,
-        label,
-        onCheck,
-        ...other,
-      } = option.props;
-
-      return (
-        <RadioButton
-          {...other}
-          ref={option.props.value}
-          name={this.props.name}
-          key={option.props.value}
-          value={option.props.value}
-          label={option.props.label}
-          labelPosition={this.props.labelPosition}
-          onCheck={this.handleChange}
-          checked={option.props.value === this.state.selected}
-        />
-      );
+      return this._radioButtonMapFunc(option);
     }, this);
 
     return (