{"patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 035193cfcd..8a26c84b39 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -1118,13 +1118,18 @@ function updateContextConsumer(\n \/\/ in DEV mode if this property exists or not and warn if it does not.\n if (__DEV__) {\n if ((context: any)._context === undefined) {\n- if (!hasWarnedAboutUsingContextAsConsumer) {\n- hasWarnedAboutUsingContextAsConsumer = true;\n- warning(\n- false,\n- 'Rendering directly is not supported and will be removed in ' +\n- 'a future major release. Did you mean to render instead?',\n- );\n+ \/\/ This may be because it's a Context (rather than a Consumer).\n+ \/\/ Or it may be because it's older React where they're the same thing.\n+ \/\/ We only want to warn if we're sure it's a new React.\n+ if (context !== context.Consumer) {\n+ if (!hasWarnedAboutUsingContextAsConsumer) {\n+ hasWarnedAboutUsingContextAsConsumer = true;\n+ warning(\n+ false,\n+ 'Rendering directly is not supported and will be removed in ' +\n+ 'a future major release. Did you mean to render instead?',\n+ );\n+ }\n }\n } else {\n context = (context: any)._context;\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\nindex 03b52dccdc..52ee23f5ff 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js\n@@ -1584,6 +1584,28 @@ Context fuzz tester error! Copy and paste the following line into the test suite\n );\n });\n \n+ \/\/ False positive regression test.\n+ it('should not warn when using Consumer from React < 16.6 with newer renderer', () => {\n+ const BarContext = React.createContext({value: 'bar-initial'});\n+ \/\/ React 16.5 and earlier didn't have a separate object.\n+ BarContext.Consumer = BarContext;\n+\n+ function Component() {\n+ return (\n+ \n+ \n+ \n+ {({value}) =>

}\n+ <\/BarContext.Consumer>\n+ <\/BarContext.Provider>\n+ <\/React.Fragment>\n+ );\n+ }\n+\n+ ReactNoop.render();\n+ ReactNoop.flush();\n+ });\n+\n it('should warn with an error message when using nested context consumers in DEV', () => {\n const BarContext = React.createContext({value: 'bar-initial'});\n const BarConsumer = BarContext;\n","parents":["4773fdf7cdf5d6d775ad0960f23ee1a830e7b82b"],"body":"","files":[{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.internal.js"}],"commit":{"shortRevision":"9ea4bc6ed6","revision":"9ea4bc6ed607b0bbd2cff7bbdd4608db99490a5f","authoredAt":"2018-10-14T15:35:52+01:00","subject":"Fix false positive context warning when using an old React (#13850)","authorName":"Dan Abramov","authorEmail":"dan.abramov@gmail.com"}}

dillon1000/react

Files changed