{"files":[{"path":"src\/isomorphic\/__tests__\/ReactDebugTool-test.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDOMComponent.js","status":"M"}],"body":"","patch":"diff --git a\/src\/isomorphic\/__tests__\/ReactDebugTool-test.js b\/src\/isomorphic\/__tests__\/ReactDebugTool-test.js\nindex b90c6bd350..a7442e5b88 100644\n--- a\/src\/isomorphic\/__tests__\/ReactDebugTool-test.js\n+++ b\/src\/isomorphic\/__tests__\/ReactDebugTool-test.js\n@@ -552,6 +552,16 @@ describe('ReactDebugTool', () => {\n };\n assertTreeMatches([element, tree]);\n });\n+\n+ it('reports html content as no children', () => {\n+ var element =

;\n+ var tree = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+ assertTreeMatches([element, tree]);\n+ });\n });\n \n describe('update', () => {\n@@ -639,6 +649,58 @@ describe('ReactDebugTool', () => {\n ]);\n });\n \n+ it('updates from html content to a single text child', () => {\n+ var elementBefore =

;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ var elementAfter =

Hi.<\/div>;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [{\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Hi.',\n+ children: [],\n+ }],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n+ it('updates from a single text child to html content', () => {\n+ var elementBefore =

Hi.<\/div>;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [{\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Hi.',\n+ children: [],\n+ }],\n+ };\n+\n+ var elementAfter =

;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n it('updates from no children to multiple text children', () => {\n var elementBefore =

;\n var treeBefore = {\n@@ -701,6 +763,110 @@ describe('ReactDebugTool', () => {\n ]);\n });\n \n+ it('updates from html content to multiple text children', () => {\n+ var elementBefore =

;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ var elementAfter =

{'Hi.'}{'Bye.'}<\/div>;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [{\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Hi.',\n+ children: [],\n+ }, {\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Bye.',\n+ children: [],\n+ }],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n+ it('updates from multiple text children to html content', () => {\n+ var elementBefore =

{'Hi.'}{'Bye.'}<\/div>;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [{\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Hi.',\n+ children: [],\n+ }, {\n+ isComposite: false,\n+ displayName: '#text',\n+ text: 'Bye.',\n+ children: [],\n+ }],\n+ };\n+\n+ var elementAfter =

;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n+ it('updates from html content to no children', () => {\n+ var elementBefore =

;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ var elementAfter =

;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n+ it('updates from no children to html content', () => {\n+ var elementBefore =

;\n+ var treeBefore = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ var elementAfter =

;\n+ var treeAfter = {\n+ isComposite: false,\n+ displayName: 'div',\n+ children: [],\n+ };\n+\n+ assertTreeMatches([\n+ [elementBefore, treeBefore],\n+ [elementAfter, treeAfter],\n+ ]);\n+ });\n+\n it('updates from one text child to multiple text children', () => {\n var elementBefore =

Hi.<\/div>;\n var treeBefore = {\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex 681efb7cf2..2514cd7c70 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -1033,6 +1033,9 @@ ReactDOMComponent.Mixin = {\n if (lastHtml !== nextHtml) {\n this.updateMarkup('' + nextHtml);\n }\n+ if (__DEV__) {\n+ ReactInstrumentation.debugTool.onSetChildren(this._debugID, []);\n+ }\n } else if (nextChildren != null) {\n this.updateChildren(nextChildren, transaction, context);\n }\n","parents":["7884606fdb4519cc0a062eb7cd98cfc889cfd8b7"],"commit":{"subject":"Report dangerouslySetInnerHTML as no children","authorEmail":"dan.abramov@gmail.com","revision":"804c680f061c7cf055bf56c12a995308dc150f4b","authorName":"Dan Abramov","authoredAt":"2016-04-20T18:01:52+01:00","shortRevision":"804c680f06"}}

dillon1000/react

Files changed