Fix suspense replaying forward refs (#26535)

Continuation of facebook/react#26420 Fixes facebook/react#26385 and facebook/react#26419 --------- Co-authored-by: eps1lon <silbermann.sebastian@gmail.com> Co-authored-by: Andrew Clark <git@andrewclark.io> DiffTrain build for [7329ea81c154d40800e30104be40f050e8c2af3e](facebook/react@7329ea8)
jerrydev0927 · Apr 2, 2023 · 4c29933 · 4c29933
1 parent 8cf2134
commit 4c29933
Show file tree

Hide file tree

Showing 18 changed files with 967 additions and 791 deletions.
diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION
@@ -1 +1 @@
-0ae348018d5b3a3f1ccdd92de85d9cc581b2b98d
+7329ea81c154d40800e30104be40f050e8c2af3e
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-01f5e12b";
+var ReactVersion = "18.3.0-www-modern-be9a0998";
 
 // ATTENTION
 // When adding new symbols to this file,

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-69b188ab";
+var ReactVersion = "18.3.0-www-classic-ec4b0889";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -13731,18 +13731,12 @@ function replayFunctionComponent(
   workInProgress,
   nextProps,
   Component,
+  secondArg,
   renderLanes
 ) {
   // This function is used to replay a component that previously suspended,
   // after its data resolves. It's a simplified version of
   // updateFunctionComponent that reuses the hooks from the previous attempt.
-  var context;
-
-  {
-    var unmaskedContext = getUnmaskedContext(workInProgress, Component, true);
-    context = getMaskedContext(workInProgress, unmaskedContext);
-  }
-
   prepareToReadContext(workInProgress, renderLanes);
 
   if (enableSchedulingProfiler) {
@@ -13754,7 +13748,7 @@ function replayFunctionComponent(
     workInProgress,
     Component,
     nextProps,
-    context
+    secondArg
   );
 
   if (enableSchedulingProfiler) {
@@ -25396,8 +25390,8 @@ function replaySuspendedUnitOfWork(unitOfWork) {
     }
     // eslint-disable-next-line no-fallthrough
 
-    case FunctionComponent:
-    case ForwardRef: {
+    case SimpleMemoComponent:
+    case FunctionComponent: {
       // Resolve `defaultProps`. This logic is copied from `beginWork`.
       // TODO: Consider moving this switch statement into that module. Also,
       // could maybe use this as an opportunity to say `use` doesn't work with
@@ -25408,24 +25402,43 @@ function replaySuspendedUnitOfWork(unitOfWork) {
         unitOfWork.elementType === Component
           ? unresolvedProps
           : resolveDefaultProps(Component, unresolvedProps);
+      var context;
+
+      {
+        var unmaskedContext = getUnmaskedContext(unitOfWork, Component, true);
+        context = getMaskedContext(unitOfWork, unmaskedContext);
+      }
+
       next = replayFunctionComponent(
         current,
         unitOfWork,
         resolvedProps,
         Component,
+        context,
         workInProgressRootRenderLanes
       );
       break;
     }
 
-    case SimpleMemoComponent: {
-      var _Component = unitOfWork.type;
-      var nextProps = unitOfWork.pendingProps;
+    case ForwardRef: {
+      // Resolve `defaultProps`. This logic is copied from `beginWork`.
+      // TODO: Consider moving this switch statement into that module. Also,
+      // could maybe use this as an opportunity to say `use` doesn't work with
+      // `defaultProps` :)
+      var _Component = unitOfWork.type.render;
+      var _unresolvedProps = unitOfWork.pendingProps;
+
+      var _resolvedProps =
+        unitOfWork.elementType === _Component
+          ? _unresolvedProps
+          : resolveDefaultProps(_Component, _unresolvedProps);
+
       next = replayFunctionComponent(
         current,
         unitOfWork,
-        nextProps,
+        _resolvedProps,
         _Component,
+        unitOfWork.ref,
         workInProgressRootRenderLanes
       );
       break;

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-e02e9428";
+var ReactVersion = "18.3.0-www-modern-ae3f1831";
 
 var LegacyRoot = 0;
 var ConcurrentRoot = 1;
@@ -13448,13 +13448,12 @@ function replayFunctionComponent(
   workInProgress,
   nextProps,
   Component,
+  secondArg,
   renderLanes
 ) {
   // This function is used to replay a component that previously suspended,
   // after its data resolves. It's a simplified version of
   // updateFunctionComponent that reuses the hooks from the previous attempt.
-  var context;
-
   prepareToReadContext(workInProgress, renderLanes);
 
   if (enableSchedulingProfiler) {
@@ -13466,7 +13465,7 @@ function replayFunctionComponent(
     workInProgress,
     Component,
     nextProps,
-    context
+    secondArg
   );
 
   if (enableSchedulingProfiler) {
@@ -25056,8 +25055,8 @@ function replaySuspendedUnitOfWork(unitOfWork) {
     }
     // eslint-disable-next-line no-fallthrough
 
-    case FunctionComponent:
-    case ForwardRef: {
+    case SimpleMemoComponent:
+    case FunctionComponent: {
       // Resolve `defaultProps`. This logic is copied from `beginWork`.
       // TODO: Consider moving this switch statement into that module. Also,
       // could maybe use this as an opportunity to say `use` doesn't work with
@@ -25068,24 +25067,38 @@ function replaySuspendedUnitOfWork(unitOfWork) {
         unitOfWork.elementType === Component
           ? unresolvedProps
           : resolveDefaultProps(Component, unresolvedProps);
+      var context;
+
       next = replayFunctionComponent(
         current,
         unitOfWork,
         resolvedProps,
         Component,
+        context,
         workInProgressRootRenderLanes
       );
       break;
     }
 
-    case SimpleMemoComponent: {
-      var _Component = unitOfWork.type;
-      var nextProps = unitOfWork.pendingProps;
+    case ForwardRef: {
+      // Resolve `defaultProps`. This logic is copied from `beginWork`.
+      // TODO: Consider moving this switch statement into that module. Also,
+      // could maybe use this as an opportunity to say `use` doesn't work with
+      // `defaultProps` :)
+      var _Component = unitOfWork.type.render;
+      var _unresolvedProps = unitOfWork.pendingProps;
+
+      var _resolvedProps =
+        unitOfWork.elementType === _Component
+          ? _unresolvedProps
+          : resolveDefaultProps(_Component, _unresolvedProps);
+
       next = replayFunctionComponent(
         current,
         unitOfWork,
-        nextProps,
+        _resolvedProps,
         _Component,
+        unitOfWork.ref,
         workInProgressRootRenderLanes
       );
       break;

diff --git a/compiled/facebook-www/ReactART-prod.classic.js b/compiled/facebook-www/ReactART-prod.classic.js
@@ -3887,18 +3887,15 @@ function replayFunctionComponent(
   workInProgress,
   nextProps,
   Component,
+  secondArg,
   renderLanes
 ) {
-  var context = isContextProvider(Component)
-    ? previousContext
-    : contextStackCursor$1.current;
-  context = getMaskedContext(workInProgress, context);
   prepareToReadContext(workInProgress, renderLanes);
   nextProps = renderWithHooksAgain(
     workInProgress,
     Component,
     nextProps,
-    context
+    secondArg
   );
   finishRenderingHooks(current);
   if (null !== current && !didReceiveUpdate)
@@ -8549,28 +8546,40 @@ function replaySuspendedUnitOfWork(unitOfWork) {
   switch (unitOfWork.tag) {
     case 2:
       unitOfWork.tag = 0;
+    case 15:
     case 0:
-    case 11:
       var Component = unitOfWork.type,
         unresolvedProps = unitOfWork.pendingProps;
       unresolvedProps =
         unitOfWork.elementType === Component
           ? unresolvedProps
           : resolveDefaultProps(Component, unresolvedProps);
+      var context = isContextProvider(Component)
+        ? previousContext
+        : contextStackCursor$1.current;
+      context = getMaskedContext(unitOfWork, context);
       current = replayFunctionComponent(
         current,
         unitOfWork,
         unresolvedProps,
         Component,
+        context,
         workInProgressRootRenderLanes
       );
       break;
-    case 15:
+    case 11:
+      Component = unitOfWork.type.render;
+      unresolvedProps = unitOfWork.pendingProps;
+      unresolvedProps =
+        unitOfWork.elementType === Component
+          ? unresolvedProps
+          : resolveDefaultProps(Component, unresolvedProps);
       current = replayFunctionComponent(
         current,
         unitOfWork,
-        unitOfWork.pendingProps,
-        unitOfWork.type,
+        unresolvedProps,
+        Component,
+        unitOfWork.ref,
         workInProgressRootRenderLanes
       );
       break;
@@ -10053,19 +10062,19 @@ var slice = Array.prototype.slice,
     };
     return Text;
   })(React.Component),
-  devToolsConfig$jscomp$inline_1168 = {
+  devToolsConfig$jscomp$inline_1170 = {
     findFiberByHostInstance: function () {
       return null;
     },
     bundleType: 0,
-    version: "18.3.0-www-classic-d70758c5",
+    version: "18.3.0-www-classic-3b2e6228",
     rendererPackageName: "react-art"
   };
-var internals$jscomp$inline_1342 = {
-  bundleType: devToolsConfig$jscomp$inline_1168.bundleType,
-  version: devToolsConfig$jscomp$inline_1168.version,
-  rendererPackageName: devToolsConfig$jscomp$inline_1168.rendererPackageName,
-  rendererConfig: devToolsConfig$jscomp$inline_1168.rendererConfig,
+var internals$jscomp$inline_1344 = {
+  bundleType: devToolsConfig$jscomp$inline_1170.bundleType,
+  version: devToolsConfig$jscomp$inline_1170.version,
+  rendererPackageName: devToolsConfig$jscomp$inline_1170.rendererPackageName,
+  rendererConfig: devToolsConfig$jscomp$inline_1170.rendererConfig,
   overrideHookState: null,
   overrideHookStateDeletePath: null,
   overrideHookStateRenamePath: null,
@@ -10082,26 +10091,26 @@ var internals$jscomp$inline_1342 = {
     return null === fiber ? null : fiber.stateNode;
   },
   findFiberByHostInstance:
-    devToolsConfig$jscomp$inline_1168.findFiberByHostInstance ||
+    devToolsConfig$jscomp$inline_1170.findFiberByHostInstance ||
     emptyFindFiberByHostInstance,
   findHostInstancesForRefresh: null,
   scheduleRefresh: null,
   scheduleRoot: null,
   setRefreshHandler: null,
   getCurrentFiber: null,
-  reconcilerVersion: "18.3.0-www-classic-d70758c5"
+  reconcilerVersion: "18.3.0-www-classic-3b2e6228"
 };
 if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
-  var hook$jscomp$inline_1343 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
+  var hook$jscomp$inline_1345 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
   if (
-    !hook$jscomp$inline_1343.isDisabled &&
-    hook$jscomp$inline_1343.supportsFiber
+    !hook$jscomp$inline_1345.isDisabled &&
+    hook$jscomp$inline_1345.supportsFiber
   )
     try {
-      (rendererID = hook$jscomp$inline_1343.inject(
-        internals$jscomp$inline_1342
+      (rendererID = hook$jscomp$inline_1345.inject(
+        internals$jscomp$inline_1344
       )),
-        (injectedHook = hook$jscomp$inline_1343);
+        (injectedHook = hook$jscomp$inline_1345);
     } catch (err) {}
 }
 var Path = Mode$1.Path;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0ae348018d5b3a3f1ccdd92de85d9cc581b2b98d
		7329ea81c154d40800e30104be40f050e8c2af3e