Fix controlled/uncontrolled validation for radio+checkbox inputs (#7003)

This commit is contained in:
Jim committed 2016-06-09 07:58:42 -07:00
1 parent 731e42998a
commit 0bb0fe8d00
2 files changed
+46 -12

No files matched your search

@@ -48,6 +48,11 @@ function warnIfValueIsNull(props) {
}
}
function isControlled(props) {
var usesChecked = props.type === 'checkbox' || props.type === 'radio';
return usesChecked ? props.checked !== undefined : props.value !== undefined;
}
/**
* Implements an <input> host component that allows setting these optional
* props: `checked`, `value`, `defaultChecked`, and `defaultValue`.
@@ -156,7 +161,7 @@ var ReactDOMInput = {
};
if (__DEV__) {
inst._wrapperState.controlled = props.checked !== undefined || props.value !== undefined;
inst._wrapperState.controlled = isControlled(props);
}
},
@@ -166,14 +171,10 @@ var ReactDOMInput = {
if (__DEV__) {
warnIfValueIsNull(props);
var defaultValue = props.defaultChecked || props.defaultValue;
var controlled = props.checked !== undefined || props.value !== undefined;
var controlled = isControlled(props);
var owner = inst._currentElement._owner;
if (
!inst._wrapperState.controlled &&
controlled && !didWarnUncontrolledToControlled
) {
if (!inst._wrapperState.controlled && controlled && !didWarnUncontrolledToControlled) {
warning(
false,
'%s is changing an uncontrolled input of type %s to be controlled. ' +
@@ -185,11 +186,7 @@ var ReactDOMInput = {
);
didWarnUncontrolledToControlled = true;
}
if (
inst._wrapperState.controlled &&
(defaultValue || !controlled) &&
!didWarnControlledToUncontrolled
) {
if (inst._wrapperState.controlled && !controlled && !didWarnControlledToUncontrolled) {
warning(
false,
'%s is changing a controlled input of type %s to be uncontrolled. ' +
@@ -662,6 +662,43 @@ describe('ReactDOMInput', function() {
);
});
it('should not warn if radio value changes but never becomes controlled', function() {
var container = document.createElement('div');
ReactDOM.render(<input type="radio" value="value" />, container);
ReactDOM.render(<input type="radio" />, container);
ReactDOM.render(<input type="radio" value="value" defaultChecked={true} />, container);
ReactDOM.render(<input type="radio" value="value" onChange={() => null} />, container);
ReactDOM.render(<input type="radio" />, container);
expect(console.error.calls.count()).toBe(0);
});
it('should not warn if radio value changes but never becomes uncontrolled', function() {
var container = document.createElement('div');
ReactDOM.render(<input type="radio" checked={false} onChange={() => null} />, container);
ReactDOM.render(
<input
type="radio"
value="value"
defaultChecked={true}
checked={false}
onChange={() => null}
/>, container);
console.log(console.error.calls.argsFor(0)[0]);
expect(console.error.calls.count()).toBe(0);
});
it('should warn if radio checked false changes to become uncontrolled', function() {
var container = document.createElement('div');
ReactDOM.render(<input type="radio" value="value" checked={false} onChange={() => null} />, container);
ReactDOM.render(<input type="radio" value="value" />, container);
expect(console.error.calls.argsFor(0)[0]).toContain(
'A component is changing a controlled input of type radio to be uncontrolled. ' +
'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
'Decide between using a controlled or uncontrolled input ' +
'element for the lifetime of the component. More info: https://fb.me/react-controlled-components'
);
});
it('sets type before value always', function() {
if (!ReactDOMFeatureFlags.useCreateElement) {
return;