DRYed things up in the new fork

Author: Brian Vaughn

packages/react-reconciler/src/ReactFiberCommitWork.new.js

@@ -112,7 +112,6 @@ import {
 } from './ReactFiberHostConfig';
 import {
   captureCommitPhaseError,
-  captureCommitPhaseErrorForUnmountedFiber,
   resolveRetryWakeable,
   markCommitTimeOfFallback,
   enqueuePendingPassiveProfilerEffect,
@@ -167,13 +166,13 @@ function safelyCallComponentWillUnmount(current, instance) {
     );
     if (hasCaughtError()) {
       const unmountError = clearCaughtError();
-      captureCommitPhaseError(current, unmountError);
+      captureCommitPhaseError(current, current.return, unmountError);
     }
   } else {
     try {
       callComponentWillUnmountWithTimer(current, instance);
     } catch (unmountError) {
-      captureCommitPhaseError(current, unmountError);
+      captureCommitPhaseError(current, current.return, unmountError);
     }
   }
 }
@@ -186,13 +185,13 @@ function safelyDetachRef(current: Fiber) {
         invokeGuardedCallback(null, ref, null, null);
         if (hasCaughtError()) {
           const refError = clearCaughtError();
-          captureCommitPhaseError(current, refError);
+          captureCommitPhaseError(current, current.return, refError);
         }
       } else {
         try {
           ref(null);
         } catch (refError) {
-          captureCommitPhaseError(current, refError);
+          captureCommitPhaseError(current, current.return, refError);
         }
       }
     } else {
@@ -201,46 +200,22 @@ function safelyDetachRef(current: Fiber) {
   }
 }
 
-export function safelyCallDestroy(current: Fiber, destroy: () => void) {
-  if (__DEV__) {
-    invokeGuardedCallback(null, destroy, null);
-    if (hasCaughtError()) {
-      const error = clearCaughtError();
-      captureCommitPhaseError(current, error);
-    }
-  } else {
-    try {
-      destroy();
-    } catch (error) {
-      captureCommitPhaseError(current, error);
-    }
-  }
-}
-
-export function safelyCallDestroyForUnmountedFiber(
+export function safelyCallDestroy(
   current: Fiber,
-  nearestMountedAncestor: Fiber,
+  nearestMountedAncestor: Fiber | null,
   destroy: () => void,
 ) {
   if (__DEV__) {
     invokeGuardedCallback(null, destroy, null);
     if (hasCaughtError()) {
       const error = clearCaughtError();
-      captureCommitPhaseErrorForUnmountedFiber(
-        current,
-        nearestMountedAncestor,
-        error,
-      );
+      captureCommitPhaseError(current, nearestMountedAncestor, error);
     }
   } else {
     try {
       destroy();
     } catch (error) {
-      captureCommitPhaseErrorForUnmountedFiber(
-        current,
-        nearestMountedAncestor,
-        error,
-      );
+      captureCommitPhaseError(current, nearestMountedAncestor, error);
     }
   }
 }
@@ -906,10 +881,10 @@ function commitUnmount(
                   current.mode & ProfileMode
                 ) {
                   startLayoutEffectTimer();
-                  safelyCallDestroy(current, destroy);
+                  safelyCallDestroy(current, current.return, destroy);
                   recordLayoutEffectDuration(current);
                 } else {
-                  safelyCallDestroy(current, destroy);
+                  safelyCallDestroy(current, current.return, destroy);
                 }
               }
             }

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

@@ -212,7 +212,6 @@ import {
   commitResetTextContent,
   isSuspenseBoundaryBeingHidden,
   safelyCallDestroy,
-  safelyCallDestroyForUnmountedFiber,
 } from './ReactFiberCommitWork.new';
 import {enqueueUpdate} from './ReactUpdateQueue.new';
 import {resetContextDependencies} from './ReactFiberNewContext.new';
