Move settings of debug fiber out of if branch

sammy-SC · sammy-SC · commit 3b01085fd61e · 2022-09-09T19:13:43.000+01:00
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js
@@ -3187,19 +3187,19 @@ function doubleInvokeEffectsInDEV(
   const isInStrictMode = parentIsInStrictMode || isStrictModeFiber;
 
   if (fiber.flags & PlacementDEV || fiber.tag === OffscreenComponent) {
+    setCurrentDebugFiberInDEV(fiber);
     const isNotOffscreen = fiber.tag !== OffscreenComponent;
     // Checks if Offscreen is being revealed. For all other components, evaluates to true.
     const hasOffscreenBecomeVisible =
       isNotOffscreen ||
       (fiber.flags & Visibility && fiber.memoizedState === null);
     if (isInStrictMode && hasOffscreenBecomeVisible) {
-      setCurrentDebugFiberInDEV(fiber);
       disappearLayoutEffects(fiber);
       disconnectPassiveEffect(fiber);
       reappearLayoutEffects(root, fiber.alternate, fiber, false);
       reconnectPassiveEffects(root, fiber, NoLanes, null, false);
-      resetCurrentDebugFiberInDEV();
     }
+    resetCurrentDebugFiberInDEV();
   } else {
     recursivelyTraverseAndDoubleInvokeEffectsInDEV(root, fiber, isInStrictMode);
   }
diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js
@@ -3187,19 +3187,19 @@ function doubleInvokeEffectsInDEV(
   const isInStrictMode = parentIsInStrictMode || isStrictModeFiber;
 
   if (fiber.flags & PlacementDEV || fiber.tag === OffscreenComponent) {
+    setCurrentDebugFiberInDEV(fiber);
     const isNotOffscreen = fiber.tag !== OffscreenComponent;
     // Checks if Offscreen is being revealed. For all other components, evaluates to true.
     const hasOffscreenBecomeVisible =
       isNotOffscreen ||
       (fiber.flags & Visibility && fiber.memoizedState === null);
     if (isInStrictMode && hasOffscreenBecomeVisible) {
-      setCurrentDebugFiberInDEV(fiber);
       disappearLayoutEffects(fiber);
       disconnectPassiveEffect(fiber);
       reappearLayoutEffects(root, fiber.alternate, fiber, false);
       reconnectPassiveEffects(root, fiber, NoLanes, null, false);
-      resetCurrentDebugFiberInDEV();
     }
+    resetCurrentDebugFiberInDEV();
   } else {
     recursivelyTraverseAndDoubleInvokeEffectsInDEV(root, fiber, isInStrictMode);
   }
