From 0568c0f8cde4ac6657dff9a5a8a7112acc35a748 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 10 Apr 2022 03:29:08 +0800 Subject: [PATCH] Replace zero with NoLanes for consistency in FiberLane (#24327) --- packages/react-reconciler/src/ReactFiberLane.new.js | 10 +++++----- packages/react-reconciler/src/ReactFiberLane.old.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberLane.new.js b/packages/react-reconciler/src/ReactFiberLane.new.js index 8290c75e882e..aa3360bd3c2b 100644 --- a/packages/react-reconciler/src/ReactFiberLane.new.js +++ b/packages/react-reconciler/src/ReactFiberLane.new.js @@ -483,7 +483,7 @@ export function includesExpiredLane(root: FiberRoot, lanes: Lanes) { } export function isTransitionLane(lane: Lane) { - return (lane & TransitionLanes) !== 0; + return (lane & TransitionLanes) !== NoLanes; } export function claimNextTransitionLane(): Lane { @@ -492,7 +492,7 @@ export function claimNextTransitionLane(): Lane { // run out of lanes and cycle back to the beginning. const lane = nextTransitionLane; nextTransitionLane <<= 1; - if ((nextTransitionLane & TransitionLanes) === 0) { + if ((nextTransitionLane & TransitionLanes) === NoLanes) { nextTransitionLane = TransitionLane1; } return lane; @@ -501,7 +501,7 @@ export function claimNextTransitionLane(): Lane { export function claimNextRetryLane(): Lane { const lane = nextRetryLane; nextRetryLane <<= 1; - if ((nextRetryLane & RetryLanes) === 0) { + if ((nextRetryLane & RetryLanes) === NoLanes) { nextRetryLane = RetryLane1; } return lane; @@ -634,8 +634,8 @@ export function markRootFinished(root: FiberRoot, remainingLanes: Lanes) { root.pendingLanes = remainingLanes; // Let's try everything again - root.suspendedLanes = 0; - root.pingedLanes = 0; + root.suspendedLanes = NoLanes; + root.pingedLanes = NoLanes; root.expiredLanes &= remainingLanes; root.mutableReadLanes &= remainingLanes; diff --git a/packages/react-reconciler/src/ReactFiberLane.old.js b/packages/react-reconciler/src/ReactFiberLane.old.js index 172518373638..a65a922d99b9 100644 --- a/packages/react-reconciler/src/ReactFiberLane.old.js +++ b/packages/react-reconciler/src/ReactFiberLane.old.js @@ -483,7 +483,7 @@ export function includesExpiredLane(root: FiberRoot, lanes: Lanes) { } export function isTransitionLane(lane: Lane) { - return (lane & TransitionLanes) !== 0; + return (lane & TransitionLanes) !== NoLanes; } export function claimNextTransitionLane(): Lane { @@ -492,7 +492,7 @@ export function claimNextTransitionLane(): Lane { // run out of lanes and cycle back to the beginning. const lane = nextTransitionLane; nextTransitionLane <<= 1; - if ((nextTransitionLane & TransitionLanes) === 0) { + if ((nextTransitionLane & TransitionLanes) === NoLanes) { nextTransitionLane = TransitionLane1; } return lane; @@ -501,7 +501,7 @@ export function claimNextTransitionLane(): Lane { export function claimNextRetryLane(): Lane { const lane = nextRetryLane; nextRetryLane <<= 1; - if ((nextRetryLane & RetryLanes) === 0) { + if ((nextRetryLane & RetryLanes) === NoLanes) { nextRetryLane = RetryLane1; } return lane; @@ -634,8 +634,8 @@ export function markRootFinished(root: FiberRoot, remainingLanes: Lanes) { root.pendingLanes = remainingLanes; // Let's try everything again - root.suspendedLanes = 0; - root.pingedLanes = 0; + root.suspendedLanes = NoLanes; + root.pingedLanes = NoLanes; root.expiredLanes &= remainingLanes; root.mutableReadLanes &= remainingLanes;