diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js index f2120c2d6920e..376a7c9670a4e 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js @@ -116,7 +116,7 @@ import { Snapshot, Callback, Passive, - PassiveUnmountPending, + PassiveUnmountPendingDev, Incomplete, HostEffectMask, Hydrating, @@ -2313,10 +2313,10 @@ export function enqueuePendingPassiveHookEffectUnmount( pendingPassiveHookEffectsUnmount.push(effect, fiber); if (__DEV__) { if (deferPassiveEffectCleanupDuringUnmount) { - fiber.effectTag |= PassiveUnmountPending; + fiber.effectTag |= PassiveUnmountPendingDev; const alternate = fiber.alternate; if (alternate !== null) { - alternate.effectTag |= PassiveUnmountPending; + alternate.effectTag |= PassiveUnmountPendingDev; } } } @@ -2385,10 +2385,10 @@ function flushPassiveEffectsImpl() { if (__DEV__) { if (deferPassiveEffectCleanupDuringUnmount) { - fiber.effectTag &= ~PassiveUnmountPending; + fiber.effectTag &= ~PassiveUnmountPendingDev; const alternate = fiber.alternate; if (alternate !== null) { - alternate.effectTag &= ~PassiveUnmountPending; + alternate.effectTag &= ~PassiveUnmountPendingDev; } } } @@ -2872,7 +2872,7 @@ function warnAboutUpdateOnUnmountedFiberInDEV(fiber) { ) { // If there are pending passive effects unmounts for this Fiber, // we can assume that they would have prevented this update. - if ((fiber.effectTag & PassiveUnmountPending) !== NoEffect) { + if ((fiber.effectTag & PassiveUnmountPendingDev) !== NoEffect) { return; } } diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js index 5c018c6bb926c..713bcc23f85f2 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js @@ -116,7 +116,7 @@ import { Snapshot, Callback, Passive, - PassiveUnmountPending, + PassiveUnmountPendingDev, Incomplete, HostEffectMask, Hydrating, @@ -2332,10 +2332,10 @@ export function enqueuePendingPassiveHookEffectUnmount( pendingPassiveHookEffectsUnmount.push(effect, fiber); if (__DEV__) { if (deferPassiveEffectCleanupDuringUnmount) { - fiber.effectTag |= PassiveUnmountPending; + fiber.effectTag |= PassiveUnmountPendingDev; const alternate = fiber.alternate; if (alternate !== null) { - alternate.effectTag |= PassiveUnmountPending; + alternate.effectTag |= PassiveUnmountPendingDev; } } } @@ -2404,10 +2404,10 @@ function flushPassiveEffectsImpl() { if (__DEV__) { if (deferPassiveEffectCleanupDuringUnmount) { - fiber.effectTag &= ~PassiveUnmountPending; + fiber.effectTag &= ~PassiveUnmountPendingDev; const alternate = fiber.alternate; if (alternate !== null) { - alternate.effectTag &= ~PassiveUnmountPending; + alternate.effectTag &= ~PassiveUnmountPendingDev; } } } @@ -2894,7 +2894,7 @@ function warnAboutUpdateOnUnmountedFiberInDEV(fiber) { ) { // If there are pending passive effects unmounts for this Fiber, // we can assume that they would have prevented this update. - if ((fiber.effectTag & PassiveUnmountPending) !== NoEffect) { + if ((fiber.effectTag & PassiveUnmountPendingDev) !== NoEffect) { return; } } diff --git a/packages/react-reconciler/src/ReactSideEffectTags.js b/packages/react-reconciler/src/ReactSideEffectTags.js index e493a0fb883bf..162b860c19eb3 100644 --- a/packages/react-reconciler/src/ReactSideEffectTags.js +++ b/packages/react-reconciler/src/ReactSideEffectTags.js @@ -10,29 +10,29 @@ export type SideEffectTag = number; // Don't change these two values. They're used by React Dev Tools. -export const NoEffect = /* */ 0b00000000000000; -export const PerformedWork = /* */ 0b00000000000001; +export const NoEffect = /* */ 0b00000000000000; +export const PerformedWork = /* */ 0b00000000000001; // You can change the rest (and add more). -export const Placement = /* */ 0b00000000000010; -export const Update = /* */ 0b00000000000100; -export const PlacementAndUpdate = /* */ 0b00000000000110; -export const Deletion = /* */ 0b00000000001000; -export const ContentReset = /* */ 0b00000000010000; -export const Callback = /* */ 0b00000000100000; -export const DidCapture = /* */ 0b00000001000000; -export const Ref = /* */ 0b00000010000000; -export const Snapshot = /* */ 0b00000100000000; -export const Passive = /* */ 0b00001000000000; -export const PassiveUnmountPending = /* */ 0b10000000000000; -export const Hydrating = /* */ 0b00010000000000; -export const HydratingAndUpdate = /* */ 0b00010000000100; +export const Placement = /* */ 0b00000000000010; +export const Update = /* */ 0b00000000000100; +export const PlacementAndUpdate = /* */ 0b00000000000110; +export const Deletion = /* */ 0b00000000001000; +export const ContentReset = /* */ 0b00000000010000; +export const Callback = /* */ 0b00000000100000; +export const DidCapture = /* */ 0b00000001000000; +export const Ref = /* */ 0b00000010000000; +export const Snapshot = /* */ 0b00000100000000; +export const Passive = /* */ 0b00001000000000; +export const PassiveUnmountPendingDev = /* */ 0b10000000000000; +export const Hydrating = /* */ 0b00010000000000; +export const HydratingAndUpdate = /* */ 0b00010000000100; // Passive & Update & Callback & Ref & Snapshot -export const LifecycleEffectMask = /* */ 0b00001110100100; +export const LifecycleEffectMask = /* */ 0b00001110100100; // Union of all host effects -export const HostEffectMask = /* */ 0b00011111111111; +export const HostEffectMask = /* */ 0b00011111111111; -export const Incomplete = /* */ 0b00100000000000; -export const ShouldCapture = /* */ 0b01000000000000; +export const Incomplete = /* */ 0b00100000000000; +export const ShouldCapture = /* */ 0b01000000000000;