Don't warn about concurrently rendering contexts if we finished rende…

…ring (#22797) Closes #22796 DiffTrain build for [555ece0](555ece0) [View git log for this commit](https://github.com/facebook/react/commits/555ece0cd14779abd5a1fc50f71625f9ada42bef)
facebook · Jan 12, 2023 · 8a13948 · 8a13948
1 parent 6a673aa
commit 8a13948
Show file tree

Hide file tree

Showing 28 changed files with 182 additions and 58 deletions.
diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-0fce6bb498357feb4465859912004b2e20fe7084
+555ece0cd14779abd5a1fc50f71625f9ada42bef
diff --git a/compiled/facebook-www/REVISION_TRANSFORMS b/compiled/facebook-www/REVISION_TRANSFORMS
@@ -1 +1 @@
-0fce6bb498357feb4465859912004b2e20fe7084
+555ece0cd14779abd5a1fc50f71625f9ada42bef
diff --git a/compiled/facebook-www/React-dev.classic.js b/compiled/facebook-www/React-dev.classic.js
@@ -27,7 +27,7 @@ if (
 }
           "use strict";
 
-var ReactVersion = "18.3.0-www-classic-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
 
 // ATTENTION
 // When adding new symbols to this file,

diff --git a/compiled/facebook-www/React-dev.modern.js b/compiled/facebook-www/React-dev.modern.js
@@ -27,7 +27,7 @@ if (
 }
           "use strict";
 
-var ReactVersion = "18.3.0-www-modern-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
 
 // ATTENTION
 // When adding new symbols to this file,

diff --git a/compiled/facebook-www/React-prod.classic.js b/compiled/facebook-www/React-prod.classic.js
@@ -643,4 +643,4 @@ exports.useSyncExternalStore = function(
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-www-classic-0fce6bb49-20230111";
+exports.version = "18.3.0-www-classic-555ece0cd-20230112";
diff --git a/compiled/facebook-www/React-prod.modern.js b/compiled/facebook-www/React-prod.modern.js
@@ -635,4 +635,4 @@ exports.useSyncExternalStore = function(
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-www-modern-0fce6bb49-20230111";
+exports.version = "18.3.0-www-modern-555ece0cd-20230112";
diff --git a/compiled/facebook-www/React-profiling.classic.js b/compiled/facebook-www/React-profiling.classic.js
@@ -654,7 +654,7 @@ exports.useSyncExternalStore = function(
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-www-classic-0fce6bb49-20230111";
+exports.version = "18.3.0-www-classic-555ece0cd-20230112";
 
           /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
 if (

diff --git a/compiled/facebook-www/React-profiling.modern.js b/compiled/facebook-www/React-profiling.modern.js
@@ -646,7 +646,7 @@ exports.useSyncExternalStore = function(
   );
 };
 exports.useTransition = useTransition;
-exports.version = "18.3.0-www-modern-0fce6bb49-20230111";
+exports.version = "18.3.0-www-modern-555ece0cd-20230112";
 
           /* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
 if (

diff --git a/compiled/facebook-www/ReactART-dev.classic.js b/compiled/facebook-www/ReactART-dev.classic.js
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var ReactVersion = "18.3.0-www-classic-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -16344,6 +16344,13 @@ function beginWork(current, workInProgress, renderLanes) {
 }
 
 var valueCursor = createCursor(null);
+
+var renderer2CursorDEV;
+
+{
+  renderer2CursorDEV = createCursor(null);
+}
+
 var rendererSigil$1;
 
 {
@@ -16382,6 +16389,8 @@ function pushProvider(providerFiber, context, nextValue) {
     context._currentValue2 = nextValue;
 
     {
+      push(renderer2CursorDEV, context._currentRenderer2, providerFiber);
+
       if (
         context._currentRenderer2 !== undefined &&
         context._currentRenderer2 !== null &&
@@ -16399,15 +16408,22 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
-  pop(valueCursor, providerFiber);
 
   {
     if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
       context._currentValue2 = context._defaultValue;
     } else {
       context._currentValue2 = currentValue;
     }
+
+    {
+      var currentRenderer2 = renderer2CursorDEV.current;
+      pop(renderer2CursorDEV, providerFiber);
+      context._currentRenderer2 = currentRenderer2;
+    }
   }
+
+  pop(valueCursor, providerFiber);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   // Update the child lanes of all the ancestors, including the alternates.

diff --git a/compiled/facebook-www/ReactART-dev.modern.js b/compiled/facebook-www/ReactART-dev.modern.js
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var ReactVersion = "18.3.0-www-modern-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -16052,6 +16052,13 @@ function beginWork(current, workInProgress, renderLanes) {
 }
 
 var valueCursor = createCursor(null);
+
+var renderer2CursorDEV;
+
+{
+  renderer2CursorDEV = createCursor(null);
+}
+
 var rendererSigil$1;
 
 {
@@ -16090,6 +16097,8 @@ function pushProvider(providerFiber, context, nextValue) {
     context._currentValue2 = nextValue;
 
     {
+      push(renderer2CursorDEV, context._currentRenderer2, providerFiber);
+
       if (
         context._currentRenderer2 !== undefined &&
         context._currentRenderer2 !== null &&
@@ -16107,15 +16116,22 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
-  pop(valueCursor, providerFiber);
 
   {
     if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
       context._currentValue2 = context._defaultValue;
     } else {
       context._currentValue2 = currentValue;
     }
+
+    {
+      var currentRenderer2 = renderer2CursorDEV.current;
+      pop(renderer2CursorDEV, providerFiber);
+      context._currentRenderer2 = currentRenderer2;
+    }
   }
+
+  pop(valueCursor, providerFiber);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   // Update the child lanes of all the ancestors, including the alternates.

diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js
@@ -4795,11 +4795,11 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context) {
   var currentValue = valueCursor.current;
-  pop(valueCursor);
   context._currentValue2 =
     currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
       ? context._defaultValue
       : currentValue;
+  pop(valueCursor);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   for (; null !== parent; ) {
@@ -9804,7 +9804,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "18.3.0-www-classic-0fce6bb49-20230111",
+    version: "18.3.0-www-classic-555ece0cd-20230112",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1318 = {
@@ -9835,7 +9835,7 @@ var internals$jscomp$inline_1318 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
+  reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

diff --git a/compiled/facebook-www/ReactART-prod.modern.js b/compiled/facebook-www/ReactART-prod.modern.js
@@ -4548,11 +4548,11 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context) {
   var currentValue = valueCursor.current;
-  pop(valueCursor);
   context._currentValue2 =
     currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
       ? context._defaultValue
       : currentValue;
+  pop(valueCursor);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   for (; null !== parent; ) {
@@ -9471,7 +9471,7 @@ var slice = Array.prototype.slice,
       return null;
     },
     bundleType: 0,
-    version: "18.3.0-www-modern-0fce6bb49-20230111",
+    version: "18.3.0-www-modern-555ece0cd-20230112",
     rendererPackageName: "react-art"
   };
 var internals$jscomp$inline_1309 = {
@@ -9502,7 +9502,7 @@ var internals$jscomp$inline_1309 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
+  reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

diff --git a/compiled/facebook-www/ReactDOM-dev.classic.js b/compiled/facebook-www/ReactDOM-dev.classic.js
@@ -30982,6 +30982,12 @@ function beginWork(current, workInProgress, renderLanes) {
 }
 
 var valueCursor = createCursor(null);
+var rendererCursorDEV;
+
+{
+  rendererCursorDEV = createCursor(null);
+}
+
 var rendererSigil$1;
 
 {
@@ -31020,6 +31026,8 @@ function pushProvider(providerFiber, context, nextValue) {
     context._currentValue = nextValue;
 
     {
+      push(rendererCursorDEV, context._currentRenderer, providerFiber);
+
       if (
         context._currentRenderer !== undefined &&
         context._currentRenderer !== null &&
@@ -31037,15 +31045,22 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
-  pop(valueCursor, providerFiber);
 
   {
     if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
       context._currentValue = context._defaultValue;
     } else {
       context._currentValue = currentValue;
     }
+
+    {
+      var currentRenderer = rendererCursorDEV.current;
+      pop(rendererCursorDEV, providerFiber);
+      context._currentRenderer = currentRenderer;
+    }
   }
+
+  pop(valueCursor, providerFiber);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   // Update the child lanes of all the ancestors, including the alternates.
@@ -42690,7 +42705,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-www-classic-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
 
 function createPortal(
   children,

diff --git a/compiled/facebook-www/ReactDOM-dev.modern.js b/compiled/facebook-www/ReactDOM-dev.modern.js
@@ -30725,6 +30725,12 @@ function beginWork(current, workInProgress, renderLanes) {
 }
 
 var valueCursor = createCursor(null);
+var rendererCursorDEV;
+
+{
+  rendererCursorDEV = createCursor(null);
+}
+
 var rendererSigil$1;
 
 {
@@ -30763,6 +30769,8 @@ function pushProvider(providerFiber, context, nextValue) {
     context._currentValue = nextValue;
 
     {
+      push(rendererCursorDEV, context._currentRenderer, providerFiber);
+
       if (
         context._currentRenderer !== undefined &&
         context._currentRenderer !== null &&
@@ -30780,15 +30788,22 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context, providerFiber) {
   var currentValue = valueCursor.current;
-  pop(valueCursor, providerFiber);
 
   {
     if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
       context._currentValue = context._defaultValue;
     } else {
       context._currentValue = currentValue;
     }
+
+    {
+      var currentRenderer = rendererCursorDEV.current;
+      pop(rendererCursorDEV, providerFiber);
+      context._currentRenderer = currentRenderer;
+    }
   }
+
+  pop(valueCursor, providerFiber);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   // Update the child lanes of all the ancestors, including the alternates.
@@ -42414,7 +42429,7 @@ function createFiberRoot(
   return root;
 }
 
-var ReactVersion = "18.3.0-www-modern-0fce6bb49-20230111";
+var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
 
 function createPortal(
   children,

diff --git a/compiled/facebook-www/ReactDOM-prod.classic.js b/compiled/facebook-www/ReactDOM-prod.classic.js
@@ -9511,11 +9511,11 @@ function pushProvider(providerFiber, context, nextValue) {
 }
 function popProvider(context) {
   var currentValue = valueCursor.current;
-  pop(valueCursor);
   context._currentValue =
     currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
       ? context._defaultValue
       : currentValue;
+  pop(valueCursor);
 }
 function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
   for (; null !== parent; ) {
@@ -15534,7 +15534,7 @@ Internals.Events = [
 var devToolsConfig$jscomp$inline_1750 = {
   findFiberByHostInstance: getClosestInstanceFromNode,
   bundleType: 0,
-  version: "18.3.0-www-classic-0fce6bb49-20230111",
+  version: "18.3.0-www-classic-555ece0cd-20230112",
   rendererPackageName: "react-dom"
 };
 var internals$jscomp$inline_2134 = {
@@ -15564,7 +15564,7 @@ var internals$jscomp$inline_2134 = {
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
+  reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
   var hook$jscomp$inline_2135 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15806,4 +15806,4 @@ exports.unstable_renderSubtreeIntoContainer = function(
   );
 };
 exports.unstable_runWithPriority = runWithPriority;
-exports.version = "18.3.0-next-0fce6bb49-20230111";
+exports.version = "18.3.0-next-555ece0cd-20230112";