Skip to content

Fix a crash when using dynamic children in <option> tag #13261

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
gaearon merged 10 commits into from
Aug 1, 2018
Merged

Fix a crash when using dynamic children in <option> tag #13261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
388028e
Make option children a text content by default
Slowyn Jul 24, 2018
f829340
Apply requested changes
Slowyn Jul 26, 2018
73697ef
remove empty row
Slowyn Jul 26, 2018
65691b6
Update comment
Slowyn Jul 26, 2018
9ca2085
Add a simple unit-test
Slowyn Jul 26, 2018
931417b
[WIP: no flow] Pass through hostContext
Slowyn Jul 26, 2018
485d8db
[WIP: no flow] Give better description for test
Slowyn Aug 1, 2018
a6a8d1c
Fixes
gaearon Aug 1, 2018
7ccf3ce
Don't pass hostContext through
gaearon Aug 1, 2018
e614dbf
Also warn on hydration
gaearon Aug 1, 2018
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
Prev Previous commit
Next Next commit
Apply requested changes 
- Remove meaningless comments
- revert scripts/rollup/results.json
  • Loading branch information
@Slowyn
Slowyn committed Jul 26, 2018
commit f829340f4fb12c9a5d7d13cb7cba29cdac8db9ae
1 change: 0 additions & 1 deletion packages/react-dom/src/client/ReactDOMFiberOption.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ function flattenChildren(children) {
if (__DEV__) {
// We do not have HostContext here
// but we can put some parent information at least
Copy link
Contributor

@nhunzaker nhunzaker Jul 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Could you reformat this like:

    // We do not have HostContext here, but we can at least
    // put some parent information

// Also this cause a bit different message than it was previously
validateDOMNesting(child.type, null, {
current: {
tag: 'option',
Expand Down
42 changes: 21 additions & 21 deletions scripts/rollup/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"filename": "react.development.js",
"bundleType": "UMD_DEV",
"packageName": "react",
"size": 59233,
"gzip": 16554
"size": 59086,
"gzip": 16296
},
{
"filename": "react.production.min.js",
"bundleType": "UMD_PROD",
"packageName": "react",
"size": 7332,
"gzip": 3111
"size": 7217,
"gzip": 3050
},
{
"filename": "react.development.js",
Expand Down Expand Up @@ -46,15 +46,15 @@
"filename": "react-dom.development.js",
"bundleType": "UMD_DEV",
"packageName": "react-dom",
"size": 656643,
"gzip": 153886
"size": 641505,
"gzip": 149286
},
{
"filename": "react-dom.production.min.js",
"bundleType": "UMD_PROD",
"packageName": "react-dom",
"size": 98962,
"gzip": 32102
"size": 96507,
"gzip": 31258
},
{
"filename": "react-dom.development.js",
Expand Down Expand Up @@ -88,15 +88,15 @@
"filename": "react-dom-test-utils.development.js",
"bundleType": "UMD_DEV",
"packageName": "react-dom",
"size": 44787,
"gzip": 12185
"size": 46355,
"gzip": 12768
},
{
"filename": "react-dom-test-utils.production.min.js",
"bundleType": "UMD_PROD",
"packageName": "react-dom",
"size": 10366,
"gzip": 3841
"size": 10653,
"gzip": 3918
},
{
"filename": "react-dom-test-utils.development.js",
Expand All @@ -123,15 +123,15 @@
"filename": "react-dom-unstable-native-dependencies.development.js",
"bundleType": "UMD_DEV",
"packageName": "react-dom",
"size": 60219,
"gzip": 15769
"size": 62921,
"gzip": 16559
},
{
"filename": "react-dom-unstable-native-dependencies.production.min.js",
"bundleType": "UMD_PROD",
"packageName": "react-dom",
"size": 11378,
"gzip": 3929
"size": 11622,
"gzip": 4007
},
{
"filename": "react-dom-unstable-native-dependencies.development.js",
Expand Down Expand Up @@ -165,15 +165,15 @@
"filename": "react-dom-server.browser.development.js",
"bundleType": "UMD_DEV",
"packageName": "react-dom",
"size": 104567,
"gzip": 27873
"size": 105006,
"gzip": 27524
},
{
"filename": "react-dom-server.browser.production.min.js",
"bundleType": "UMD_PROD",
"packageName": "react-dom",
"size": 15619,
"gzip": 5953
"size": 15463,
"gzip": 5917
},
{
"filename": "react-dom-server.browser.development.js",
Expand Down Expand Up @@ -750,4 +750,4 @@
"gzip": 2108
}
]
}
}