Fix uncontrolled radios #10156
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ const propTypes = { | |
| children: PropTypes.node.isRequired, | ||
| title: PropTypes.node.isRequired, | ||
| resolvedIn: semverString, | ||
| introducedIn: semverString, | ||
| resolvedBy: PropTypes.string | ||
| }; | ||
|
|
||
|
|
@@ -31,6 +32,7 @@ class TestCase extends React.Component { | |
| const { | ||
| title, | ||
| description, | ||
| introducedIn, | ||
| resolvedIn, | ||
| resolvedBy, | ||
| affectedBrowsers, | ||
|
|
@@ -40,13 +42,13 @@ class TestCase extends React.Component { | |
| let { complete } = this.state; | ||
|
|
||
| const { version } = parse(window.location.search); | ||
| const isTestFixed = ( | ||
| !version || | ||
| !resolvedIn || | ||
| semver.gte(version, resolvedIn) | ||
| ); | ||
|
|
||
| complete = !isTestFixed || complete; | ||
|
There was a problem hiding this comment. Doing some local testing, looks like this causes a failure on line 103: There was a problem hiding this comment. Last time I do merge conflict resolve on github :P man. |
||
|
|
||
| return ( | ||
| <section | ||
|
|
@@ -68,6 +70,16 @@ class TestCase extends React.Component { | |
| </h2> | ||
|
|
||
| <dl className="test-case__details"> | ||
| {introducedIn && ( | ||
| <dt>First broken in: </dt>)} | ||
| {introducedIn && ( | ||
| <dd> | ||
| <a href={'https://github.com/facebook/react/tag/v' + introducedIn}> | ||
| <code>{introducedIn}</code> | ||
| </a> | ||
| </dd> | ||
| )} | ||
|
|
||
| {resolvedIn && ( | ||
| <dt>First supported in: </dt>)} | ||
| {resolvedIn && ( | ||
|
|
@@ -100,12 +112,12 @@ class TestCase extends React.Component { | |
| </p> | ||
|
|
||
| <div className="test-case__body"> | ||
| {!isTestFixed && ( | ||
| <p className="test-case__invalid-version"> | ||
| <strong>Note:</strong> This test case was fixed in a later version of React. | ||
| This test is not expected to pass for the selected version, and that's ok! | ||
| </p> | ||
| )} | ||
|
|
||
| {children} | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import React from 'react'; | ||
|
|
||
| import Fixture from '../../Fixture'; | ||
|
|
||
| class RadioGroupFixture extends React.Component { | ||
| constructor(props, context) { | ||
| super(props, context); | ||
|
|
||
| this.state = { | ||
| changeCount: 0, | ||
| }; | ||
| } | ||
|
|
||
| handleChange = () => { | ||
| this.setState(({ changeCount }) => { | ||
| return { | ||
| changeCount: changeCount + 1 | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| handleReset = () => { | ||
| this.setState({ | ||
| changeCount: 0, | ||
| }) | ||
| } | ||
|
|
||
| render() { | ||
| const { changeCount } = this.state; | ||
| const color = changeCount === 2 ? 'green' : 'red'; | ||
|
|
||
| return ( | ||
| <Fixture> | ||
| <label> | ||
| <input | ||
| defaultChecked | ||
| name="foo" | ||
| type='radio' | ||
| onChange={this.handleChange} | ||
| /> | ||
| Radio 1 | ||
| </label> | ||
| <label> | ||
| <input | ||
| name="foo" | ||
| type='radio' | ||
| onChange={this.handleChange} | ||
| /> | ||
| Radio 2 | ||
| </label> | ||
|
|
||
| {' '} | ||
| <p style={{ color }}> | ||
| <code>onChange</code>{' calls: '}<strong>{changeCount}</strong> | ||
| </p> | ||
| <button onClick={this.handleReset}>Reset count</button> | ||
| </Fixture> | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default RadioGroupFixture; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,9 @@ type ValueTracker = { | |
| type WrapperState = {_wrapperState: {valueTracker: ?ValueTracker}}; | ||
| type ElementWithWrapperState = Element & WrapperState; | ||
| type InstanceWithWrapperState = ReactInstance & WrapperState; | ||
| type SubjectWithWrapperState = | ||
| | InstanceWithWrapperState | ||
| | ElementWithWrapperState; | ||
|
|
||
| var ReactDOMComponentTree = require('ReactDOMComponentTree'); | ||
|
|
||
|
|
@@ -43,15 +46,11 @@ function getTracker(inst: any) { | |
| return inst._wrapperState.valueTracker; | ||
| } | ||
|
|
||
| function detachTracker(subject: SubjectWithWrapperState) { | ||
| delete subject._wrapperState.valueTracker; | ||
|
There was a problem hiding this comment. Can we use There was a problem hiding this comment. I think so. I think originally I was being overly cautious about expected properties sticking around. |
||
| } | ||
|
|
||
| function getValueFromNode(node: any) { | ||
|
There was a problem hiding this comment. In general we should avoid adding (I don’t mean this particular case is problematic, but this is something to always keep in mind.) |
||
| var value; | ||
| if (node) { | ||
| value = isCheckable(node) ? '' + node.checked : node.value; | ||
|
|
@@ -113,22 +112,22 @@ var inputValueTracking = { | |
| return getTracker(ReactDOMComponentTree.getInstanceFromNode(node)); | ||
| }, | ||
|
|
||
| trackNode(node: ElementWithWrapperState) { | ||
| if (getTracker(node)) { | ||
| return; | ||
| } | ||
| node._wrapperState.valueTracker = trackValueOnNode(node, node); | ||
| }, | ||
|
|
||
| track(inst: InstanceWithWrapperState) { | ||
| if (getTracker(inst)) { | ||
| return; | ||
| } | ||
| var node = ReactDOMComponentTree.getNodeFromInstance(inst); | ||
|
There was a problem hiding this comment. I looked at the stacktrace and it's crashing here (rather than in the other place I expected). There was a problem hiding this comment. ooo I think I understand where the bug is |
||
| inst._wrapperState.valueTracker = trackValueOnNode(node, inst); | ||
| }, | ||
|
|
||
| updateValueIfChanged(inst: SubjectWithWrapperState | Fiber) { | ||
| if (!inst) { | ||
| return false; | ||
| } | ||
|
|
@@ -144,9 +143,13 @@ var inputValueTracking = { | |
| } | ||
|
|
||
| var lastValue = tracker.getValue(); | ||
|
|
||
| var node = inst; | ||
| if (!(inst: any).nodeName) { | ||
|
There was a problem hiding this comment. Can you comment on this part? What are you trying to detect? There was a problem hiding this comment. yeah its not great, I'm trying to detect if There was a problem hiding this comment. Let's use same check as in here and leave a TODO to remove it when Stack is removed. |
||
| node = ReactDOMComponentTree.getNodeFromInstance(inst); | ||
| } | ||
|
|
||
| var nextValue = getValueFromNode(node); | ||
|
|
||
| if (nextValue !== lastValue) { | ||
| tracker.setValue(nextValue); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I switched to the unminified versions intentionally so was easier to step through stuff in devtools