Skip to content

Commit 1abb404

Browse files
tyao1tyao1
committed
Add a separate feature flag
1 parent df90b2b commit 1abb404

23 files changed

+38
-27
lines changed

‎packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@ describe('ReactDOMFiberAsync', () => {
275275
expect(ops).toEqual([]);
276276
});
277277
// Only the active updates have flushed
278-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
278+
if (gate(flags => flags.enableUnifiedSyncLane)) {
279279
expect(container.textContent).toEqual('ABC');
280280
expect(ops).toEqual(['ABC']);
281281
} else {
282282
expect(container.textContent).toEqual('BC');
283283
expect(ops).toEqual(['BC']);
284284
}
285285

286-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
286+
if (gate(flags => flags.enableUnifiedSyncLane)) {
287287
instance.push('D');
288288
expect(container.textContent).toEqual('ABC');
289289
expect(ops).toEqual(['ABC']);
@@ -296,7 +296,7 @@ describe('ReactDOMFiberAsync', () => {
296296
// Flush the async updates
297297
Scheduler.unstable_flushAll();
298298
expect(container.textContent).toEqual('ABCD');
299-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
299+
if (gate(flags => flags.enableUnifiedSyncLane)) {
300300
expect(ops).toEqual(['ABC', 'ABCD']);
301301
} else {
302302
expect(ops).toEqual(['BC', 'ABCD']);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
enableUpdaterTracking,
2424
allowConcurrentByDefault,
2525
enableTransitionTracing,
26-
enableSyncDefaultUpdates,
26+
enableUnifiedSyncLane,
2727
} from 'shared/ReactFeatureFlags';
2828
import {isDevToolsPresent} from './ReactFiberDevToolsHook.new';
2929
import {ConcurrentUpdatesByDefaultMode, NoMode} from './ReactTypeOfMode';
@@ -136,7 +136,7 @@ let nextRetryLane: Lane = RetryLane1;
136136
function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
137137
switch (getHighestPriorityLane(lanes)) {
138138
case SyncHydrationLane:
139-
if (enableSyncDefaultUpdates) {
139+
if (enableUnifiedSyncLane) {
140140
let ret = SyncHydrationLane;
141141
if (lanes & DefaultHydrationLane) {
142142
ret |= DefaultHydrationLane;
@@ -148,7 +148,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
148148
}
149149
return SyncHydrationLane;
150150
case SyncLane:
151-
if (enableSyncDefaultUpdates) {
151+
if (enableUnifiedSyncLane) {
152152
let ret = SyncLane;
153153
if (lanes & DefaultLane) {
154154
ret |= DefaultLane;
@@ -273,7 +273,7 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
273273
// only difference between default updates and transition updates is that
274274
// default updates do not support refresh transitions.
275275
// Interrupt transtion if default is batched with sync.
276-
(!enableSyncDefaultUpdates &&
276+
(!enableUnifiedSyncLane &&
277277
nextLane === DefaultLane &&
278278
(wipLane & TransitionLanes) !== NoLanes)
279279
) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
enableUpdaterTracking,
2424
allowConcurrentByDefault,
2525
enableTransitionTracing,
26-
enableSyncDefaultUpdates,
26+
enableUnifiedSyncLane,
2727
} from 'shared/ReactFeatureFlags';
2828
import {isDevToolsPresent} from './ReactFiberDevToolsHook.old';
2929
import {ConcurrentUpdatesByDefaultMode, NoMode} from './ReactTypeOfMode';
@@ -136,7 +136,7 @@ let nextRetryLane: Lane = RetryLane1;
136136
function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
137137
switch (getHighestPriorityLane(lanes)) {
138138
case SyncHydrationLane:
139-
if (enableSyncDefaultUpdates) {
139+
if (enableUnifiedSyncLane) {
140140
let ret = SyncHydrationLane;
141141
if (lanes & DefaultHydrationLane) {
142142
ret |= DefaultHydrationLane;
@@ -148,7 +148,7 @@ function getHighestPriorityLanes(lanes: Lanes | Lane): Lanes {
148148
}
149149
return SyncHydrationLane;
150150
case SyncLane:
151-
if (enableSyncDefaultUpdates) {
151+
if (enableUnifiedSyncLane) {
152152
let ret = SyncLane;
153153
if (lanes & DefaultLane) {
154154
ret |= DefaultLane;
@@ -273,7 +273,7 @@ export function getNextLanes(root: FiberRoot, wipLanes: Lanes): Lanes {
273273
// only difference between default updates and transition updates is that
274274
// default updates do not support refresh transitions.
275275
// Interrupt transtion if default is batched with sync.
276-
(!enableSyncDefaultUpdates &&
276+
(!enableUnifiedSyncLane &&
277277
nextLane === DefaultLane &&
278278
(wipLane & TransitionLanes) !== NoLanes)
279279
) {

‎packages/react-reconciler/src/__tests__/ReactBatching-test.internal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ describe('ReactBlockingMode', () => {
158158
);
159159

160160
// Now flush the first update
161-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
161+
if (gate(flags => flags.enableUnifiedSyncLane)) {
162162
expect(Scheduler).toHaveYielded(['A1', 'B1']);
163163
expect(root).toMatchRenderedOutput('A1B1');
164164
} else {

‎packages/react-reconciler/src/__tests__/ReactClassSetStateCallback-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('ReactClassSetStateCallback', () => {
3535
expect(Scheduler).toHaveYielded([0]);
3636

3737
await act(async () => {
38-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
38+
if (gate(flags => flags.enableUnifiedSyncLane)) {
3939
React.startTransition(() => {
4040
app.setState({step: 1}, () =>
4141
Scheduler.unstable_yieldValue('Callback 1'),

‎packages/react-reconciler/src/__tests__/ReactFlushSync-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ describe('ReactFlushSync', () => {
5555
// They should commit in two separate batches. First the sync one.
5656
expect(() => {
5757
expect(Scheduler).toFlushUntilNextPaint(
58-
gate(flags => flags.enableSyncDefaultUpdates) ? ['1, 1'] : ['1, 0'],
58+
gate(flags => flags.enableUnifiedSyncLane) ? ['1, 1'] : ['1, 0'],
5959
);
6060
}).toErrorDev('flushSync was called from inside a lifecycle method');
6161

6262
// The remaining update is not sync
6363
ReactNoop.flushSync();
6464
expect(Scheduler).toHaveYielded([]);
6565

66-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
66+
if (gate(flags => flags.enableUnifiedSyncLane)) {
6767
expect(Scheduler).toFlushUntilNextPaint([]);
6868
} else {
6969
// Now flush it.

‎packages/react-reconciler/src/__tests__/ReactHooks-test.internal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ describe('ReactHooks', () => {
568568
});
569569
};
570570

571-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
571+
if (gate(flags => flags.enableUnifiedSyncLane)) {
572572
// Update at transition priority
573573
React.startTransition(() => update(n => n * 100));
574574
} else {

‎packages/react-reconciler/src/__tests__/ReactIncremental-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ describe('ReactIncremental', () => {
19101910
<ShowBoth />
19111911
</Intl>,
19121912
);
1913-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
1913+
if (gate(flags => flags.enableUnifiedSyncLane)) {
19141914
expect(Scheduler).toFlushAndYield([
19151915
'Intl {}',
19161916
'ShowLocale {"locale":"en"}',
@@ -2774,7 +2774,7 @@ describe('ReactIncremental', () => {
27742774
// Interrupt at same priority
27752775
ReactNoop.render(<Parent step={2} />);
27762776

2777-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
2777+
if (gate(flags => flags.enableUnifiedSyncLane)) {
27782778
expect(Scheduler).toFlushAndYield(['Parent: 2', 'Child: 2']);
27792779
} else {
27802780
expect(Scheduler).toFlushAndYield(['Child: 1', 'Parent: 2', 'Child: 2']);
@@ -2805,7 +2805,7 @@ describe('ReactIncremental', () => {
28052805
ReactNoop.expire(2000);
28062806
ReactNoop.render(<Parent step={2} />);
28072807

2808-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
2808+
if (gate(flags => flags.enableUnifiedSyncLane)) {
28092809
expect(Scheduler).toFlushAndYield(['Parent: 2', 'Child: 2']);
28102810
} else {
28112811
expect(Scheduler).toFlushAndYield(['Child: 1', 'Parent: 2', 'Child: 2']);

‎packages/react-reconciler/src/__tests__/ReactIncrementalUpdates-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ describe('ReactIncrementalUpdates', () => {
196196
// Now flush the remaining work. Even though e and f were already processed,
197197
// they should be processed again, to ensure that the terminal state
198198
// is deterministic.
199-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
199+
if (gate(flags => flags.enableUnifiedSyncLane)) {
200200
expect(Scheduler).toFlushAndYield([
201201
// Then we'll re-process everything for 'g'.
202202
'a',
@@ -311,7 +311,7 @@ describe('ReactIncrementalUpdates', () => {
311311
// Now flush the remaining work. Even though e and f were already processed,
312312
// they should be processed again, to ensure that the terminal state
313313
// is deterministic.
314-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
314+
if (gate(flags => flags.enableUnifiedSyncLane)) {
315315
expect(Scheduler).toFlushAndYield([
316316
// Then we'll re-process everything for 'g'.
317317
'a',
@@ -714,7 +714,7 @@ describe('ReactIncrementalUpdates', () => {
714714
pushToLog('B'),
715715
);
716716
});
717-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
717+
if (gate(flags => flags.enableUnifiedSyncLane)) {
718718
expect(Scheduler).toHaveYielded([
719719
'Committed: B',
720720
'Committed: BCD',
@@ -782,7 +782,7 @@ describe('ReactIncrementalUpdates', () => {
782782
pushToLog('B'),
783783
);
784784
});
785-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
785+
if (gate(flags => flags.enableUnifiedSyncLane)) {
786786
expect(Scheduler).toHaveYielded([
787787
'Committed: B',
788788
'Committed: BCD',

‎packages/react-reconciler/src/__tests__/ReactOffscreen-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ describe('ReactOffscreen', () => {
673673
);
674674

675675
// Before the inner update can finish, we receive another pair of updates.
676-
if (gate(flags => flags.enableSyncDefaultUpdates)) {
676+
if (gate(flags => flags.enableUnifiedSyncLane)) {
677677
React.startTransition(() => {
678678
setOuter(2);
679679
setInner(2);

0 commit comments

Comments
 (0)