dillon1000/react

Commit

Merge pull request #4427 from spicyj/gh-1232

Fix switching between dangerouslySetInnerHTML and children
Browse files
Ben Alpert authored 16483e3ccaeacda7cb006011e567314a31dcc70a Parent 3ca5c15, caae627
Changed paths8 files
First-parent comparison
M src/renderers/dom/client/ReactDOMIDOperations.js ModifiedM src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js ModifiedM src/renderers/dom/client/utils/DOMChildrenOperations.js ModifiedM src/renderers/dom/shared/ReactDOMComponent.js ModifiedM src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js ModifiedM src/renderers/shared/reconciler/ReactMultiChild.js ModifiedM src/renderers/shared/reconciler/ReactMultiChildUpdateTypes.js ModifiedM src/test/ReactDefaultPerfAnalysis.js Modified
Patch

Files changed

Rendering syntax-highlighted changes…