diff --git a/packages/react-dom/src/__tests__/ReactMultiChild-test.js b/packages/react-dom/src/__tests__/ReactMultiChild-test.js index 6eb0199be9..2f76f33270 100644 --- a/packages/react-dom/src/__tests__/ReactMultiChild-test.js +++ b/packages/react-dom/src/__tests__/ReactMultiChild-test.js @@ -295,9 +295,8 @@ describe('ReactMultiChild', () => { } const container = document.createElement('div'); expect(() => ReactDOM.render(, container)).toErrorDev( - 'Warning: Using Maps as children is unsupported and will likely yield ' + - 'unexpected results. Convert it to a sequence/iterable of keyed ' + - 'ReactElements instead.\n' + + 'Using Maps as children is not supported. ' + + 'Use an array of keyed ReactElements instead.\n' + ' in div (at **)\n' + ' in Parent (at **)', ); diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 93e6ffae5d..5131985d13 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -998,9 +998,8 @@ function ChildReconciler(shouldTrackSideEffects) { if ((newChildrenIterable: any).entries === iteratorFn) { if (!didWarnAboutMaps) { console.error( - 'Using Maps as children is unsupported and will likely yield ' + - 'unexpected results. Convert it to a sequence/iterable of keyed ' + - 'ReactElements instead.', + 'Using Maps as children is not supported. ' + + 'Use an array of keyed ReactElements instead.', ); } didWarnAboutMaps = true; diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js index 09690320f1..9db8285a20 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -15,7 +15,6 @@ import { REACT_ELEMENT_TYPE, REACT_PORTAL_TYPE, } from 'shared/ReactSymbols'; -import {disableMapsAsChildren} from 'shared/ReactFeatureFlags'; import {isValidElement, cloneAndReplaceKey} from './ReactElement'; import ReactDebugCurrentFrame from './ReactDebugCurrentFrame'; @@ -162,23 +161,14 @@ function mapIntoArray( const iterableChildren: Iterable & { entries: any, } = (children: any); - if (disableMapsAsChildren) { - invariant( - iteratorFn !== iterableChildren.entries, - 'Maps are not valid as a React child (found: %s). Consider converting ' + - 'children to an array of keyed ReactElements instead.', - iterableChildren, - ); - } if (__DEV__) { // Warn about using Maps as children if (iteratorFn === iterableChildren.entries) { if (!didWarnAboutMaps) { console.warn( - 'Using Maps as children is deprecated and will be removed in ' + - 'a future major release. Consider converting children to ' + - 'an array of keyed ReactElements instead.', + 'Using Maps as children is not supported. ' + + 'Use an array of keyed ReactElements instead.', ); } didWarnAboutMaps = true; diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index cc1688e076..a48a91c924 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -121,9 +121,6 @@ export const disableLegacyContext = false; // Disables children for