Skip to content

Commit 7fe6a73

Browse files
rickhanloniirickhanlonii
committed
Go back to 31 lanes
1 parent e0ee779 commit 7fe6a73

File tree

4 files changed

+82
-78
lines changed

4 files changed

+82
-78
lines changed

‎packages/react-devtools-scheduling-profiler/src/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ export {
1212
COMPACT_LINE_HEIGHT,
1313
} from 'react-devtools-shared/src/constants.js';
1414

15-
export const REACT_TOTAL_NUM_LANES = 30;
15+
export const REACT_TOTAL_NUM_LANES = 31;

‎packages/react-devtools-scheduling-profiler/src/import-worker/__tests__/preprocessData-test.internal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe(getLanesFromTransportDecimalBitmask, () => {
4242
it('should ignore lanes outside REACT_TOTAL_NUM_LANES', () => {
4343
// Sanity check; this test may need to be updated when the no. of fiber
4444
// lanes are changed.
45-
expect(REACT_TOTAL_NUM_LANES).toBe(30);
45+
expect(REACT_TOTAL_NUM_LANES).toBe(31);
4646

4747
expect(
4848
getLanesFromTransportDecimalBitmask(

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

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,54 +71,55 @@ export const NoLanePriority: LanePriority = 0;
7171
// Lane values below should be kept in sync with getLabelsForLanes(), used by react-devtools-scheduling-profiler.
7272
// If those values are changed that package should be rebuilt and redeployed.
7373

74-
export const TotalLanes = 30;
74+
export const TotalLanes = 31;
7575

7676
export const NoLanes: Lanes = /* */ 0b000000000000000000000000000000;
7777
export const NoLane: Lane = /* */ 0b000000000000000000000000000000;
7878

79-
export const SyncLane: Lane = /* */ 0b000000000000000000000000000001;
80-
81-
const InputContinuousHydrationLane: Lane = /* */ 0b000000000000000000000000000010;
82-
export const InputContinuousLane: Lanes = /* */ 0b000000000000000000000000000100;
83-
84-
export const DefaultHydrationLane: Lane = /* */ 0b000000000000000000000000001000;
85-
export const DefaultLane: Lanes = /* */ 0b000000000000000000000000010000;
86-
87-
const TransitionHydrationLane: Lane = /* */ 0b000000000000000000000000100000;
88-
const TransitionLanes: Lanes = /* */ 0b000000001111111111111111000000;
89-
const TransitionLane1: Lane = /* */ 0b000000000000000000000001000000;
90-
const TransitionLane2: Lane = /* */ 0b000000000000000000000010000000;
91-
const TransitionLane3: Lane = /* */ 0b000000000000000000000100000000;
92-
const TransitionLane4: Lane = /* */ 0b000000000000000000001000000000;
93-
const TransitionLane5: Lane = /* */ 0b000000000000000000010000000000;
94-
const TransitionLane6: Lane = /* */ 0b000000000000000000100000000000;
95-
const TransitionLane7: Lane = /* */ 0b000000000000000001000000000000;
96-
const TransitionLane8: Lane = /* */ 0b000000000000000010000000000000;
97-
const TransitionLane9: Lane = /* */ 0b000000000000000100000000000000;
98-
const TransitionLane10: Lane = /* */ 0b000000000000001000000000000000;
99-
const TransitionLane11: Lane = /* */ 0b000000000000010000000000000000;
100-
const TransitionLane12: Lane = /* */ 0b000000000000100000000000000000;
101-
const TransitionLane13: Lane = /* */ 0b000000000001000000000000000000;
102-
const TransitionLane14: Lane = /* */ 0b000000000010000000000000000000;
103-
const TransitionLane15: Lane = /* */ 0b000000000100000000000000000000;
104-
const TransitionLane16: Lane = /* */ 0b000000001000000000000000000000;
105-
106-
const RetryLanes: Lanes = /* */ 0b000011110000000000000000000000;
107-
const RetryLane1: Lane = /* */ 0b000000010000000000000000000000;
108-
const RetryLane2: Lane = /* */ 0b000000100000000000000000000000;
109-
const RetryLane3: Lane = /* */ 0b000001000000000000000000000000;
110-
const RetryLane4: Lane = /* */ 0b000010000000000000000000000000;
79+
export const SyncLane: Lane = /* */ 0b0000000000000000000000000000001;
80+
81+
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000010;
82+
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000000100;
83+
84+
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000001000;
85+
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000010000;
86+
87+
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000000100000;
88+
const TransitionLanes: Lanes = /* */ 0b0000000001111111111111111000000;
89+
const TransitionLane1: Lane = /* */ 0b0000000000000000000000001000000;
90+
const TransitionLane2: Lane = /* */ 0b0000000000000000000000010000000;
91+
const TransitionLane3: Lane = /* */ 0b0000000000000000000000100000000;
92+
const TransitionLane4: Lane = /* */ 0b0000000000000000000001000000000;
93+
const TransitionLane5: Lane = /* */ 0b0000000000000000000010000000000;
94+
const TransitionLane6: Lane = /* */ 0b0000000000000000000100000000000;
95+
const TransitionLane7: Lane = /* */ 0b0000000000000000001000000000000;
96+
const TransitionLane8: Lane = /* */ 0b0000000000000000010000000000000;
97+
const TransitionLane9: Lane = /* */ 0b0000000000000000100000000000000;
98+
const TransitionLane10: Lane = /* */ 0b0000000000000001000000000000000;
99+
const TransitionLane11: Lane = /* */ 0b0000000000000010000000000000000;
100+
const TransitionLane12: Lane = /* */ 0b0000000000000100000000000000000;
101+
const TransitionLane13: Lane = /* */ 0b0000000000001000000000000000000;
102+
const TransitionLane14: Lane = /* */ 0b0000000000010000000000000000000;
103+
const TransitionLane15: Lane = /* */ 0b0000000000100000000000000000000;
104+
const TransitionLane16: Lane = /* */ 0b0000000001000000000000000000000;
105+
106+
const RetryLanes: Lanes = /* */ 0b0000111110000000000000000000000;
107+
const RetryLane1: Lane = /* */ 0b0000000010000000000000000000000;
108+
const RetryLane2: Lane = /* */ 0b0000000100000000000000000000000;
109+
const RetryLane3: Lane = /* */ 0b0000001000000000000000000000000;
110+
const RetryLane4: Lane = /* */ 0b0000010000000000000000000000000;
111+
const RetryLane5: Lane = /* */ 0b0000100000000000000000000000000;
111112

112113
export const SomeRetryLane: Lane = RetryLane1;
113114

114-
export const SelectiveHydrationLane: Lane = /* */ 0b000100000000000000000000000000;
115+
export const SelectiveHydrationLane: Lane = /* */ 0b0001000000000000000000000000000;
115116

116-
const NonIdleLanes = /* */ 0b000111111111111111111111111111;
117+
const NonIdleLanes = /* */ 0b0001111111111111111111111111111;
117118

118-
export const IdleHydrationLane: Lane = /* */ 0b001000000000000000000000000000;
119-
const IdleLane: Lanes = /* */ 0b010000000000000000000000000000;
119+
export const IdleHydrationLane: Lane = /* */ 0b0010000000000000000000000000000;
120+
const IdleLane: Lanes = /* */ 0b0100000000000000000000000000000;
120121

121-
export const OffscreenLane: Lane = /* */ 0b100000000000000000000000000000;
122+
export const OffscreenLane: Lane = /* */ 0b1000000000000000000000000000000;
122123

123124
// This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
124125
// It should be kept in sync with the Lanes values above.
@@ -226,6 +227,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
226227
case RetryLane2:
227228
case RetryLane3:
228229
case RetryLane4:
230+
case RetryLane5:
229231
return_highestLanePriority = RetryLanePriority;
230232
return lanes & RetryLanes;
231233
case SelectiveHydrationLane:

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

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,54 +71,55 @@ export const NoLanePriority: LanePriority = 0;
7171
// Lane values below should be kept in sync with getLabelsForLanes(), used by react-devtools-scheduling-profiler.
7272
// If those values are changed that package should be rebuilt and redeployed.
7373

74-
export const TotalLanes = 30;
74+
export const TotalLanes = 31;
7575

7676
export const NoLanes: Lanes = /* */ 0b000000000000000000000000000000;
7777
export const NoLane: Lane = /* */ 0b000000000000000000000000000000;
7878

79-
export const SyncLane: Lane = /* */ 0b000000000000000000000000000001;
80-
81-
const InputContinuousHydrationLane: Lane = /* */ 0b000000000000000000000000000010;
82-
export const InputContinuousLane: Lanes = /* */ 0b000000000000000000000000000100;
83-
84-
export const DefaultHydrationLane: Lane = /* */ 0b000000000000000000000000001000;
85-
export const DefaultLane: Lanes = /* */ 0b000000000000000000000000010000;
86-
87-
const TransitionHydrationLane: Lane = /* */ 0b000000000000000000000000100000;
88-
const TransitionLanes: Lanes = /* */ 0b000000001111111111111111000000;
89-
const TransitionLane1: Lane = /* */ 0b000000000000000000000001000000;
90-
const TransitionLane2: Lane = /* */ 0b000000000000000000000010000000;
91-
const TransitionLane3: Lane = /* */ 0b000000000000000000000100000000;
92-
const TransitionLane4: Lane = /* */ 0b000000000000000000001000000000;
93-
const TransitionLane5: Lane = /* */ 0b000000000000000000010000000000;
94-
const TransitionLane6: Lane = /* */ 0b000000000000000000100000000000;
95-
const TransitionLane7: Lane = /* */ 0b000000000000000001000000000000;
96-
const TransitionLane8: Lane = /* */ 0b000000000000000010000000000000;
97-
const TransitionLane9: Lane = /* */ 0b000000000000000100000000000000;
98-
const TransitionLane10: Lane = /* */ 0b000000000000001000000000000000;
99-
const TransitionLane11: Lane = /* */ 0b000000000000010000000000000000;
100-
const TransitionLane12: Lane = /* */ 0b000000000000100000000000000000;
101-
const TransitionLane13: Lane = /* */ 0b000000000001000000000000000000;
102-
const TransitionLane14: Lane = /* */ 0b000000000010000000000000000000;
103-
const TransitionLane15: Lane = /* */ 0b000000000100000000000000000000;
104-
const TransitionLane16: Lane = /* */ 0b000000001000000000000000000000;
105-
106-
const RetryLanes: Lanes = /* */ 0b000011110000000000000000000000;
107-
const RetryLane1: Lane = /* */ 0b000000010000000000000000000000;
108-
const RetryLane2: Lane = /* */ 0b000000100000000000000000000000;
109-
const RetryLane3: Lane = /* */ 0b000001000000000000000000000000;
110-
const RetryLane4: Lane = /* */ 0b000010000000000000000000000000;
79+
export const SyncLane: Lane = /* */ 0b0000000000000000000000000000001;
80+
81+
const InputContinuousHydrationLane: Lane = /* */ 0b0000000000000000000000000000010;
82+
export const InputContinuousLane: Lanes = /* */ 0b0000000000000000000000000000100;
83+
84+
export const DefaultHydrationLane: Lane = /* */ 0b0000000000000000000000000001000;
85+
export const DefaultLane: Lanes = /* */ 0b0000000000000000000000000010000;
86+
87+
const TransitionHydrationLane: Lane = /* */ 0b0000000000000000000000000100000;
88+
const TransitionLanes: Lanes = /* */ 0b0000000001111111111111111000000;
89+
const TransitionLane1: Lane = /* */ 0b0000000000000000000000001000000;
90+
const TransitionLane2: Lane = /* */ 0b0000000000000000000000010000000;
91+
const TransitionLane3: Lane = /* */ 0b0000000000000000000000100000000;
92+
const TransitionLane4: Lane = /* */ 0b0000000000000000000001000000000;
93+
const TransitionLane5: Lane = /* */ 0b0000000000000000000010000000000;
94+
const TransitionLane6: Lane = /* */ 0b0000000000000000000100000000000;
95+
const TransitionLane7: Lane = /* */ 0b0000000000000000001000000000000;
96+
const TransitionLane8: Lane = /* */ 0b0000000000000000010000000000000;
97+
const TransitionLane9: Lane = /* */ 0b0000000000000000100000000000000;
98+
const TransitionLane10: Lane = /* */ 0b0000000000000001000000000000000;
99+
const TransitionLane11: Lane = /* */ 0b0000000000000010000000000000000;
100+
const TransitionLane12: Lane = /* */ 0b0000000000000100000000000000000;
101+
const TransitionLane13: Lane = /* */ 0b0000000000001000000000000000000;
102+
const TransitionLane14: Lane = /* */ 0b0000000000010000000000000000000;
103+
const TransitionLane15: Lane = /* */ 0b0000000000100000000000000000000;
104+
const TransitionLane16: Lane = /* */ 0b0000000001000000000000000000000;
105+
106+
const RetryLanes: Lanes = /* */ 0b0000111110000000000000000000000;
107+
const RetryLane1: Lane = /* */ 0b0000000010000000000000000000000;
108+
const RetryLane2: Lane = /* */ 0b0000000100000000000000000000000;
109+
const RetryLane3: Lane = /* */ 0b0000001000000000000000000000000;
110+
const RetryLane4: Lane = /* */ 0b0000010000000000000000000000000;
111+
const RetryLane5: Lane = /* */ 0b0000100000000000000000000000000;
111112

112113
export const SomeRetryLane: Lane = RetryLane1;
113114

114-
export const SelectiveHydrationLane: Lane = /* */ 0b000100000000000000000000000000;
115+
export const SelectiveHydrationLane: Lane = /* */ 0b0001000000000000000000000000000;
115116

116-
const NonIdleLanes = /* */ 0b000111111111111111111111111111;
117+
const NonIdleLanes = /* */ 0b0001111111111111111111111111111;
117118

118-
export const IdleHydrationLane: Lane = /* */ 0b001000000000000000000000000000;
119-
const IdleLane: Lanes = /* */ 0b010000000000000000000000000000;
119+
export const IdleHydrationLane: Lane = /* */ 0b0010000000000000000000000000000;
120+
const IdleLane: Lanes = /* */ 0b0100000000000000000000000000000;
120121

121-
export const OffscreenLane: Lane = /* */ 0b100000000000000000000000000000;
122+
export const OffscreenLane: Lane = /* */ 0b1000000000000000000000000000000;
122123

123124
// This function is used for the experimental scheduling profiler (react-devtools-scheduling-profiler)
124125
// It should be kept in sync with the Lanes values above.
@@ -226,6 +227,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
226227
case RetryLane2:
227228
case RetryLane3:
228229
case RetryLane4:
230+
case RetryLane5:
229231
return_highestLanePriority = RetryLanePriority;
230232
return lanes & RetryLanes;
231233
case SelectiveHydrationLane:

0 commit comments

Comments
 (0)