{"body":"I don't think \"array or iterator\" is adding anything, and it may well be confusing, especially since this is one of the first and most common warnings that devs see.","parents":["3494ee57e69f1f6cdf5e128dfbaa39db4dfd12db"],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\nindex 8fd8830787..7b7d5fa619 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js\n@@ -354,7 +354,7 @@ describe('ReactFunctionComponent', () => {\n }\n \n expect(() => ReactTestUtils.renderIntoDocument()).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.\\n\\n' +\n+ 'Each child in a list should have a unique \"key\" prop.\\n\\n' +\n 'Check the render method of `Child`.',\n );\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactMultiChildText-test.js b\/packages\/react-dom\/src\/__tests__\/ReactMultiChildText-test.js\nindex 360860c00c..2785bd0304 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactMultiChildText-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactMultiChildText-test.js\n@@ -162,8 +162,8 @@ describe('ReactMultiChildText', () => {\n ['', 'foo',

{true}{

}{1.2}{''}<\/div>, 'foo'], ['', 'foo',

, 'foo'],\n ]);\n }).toWarnDev([\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Warning: Each child in a list should have a unique \"key\" prop.',\n+ 'Warning: Each child in a list should have a unique \"key\" prop.',\n ]);\n });\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactChildFiber.js b\/packages\/react-reconciler\/src\/ReactChildFiber.js\nindex bed780c2b1..fd1aa488c6 100644\n--- a\/packages\/react-reconciler\/src\/ReactChildFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactChildFiber.js\n@@ -80,7 +80,7 @@ if (__DEV__) {\n child._store.validated = true;\n \n const currentComponentErrorInfo =\n- 'Each child in an array or iterator should have a unique ' +\n+ 'Each child in a list should have a unique ' +\n '\"key\" prop. See https:\/\/fb.me\/react-warning-keys for ' +\n 'more information.' +\n getCurrentFiberStackInDev();\n@@ -91,7 +91,7 @@ if (__DEV__) {\n \n warning(\n false,\n- 'Each child in an array or iterator should have a unique ' +\n+ 'Each child in a list should have a unique ' +\n '\"key\" prop. See https:\/\/fb.me\/react-warning-keys for ' +\n 'more information.',\n );\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactFragment-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactFragment-test.js\nindex a742ac0884..d6b8b41fc0 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactFragment-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactFragment-test.js\n@@ -709,7 +709,7 @@ describe('ReactFragment', () => {\n \n ReactNoop.render();\n expect(ReactNoop.flush).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Each child in a list should have a unique \"key\" prop.',\n );\n \n expect(ops).toEqual([]);\n@@ -753,12 +753,12 @@ describe('ReactFragment', () => {\n \n ReactNoop.render();\n expect(ReactNoop.flush).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Each child in a list should have a unique \"key\" prop.',\n );\n \n ReactNoop.render();\n expect(ReactNoop.flush).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Each child in a list should have a unique \"key\" prop.',\n );\n \n expect(ops).toEqual(['Update Stateful']);\n@@ -766,7 +766,7 @@ describe('ReactFragment', () => {\n \n ReactNoop.render();\n expect(ReactNoop.flush).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Each child in a list should have a unique \"key\" prop.',\n );\n \n expect(ops).toEqual(['Update Stateful', 'Update Stateful']);\ndiff --git a\/packages\/react\/src\/ReactElementValidator.js b\/packages\/react\/src\/ReactElementValidator.js\nindex f25677580e..fa83aea4ef 100644\n--- a\/packages\/react\/src\/ReactElementValidator.js\n+++ b\/packages\/react\/src\/ReactElementValidator.js\n@@ -126,7 +126,7 @@ function validateExplicitKey(element, parentType) {\n if (__DEV__) {\n warning(\n false,\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ 'Each child in a list should have a unique \"key\" prop.' +\n '%s%s See https:\/\/fb.me\/react-warning-keys for more information.',\n currentComponentErrorInfo,\n childOwner,\ndiff --git a\/packages\/react\/src\/__tests__\/ReactChildren-test.js b\/packages\/react\/src\/__tests__\/ReactChildren-test.js\nindex 5dc7a9155a..68165197ef 100644\n--- a\/packages\/react\/src\/__tests__\/ReactChildren-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactChildren-test.js\n@@ -320,7 +320,7 @@ describe('ReactChildren', () => {\n \n let instance;\n expect(() => (instance =

{threeDivIterable}<\/div>)).toWarnDev(\n- 'Warning: Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Warning: Each child in a list should have a unique \"key\" prop.',\n );\n \n function assertCalls() {\n@@ -905,7 +905,7 @@ describe('ReactChildren', () => {\n ReactTestUtils.renderIntoDocument(),\n ).toWarnDev(\n 'Warning: ' +\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ 'Each child in a list should have a unique \"key\" prop.' +\n ' See https:\/\/fb.me\/react-warning-keys for more information.' +\n '\\n in ComponentReturningArray (at **)',\n );\n@@ -926,7 +926,7 @@ describe('ReactChildren', () => {\n ReactTestUtils.renderIntoDocument([

]),\n ).toWarnDev(\n 'Warning: ' +\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ 'Each child in a list should have a unique \"key\" prop.' +\n ' See https:\/\/fb.me\/react-warning-keys for more information.',\n {withoutStack: true}, \/\/ There's nothing on the stack\n );\ndiff --git a\/packages\/react\/src\/__tests__\/ReactElementClone-test.js b\/packages\/react\/src\/__tests__\/ReactElementClone-test.js\nindex 722bff24ee..2220a7b112 100644\n--- a\/packages\/react\/src\/__tests__\/ReactElementClone-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactElementClone-test.js\n@@ -259,9 +259,7 @@ describe('ReactElementClone', () => {\n it('warns for keys for arrays of elements in rest args', () => {\n expect(() =>\n React.cloneElement(

, null, [

]),\n- ).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n+ ).toWarnDev('Each child in a list should have a unique \"key\" prop.');\n });\n \n it('does not warns for arrays of elements with keys', () => {\ndiff --git a\/packages\/react\/src\/__tests__\/ReactElementValidator-test.internal.js b\/packages\/react\/src\/__tests__\/ReactElementValidator-test.internal.js\nindex 5a17a079bc..d4c7f9bf2a 100644\n--- a\/packages\/react\/src\/__tests__\/ReactElementValidator-test.internal.js\n+++ b\/packages\/react\/src\/__tests__\/ReactElementValidator-test.internal.js\n@@ -42,9 +42,7 @@ describe('ReactElementValidator', () => {\n \n expect(() => {\n Component(null, [Component(), Component()]);\n- }).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n+ }).toWarnDev('Each child in a list should have a unique \"key\" prop.');\n });\n \n it('warns for keys for arrays of elements with owner info', () => {\n@@ -67,7 +65,7 @@ describe('ReactElementValidator', () => {\n expect(() => {\n ReactTestUtils.renderIntoDocument(React.createElement(ComponentWrapper));\n }).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the render method of `InnerClass`. ' +\n 'It was passed a child from ComponentWrapper. ',\n );\n@@ -84,7 +82,7 @@ describe('ReactElementValidator', () => {\n expect(() => {\n ReactTestUtils.renderIntoDocument({divs}<\/Anonymous>);\n }).toWarnDev(\n- 'Warning: Each child in an array or iterator should have a unique ' +\n+ 'Warning: Each child in a list should have a unique ' +\n '\"key\" prop. See https:\/\/fb.me\/react-warning-keys for more information.\\n' +\n ' in div (at **)',\n );\n@@ -96,7 +94,7 @@ describe('ReactElementValidator', () => {\n expect(() => {\n ReactTestUtils.renderIntoDocument(

{divs}<\/div>);\n }).toWarnDev(\n- 'Warning: Each child in an array or iterator should have a unique ' +\n+ 'Warning: Each child in a list should have a unique ' +\n '\"key\" prop.\\n\\nCheck the top-level render call using

. See ' +\n 'https:\/\/fb.me\/react-warning-keys for more information.\\n' +\n ' in div (at **)',\n@@ -117,7 +115,7 @@ describe('ReactElementValidator', () => {\n }\n \n expect(() => ReactTestUtils.renderIntoDocument()).toWarnDev(\n- 'Warning: Each child in an array or iterator should have a unique ' +\n+ 'Warning: Each child in a list should have a unique ' +\n '\"key\" prop.\\n\\nCheck the render method of `Component`. See ' +\n 'https:\/\/fb.me\/react-warning-keys for more information.\\n' +\n ' in div (at **)\\n' +\n@@ -161,7 +159,7 @@ describe('ReactElementValidator', () => {\n };\n \n expect(() => Component(null, iterable)).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n+ 'Each child in a list should have a unique \"key\" prop.',\n );\n });\n \ndiff --git a\/packages\/react\/src\/__tests__\/ReactJSXElementValidator-test.js b\/packages\/react\/src\/__tests__\/ReactJSXElementValidator-test.js\nindex 24fe79fdb1..0321e5cd22 100644\n--- a\/packages\/react\/src\/__tests__\/ReactJSXElementValidator-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactJSXElementValidator-test.js\n@@ -48,9 +48,7 @@ describe('ReactJSXElementValidator', () => {\n ReactTestUtils.renderIntoDocument(\n {[, ]}<\/Component>,\n ),\n- ).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n+ ).toWarnDev('Each child in a list should have a unique \"key\" prop.');\n });\n \n it('warns for keys for arrays of elements with owner info', () => {\n@@ -69,7 +67,7 @@ describe('ReactJSXElementValidator', () => {\n expect(() =>\n ReactTestUtils.renderIntoDocument(),\n ).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.' +\n+ 'Each child in a list should have a unique \"key\" prop.' +\n '\\n\\nCheck the render method of `InnerComponent`. ' +\n 'It was passed a child from ComponentWrapper. ',\n );\n@@ -90,9 +88,7 @@ describe('ReactJSXElementValidator', () => {\n \n expect(() =>\n ReactTestUtils.renderIntoDocument({iterable}<\/Component>),\n- ).toWarnDev(\n- 'Each child in an array or iterator should have a unique \"key\" prop.',\n- );\n+ ).toWarnDev('Each child in a list should have a unique \"key\" prop.');\n });\n \n it('does not warn for arrays of elements with keys', () => {\n","commit":{"subject":"Simplify wording of key warning (#14503)","shortRevision":"547e059f0b","authorName":"Sophie Alpert","revision":"547e059f0bc88e76cd738b01b76e777ff1b222a7","authorEmail":"git@sophiebits.com","authoredAt":"2019-01-07T08:30:23-08:00"},"files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactFunctionComponent-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactMultiChildText-test.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactChildFiber.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactFragment-test.js","status":"M"},{"path":"packages\/react\/src\/ReactElementValidator.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactChildren-test.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactElementClone-test.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactElementValidator-test.internal.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactJSXElementValidator-test.js","status":"M"}]}

dillon1000/react

Files changed