@@ -2410,14 +2409,14 @@ function commitBeforeMutationEffects(firstChild: Fiber) {
       invokeGuardedCallback(null, commitBeforeMutationEffectsImpl, null, fiber);
       if (hasCaughtError()) {
         const error = clearCaughtError();
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
       resetCurrentDebugFiberInDEV();
     } else {
       try {
         commitBeforeMutationEffectsImpl(fiber);
       } catch (error) {
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
     }
     fiber = fiber.sibling;
@@ -2507,14 +2506,14 @@ function commitMutationEffects(
       );
       if (hasCaughtError()) {
         const error = clearCaughtError();
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
       resetCurrentDebugFiberInDEV();
     } else {
       try {
         commitMutationEffectsImpl(fiber, root, renderPriorityLevel);
       } catch (error) {
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
     }
     fiber = fiber.sibling;
@@ -2610,13 +2609,13 @@ function commitMutationEffectsDeletions(
       );
       if (hasCaughtError()) {
         const error = clearCaughtError();
-        captureCommitPhaseError(childToDelete, error);
+        captureCommitPhaseError(childToDelete, childToDelete.return, error);
       }
     } else {
       try {
         commitDeletion(root, childToDelete, renderPriorityLevel);
       } catch (error) {
-        captureCommitPhaseError(childToDelete, error);
+        captureCommitPhaseError(childToDelete, childToDelete.return, error);
       }
     }
   }
@@ -2658,14 +2657,14 @@ function commitLayoutEffects(
       );
       if (hasCaughtError()) {
         const error = clearCaughtError();
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
       resetCurrentDebugFiberInDEV();
     } else {
       try {
         commitLayoutEffectsImpl(fiber, root, committedLanes);
       } catch (error) {
-        captureCommitPhaseError(fiber, error);
+        captureCommitPhaseError(fiber, fiber.return, error);
       }
     }
     fiber = fiber.sibling;
@@ -2808,7 +2807,7 @@ function flushPassiveMountEffectsImpl(fiber: Fiber): void {
           if (hasCaughtError()) {
             invariant(fiber !== null, 'Should be working on an effect.');
             const error = clearCaughtError();
-            captureCommitPhaseError(fiber, error);
+            captureCommitPhaseError(fiber, fiber.return, error);
           }
         } else {
           try {
@@ -2829,7 +2828,7 @@ function flushPassiveMountEffectsImpl(fiber: Fiber): void {
             }
           } catch (error) {
             invariant(fiber !== null, 'Should be working on an effect.');
-            captureCommitPhaseError(fiber, error);
+            captureCommitPhaseError(fiber, fiber.return, error);
           }
         }
       }
