Skip to content

Commit 6d7bfe1

Browse files
committed
Fix radio group
1 parent 232e38a commit 6d7bfe1

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

packages/mui-component-mapper/src/form-fields/form-fields.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,12 @@ const selectComponent = ({
9797
<RadioGroup
9898
FieldProvider={ FieldProvider }
9999
options={ options }
100-
isDisabled={ isDisabled }
100+
isDisabled={ isDisabled || isReadOnly }
101101
input={ input }
102-
label={ label }
102+
label={ originalLabel }
103+
isRequired={ isRequired }
104+
invalid={ invalid }
105+
helperText={ helperText }
103106
/>
104107
),
105108
[componentTypes.SELECT_COMPONENT]: () => (

packages/mui-component-mapper/src/form-fields/radio.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,21 @@ import Radio from '@material-ui/core/Radio';
44
import FormControlLabel from '@material-ui/core/FormControlLabel';
55
import FormControl from '@material-ui/core/FormControl';
66
import FormLabel from '@material-ui/core/FormLabel';
7+
import FormHelperText from '@material-ui/core/FormHelperText';
8+
import { wrapperProps } from '@data-driven-forms/common/src/multiple-choice-list';
79

8-
const RadioGroup = ({ FieldProvider, options, isDisabled, input, label }) => (
10+
const RadioGroup = ({
11+
FieldProvider,
12+
options,
13+
isDisabled,
14+
input,
15+
label,
16+
isRequired,
17+
helperText,
18+
invalid,
19+
}) => (
920
<div className="mui-ddform-radio-group">
10-
<FormControl component="fieldset">
21+
<FormControl required={ isRequired } error={ invalid } component="fieldset">
1122
<FormLabel component="legend">{ label }</FormLabel>
1223
{ options.map(option => (
1324
<FieldProvider
@@ -26,11 +37,13 @@ const RadioGroup = ({ FieldProvider, options, isDisabled, input, label }) => (
2637
) }
2738
/>
2839
)) }
40+
{ (invalid || helperText) && <FormHelperText>{ invalid || helperText }</FormHelperText> }
2941
</FormControl>
3042
</div>
3143
);
3244

3345
RadioGroup.propTypes = {
46+
...wrapperProps,
3447
FieldProvider: PropTypes.oneOfType([ PropTypes.node, PropTypes.func ]),
3548
options: PropTypes.arrayOf(PropTypes.shape({
3649
value: PropTypes.any,
@@ -42,6 +55,7 @@ RadioGroup.propTypes = {
4255
name: PropTypes.string.isRequired,
4356
onChange: PropTypes.func.isRequired,
4457
}),
58+
children: PropTypes.any,
4559
};
4660

4761
RadioGroup.defaultProps = {

0 commit comments

Comments
 (0)