Skip to content

Commit 64cc527

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 commit 6fd0cb9.
1 parent d8ec1f6 commit 64cc527

File tree

7 files changed

+27
-39
lines changed

7 files changed

+27
-39
lines changed

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/REVISION‎

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

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<12552a7a8021ca2d901cc4c6091baa69>>
10+
* @generated SignedSource<<21b7fbadb734a6be706327eb8e16459f>>
1111
*/
1212

1313
"use strict";
@@ -2973,9 +2973,7 @@ to return true:wantsResponderID| |
29732973
var dynamicFlags = dynamicFlagsUntyped; // We destructure each value before re-exporting to avoid a dynamic look-up on
29742974
// the exports object every time a flag is read.
29752975

2976-
var alwaysThrottleDisappearingFallbacks =
2977-
dynamicFlags.alwaysThrottleDisappearingFallbacks,
2978-
alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries,
2976+
var alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries,
29792977
consoleManagedByDevToolsDuringStrictMode =
29802978
dynamicFlags.consoleManagedByDevToolsDuringStrictMode,
29812979
enableAsyncActions = dynamicFlags.enableAsyncActions,
@@ -23797,7 +23795,7 @@ to return true:wantsResponderID| |
2379723795
var wasShowingFallback =
2379823796
current !== null && current.memoizedState !== null;
2379923797