@@ -2848,7 +2847,7 @@ function flushPassiveUnmountEffects(firstChild: Fiber): void {
     if (deletions !== null) {
       for (let i = 0; i < deletions.length; i++) {
         const fiberToDelete = deletions[i];
-        flushPassiveUnmountEffectsForUnmountedFiber(fiberToDelete, fiber);
+        flushPassiveUnmountEffectsInsideOfDeletedTree(fiberToDelete, fiber);
 
         // Now that passive effects have been processed, it's safe to detach lingering pointers.
         detachFiberAfterEffects(fiberToDelete);
@@ -2874,7 +2873,11 @@ function flushPassiveUnmountEffects(firstChild: Fiber): void {
       case Block: {
         const primaryEffectTag = fiber.effectTag & Passive;
         if (primaryEffectTag !== NoEffect) {
-          flushPassiveUnmountEffectsImpl(fiber, HookPassive | HookHasEffect);
+          flushPassiveUnmountEffectsImpl(
+            fiber,
+            fiber.return,
+            HookPassive | HookHasEffect,
+          );
         }
       }
     }
@@ -2883,7 +2886,7 @@ function flushPassiveUnmountEffects(firstChild: Fiber): void {
   }
 }
 
-function flushPassiveUnmountEffectsForUnmountedFiber(
+function flushPassiveUnmountEffectsInsideOfDeletedTree(
   fiberToDelete: Fiber,
   nearestMountedAncestor: Fiber,
 ): void {
@@ -2894,7 +2897,7 @@ function flushPassiveUnmountEffectsForUnmountedFiber(
     // since that would not cover passive effects in siblings.
     let child = fiberToDelete.child;
     while (child !== null) {
-      flushPassiveUnmountEffectsForUnmountedFiber(
+      flushPassiveUnmountEffectsInsideOfDeletedTree(
         child,
         nearestMountedAncestor,
       );
@@ -2908,63 +2911,19 @@ function flushPassiveUnmountEffectsForUnmountedFiber(
       case ForwardRef:
       case SimpleMemoComponent:
       case Block: {
-        flushPassiveUnmountEffectsForUnmountedFiberImpl(
+        flushPassiveUnmountEffectsImpl(
           fiberToDelete,
           nearestMountedAncestor,
+          HookPassive,
         );
       }
     }
   }
 }
 
-function flushPassiveUnmountEffectsForUnmountedFiberImpl(
-  fiber: Fiber,
-  nearestMountedAncestor: Fiber,
-): void {
-  const updateQueue: FunctionComponentUpdateQueue | null = (fiber.updateQueue: any);
-  const lastEffect = updateQueue !== null ? updateQueue.lastEffect : null;
-  if (lastEffect !== null) {
-    setCurrentDebugFiberInDEV(fiber);
-
-    const firstEffect = lastEffect.next;
-    let effect = firstEffect;
-    do {
-      const {next, tag} = effect;
-      if ((tag & HookPassive) === HookPassive) {
-        const destroy = effect.destroy;
-        if (destroy !== undefined) {
-          effect.destroy = undefined;
-
-          if (
-            enableProfilerTimer &&
-            enableProfilerCommitHooks &&
-            fiber.mode & ProfileMode
-          ) {
-            startPassiveEffectTimer();
-            safelyCallDestroyForUnmountedFiber(
-              fiber,
-              nearestMountedAncestor,
-              destroy,
-            );
-            recordPassiveEffectDuration(fiber);
-          } else {
-            safelyCallDestroyForUnmountedFiber(
-              fiber,
-              nearestMountedAncestor,
-              destroy,
-            );
-          }
-        }
-      }
-      effect = next;
-    } while (effect !== firstEffect);
-
-    resetCurrentDebugFiberInDEV();
-  }
-}
-
 function flushPassiveUnmountEffectsImpl(
   fiber: Fiber,
+  nearestMountedAncestor: Fiber | null,
   // Tags to check for when deciding whether to unmount. e.g. to skip over layout effects
   hookEffectTag: HookEffectTag,
 ): void {
@@ -2987,10 +2946,10 @@ function flushPassiveUnmountEffectsImpl(
             fiber.mode & ProfileMode
           ) {
             startPassiveEffectTimer();
-            safelyCallDestroy(fiber, destroy);
+            safelyCallDestroy(fiber, nearestMountedAncestor, destroy);
             recordPassiveEffectDuration(fiber);
           } else {
-            safelyCallDestroy(fiber, destroy);
+            safelyCallDestroy(fiber, nearestMountedAncestor, destroy);
           }
         }
       }
@@ -3123,53 +3082,18 @@ function captureCommitPhaseErrorOnRoot(
   }
 }
 
-export function captureCommitPhaseError(sourceFiber: Fiber, error: mixed) {
+export function captureCommitPhaseError(
+  sourceFiber: Fiber,
+  nearestMountedAncestor: Fiber | null,
+  error: mixed,
+) {
   if (sourceFiber.tag === HostRoot) {
     // Error was thrown at the root. There is no parent, so the root
     // itself should capture it.
     captureCommitPhaseErrorOnRoot(sourceFiber, sourceFiber, error);
     return;
   }
 
-  let fiber = sourceFiber.return;
-  while (fiber !== null) {
-    if (fiber.tag === HostRoot) {
-      captureCommitPhaseErrorOnRoot(fiber, sourceFiber, error);
-      return;
-    } else if (fiber.tag === ClassComponent) {
-      const ctor = fiber.type;
-      const instance = fiber.stateNode;
-      if (
-        typeof ctor.getDerivedStateFromError === 'function' ||
-        (typeof instance.componentDidCatch === 'function' &&
-          !isAlreadyFailedLegacyErrorBoundary(instance))
-      ) {
-        const errorInfo = createCapturedValue(error, sourceFiber);
-        const update = createClassErrorUpdate(
-          fiber,
-          errorInfo,
-          (SyncLane: Lane),
-        );
-        enqueueUpdate(fiber, update);
-        const eventTime = requestEventTime();
-        const root = markUpdateLaneFromFiberToRoot(fiber, (SyncLane: Lane));
-        if (root !== null) {
-          markRootUpdated(root, SyncLane, eventTime);
-          ensureRootIsScheduled(root, eventTime);
-          schedulePendingInteractions(root, SyncLane);
-        }
-        return;
-      }
-    }
-    fiber = fiber.return;
-  }
-}
-
-export function captureCommitPhaseErrorForUnmountedFiber(
-  sourceFiber: Fiber,
-  nearestMountedAncestor: Fiber,
-  error: mixed,
-) {
   let fiber = nearestMountedAncestor;
   while (fiber !== null) {
     if (fiber.tag === HostRoot) {