{"body":"Don't set children attribute on SVG nodes","patch":"diff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex 82fef299d5..ec1a0f4ab5 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -53,9 +53,13 @@ var registrationNameModules = EventPluginRegistry.registrationNameModules;\n \/\/ For quickly matching children type, to test if can be treated as content.\n var CONTENT_TYPES = {'string': true, 'number': true};\n \n-var CHILDREN = keyOf({children: null});\n var STYLE = keyOf({style: null});\n var HTML = keyOf({__html: null});\n+var RESERVED_PROPS = {\n+ children: null,\n+ dangerouslySetInnerHTML: null,\n+ suppressContentEditableWarning: null,\n+};\n \n function getDeclarationErrorAddendum(internalInstance) {\n if (internalInstance) {\n@@ -633,11 +637,13 @@ ReactDOMComponent.Mixin = {\n }\n var markup = null;\n if (this._tag != null && isCustomComponent(this._tag, props)) {\n- if (propKey !== CHILDREN) {\n+ if (!RESERVED_PROPS.hasOwnProperty(propKey)) {\n markup = DOMPropertyOperations.createMarkupForCustomAttribute(propKey, propValue);\n }\n } else if (this._namespaceURI === DOMNamespaces.svg) {\n- markup = DOMPropertyOperations.createMarkupForSVGAttribute(propKey, propValue);\n+ if (!RESERVED_PROPS.hasOwnProperty(propKey)) {\n+ markup = DOMPropertyOperations.createMarkupForSVGAttribute(propKey, propValue);\n+ }\n } else {\n markup = DOMPropertyOperations.createMarkupForProperty(propKey, propValue);\n }\n@@ -912,20 +918,21 @@ ReactDOMComponent.Mixin = {\n deleteListener(this, propKey);\n }\n } else if (isCustomComponent(this._tag, nextProps)) {\n- if (propKey === CHILDREN) {\n- nextProp = null;\n+ if (!RESERVED_PROPS.hasOwnProperty(propKey)) {\n+ DOMPropertyOperations.setValueForAttribute(\n+ getNode(this),\n+ propKey,\n+ nextProp\n+ );\n }\n- DOMPropertyOperations.setValueForAttribute(\n- getNode(this),\n- propKey,\n- nextProp\n- );\n } else if (this._namespaceURI === DOMNamespaces.svg) {\n- DOMPropertyOperations.setValueForSVGAttribute(\n- getNode(this),\n- propKey,\n- nextProp\n- );\n+ if (!RESERVED_PROPS.hasOwnProperty(propKey)) {\n+ DOMPropertyOperations.setValueForSVGAttribute(\n+ getNode(this),\n+ propKey,\n+ nextProp\n+ );\n+ }\n } else if (\n DOMProperty.properties[propKey] ||\n DOMProperty.isCustomAttribute(propKey)) {\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\nindex 3bae74a04b..bc2fbc6563 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n@@ -244,16 +244,100 @@ describe('ReactDOMComponent', function() {\n expect(stubStyle.display).toEqual('');\n });\n \n- it('should skip child object attribute on web components', function() {\n+ it('should skip reserved props on web components', function() {\n var container = document.createElement('div');\n \n- \/\/ Test initial render to null\n- ReactDOM.render(, container);\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n expect(container.firstChild.hasAttribute('children')).toBe(false);\n+ expect(\n+ container.firstChild.hasAttribute('suppressContentEditableWarning')\n+ ).toBe(false);\n \n- \/\/ Test updates to null\n- ReactDOM.render(, container);\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n expect(container.firstChild.hasAttribute('children')).toBe(false);\n+ expect(\n+ container.firstChild.hasAttribute('suppressContentEditableWarning')\n+ ).toBe(false);\n+ });\n+\n+ it('should skip dangerouslySetInnerHTML on web components', function() {\n+ var container = document.createElement('div');\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(\n+ container.firstChild.hasAttribute('dangerouslySetInnerHTML')\n+ ).toBe(false);\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(\n+ container.firstChild.hasAttribute('dangerouslySetInnerHTML')\n+ ).toBe(false);\n+ });\n+\n+ it('should skip reserved props on SVG components', function() {\n+ var container = document.createElement('div');\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(container.firstChild.hasAttribute('children')).toBe(false);\n+ expect(\n+ container.firstChild.hasAttribute('suppressContentEditableWarning')\n+ ).toBe(false);\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(container.firstChild.hasAttribute('children')).toBe(false);\n+ expect(\n+ container.firstChild.hasAttribute('suppressContentEditableWarning')\n+ ).toBe(false);\n+ });\n+\n+ it('should skip dangerouslySetInnerHTML on SVG components', function() {\n+ var container = document.createElement('div');\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(\n+ container.firstChild.hasAttribute('dangerouslySetInnerHTML')\n+ ).toBe(false);\n+\n+ ReactDOM.render(\n+ ,\n+ container\n+ );\n+ expect(\n+ container.firstChild.hasAttribute('dangerouslySetInnerHTML')\n+ ).toBe(false);\n });\n \n it('should remove attributes', function() {\n","files":[{"path":"src\/renderers\/dom\/shared\/ReactDOMComponent.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js","status":"M"}],"parents":["56c423afd66f7f1363dee87d25795418d5e74a30","5eab1bbe29860e3bc262a7747aead016482b4999"],"commit":{"authorName":"Dan Abramov","shortRevision":"4bbd8d25e1","authoredAt":"2016-03-02T11:02:50+00:00","revision":"4bbd8d25e19e42533ba69c8fc995bb0cd74427bf","subject":"Merge pull request #6164 from gaearon\/fix-svg","authorEmail":"dan.abramov@gmail.com"}}

dillon1000/react

Files changed