Skip to content

Commit b4e3148

Browse files
authored
Remove unused flag (#18132)
1 parent 849e832 commit b4e3148

10 files changed

+1
-23
lines changed

packages/react-reconciler/src/ReactFiberWorkLoop.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import {
2828
warnAboutUnmockedScheduler,
2929
flushSuspenseFallbacksInTests,
3030
disableSchedulerTimeoutBasedOnReactExpirationTime,
31-
enableTrainModelFix,
3231
} from 'shared/ReactFeatureFlags';
3332
import ReactSharedInternals from 'shared/ReactSharedInternals';
3433
import invariant from 'shared/invariant';
@@ -548,11 +547,7 @@ function getNextRootExpirationTimeToWorkOn(root: FiberRoot): ExpirationTime {
548547
lastPingedTime > nextKnownPendingLevel
549548
? lastPingedTime
550549
: nextKnownPendingLevel;
551-
if (
552-
enableTrainModelFix &&
553-
nextLevel <= Idle &&
554-
firstPendingTime !== nextLevel
555-
) {
550+
if (nextLevel <= Idle && firstPendingTime !== nextLevel) {
556551
// Don't work on Idle/Never priority unless everything else is committed.
557552
return NoWork;
558553
}
@@ -2478,12 +2473,6 @@ export function pingSuspendedRoot(
24782473
// Mark the time at which this ping was scheduled.
24792474
root.lastPingedTime = suspendedTime;
24802475

2481-
if (!enableTrainModelFix && root.finishedExpirationTime === suspendedTime) {
2482-
// If there's a pending fallback waiting to commit, throw it away.
2483-
root.finishedExpirationTime = NoWork;
2484-
root.finishedWork = null;
2485-
}
2486-
24872476
ensureRootIsScheduled(root);
24882477
schedulePendingInteractions(root, suspendedTime);
24892478
}

packages/shared/ReactFeatureFlags.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
8181

8282
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
8383

84-
export const enableTrainModelFix = true;
85-
8684
export const enableTrustedTypesIntegration = false;
8785

8886
// Flag to turn event.target and event.currentTarget in ReactNative from a reactTag to a component instance

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
4141
export const warnAboutStringRefs = false;
4242
export const disableLegacyContext = false;
4343
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
44-
export const enableTrainModelFix = true;
4544
export const enableTrustedTypesIntegration = false;
4645
export const disableTextareaChildren = false;
4746
export const disableMapsAsChildren = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = false;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = false;

packages/shared/forks/ReactFeatureFlags.persistent.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = false;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = false;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = false;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = false;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = false;

packages/shared/forks/ReactFeatureFlags.testing.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = false;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = false;

packages/shared/forks/ReactFeatureFlags.testing.www.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;
3535
export const warnAboutStringRefs = false;
3636
export const disableLegacyContext = __EXPERIMENTAL__;
3737
export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;
38-
export const enableTrainModelFix = true;
3938
export const enableTrustedTypesIntegration = false;
4039
export const enableNativeTargetAsInstance = false;
4140
export const disableTextareaChildren = __EXPERIMENTAL__;

packages/shared/forks/ReactFeatureFlags.www.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ export const disableLegacyContext = __EXPERIMENTAL__;
4343
export const warnAboutStringRefs = false;
4444
export const warnAboutDefaultPropsOnFunctionComponents = false;
4545

46-
export const enableTrainModelFix = true;
47-
4846
export const enableSuspenseServerRenderer = true;
4947
export const enableSelectiveHydration = true;
5048

0 commit comments

Comments
 (0)