23800-
if (alwaysThrottleDisappearingFallbacks) {
23798+
if (alwaysThrottleRetries) {
2380123799
if (isShowingFallback !== wasShowingFallback) {
2380223800
// A fallback is either appearing or disappearing.
2380323801
markCommitTimeOfFallback();
@@ -29869,7 +29867,7 @@ to return true:wantsResponderID| |
2986929867
return root;
2987029868
}
2987129869

29872-
var ReactVersion = "18.3.0-canary-cfa61256";
29870+
var ReactVersion = "18.3.0-canary-02de57fb";
2987329871

2987429872
function createPortal$1(
2987529873
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<9c870bda750533d8b9982dc8f016f24a>>
10+
* @generated SignedSource<<af8b12272023bc2a05fa4218b5208e67>>
1111
*/
1212

1313
"use strict";
@@ -1264,9 +1264,7 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
12641264
}
12651265
});
12661266
}
1267-
var alwaysThrottleDisappearingFallbacks =
1268-
dynamicFlagsUntyped.alwaysThrottleDisappearingFallbacks,
1269-
alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
1267+
var alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
12701268
consoleManagedByDevToolsDuringStrictMode =
12711269
dynamicFlagsUntyped.consoleManagedByDevToolsDuringStrictMode,
12721270
enableAsyncActions = dynamicFlagsUntyped.enableAsyncActions,
@@ -8363,7 +8361,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
83638361
if (finishedWork.child.flags & 8192) {
83648362
var isShowingFallback = null !== finishedWork.memoizedState;
83658363
current = null !== current && null !== current.memoizedState;
8366-
alwaysThrottleDisappearingFallbacks
8364+
alwaysThrottleRetries
83678365
? isShowingFallback !== current &&
83688366
(globalMostRecentFallbackTime = now())
83698367
: isShowingFallback &&
@@ -10639,7 +10637,7 @@ var roots = new Map(),
1063910637
devToolsConfig$jscomp$inline_1103 = {
1064010638
findFiberByHostInstance: getInstanceFromNode,
1064110639
bundleType: 0,
10642-
version: "18.3.0-canary-c9259216",
10640+
version: "18.3.0-canary-47f8e86b",
1064310641
rendererPackageName: "react-native-renderer",
1064410642
rendererConfig: {
1064510643
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10682,7 +10680,7 @@ var internals$jscomp$inline_1330 = {
1068210680
scheduleRoot: null,
1068310681
setRefreshHandler: null,
1068410682
getCurrentFiber: null,
10685-
reconcilerVersion: "18.3.0-canary-c9259216"
10683+
reconcilerVersion: "18.3.0-canary-47f8e86b"
1068610684
};
1068710685
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1068810686
var hook$jscomp$inline_1331 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-profiling.fb.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<21578182276a5af6944723558c3acba1>>
10+
* @generated SignedSource<<6a58f6f30d7decb0551b12e6d4b29859>>
1111
*/
1212

1313
"use strict";
@@ -1268,9 +1268,7 @@ function dispatchEvent(target, topLevelType, nativeEvent) {
12681268
}
12691269
});
12701270
}
1271-
var alwaysThrottleDisappearingFallbacks =
1272-
dynamicFlagsUntyped.alwaysThrottleDisappearingFallbacks,
1273-
alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
1271+
var alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
12741272
consoleManagedByDevToolsDuringStrictMode =
12751273
dynamicFlagsUntyped.consoleManagedByDevToolsDuringStrictMode,
12761274
enableAsyncActions = dynamicFlagsUntyped.enableAsyncActions,
@@ -8853,7 +8851,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
88538851
if (finishedWork.child.flags & 8192) {
88548852
var isShowingFallback = null !== finishedWork.memoizedState;
88558853
current = null !== current && null !== current.memoizedState;
8856-
alwaysThrottleDisappearingFallbacks
8854+
alwaysThrottleRetries
88578855
? isShowingFallback !== current &&
88588856
(globalMostRecentFallbackTime = now$1())
88598857
: isShowingFallback &&
@@ -11345,7 +11343,7 @@ var roots = new Map(),
1134511343
devToolsConfig$jscomp$inline_1184 = {
1134611344
findFiberByHostInstance: getInstanceFromNode,
1134711345
bundleType: 0,
11348-
version: "18.3.0-canary-12ec6062",
11346+
version: "18.3.0-canary-e35bd692",
1134911347
rendererPackageName: "react-native-renderer",
1135011348
rendererConfig: {
1135111349
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11401,7 +11399,7 @@ var roots = new Map(),
1140111399
scheduleRoot: null,
1140211400
setRefreshHandler: null,
1140311401
getCurrentFiber: null,
11404-
reconcilerVersion: "18.3.0-canary-12ec6062"
11402+
reconcilerVersion: "18.3.0-canary-e35bd692"
1140511403
});
1140611404
exports.createPortal = function (children, containerTag) {
1140711405
return createPortal$1(

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-dev.fb.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<70cb1bafe80360449fbf0dd300a7e96e>>
10+
* @generated SignedSource<<4cb48ae21900db8de9972978bb4b0320>>
1111
*/
1212

1313
"use strict";
@@ -2684,9 +2684,7 @@ to return true:wantsResponderID| |
26842684
var dynamicFlags = dynamicFlagsUntyped; // We destructure each value before re-exporting to avoid a dynamic look-up on
26852685
// the exports object every time a flag is read.
26862686

2687-
var alwaysThrottleDisappearingFallbacks =
2688-
dynamicFlags.alwaysThrottleDisappearingFallbacks,
2689-
alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries,
2687+
var alwaysThrottleRetries = dynamicFlags.alwaysThrottleRetries,
26902688
consoleManagedByDevToolsDuringStrictMode =
26912689
dynamicFlags.consoleManagedByDevToolsDuringStrictMode,
26922690
enableAsyncActions = dynamicFlags.enableAsyncActions,
@@ -24229,7 +24227,7 @@ to return true:wantsResponderID| |
2422924227
var wasShowingFallback =
2423024228
current !== null && current.memoizedState !== null;
2423124229

24232-
if (alwaysThrottleDisappearingFallbacks) {
24230+
if (alwaysThrottleRetries) {
2423324231
if (isShowingFallback !== wasShowingFallback) {
2423424232
// A fallback is either appearing or disappearing.
2423524233
markCommitTimeOfFallback();
@@ -30309,7 +30307,7 @@ to return true:wantsResponderID| |
3030930307
return root;
3031030308
}
3031130309

30312-
var ReactVersion = "18.3.0-canary-f4bcb4ec";
30310+
var ReactVersion = "18.3.0-canary-bdcdb60d";
3031330311

3031430312
function createPortal$1(
3031530313
children,

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-prod.fb.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<416086958671e24cde65e001e852e081>>
10+
* @generated SignedSource<<a799d7b035e7d48a7f39fea2ddd97aa2>>
1111
*/
1212

1313
"use strict";
@@ -1112,8 +1112,6 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
11121112
});
11131113
var ReactSharedInternals =
11141114
React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
1115-
alwaysThrottleDisappearingFallbacks =
1116-
dynamicFlagsUntyped.alwaysThrottleDisappearingFallbacks,
11171115
alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
11181116
consoleManagedByDevToolsDuringStrictMode =
11191117
dynamicFlagsUntyped.consoleManagedByDevToolsDuringStrictMode,
@@ -8473,7 +8471,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
84738471
finishedWork.child.flags & 8192 &&
84748472
((newProps = null !== finishedWork.memoizedState),
84758473
(current = null !== current && null !== current.memoizedState),
8476-
alwaysThrottleDisappearingFallbacks
8474+
alwaysThrottleRetries
84778475
? newProps !== current && (globalMostRecentFallbackTime = now())
84788476
: newProps && !current && (globalMostRecentFallbackTime = now()));
84798477
flags & 4 &&
@@ -10856,7 +10854,7 @@ var roots = new Map(),
1085610854
devToolsConfig$jscomp$inline_1172 = {
1085710855
findFiberByHostInstance: getInstanceFromTag,
1085810856
bundleType: 0,
10859-
version: "18.3.0-canary-1348f1f1",
10857+
version: "18.3.0-canary-b7dca037",
1086010858
rendererPackageName: "react-native-renderer",
1086110859
rendererConfig: {
1086210860
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10899,7 +10897,7 @@ var internals$jscomp$inline_1413 = {
1089910897
scheduleRoot: null,
1090010898
setRefreshHandler: null,
1090110899
getCurrentFiber: null,
10902-
reconcilerVersion: "18.3.0-canary-1348f1f1"
10900+
reconcilerVersion: "18.3.0-canary-b7dca037"
1090310901
};
1090410902
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1090510903
var hook$jscomp$inline_1414 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactNativeRenderer-profiling.fb.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<55938951b43a2261857e0fa831ee395d>>
10+
* @generated SignedSource<<d846fb20fee7854666c856a0f6390694>>
1111
*/
1212

1313
"use strict";
@@ -1116,8 +1116,6 @@ ResponderEventPlugin.injection.injectGlobalResponderHandler({
11161116
});
11171117
var ReactSharedInternals =
11181118
React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
1119-
alwaysThrottleDisappearingFallbacks =
1120-
dynamicFlagsUntyped.alwaysThrottleDisappearingFallbacks,
11211119
alwaysThrottleRetries = dynamicFlagsUntyped.alwaysThrottleRetries,
11221120
consoleManagedByDevToolsDuringStrictMode =
11231121
dynamicFlagsUntyped.consoleManagedByDevToolsDuringStrictMode,
@@ -8963,7 +8961,7 @@ function commitMutationEffectsOnFiber(finishedWork, root) {
89638961
finishedWork.child.flags & 8192 &&
89648962
((newProps = null !== finishedWork.memoizedState),
89658963
(current = null !== current && null !== current.memoizedState),
8966-
alwaysThrottleDisappearingFallbacks
8964+
alwaysThrottleRetries
89678965
? newProps !== current && (globalMostRecentFallbackTime = now$1())
89688966
: newProps && !current && (globalMostRecentFallbackTime = now$1()));
89698967
flags & 4 &&
@@ -11563,7 +11561,7 @@ var roots = new Map(),
1156311561
devToolsConfig$jscomp$inline_1253 = {
1156411562
findFiberByHostInstance: getInstanceFromTag,
1156511563
bundleType: 0,
11566-
version: "18.3.0-canary-336fb33e",
11564+
version: "18.3.0-canary-651a2bf9",
1156711565
rendererPackageName: "react-native-renderer",
1156811566
rendererConfig: {
1156911567
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -11619,7 +11617,7 @@ var roots = new Map(),
1161911617
scheduleRoot: null,
1162011618
setRefreshHandler: null,
1162111619
getCurrentFiber: null,
11622-
reconcilerVersion: "18.3.0-canary-336fb33e"
11620+
reconcilerVersion: "18.3.0-canary-651a2bf9"
1162311621
});
1162411622
exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
1162511623
computeComponentStackForErrorReporting: function (reactTag) {

0 commit comments

Comments
 (0)