{"parents":["1c697ab1413f0db7e79de8f1a685c071128807fe"],"body":"Fixes #3222.","patch":"diff --git a\/src\/classic\/element\/ReactElementValidator.js b\/src\/classic\/element\/ReactElementValidator.js\nindex 35cd38d6cf..2cf89f98e2 100644\n--- a\/src\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/classic\/element\/ReactElementValidator.js\n@@ -134,7 +134,8 @@ function validatePropertyKey(name, element, parentType) {\n *\/\n function warnAndMonitorForKeyUse(message, element, parentType) {\n var ownerName = getCurrentOwnerDisplayName();\n- var parentName = parentType.displayName || parentType.name;\n+ var parentName = typeof parentType === 'string' ?\n+ parentType : parentType.displayName || parentType.name;\n \n var useName = ownerName || parentName;\n var memoizer = ownerHasKeyUseWarning[message] || (\n@@ -145,9 +146,10 @@ function warnAndMonitorForKeyUse(message, element, parentType) {\n }\n memoizer[useName] = true;\n \n- message += ownerName ?\n- ` Check the render method of ${ownerName}.` :\n- ` Check the React.render call using <${parentName}>.`;\n+ message +=\n+ ownerName ? ` Check the render method of ${ownerName}.` :\n+ parentName ? ` Check the React.render call using <${parentName}>.` :\n+ '';\n \n \/\/ Usually the current owner is the offender, but if it accepts children as a\n \/\/ property, it may be the creator of the child that's responsible for\ndiff --git a\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js b\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\nindex 9555335c48..98de236f28 100644\n--- a\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\n+++ b\/src\/classic\/element\/__tests__\/ReactElementValidator-test.js\n@@ -80,6 +80,46 @@ describe('ReactElementValidator', function() {\n );\n });\n \n+ it('warns for keys for arrays with no owner or parent info', function() {\n+ spyOn(console, 'warn');\n+\n+ var Anonymous = React.createClass({\n+ displayName: undefined,\n+ render: function() {\n+ return

;\n+ }\n+ });\n+\n+ var divs = [\n+

,\n+

\n+ ];\n+ ReactTestUtils.renderIntoDocument({divs}<\/Anonymous>);\n+\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toBe(\n+ 'Warning: Each child in an array or iterator should have a unique ' +\n+ '\"key\" prop. See http:\/\/fb.me\/react-warning-keys for more information.'\n+ );\n+ });\n+\n+ it('warns for keys for arrays of elements with no owner info', function() {\n+ spyOn(console, 'warn');\n+\n+ var divs = [\n+

,\n+

\n+ ];\n+ ReactTestUtils.renderIntoDocument(

{divs}<\/div>);\n+\n+ expect(console.warn.argsForCall.length).toBe(1);\n+ expect(console.warn.argsForCall[0][0]).toBe(\n+ 'Warning: Each child in an array or iterator should have a unique ' +\n+ '\"key\" prop. Check the React.render call using

. See ' +\n+ 'http:\/\/fb.me\/react-warning-keys for more information.'\n+ );\n+ });\n+\n it('warns for keys for iterables of elements in rest args', function() {\n spyOn(console, 'warn');\n var Component = React.createFactory(ComponentClass);\n","commit":{"authorName":"Ben Alpert","authorEmail":"balpert@fb.com","shortRevision":"d5fa14de1a","revision":"d5fa14de1a7babf4e80288f6914e94d160667af9","authoredAt":"2015-02-26T15:20:37-08:00","subject":"Don't use undefined as parent name in key warning"},"files":[{"path":"src\/classic\/element\/ReactElementValidator.js","status":"M"},{"path":"src\/classic\/element\/__tests__\/ReactElementValidator-test.js","status":"M"}]}

dillon1000/react

Files changed