Check thenable instead of thenableState

acdlite · acdlite · commit 6b4c0314e82e · 2022-11-17T14:48:42.000-05:00
Now that hook state is preserved while the work loop is suspended, we
don't need to track the thenable state in the work loop. We can track
it alongside the rest of the hook state.

Before deleting the thenable state variable from the work loop, I need
to remove the other places where it's referenced.

One of them is `isThenableStateResolved`. This grabs the last thenable
from the array and checks if it has resolved.

This was a pointless indirection anyway. The thenable is already stored
as `workInProgressThrownValue`. So we can check that directly.
diff --git a/packages/react-reconciler/src/ReactFiberThenable.new.js b/packages/react-reconciler/src/ReactFiberThenable.new.js
@@ -54,13 +54,9 @@ export function getThenableStateAfterSuspending(): ThenableState | null {
   return state;
 }
 
-export function isThenableStateResolved(thenables: ThenableState): boolean {
-  const lastThenable = thenables[thenables.length - 1];
-  if (lastThenable !== undefined) {
-    const status = lastThenable.status;
-    return status === 'fulfilled' || status === 'rejected';
-  }
-  return true;
+export function isThenableResolved(thenable: Thenable<mixed>): boolean {
+  const status = thenable.status;
+  return status === 'fulfilled' || status === 'rejected';
 }
 
 function noop(): void {}
diff --git a/packages/react-reconciler/src/ReactFiberThenable.old.js b/packages/react-reconciler/src/ReactFiberThenable.old.js
@@ -54,13 +54,9 @@ export function getThenableStateAfterSuspending(): ThenableState | null {
   return state;
 }
 
-export function isThenableStateResolved(thenables: ThenableState): boolean {
-  const lastThenable = thenables[thenables.length - 1];
-  if (lastThenable !== undefined) {
-    const status = lastThenable.status;
-    return status === 'fulfilled' || status === 'rejected';
-  }
-  return true;
+export function isThenableResolved(thenable: Thenable<mixed>): boolean {
+  const status = thenable.status;
+  return status === 'fulfilled' || status === 'rejected';
 }
 
 function noop(): void {}
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -276,7 +276,7 @@ import {
   SuspenseException,
   getSuspendedThenable,
   getThenableStateAfterSuspending,
-  isThenableStateResolved,
+  isThenableResolved,
 } from './ReactFiberThenable.new';
 import {schedulePostPaintCallback} from './ReactPostPaintCallback';
 import {
@@ -2204,24 +2204,20 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {
             break;
           }
           case SuspendedOnData: {
+            const thenable: Thenable<mixed> = (thrownValue: any);
             if (workInProgressSuspendedThenableState !== null) {
               const thenableState = workInProgressSuspendedThenableState;
-              if (isThenableStateResolved(thenableState)) {
+              if (isThenableResolved(thenable)) {
                 // The data resolved. Try rendering the component again.
                 workInProgressSuspendedReason = NotSuspended;
                 workInProgressThrownValue = null;
-                replaySuspendedUnitOfWork(
-                  unitOfWork,
-                  thrownValue,
-                  thenableState,
-                );
+                replaySuspendedUnitOfWork(unitOfWork, thenable, thenableState);
                 break;
               }
             }
 
             // The work loop is suspended on data. We should wait for it to
             // resolve before continuing to render.
-            const thenable: Thenable<mixed> = (workInProgressThrownValue: any);
             const onResolution = () => {
               ensureRootIsScheduled(root, now());
             };
@@ -2246,7 +2242,8 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {
           default: {
             if (workInProgressSuspendedThenableState !== null) {
               const thenableState = workInProgressSuspendedThenableState;
-              if (isThenableStateResolved(thenableState)) {
+              const thenable: Thenable<mixed> = (thrownValue: any);
+              if (isThenableResolved(thenable)) {
                 // The data resolved. Try rendering the component again.
                 workInProgressSuspendedReason = NotSuspended;
                 workInProgressThrownValue = null;
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js
@@ -276,7 +276,7 @@ import {
   SuspenseException,
   getSuspendedThenable,
   getThenableStateAfterSuspending,
-  isThenableStateResolved,
+  isThenableResolved,
 } from './ReactFiberThenable.old';
 import {schedulePostPaintCallback} from './ReactPostPaintCallback';
 import {
@@ -2204,24 +2204,20 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {
             break;
           }
           case SuspendedOnData: {
+            const thenable: Thenable<mixed> = (thrownValue: any);
             if (workInProgressSuspendedThenableState !== null) {
               const thenableState = workInProgressSuspendedThenableState;
-              if (isThenableStateResolved(thenableState)) {
+              if (isThenableResolved(thenable)) {
                 // The data resolved. Try rendering the component again.
                 workInProgressSuspendedReason = NotSuspended;
                 workInProgressThrownValue = null;
-                replaySuspendedUnitOfWork(
-                  unitOfWork,
-                  thrownValue,
-                  thenableState,
-                );
+                replaySuspendedUnitOfWork(unitOfWork, thenable, thenableState);
                 break;
               }
             }
 
             // The work loop is suspended on data. We should wait for it to
             // resolve before continuing to render.
-            const thenable: Thenable<mixed> = (workInProgressThrownValue: any);
             const onResolution = () => {
               ensureRootIsScheduled(root, now());
             };
@@ -2246,7 +2242,8 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {
           default: {
             if (workInProgressSuspendedThenableState !== null) {
               const thenableState = workInProgressSuspendedThenableState;
-              if (isThenableStateResolved(thenableState)) {
+              const thenable: Thenable<mixed> = (thrownValue: any);
+              if (isThenableResolved(thenable)) {
                 // The data resolved. Try rendering the component again.
                 workInProgressSuspendedReason = NotSuspended;
                 workInProgressThrownValue = null;
