{"body":"cf. #5071","parents":["8e9682c542e08b4e5d019a3d93d86931bd36df0e"],"commit":{"authorName":"Ben Alpert","revision":"f7816cdbfe0ef38ed43f4354fd6d7d53c2f7efef","shortRevision":"f7816cdbfe","authorEmail":"balpert@fb.com","authoredAt":"2015-10-16T11:36:16-07:00","subject":"Fix buggy DOM nesting warning for text components"},"files":[{"status":"M","path":"src\/renderers\/dom\/shared\/ReactDOMTextComponent.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js"}],"patch":"diff --git a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\nindex ded6a67381..39ad8a13cd 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n@@ -93,7 +93,7 @@ assign(ReactDOMTextComponent.prototype, {\n if (parentInfo) {\n \/\/ parentInfo should always be present except for the top-level\n \/\/ component when server rendering\n- validateDOMNesting(this._tag, this, parentInfo);\n+ validateDOMNesting('span', this, parentInfo);\n }\n }\n \ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\nindex 31491eaab8..6604bda726 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n@@ -926,17 +926,21 @@ describe('ReactDOMComponent', function() {\n });\n var Foo = React.createClass({\n render: function() {\n- return <\/table>;\n+ return

<\/table>;\n },\n });\n ReactTestUtils.renderIntoDocument();\n \n- expect(console.error.calls.length).toBe(1);\n+ expect(console.error.calls.length).toBe(2);\n expect(console.error.argsForCall[0][0]).toBe(\n 'Warning: validateDOMNesting(...): cannot appear as a child of ' +\n '

. See Foo > table > Row > tr. Add a to your code to ' +\n 'match the DOM tree generated by the browser.'\n );\n+ expect(console.error.argsForCall[1][0]).toBe(\n+ 'Warning: validateDOMNesting(...): cannot appear as a child ' +\n+ 'of

. See Foo > table > span.'\n+ );\n });\n \n it('gives useful context in warnings', () => {\n"}

dillon1000/react

Files changed