Skip to content

Commit 6fd0cb9

Browse files
authored
Cleanup alwaysThrottleDisappearingFallbacks Flag (#28639)
## Summary After realizing that this feature flag is entangled with `alwaysThrottleRetries`, we're going to undo #28550 ## How did you test this change? ``` $ yarn test $ yarn flow dom-browser $ yarn flow dom-fb $ yarn flow fabric ```
1 parent 95319ab commit 6fd0cb9

10 files changed

+2
-12
lines changed

packages/react-reconciler/src/ReactFiberCommitWork.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import type {
4040
} from './ReactFiberTracingMarkerComponent';
4141

4242
import {
43-
alwaysThrottleDisappearingFallbacks,
43+
alwaysThrottleRetries,
4444
enableCreateEventHandleAPI,
4545
enableProfilerTimer,
4646
enableProfilerCommitHooks,
@@ -2893,7 +2893,7 @@ function commitMutationEffectsOnFiber(
28932893
current !== null &&
28942894
(current.memoizedState: SuspenseState | null) !== null;
28952895

2896-
if (alwaysThrottleDisappearingFallbacks) {
2896+
if (alwaysThrottleRetries) {
28972897
if (isShowingFallback !== wasShowingFallback) {
28982898
// A fallback is either appearing or disappearing.
28992899
markCommitTimeOfFallback();

packages/shared/ReactFeatureFlags.js

-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ export const enableUseEffectEventHook = __EXPERIMENTAL__;
110110
// (handled with an MutationObserver) instead of inline-scripts
111111
export const enableFizzExternalRuntime = true;
112112

113-
export const alwaysThrottleDisappearingFallbacks = true;
114-
115113
export const alwaysThrottleRetries = true;
116114

117115
export const passChildrenWhenCloningPersistedNodes = false;

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

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// flag here but it won't be set to `true` in any of our test runs. Need to
1818
// add a test configuration for React Native.
1919

20-
export const alwaysThrottleDisappearingFallbacks = __VARIANT__;
2120
export const alwaysThrottleRetries = __VARIANT__;
2221
export const consoleManagedByDevToolsDuringStrictMode = __VARIANT__;
2322
export const enableAsyncActions = __VARIANT__;

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

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const dynamicFlags: DynamicExportsType = (dynamicFlagsUntyped: any);
1919
// We destructure each value before re-exporting to avoid a dynamic look-up on
2020
// the exports object every time a flag is read.
2121
export const {
22-
alwaysThrottleDisappearingFallbacks,
2322
alwaysThrottleRetries,
2423
consoleManagedByDevToolsDuringStrictMode,
2524
enableAsyncActions,

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

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export const enableReactTestRendererWarning = __TODO_NEXT_RN_MAJOR__;
2727
export const enableAsyncActions = __TODO_NEXT_RN_MAJOR__;
2828
export const consoleManagedByDevToolsDuringStrictMode = __TODO_NEXT_RN_MAJOR__;
2929
export const enableDeferRootSchedulingToMicrotask = __TODO_NEXT_RN_MAJOR__;
30-
export const alwaysThrottleDisappearingFallbacks = __TODO_NEXT_RN_MAJOR__;
3130
export const alwaysThrottleRetries = __TODO_NEXT_RN_MAJOR__;
3231
export const enableInfiniteRenderLoopDetection = __TODO_NEXT_RN_MAJOR__;
3332
export const enableComponentStackLocations = __TODO_NEXT_RN_MAJOR__;

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

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ export const enableDeferRootSchedulingToMicrotask = true;
7272

7373
export const enableAsyncActions = true;
7474

75-
export const alwaysThrottleDisappearingFallbacks = true;
7675
export const alwaysThrottleRetries = true;
7776

7877
export const passChildrenWhenCloningPersistedNodes = false;

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

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export const enableDeferRootSchedulingToMicrotask = false;
7474

7575
export const enableAsyncActions = true;
7676

77-
export const alwaysThrottleDisappearingFallbacks = true;
7877
export const alwaysThrottleRetries = true;
7978

8079
export const passChildrenWhenCloningPersistedNodes = false;

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

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ export const enableDeferRootSchedulingToMicrotask = true;
7575

7676
export const enableAsyncActions = true;
7777

78-
export const alwaysThrottleDisappearingFallbacks = false;
7978
export const alwaysThrottleRetries = true;
8079

8180
export const passChildrenWhenCloningPersistedNodes = false;

packages/shared/forks/ReactFeatureFlags.www-dynamic.js

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export const forceConcurrentByDefaultForTesting = __VARIANT__;
2424
export const enableUnifiedSyncLane = __VARIANT__;
2525
export const enableTransitionTracing = __VARIANT__;
2626
export const enableDeferRootSchedulingToMicrotask = __VARIANT__;
27-
export const alwaysThrottleDisappearingFallbacks = __VARIANT__;
2827
export const alwaysThrottleRetries = __VARIANT__;
2928
export const enableDO_NOT_USE_disableStrictPassiveEffect = __VARIANT__;
3029
export const enableUseDeferredValueInitialArg = __VARIANT__;

packages/shared/forks/ReactFeatureFlags.www.js

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export const {
2727
enableRetryLaneExpiration,
2828
enableTransitionTracing,
2929
enableDeferRootSchedulingToMicrotask,
30-
alwaysThrottleDisappearingFallbacks,
3130
alwaysThrottleRetries,
3231
enableDO_NOT_USE_disableStrictPassiveEffect,
3332
disableSchedulerTimeoutInWorkLoop,

0 commit comments

Comments
 (0)