Merge pull request #3123 from johncalvinroberts/master

Fix undefined id in RadioButtonGroupInput
marmelab · Apr 13, 2019 · 164e258 · 164e258
2 parents bc45dbd + 14e72a0
commit 164e258
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.js b/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.js
@@ -83,28 +83,26 @@ export class RadioButtonGroupInput extends Component {
 
     renderRadioButton = choice => {
         const {
-            id,
             optionText,
             optionValue,
             translate,
             translateChoice,
+            source,
         } = this.props;
         const choiceName = React.isValidElement(optionText) // eslint-disable-line no-nested-ternary
             ? React.cloneElement(optionText, { record: choice })
             : typeof optionText === 'function'
             ? optionText(choice)
             : get(choice, optionText);
+
+        const nodeId = `${source}_${get(choice, optionValue)}`;
+
         return (
             <FormControlLabel
-                htmlFor={`${id}_${get(choice, optionValue)}`}
+                htmlFor={nodeId}
                 key={get(choice, optionValue)}
                 value={get(choice, optionValue)}
-                control={
-                    <Radio
-                        id={`${id}_${get(choice, optionValue)}`}
-                        color="primary"
-                    />
-                }
+                control={<Radio id={nodeId} color="primary" />}
                 label={
                     translateChoice
                         ? translate(choiceName, { _: choiceName })
@@ -173,7 +171,6 @@ RadioButtonGroupInput.propTypes = {
     choices: PropTypes.arrayOf(PropTypes.object),
     classes: PropTypes.object,
     className: PropTypes.string,
-    id: PropTypes.string,
     input: PropTypes.object,
     isRequired: PropTypes.bool,
     label: PropTypes.string,