Skip to content

Commit 2dddcba

Browse files
committed
Remove flag enableUseDeferredValueInitialArg
This is enabled everywhere for a while and I don't think we'd be backing this out of 19. Seems like it's good to clean up to me.
1 parent c0ee8e9 commit 2dddcba

12 files changed

+1
-33
lines changed

packages/react-dom/src/__tests__/ReactDOMFizzDeferredValue-test.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ describe('ReactDOMFizzForm', () => {
8383
return text;
8484
}
8585

86-
// @gate enableUseDeferredValueInitialArg
8786
it('returns initialValue argument, if provided', async () => {
8887
function App() {
8988
return useDeferredValue('Final', 'Initial');
@@ -100,7 +99,6 @@ describe('ReactDOMFizzForm', () => {
10099
expect(container.textContent).toEqual('Final');
101100
});
102101

103-
// @gate enableUseDeferredValueInitialArg
104102
// @gate enablePostpone
105103
it(
106104
'if initial value postpones during hydration, it will switch to the ' +
@@ -136,7 +134,6 @@ describe('ReactDOMFizzForm', () => {
136134
},
137135
);
138136

139-
// @gate enableUseDeferredValueInitialArg
140137
it(
141138
'useDeferredValue during hydration has higher priority than remaining ' +
142139
'incremental hydration',

packages/react-reconciler/src/ReactFiberHooks.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import {
4545
enableLegacyCache,
4646
debugRenderPhaseSideEffectsForStrictMode,
4747
enableAsyncActions,
48-
enableUseDeferredValueInitialArg,
4948
disableLegacyMode,
5049
enableNoCloningMemoCache,
5150
enableContextProfiling,
@@ -2879,7 +2878,6 @@ function rerenderDeferredValue<T>(value: T, initialValue?: T): T {
28792878

28802879
function mountDeferredValueImpl<T>(hook: Hook, value: T, initialValue?: T): T {
28812880
if (
2882-
enableUseDeferredValueInitialArg &&
28832881
// When `initialValue` is provided, we defer the initial render even if the
28842882
// current render is not synchronous.
28852883
initialValue !== undefined &&

packages/react-reconciler/src/__tests__/ReactDeferredValue-test.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ describe('ReactDeferredValue', () => {
371371
});
372372
});
373373

374-
// @gate enableUseDeferredValueInitialArg
375374
it('supports initialValue argument', async () => {
376375
function App() {
377376
const value = useDeferredValue('Final', 'Initial');
@@ -388,7 +387,6 @@ describe('ReactDeferredValue', () => {
388387
expect(root).toMatchRenderedOutput('Final');
389388
});
390389

391-
// @gate enableUseDeferredValueInitialArg
392390
it('defers during initial render when initialValue is provided, even if render is not sync', async () => {
393391
function App() {
394392
const value = useDeferredValue('Final', 'Initial');
@@ -406,7 +404,6 @@ describe('ReactDeferredValue', () => {
406404
expect(root).toMatchRenderedOutput('Final');
407405
});
408406

409-
// @gate enableUseDeferredValueInitialArg
410407
it(
411408
'if a suspended render spawns a deferred task, we can switch to the ' +
412409
'deferred task without finishing the original one (no Suspense boundary)',
@@ -439,7 +436,6 @@ describe('ReactDeferredValue', () => {
439436
},
440437
);
441438

442-
// @gate enableUseDeferredValueInitialArg
443439
it(
444440
'if a suspended render spawns a deferred task, we can switch to the ' +
445441
'deferred task without finishing the original one (no Suspense boundary, ' +
@@ -479,7 +475,6 @@ describe('ReactDeferredValue', () => {
479475
},
480476
);
481477

482-
// @gate enableUseDeferredValueInitialArg
483478
it(
484479
'if a suspended render spawns a deferred task, we can switch to the ' +
485480
'deferred task without finishing the original one (Suspense boundary)',
@@ -520,7 +515,6 @@ describe('ReactDeferredValue', () => {
520515
},
521516
);
522517

523-
// @gate enableUseDeferredValueInitialArg
524518
it(
525519
'if a suspended render spawns a deferred task that also suspends, we can ' +
526520
'finish the original task if that one loads first',
@@ -556,7 +550,6 @@ describe('ReactDeferredValue', () => {
556550
},
557551
);
558552

559-
// @gate enableUseDeferredValueInitialArg
560553
it(
561554
'if there are multiple useDeferredValues in the same tree, only the ' +
562555
'first level defers; subsequent ones go straight to the final value, to ' +
@@ -604,7 +597,6 @@ describe('ReactDeferredValue', () => {
604597
},
605598
);
606599

607-
// @gate enableUseDeferredValueInitialArg
608600
it('avoids a useDeferredValue waterfall when separated by a Suspense boundary', async () => {
609601
// Same as the previous test but with a Suspense boundary separating the
610602
// two useDeferredValue hooks.
@@ -649,7 +641,6 @@ describe('ReactDeferredValue', () => {
649641
expect(root).toMatchRenderedOutput('Content');
650642
});
651643

652-
// @gate enableUseDeferredValueInitialArg
653644
// @gate enableActivity
654645
it('useDeferredValue can spawn a deferred task while prerendering a hidden tree', async () => {
655646
function App() {
@@ -696,7 +687,6 @@ describe('ReactDeferredValue', () => {
696687
expect(root).toMatchRenderedOutput(<div>Final</div>);
697688
});
698689

699-
// @gate enableUseDeferredValueInitialArg
700690
// @gate enableActivity
701691
it('useDeferredValue can prerender the initial value inside a hidden tree', async () => {
702692
function App({text}) {
@@ -755,7 +745,6 @@ describe('ReactDeferredValue', () => {
755745
expect(root).toMatchRenderedOutput(<div>B</div>);
756746
});
757747

758-
// @gate enableUseDeferredValueInitialArg
759748
// @gate enableActivity
760749
it(
761750
'useDeferredValue skips the preview state when revealing a hidden tree ' +
@@ -796,7 +785,6 @@ describe('ReactDeferredValue', () => {
796785
},
797786
);
798787

799-
// @gate enableUseDeferredValueInitialArg
800788
// @gate enableActivity
801789
it(
802790
'useDeferredValue does not skip the preview state when revealing a ' +

packages/react-server/src/ReactFizzHooks.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import {
4343
enableUseEffectEventHook,
4444
enableUseMemoCacheHook,
4545
enableAsyncActions,
46-
enableUseDeferredValueInitialArg,
4746
} from 'shared/ReactFeatureFlags';
4847
import is from 'shared/objectIs';
4948
import {
@@ -570,11 +569,7 @@ function useSyncExternalStore<T>(
570569

571570
function useDeferredValue<T>(value: T, initialValue?: T): T {
572571
resolveCurrentlyRenderingComponent();
573-
if (enableUseDeferredValueInitialArg) {
574-
return initialValue !== undefined ? initialValue : value;
575-
} else {
576-
return value;
577-
}
572+
return initialValue !== undefined ? initialValue : value;
578573
}
579574

580575
function unsupportedStartTransition() {

packages/shared/ReactFeatureFlags.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@ export const disableLegacyMode = true;
221221
// Make <Context> equivalent to <Context.Provider> instead of <Context.Consumer>
222222
export const enableRenderableContext = true;
223223

224-
// Enables the `initialValue` option for `useDeferredValue`
225-
export const enableUseDeferredValueInitialArg = true;
226-
227224
// -----------------------------------------------------------------------------
228225
// Chopping Block
229226
//

packages/shared/forks/ReactFeatureFlags.native-fb.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ export const enableTaint = true;
8383
export const enableTransitionTracing = false;
8484
export const enableTrustedTypesIntegration = false;
8585
export const enableUpdaterTracking = __PROFILE__;
86-
export const enableUseDeferredValueInitialArg = true;
8786
export const enableUseEffectEventHook = false;
8887
export const enableUseMemoCacheHook = true;
8988
export const favorSafetyOverHydrationPerf = true;

packages/shared/forks/ReactFeatureFlags.native-oss.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const enableSuspenseCallback = false;
7474
export const enableTaint = true;
7575
export const enableTransitionTracing = false;
7676
export const enableTrustedTypesIntegration = false;
77-
export const enableUseDeferredValueInitialArg = true;
7877
export const enableUseEffectEventHook = false;
7978
export const enableUseMemoCacheHook = true;
8079
export const favorSafetyOverHydrationPerf = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ export const alwaysThrottleRetries = true;
7171

7272
export const passChildrenWhenCloningPersistedNodes = false;
7373
export const enablePersistedModeClonedFlag = false;
74-
export const enableUseDeferredValueInitialArg = __EXPERIMENTAL__;
7574
export const disableClientCache = true;
7675

7776
export const enableServerComponentLogs = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export const enableTaint = true;
6969
export const enableTransitionTracing = false;
7070
export const enableTrustedTypesIntegration = false;
7171
export const enableUpdaterTracking = false;
72-
export const enableUseDeferredValueInitialArg = true;
7372
export const enableUseEffectEventHook = false;
7473
export const enableUseMemoCacheHook = true;
7574
export const favorSafetyOverHydrationPerf = true;

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const alwaysThrottleRetries = true;
7474

7575
export const passChildrenWhenCloningPersistedNodes = false;
7676
export const enablePersistedModeClonedFlag = false;
77-
export const enableUseDeferredValueInitialArg = true;
7877
export const disableClientCache = true;
7978

8079
export const enableServerComponentLogs = true;

0 commit comments

Comments
 (0)