Skip to content

Commit 6f96d0a

Browse files
committed
Include all non-urgent lanes
1 parent a47c615 commit 6f96d0a

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -458,15 +458,9 @@ export function includesNonIdleWork(lanes: Lanes) {
458458
export function includesOnlyRetries(lanes: Lanes) {
459459
return (lanes & RetryLanes) === lanes;
460460
}
461-
export function includesOnlyTransitionsOrHydration(lanes: Lanes) {
462-
const TransitionOrHydrationLanes =
463-
TransitionLanes |
464-
InputContinuousHydrationLane |
465-
DefaultHydrationLane |
466-
TransitionHydrationLane |
467-
SelectiveHydrationLane |
468-
IdleHydrationLane;
469-
return (lanes & TransitionOrHydrationLanes) === lanes;
461+
export function includesOnlyNonUrgentLanes(lanes: Lanes) {
462+
const UrgentLanes = SyncLane | InputContinuousLane | DefaultLane;
463+
return (lanes & UrgentLanes) === NoLanes;
470464
}
471465

472466
export function includesBlockingLane(root: FiberRoot, lanes: Lanes) {

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -458,15 +458,9 @@ export function includesNonIdleWork(lanes: Lanes) {
458458
export function includesOnlyRetries(lanes: Lanes) {
459459
return (lanes & RetryLanes) === lanes;
460460
}
461-
export function includesOnlyTransitionsOrHydration(lanes: Lanes) {
462-
const TransitionOrHydrationLanes =
463-
TransitionLanes |
464-
InputContinuousHydrationLane |
465-
DefaultHydrationLane |
466-
TransitionHydrationLane |
467-
SelectiveHydrationLane |
468-
IdleHydrationLane;
469-
return (lanes & TransitionOrHydrationLanes) === lanes;
461+
export function includesOnlyNonUrgentLanes(lanes: Lanes) {
462+
const UrgentLanes = SyncLane | InputContinuousLane | DefaultLane;
463+
return (lanes & UrgentLanes) === NoLanes;
470464
}
471465

472466
export function includesBlockingLane(root: FiberRoot, lanes: Lanes) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ import {
132132
pickArbitraryLane,
133133
includesNonIdleWork,
134134
includesOnlyRetries,
135-
includesOnlyTransitionsOrHydration,
135+
includesOnlyNonUrgentLanes,
136136
includesBlockingLane,
137137
includesExpiredLane,
138138
getNextLanes,
@@ -1110,7 +1110,7 @@ function finishConcurrentRender(root, exitStatus, lanes) {
11101110
case RootSuspendedWithDelay: {
11111111
markRootSuspended(root, lanes);
11121112

1113-
if (includesOnlyTransitionsOrHydration(lanes)) {
1113+
if (includesOnlyNonUrgentLanes(lanes)) {
11141114
// This is a transition, so we should exit without committing a
11151115
// placeholder and without scheduling a timeout. Delay indefinitely
11161116
// until we receive more data.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ import {
132132
pickArbitraryLane,
133133
includesNonIdleWork,
134134
includesOnlyRetries,
135-
includesOnlyTransitionsOrHydration,
135+
includesOnlyNonUrgentLanes,
136136
includesBlockingLane,
137137
includesExpiredLane,
138138
getNextLanes,
@@ -1110,7 +1110,7 @@ function finishConcurrentRender(root, exitStatus, lanes) {
11101110
case RootSuspendedWithDelay: {
11111111
markRootSuspended(root, lanes);
11121112

1113-
if (includesOnlyTransitionsOrHydration(lanes)) {
1113+
if (includesOnlyNonUrgentLanes(lanes)) {
11141114
// This is a transition, so we should exit without committing a
11151115
// placeholder and without scheduling a timeout. Delay indefinitely
11161116
// until we receive more data.

0 commit comments

Comments
 (0)