Skip to content

Commit ed3c6af

Browse files
yungstersyungsters
committed
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 ``` DiffTrain build for [6fd0cb9](6fd0cb9)
1 parent fc5d9db commit ed3c6af

17 files changed

+49
-79
lines changed

‎compiled/facebook-www/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
95319ab5afd384f5858f7c080573b9736e6b2f9c
1+
6fd0cb9a9feeccea2f70d993dc2d53f11cab0b5d

‎compiled/facebook-www/ReactART-dev.classic.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

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

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -173,8 +173,6 @@ if (__DEV__) {
173173
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
174174
enableDeferRootSchedulingToMicrotask =
175175
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
176-
alwaysThrottleDisappearingFallbacks =
177-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
178176
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
179177
enableDO_NOT_USE_disableStrictPassiveEffect =
180178
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -23231,7 +23229,7 @@ if (__DEV__) {
2323123229
var wasShowingFallback =
2323223230
current !== null && current.memoizedState !== null;
2323323231

23234-
if (alwaysThrottleDisappearingFallbacks) {
23232+
if (alwaysThrottleRetries) {
2323523233
if (isShowingFallback !== wasShowingFallback) {
2323623234
// A fallback is either appearing or disappearing.
2323723235
markCommitTimeOfFallback();

‎compiled/facebook-www/ReactART-dev.modern.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (__DEV__) {
6666
return self;
6767
}
6868

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

7171
var LegacyRoot = 0;
7272
var ConcurrentRoot = 1;
@@ -173,8 +173,6 @@ if (__DEV__) {
173173
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
174174
enableDeferRootSchedulingToMicrotask =
175175
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
176-
alwaysThrottleDisappearingFallbacks =
177-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
178176
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
179177
enableDO_NOT_USE_disableStrictPassiveEffect =
180178
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -22890,7 +22888,7 @@ if (__DEV__) {
2289022888
var wasShowingFallback =
2289122889
current !== null && current.memoizedState !== null;
2289222890

22893-
if (alwaysThrottleDisappearingFallbacks) {
22891+
if (alwaysThrottleRetries) {
2289422892
if (isShowingFallback !== wasShowingFallback) {
2289522893
// A fallback is either appearing or disappearing.
2289622894
markCommitTimeOfFallback();

‎compiled/facebook-www/ReactART-prod.classic.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ var ReactSharedInternals =
7272
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
7373
enableDeferRootSchedulingToMicrotask =
7474
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
75-
alwaysThrottleDisappearingFallbacks =
76-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
7775
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
7876
enableDO_NOT_USE_disableStrictPassiveEffect =
7977
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -8011,7 +8009,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
80118009
finishedWork.child.flags & 8192 &&
80128010
((newProps = null !== finishedWork.memoizedState),
80138011
(current = null !== current && null !== current.memoizedState),
8014-
alwaysThrottleDisappearingFallbacks
8012+
alwaysThrottleRetries
80158013
? newProps !== current && (globalMostRecentFallbackTime = now())
80168014
: newProps && !current && (globalMostRecentFallbackTime = now()));
80178015
if (flags & 4) {
@@ -10641,7 +10639,7 @@ var slice = Array.prototype.slice,
1064110639
return null;
1064210640
},
1064310641
bundleType: 0,
10644-
version: "18.3.0-www-classic-eb1a0983",
10642+
version: "18.3.0-www-classic-1eed95a8",
1064510643
rendererPackageName: "react-art"
1064610644
};
1064710645
var internals$jscomp$inline_1320 = {
@@ -10672,7 +10670,7 @@ var internals$jscomp$inline_1320 = {
1067210670
scheduleRoot: null,
1067310671
setRefreshHandler: null,
1067410672
getCurrentFiber: null,
10675-
reconcilerVersion: "18.3.0-www-classic-eb1a0983"
10673+
reconcilerVersion: "18.3.0-www-classic-1eed95a8"
1067610674
};
1067710675
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1067810676
var hook$jscomp$inline_1321 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled/facebook-www/ReactART-prod.modern.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ var ReactSharedInternals =
7272
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
7373
enableDeferRootSchedulingToMicrotask =
7474
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
75-
alwaysThrottleDisappearingFallbacks =
76-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
7775
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
7876
enableDO_NOT_USE_disableStrictPassiveEffect =
7977
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -7710,7 +7708,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
77107708
finishedWork.child.flags & 8192 &&
77117709
((newProps = null !== finishedWork.memoizedState),
77127710
(current = null !== current && null !== current.memoizedState),
7713-
alwaysThrottleDisappearingFallbacks
7711+
alwaysThrottleRetries
77147712
? newProps !== current && (globalMostRecentFallbackTime = now())
77157713
: newProps && !current && (globalMostRecentFallbackTime = now()));
77167714
if (flags & 4) {
@@ -10296,7 +10294,7 @@ var slice = Array.prototype.slice,
1029610294
return null;
1029710295
},
1029810296
bundleType: 0,
10299-
version: "18.3.0-www-modern-c6c114f4",
10297+
version: "18.3.0-www-modern-9fae8faa",
1030010298
rendererPackageName: "react-art"
1030110299
};
1030210300
var internals$jscomp$inline_1300 = {
@@ -10327,7 +10325,7 @@ var internals$jscomp$inline_1300 = {
1032710325
scheduleRoot: null,
1032810326
setRefreshHandler: null,
1032910327
getCurrentFiber: null,
10330-
reconcilerVersion: "18.3.0-www-modern-c6c114f4"
10328+
reconcilerVersion: "18.3.0-www-modern-9fae8faa"
1033110329
};
1033210330
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1033310331
var hook$jscomp$inline_1301 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled/facebook-www/ReactDOM-dev.classic.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ if (__DEV__) {
138138
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
139139
enableDeferRootSchedulingToMicrotask =
140140
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
141-
alwaysThrottleDisappearingFallbacks =
142-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
143141
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
144142
enableDO_NOT_USE_disableStrictPassiveEffect =
145143
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -28979,7 +28977,7 @@ if (__DEV__) {
2897928977
var wasShowingFallback =
2898028978
current !== null && current.memoizedState !== null;
2898128979

28982-
if (alwaysThrottleDisappearingFallbacks) {
28980+
if (alwaysThrottleRetries) {
2898328981
if (isShowingFallback !== wasShowingFallback) {
2898428982
// A fallback is either appearing or disappearing.
2898528983
markCommitTimeOfFallback();
@@ -35849,7 +35847,7 @@ if (__DEV__) {
3584935847
return root;
3585035848
}
3585135849

35852-
var ReactVersion = "18.3.0-www-classic-316f7f5a";
35850+
var ReactVersion = "18.3.0-www-classic-291e722d";
3585335851

3585435852
function createPortal$1(
3585535853
children,

‎compiled/facebook-www/ReactDOM-dev.modern.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ if (__DEV__) {
133133
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
134134
enableDeferRootSchedulingToMicrotask =
135135
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
136-
alwaysThrottleDisappearingFallbacks =
137-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
138136
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
139137
enableDO_NOT_USE_disableStrictPassiveEffect =
140138
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -28835,7 +28833,7 @@ if (__DEV__) {
2883528833
var wasShowingFallback =
2883628834
current !== null && current.memoizedState !== null;
2883728835

28838-
if (alwaysThrottleDisappearingFallbacks) {
28836+
if (alwaysThrottleRetries) {
2883928837
if (isShowingFallback !== wasShowingFallback) {
2884028838
// A fallback is either appearing or disappearing.
2884128839
markCommitTimeOfFallback();
@@ -35696,7 +35694,7 @@ if (__DEV__) {
3569635694
return root;
3569735695
}
3569835696

35699-
var ReactVersion = "18.3.0-www-modern-55f668d0";
35697+
var ReactVersion = "18.3.0-www-modern-e1f4912b";
3570035698

3570135699
function createPortal$1(
3570235700
children,

‎compiled/facebook-www/ReactDOM-prod.classic.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ var ReactSharedInternals =
5151
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
5252
enableDeferRootSchedulingToMicrotask =
5353
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
54-
alwaysThrottleDisappearingFallbacks =
55-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
5654
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
5755
enableDO_NOT_USE_disableStrictPassiveEffect =
5856
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -9789,7 +9787,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
97899787
finishedWork.child.flags & 8192 &&
97909788
((root = null !== finishedWork.memoizedState),
97919789
(current = null !== current && null !== current.memoizedState),
9792-
alwaysThrottleDisappearingFallbacks
9790+
alwaysThrottleRetries
97939791
? root !== current && (globalMostRecentFallbackTime = now())
97949792
: root && !current && (globalMostRecentFallbackTime = now()));
97959793
if (flags & 4) {
@@ -17254,7 +17252,7 @@ Internals.Events = [
1725417252
var devToolsConfig$jscomp$inline_1816 = {
1725517253
findFiberByHostInstance: getClosestInstanceFromNode,
1725617254
bundleType: 0,
17257-
version: "18.3.0-www-classic-08f7844e",
17255+
version: "18.3.0-www-classic-2d523fe2",
1725817256
rendererPackageName: "react-dom"
1725917257
};
1726017258
var internals$jscomp$inline_2175 = {
@@ -17284,7 +17282,7 @@ var internals$jscomp$inline_2175 = {
1728417282
scheduleRoot: null,
1728517283
setRefreshHandler: null,
1728617284
getCurrentFiber: null,
17287-
reconcilerVersion: "18.3.0-www-classic-08f7844e"
17285+
reconcilerVersion: "18.3.0-www-classic-2d523fe2"
1728817286
};
1728917287
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1729017288
var hook$jscomp$inline_2176 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17615,4 +17613,4 @@ exports.useFormState = function (action, initialState, permalink) {
1761517613
exports.useFormStatus = function () {
1761617614
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1761717615
};
17618-
exports.version = "18.3.0-www-classic-08f7844e";
17616+
exports.version = "18.3.0-www-classic-2d523fe2";

‎compiled/facebook-www/ReactDOM-prod.modern.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ var dynamicFeatureFlags = require("ReactFeatureFlags"),
6464
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
6565
enableDeferRootSchedulingToMicrotask =
6666
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
67-
alwaysThrottleDisappearingFallbacks =
68-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
6967
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
7068
enableDO_NOT_USE_disableStrictPassiveEffect =
7169
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -9602,7 +9600,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
96029600
finishedWork.child.flags & 8192 &&
96039601
((root = null !== finishedWork.memoizedState),
96049602
(current = null !== current && null !== current.memoizedState),
9605-
alwaysThrottleDisappearingFallbacks
9603+
alwaysThrottleRetries
96069604
? root !== current && (globalMostRecentFallbackTime = now())
96079605
: root && !current && (globalMostRecentFallbackTime = now()));
96089606
if (flags & 4) {
@@ -16770,7 +16768,7 @@ Internals.Events = [
1677016768
var devToolsConfig$jscomp$inline_1775 = {
1677116769
findFiberByHostInstance: getClosestInstanceFromNode,
1677216770
bundleType: 0,
16773-
version: "18.3.0-www-modern-751684a1",
16771+
version: "18.3.0-www-modern-9cc4c602",
1677416772
rendererPackageName: "react-dom"
1677516773
};
1677616774
var internals$jscomp$inline_2139 = {
@@ -16801,7 +16799,7 @@ var internals$jscomp$inline_2139 = {
1680116799
scheduleRoot: null,
1680216800
setRefreshHandler: null,
1680316801
getCurrentFiber: null,
16804-
reconcilerVersion: "18.3.0-www-modern-751684a1"
16802+
reconcilerVersion: "18.3.0-www-modern-9cc4c602"
1680516803
};
1680616804
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1680716805
var hook$jscomp$inline_2140 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17060,4 +17058,4 @@ exports.useFormState = function (action, initialState, permalink) {
1706017058
exports.useFormStatus = function () {
1706117059
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1706217060
};
17063-
exports.version = "18.3.0-www-modern-751684a1";
17061+
exports.version = "18.3.0-www-modern-9cc4c602";

‎compiled/facebook-www/ReactDOM-profiling.classic.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ var ReactSharedInternals =
5555
enableTransitionTracing = dynamicFeatureFlags.enableTransitionTracing,
5656
enableDeferRootSchedulingToMicrotask =
5757
dynamicFeatureFlags.enableDeferRootSchedulingToMicrotask,
58-
alwaysThrottleDisappearingFallbacks =
59-
dynamicFeatureFlags.alwaysThrottleDisappearingFallbacks,
6058
alwaysThrottleRetries = dynamicFeatureFlags.alwaysThrottleRetries,
6159
enableDO_NOT_USE_disableStrictPassiveEffect =
6260
dynamicFeatureFlags.enableDO_NOT_USE_disableStrictPassiveEffect,
@@ -10340,7 +10338,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
1034010338
finishedWork.child.flags & 8192 &&
1034110339
((root = null !== finishedWork.memoizedState),
1034210340
(current = null !== current && null !== current.memoizedState),
10343-
alwaysThrottleDisappearingFallbacks
10341+
alwaysThrottleRetries
1034410342
? root !== current && (globalMostRecentFallbackTime = now$1())
1034510343
: root && !current && (globalMostRecentFallbackTime = now$1()));
1034610344
if (flags & 4) {
@@ -18001,7 +17999,7 @@ Internals.Events = [
1800117999
var devToolsConfig$jscomp$inline_1901 = {
1800218000
findFiberByHostInstance: getClosestInstanceFromNode,
1800318001
bundleType: 0,
18004-
version: "18.3.0-www-classic-433eac99",
18002+
version: "18.3.0-www-classic-a1c3018b",
1800518003
rendererPackageName: "react-dom"
1800618004
};
1800718005
(function (internals) {
@@ -18045,7 +18043,7 @@ var devToolsConfig$jscomp$inline_1901 = {
1804518043
scheduleRoot: null,
1804618044
setRefreshHandler: null,
1804718045
getCurrentFiber: null,
18048-
reconcilerVersion: "18.3.0-www-classic-433eac99"
18046+
reconcilerVersion: "18.3.0-www-classic-a1c3018b"
1804918047
});
1805018048
assign(Internals, {
1805118049
ReactBrowserEventEmitter: {
@@ -18363,7 +18361,7 @@ exports.useFormState = function (action, initialState, permalink) {
1836318361
exports.useFormStatus = function () {
1836418362
return ReactCurrentDispatcher$2.current.useHostTransitionStatus();
1836518363
};
18366-
exports.version = "18.3.0-www-classic-433eac99";
18364+
exports.version = "18.3.0-www-classic-a1c3018b";
1836718365
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1836818366
"function" ===
1836918367
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)