Skip to content

Commit 536ae09

Browse files
committed
Move setting debug fiber into if branch
1 parent fc298f5 commit 536ae09

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,19 +3187,19 @@ function doubleInvokeEffectsInDEV(
31873187
const isInStrictMode = parentIsInStrictMode || isStrictModeFiber;
31883188

31893189
if (fiber.flags & PlacementDEV || fiber.tag === OffscreenComponent) {
3190-
setCurrentDebugFiberInDEV(fiber);
31913190
const isNotOffscreen = fiber.tag !== OffscreenComponent;
31923191
// Checks if Offscreen is being revealed. For all other components, evaluates to true.
31933192
const hasOffscreenBecomeVisible =
31943193
isNotOffscreen ||
31953194
(fiber.flags & Visibility && fiber.memoizedState === null);
31963195
if (isInStrictMode && hasOffscreenBecomeVisible) {
3196+
setCurrentDebugFiberInDEV(fiber);
31973197
disappearLayoutEffects(fiber);
31983198
disconnectPassiveEffect(fiber);
31993199
reappearLayoutEffects(root, fiber.alternate, fiber, false);
32003200
reconnectPassiveEffects(root, fiber, NoLanes, null, false);
3201+
resetCurrentDebugFiberInDEV();
32013202
}
3202-
resetCurrentDebugFiberInDEV();
32033203
} else {
32043204
recursivelyTraverseAndDoubleInvokeEffectsInDEV(root, fiber, isInStrictMode);
32053205
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,19 +3187,19 @@ function doubleInvokeEffectsInDEV(
31873187
const isInStrictMode = parentIsInStrictMode || isStrictModeFiber;
31883188

31893189
if (fiber.flags & PlacementDEV || fiber.tag === OffscreenComponent) {
3190-
setCurrentDebugFiberInDEV(fiber);
31913190
const isNotOffscreen = fiber.tag !== OffscreenComponent;
31923191
// Checks if Offscreen is being revealed. For all other components, evaluates to true.
31933192
const hasOffscreenBecomeVisible =
31943193
isNotOffscreen ||
31953194
(fiber.flags & Visibility && fiber.memoizedState === null);
31963195
if (isInStrictMode && hasOffscreenBecomeVisible) {
3196+
setCurrentDebugFiberInDEV(fiber);
31973197
disappearLayoutEffects(fiber);
31983198
disconnectPassiveEffect(fiber);
31993199
reappearLayoutEffects(root, fiber.alternate, fiber, false);
32003200
reconnectPassiveEffects(root, fiber, NoLanes, null, false);
3201+
resetCurrentDebugFiberInDEV();
32013202
}
3202-
resetCurrentDebugFiberInDEV();
32033203
} else {
32043204
recursivelyTraverseAndDoubleInvokeEffectsInDEV(root, fiber, isInStrictMode);
32053205
}

0 commit comments

Comments
 (0)