Skip to content

Commit

Permalink
Cleanup alwaysThrottleDisappearingFallbacks Flag (#28639)
Browse files Browse the repository at this point in the history 
## 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
```

DiffTrain build for [6fd0cb9](6fd0cb9)
  • Loading branch information
@yungsters
yungsters committed Mar 26, 2024
1 parent fc5d9db commit ed3c6af
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 79 deletions.
2 changes: 1 addition & 1 deletion compiled/facebook-www/REVISION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
95319ab5afd384f5858f7c080573b9736e6b2f9c
6fd0cb9a9feeccea2f70d993dc2d53f11cab0b5d
6 changes: 2 additions & 4 deletions compiled/facebook-www/ReactART-dev.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (__DEV__) {
return self;
}

var ReactVersion = "18.3.0-www-classic-df608462";
var ReactVersion = "18.3.0-www-classic-64a6efdf";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -173,8 +173,6 @@ if (__DEV__) {
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -23231,7 +23229,7 @@ if (__DEV__) {
var wasShowingFallback =
current !== null && current.memoizedState !== null;

if (alwaysThrottleDisappearingFallbacks) {
if (alwaysThrottleRetries) {
if (isShowingFallback !== wasShowingFallback) {
// A fallback is either appearing or disappearing.
markCommitTimeOfFallback();
Expand Down
6 changes: 2 additions & 4 deletions compiled/facebook-www/ReactART-dev.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if (__DEV__) {
return self;
}

var ReactVersion = "18.3.0-www-modern-c6cfe90f";
var ReactVersion = "18.3.0-www-modern-71ec75b3";

var LegacyRoot = 0;
var ConcurrentRoot = 1;
Expand Down Expand Up @@ -173,8 +173,6 @@ if (__DEV__) {
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -22890,7 +22888,7 @@ if (__DEV__) {
var wasShowingFallback =
current !== null && current.memoizedState !== null;

if (alwaysThrottleDisappearingFallbacks) {
if (alwaysThrottleRetries) {
if (isShowingFallback !== wasShowingFallback) {
// A fallback is either appearing or disappearing.
markCommitTimeOfFallback();
Expand Down
8 changes: 3 additions & 5 deletions compiled/facebook-www/ReactART-prod.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ var ReactSharedInternals =
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -8011,7 +8009,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((newProps = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? newProps !== current && (globalMostRecentFallbackTime = now())
: newProps && !current && (globalMostRecentFallbackTime = now()));
if (flags & 4) {
Expand Down Expand Up @@ -10641,7 +10639,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-classic-eb1a0983",
version: "18.3.0-www-classic-1eed95a8",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1320 = {
Expand Down Expand Up @@ -10672,7 +10670,7 @@ var internals$jscomp$inline_1320 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-eb1a0983"
reconcilerVersion: "18.3.0-www-classic-1eed95a8"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1321 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
8 changes: 3 additions & 5 deletions compiled/facebook-www/ReactART-prod.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ var ReactSharedInternals =
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -7710,7 +7708,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((newProps = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? newProps !== current && (globalMostRecentFallbackTime = now())
: newProps && !current && (globalMostRecentFallbackTime = now()));
if (flags & 4) {
Expand Down Expand Up @@ -10296,7 +10294,7 @@ var slice = Array.prototype.slice,
return null;
},
bundleType: 0,
version: "18.3.0-www-modern-c6c114f4",
version: "18.3.0-www-modern-9fae8faa",
rendererPackageName: "react-art"
};
var internals$jscomp$inline_1300 = {
Expand Down Expand Up @@ -10327,7 +10325,7 @@ var internals$jscomp$inline_1300 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-c6c114f4"
reconcilerVersion: "18.3.0-www-modern-9fae8faa"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_1301 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down
6 changes: 2 additions & 4 deletions compiled/facebook-www/ReactDOM-dev.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ if (__DEV__) {
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -28979,7 +28977,7 @@ if (__DEV__) {
var wasShowingFallback =
current !== null && current.memoizedState !== null;

if (alwaysThrottleDisappearingFallbacks) {
if (alwaysThrottleRetries) {
if (isShowingFallback !== wasShowingFallback) {
// A fallback is either appearing or disappearing.
markCommitTimeOfFallback();
Expand Down Expand Up @@ -35849,7 +35847,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-www-classic-316f7f5a";
var ReactVersion = "18.3.0-www-classic-291e722d";

function createPortal$1(
children,
Expand Down
6 changes: 2 additions & 4 deletions compiled/facebook-www/ReactDOM-dev.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ if (__DEV__) {
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -28835,7 +28833,7 @@ if (__DEV__) {
var wasShowingFallback =
current !== null && current.memoizedState !== null;

if (alwaysThrottleDisappearingFallbacks) {
if (alwaysThrottleRetries) {
if (isShowingFallback !== wasShowingFallback) {
// A fallback is either appearing or disappearing.
markCommitTimeOfFallback();
Expand Down Expand Up @@ -35696,7 +35694,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-www-modern-55f668d0";
var ReactVersion = "18.3.0-www-modern-e1f4912b";

function createPortal$1(
children,
Expand Down
10 changes: 4 additions & 6 deletions compiled/facebook-www/ReactDOM-prod.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ var ReactSharedInternals =
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -9789,7 +9787,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((root = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? root !== current && (globalMostRecentFallbackTime = now())
: root && !current && (globalMostRecentFallbackTime = now()));
if (flags & 4) {
Expand Down Expand Up @@ -17254,7 +17252,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1816 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-08f7844e",
version: "18.3.0-www-classic-2d523fe2",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2175 = {
Expand Down Expand Up @@ -17284,7 +17282,7 @@ var internals$jscomp$inline_2175 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-08f7844e"
reconcilerVersion: "18.3.0-www-classic-2d523fe2"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2176 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -17615,4 +17613,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-classic-08f7844e";
exports.version = "18.3.0-www-classic-2d523fe2";
10 changes: 4 additions & 6 deletions compiled/facebook-www/ReactDOM-prod.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -9602,7 +9600,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((root = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? root !== current && (globalMostRecentFallbackTime = now())
: root && !current && (globalMostRecentFallbackTime = now()));
if (flags & 4) {
Expand Down Expand Up @@ -16770,7 +16768,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1775 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-751684a1",
version: "18.3.0-www-modern-9cc4c602",
rendererPackageName: "react-dom"
};
var internals$jscomp$inline_2139 = {
Expand Down Expand Up @@ -16801,7 +16799,7 @@ var internals$jscomp$inline_2139 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-751684a1"
reconcilerVersion: "18.3.0-www-modern-9cc4c602"
};
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
var hook$jscomp$inline_2140 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
Expand Down Expand Up @@ -17060,4 +17058,4 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-modern-751684a1";
exports.version = "18.3.0-www-modern-9cc4c602";
10 changes: 4 additions & 6 deletions compiled/facebook-www/ReactDOM-profiling.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ var ReactSharedInternals =
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -10340,7 +10338,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((root = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? root !== current && (globalMostRecentFallbackTime = now$1())
: root && !current && (globalMostRecentFallbackTime = now$1()));
if (flags & 4) {
Expand Down Expand Up @@ -18001,7 +17999,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1901 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-classic-433eac99",
version: "18.3.0-www-classic-a1c3018b",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -18045,7 +18043,7 @@ var devToolsConfig$jscomp$inline_1901 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-classic-433eac99"
reconcilerVersion: "18.3.0-www-classic-a1c3018b"
});
assign(Internals, {
ReactBrowserEventEmitter: {
Expand Down Expand Up @@ -18363,7 +18361,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-classic-433eac99";
exports.version = "18.3.0-www-classic-a1c3018b";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
10 changes: 4 additions & 6 deletions compiled/facebook-www/ReactDOM-profiling.modern.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -10147,7 +10145,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
finishedWork.child.flags & 8192 &&
((root = null !== finishedWork.memoizedState),
(current = null !== current && null !== current.memoizedState),
alwaysThrottleDisappearingFallbacks
alwaysThrottleRetries
? root !== current && (globalMostRecentFallbackTime = now$1())
: root && !current && (globalMostRecentFallbackTime = now$1()));
if (flags & 4) {
Expand Down Expand Up @@ -17511,7 +17509,7 @@ Internals.Events = [
var devToolsConfig$jscomp$inline_1860 = {
findFiberByHostInstance: getClosestInstanceFromNode,
bundleType: 0,
version: "18.3.0-www-modern-9404d44b",
version: "18.3.0-www-modern-0fa2ec75",
rendererPackageName: "react-dom"
};
(function (internals) {
Expand Down Expand Up @@ -17556,7 +17554,7 @@ var devToolsConfig$jscomp$inline_1860 = {
scheduleRoot: null,
setRefreshHandler: null,
getCurrentFiber: null,
reconcilerVersion: "18.3.0-www-modern-9404d44b"
reconcilerVersion: "18.3.0-www-modern-0fa2ec75"
});
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = Internals;
exports.createPortal = function (children, container) {
Expand Down Expand Up @@ -17802,7 +17800,7 @@ exports.useFormState = function (action, initialState, permalink) {
exports.useFormStatus = function () {
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
};
exports.version = "18.3.0-www-modern-9404d44b";
exports.version = "18.3.0-www-modern-0fa2ec75";
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
"function" ===
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Expand Down
6 changes: 2 additions & 4 deletions compiled/facebook-www/ReactDOMTesting-dev.classic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@ if (__DEV__) {
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
enableDeferRootSchedulingToMicrotask =
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
alwaysThrottleDisappearingFallbacks =
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
enableDO_NOT_USE_disableStrictPassiveEffect =
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
Expand Down Expand Up @@ -29116,7 +29114,7 @@ if (__DEV__) {
var wasShowingFallback =
current !== null && current.memoizedState !== null;

if (alwaysThrottleDisappearingFallbacks) {
if (alwaysThrottleRetries) {
if (isShowingFallback !== wasShowingFallback) {
// A fallback is either appearing or disappearing.
markCommitTimeOfFallback();
Expand Down Expand Up @@ -36473,7 +36471,7 @@ if (__DEV__) {
return root;
}

var ReactVersion = "18.3.0-www-classic-ed51cb66";
var ReactVersion = "18.3.0-www-classic-91a12e86";

function createPortal$1(
children,
Expand Down
Loading

0 comments on commit ed3c6af

Please sign in to comment.