Skip to content

[RadioGroup] Support defaultValue in uncontrolled mode #14092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oliviertassinari merged 3 commits into from
Jan 6, 2019
Merged

[RadioGroup] Support defaultValue in uncontrolled mode #14092

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fae79e4
Respect defaultValue for uncontrolled RadioGroup
Slessi Jan 5, 2019
b6215d3
Remove props from RadioGroup super() and split uncontrolled/defaultVa…
Slessi Jan 5, 2019
a0a1337
Change RadioGroup isControlled check to compare with null
Slessi Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions packages/material-ui/src/RadioGroup/RadioGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import { createChainedFunction, find } from '../utils/helpers';
class RadioGroup extends React.Component {
radios = [];

state = {
value: null,
};

constructor(props) {
super();
this.isControlled = props.value != null;
super(props);

this.isControlled = !props.hasOwnProperty('defaultValue') && !props.hasOwnProperty('value');

this.state = {
value: this.isControlled ? props.value : props.defaultValue,
};
}

focus = () => {
Expand Down
16 changes: 13 additions & 3 deletions packages/material-ui/src/RadioGroup/RadioGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,28 @@ describe('<RadioGroup />', () => {

it('should support uncontrolled mode', () => {
const wrapper = shallow(
<RadioGroup name="group">
<RadioGroup name="group" defaultValue="zero">
<Radio value="zero" />
<Radio value="one" />
</RadioGroup>,
);

const radio = wrapper.children().first();
assert.strictEqual(
wrapper
.children()
.first()
.props().checked,
true,
);

const radio = wrapper.children().last();
const event = { target: { value: 'one' } };
radio.simulate('change', event, true);

assert.strictEqual(
wrapper
.children()
.first()
.last()
.props().checked,
true,
);
Expand Down