Skip to content

Commit a9b5593

Browse files
committed
Apparently isBlockingLane doesn't include Sync lanes
1 parent 43fe84f commit a9b5593

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

packages/react-reconciler/src/ReactFiberLane.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,10 @@ export function includesSyncLane(lanes: Lanes): boolean {
592592
return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes;
593593
}
594594

595+
export function isSyncLane(lanes: Lanes): boolean {
596+
return (lanes & (SyncLane | SyncHydrationLane)) !== NoLanes;
597+
}
598+
595599
export function includesNonIdleWork(lanes: Lanes): boolean {
596600
return (lanes & NonIdleLanes) !== NoLanes;
597601
}

packages/react-reconciler/src/ReactFiberWorkLoop.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@ function resetWorkInProgressStack() {
17181718

17191719
function finalizeRender(lanes: Lanes, finalizationTime: number): void {
17201720
if (enableProfilerTimer && enableComponentPerformanceTrack) {
1721-
if (includesBlockingLane(lanes)) {
1721+
if (includesSyncLane(lanes) || includesBlockingLane(lanes)) {
17221722
clampBlockingTimers(finalizationTime);
17231723
}
17241724
if (includesTransitionLane(lanes)) {
@@ -1737,7 +1737,7 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17371737
// restart so we need to clamp that.
17381738
finalizeRender(workInProgressRootRenderLanes, renderStartTime);
17391739

1740-
if (includesBlockingLane(lanes)) {
1740+
if (includesSyncLane(lanes) || includesBlockingLane(lanes)) {
17411741
logBlockingStart(
17421742
blockingUpdateTime,
17431743
blockingEventTime,

packages/react-reconciler/src/ReactProfilerTimer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import type {Fiber} from './ReactInternalTypes';
1111

1212
import type {Lane} from './ReactFiberLane';
13-
import {isTransitionLane, isBlockingLane} from './ReactFiberLane';
13+
import {isTransitionLane, isBlockingLane, isSyncLane} from './ReactFiberLane';
1414

1515
import {resolveEventType, resolveEventTimeStamp} from './ReactFiberConfig';
1616

@@ -49,7 +49,7 @@ export function startUpdateTimerByLane(lane: Lane): void {
4949
if (!enableProfilerTimer || !enableComponentPerformanceTrack) {
5050
return;
5151
}
52-
if (isBlockingLane(lane)) {
52+
if (isSyncLane(lane) || isBlockingLane(lane)) {
5353
if (blockingUpdateTime < 0) {
5454
blockingUpdateTime = now();
5555
blockingEventTime = resolveEventTimeStamp();

0 commit comments

Comments
 (0)