{"patch":"diff --git a\/src\/core\/__tests__\/ReactCompositeComponent-test.js b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\nindex 73e0a7d9ef..0917f69640 100644\n--- a\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/core\/__tests__\/ReactCompositeComponent-test.js\n@@ -501,6 +501,50 @@ describe('ReactCompositeComponent', function() {\n );\n });\n \n+ it('should warn when owner is necessary', function() {\n+\n+ var Chooser = React.createClass({\n+ render: function() {\n+ return this.props.selection == 1 ? this.props.child1 : this.props.child2;\n+ }\n+ });\n+\n+ var CoolParent1 = React.createClass({\n+ render: function() {\n+ return }\n+ child2={this.props.child2} \/>;\n+ }\n+ });\n+\n+ var CoolParent2 = React.createClass({\n+ render: function() {\n+ return } \/>;\n+ }\n+ });\n+\n+ var div = document.createElement('div');\n+ React.render(, div);\n+ expect(console.warn.argsForCall.length).toBe(0);\n+ React.render(, div);\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ React.render(, div);\n+ React.render(, div);\n+ expect(console.warn.argsForCall.length).toBe(1);\n+\n+ expect(console.warn.argsForCall[0][0]).toBe(\n+ 'Warning: is being rendered by both CoolParent1 and ' +\n+ 'CoolParent2 using the same key (null) in the same place. Currently, ' +\n+ 'this means that they don\\'t preserve state. This behavior should be ' +\n+ 'very rare so we\\'re considering deprecating it. Please contact the ' +\n+ 'React team and explain your use case so that we can take that into ' +\n+ 'consideration.'\n+ );\n+ });\n+\n it('should pass context', function() {\n var childInstance = null;\n var grandchildInstance = null;\ndiff --git a\/src\/core\/instantiateReactComponent.js b\/src\/core\/instantiateReactComponent.js\nindex 56a9833440..ffdfbc92fd 100644\n--- a\/src\/core\/instantiateReactComponent.js\n+++ b\/src\/core\/instantiateReactComponent.js\n@@ -114,6 +114,10 @@ function instantiateReactComponent(node, parentCompositeType) {\n instance._mountIndex = 0;\n instance._mountImage = null;\n \n+ if (__DEV__) {\n+ instance._isOwnerNecessary = false;\n+ }\n+\n \/\/ Internal instances should fully constructed at this point, so they should\n \/\/ not get any new fields added to them at this point.\n if (__DEV__) {\ndiff --git a\/src\/core\/shouldUpdateReactComponent.js b\/src\/core\/shouldUpdateReactComponent.js\nindex 5b7fa30e8b..49a35a2730 100644\n--- a\/src\/core\/shouldUpdateReactComponent.js\n+++ b\/src\/core\/shouldUpdateReactComponent.js\n@@ -63,19 +63,30 @@ function shouldUpdateReactComponent(prevElement, nextElement) {\n if (typeof nextElement.type !== 'string' ||\n nextElement.type === 'input' ||\n nextElement.type === 'textarea') {\n- warning(\n- false,\n- '<%s \/> is being rendered by both %s and %s using the same key ' +\n- '(%s) in the same place. Currently, this means that they ' +\n- 'don\\'t preserve state. This behavior should be very rare ' +\n- 'so we\\'re considering deprecating it. Please contact the ' +\n- 'React team and explain your use case so that we can take that ' +\n- 'into consideration.',\n- nextDisplayName || 'Unknown Component',\n- prevName || '[Unknown]',\n- nextName || '[Unknown]',\n- prevElement.key\n- );\n+ if ((prevElement._owner != null &&\n+ prevElement._owner._isOwnerNecessary === false) ||\n+ (nextElement._owner != null &&\n+ nextElement._owner._isOwnerNecessary === false)) {\n+ if (prevElement._owner != null) {\n+ prevElement._owner._isOwnerNecessary = true;\n+ }\n+ if (nextElement._owner != null) {\n+ nextElement._owner._isOwnerNecessary = true;\n+ }\n+ warning(\n+ false,\n+ '<%s \/> is being rendered by both %s and %s using the same ' +\n+ 'key (%s) in the same place. Currently, this means that ' +\n+ 'they don\\'t preserve state. This behavior should be very ' +\n+ 'rare so we\\'re considering deprecating it. Please contact ' +\n+ 'the React team and explain your use case so that we can ' +\n+ 'take that into consideration.',\n+ nextDisplayName || 'Unknown Component',\n+ prevName || '[Unknown]',\n+ nextName || '[Unknown]',\n+ prevElement.key\n+ );\n+ }\n }\n }\n }\n","files":[{"path":"src\/core\/__tests__\/ReactCompositeComponent-test.js","status":"M"},{"path":"src\/core\/instantiateReactComponent.js","status":"M"},{"path":"src\/core\/shouldUpdateReactComponent.js","status":"M"}],"body":"","parents":["0b5331c1553dac553f756066d1bdc0d039d6fdec"],"commit":{"authorEmail":"jsfb@github","subject":"Dedupe owner-is-important warning.","authorName":"Jim","authoredAt":"2015-02-13T17:17:20-08:00","shortRevision":"207b03c56d","revision":"207b03c56d8630a4baa62bacb633d6fcc1f4b2e9"}}

dillon1000/react

Files changed