{"patch":"diff --git a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\nindex 2ce3826c6a..c4bcca0c8e 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n@@ -48,6 +48,11 @@ function warnIfValueIsNull(props) {\n }\n }\n \n+function isControlled(props) {\n+ var usesChecked = props.type === 'checkbox' || props.type === 'radio';\n+ return usesChecked ? props.checked !== undefined : props.value !== undefined;\n+}\n+\n \/**\n * Implements an host component that allows setting these optional\n * props: `checked`, `value`, `defaultChecked`, and `defaultValue`.\n@@ -156,7 +161,7 @@ var ReactDOMInput = {\n };\n \n if (__DEV__) {\n- inst._wrapperState.controlled = props.checked !== undefined || props.value !== undefined;\n+ inst._wrapperState.controlled = isControlled(props);\n }\n },\n \n@@ -166,14 +171,10 @@ var ReactDOMInput = {\n if (__DEV__) {\n warnIfValueIsNull(props);\n \n- var defaultValue = props.defaultChecked || props.defaultValue;\n- var controlled = props.checked !== undefined || props.value !== undefined;\n+ var controlled = isControlled(props);\n var owner = inst._currentElement._owner;\n \n- if (\n- !inst._wrapperState.controlled &&\n- controlled && !didWarnUncontrolledToControlled\n- ) {\n+ if (!inst._wrapperState.controlled && controlled && !didWarnUncontrolledToControlled) {\n warning(\n false,\n '%s is changing an uncontrolled input of type %s to be controlled. ' +\n@@ -185,11 +186,7 @@ var ReactDOMInput = {\n );\n didWarnUncontrolledToControlled = true;\n }\n- if (\n- inst._wrapperState.controlled &&\n- (defaultValue || !controlled) &&\n- !didWarnControlledToUncontrolled\n- ) {\n+ if (inst._wrapperState.controlled && !controlled && !didWarnControlledToUncontrolled) {\n warning(\n false,\n '%s is changing a controlled input of type %s to be uncontrolled. ' +\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\nindex 090207f301..46fe29f490 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\n@@ -662,6 +662,43 @@ describe('ReactDOMInput', function() {\n );\n });\n \n+ it('should not warn if radio value changes but never becomes controlled', function() {\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ ReactDOM.render(, container);\n+ ReactDOM.render(, container);\n+ ReactDOM.render( null} \/>, container);\n+ ReactDOM.render(, container);\n+ expect(console.error.calls.count()).toBe(0);\n+ });\n+\n+ it('should not warn if radio value changes but never becomes uncontrolled', function() {\n+ var container = document.createElement('div');\n+ ReactDOM.render( null} \/>, container);\n+ ReactDOM.render(\n+ null} \n+ \/>, container);\n+ console.log(console.error.calls.argsFor(0)[0]);\n+ expect(console.error.calls.count()).toBe(0);\n+ });\n+\n+ it('should warn if radio checked false changes to become uncontrolled', function() {\n+ var container = document.createElement('div');\n+ ReactDOM.render( null} \/>, container);\n+ ReactDOM.render(, container);\n+ expect(console.error.calls.argsFor(0)[0]).toContain(\n+ 'A component is changing a controlled input of type radio to be uncontrolled. ' +\n+ 'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +\n+ 'Decide between using a controlled or uncontrolled input ' +\n+ 'element for the lifetime of the component. More info: https:\/\/fb.me\/react-controlled-components'\n+ );\n+ });\n+\n it('sets type before value always', function() {\n if (!ReactDOMFeatureFlags.useCreateElement) {\n return;\n","commit":{"shortRevision":"0bb0fe8d00","authoredAt":"2016-06-09T07:58:42-07:00","authorName":"Jim","subject":"Fix controlled\/uncontrolled validation for radio+checkbox inputs (#7003)","authorEmail":"jsproch@fb.com","revision":"0bb0fe8d0006c6f26e64723ffdbce3baf74c9ab1"},"parents":["731e42998a4dc7e4506b86eefd1117ba18b68969"],"body":"","files":[{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js"}]}

dillon1000/react

Files changed