Skip to content

Commit b480230

Browse files
sebmarkbagesebmarkbage
committed
Set hidden Offscreen to the shellBoundary regardless of previous state (#32844)
I think this was probably just copy-paste from the Suspense path. It shouldn't matter what the previous state of an Offscreen boundary was. What matters is that it's now hidden and therefore if it suspends, we can just leave it as is without the tree becoming inconsistent. DiffTrain build for [3fbd6b7](3fbd6b7)
1 parent f75bdfd commit b480230

23 files changed

+146
-251
lines changed

‎compiled-rn/VERSION_NATIVE_FB‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.2.0-native-fb-ebf7318e-20250422
1+
19.2.0-native-fb-3fbd6b7b-20250422

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<f016df1eb6a478012d80365da91fa0e3>>
10+
* @generated SignedSource<<619fc57ea8661dca84d6a2d35efb44ac>>
1111
*/
1212

1313
"use strict";
@@ -404,5 +404,5 @@ __DEV__ &&
404404
exports.useFormStatus = function () {
405405
return resolveDispatcher().useHostTransitionStatus();
406406
};
407-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
407+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";
408408
})();

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-prod.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<7062b5550796a072c5b99b383e56e4ff>>
10+
* @generated SignedSource<<a95808a94d4df1b94e07a099f06a7398>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
206+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOM-profiling.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<7062b5550796a072c5b99b383e56e4ff>>
10+
* @generated SignedSource<<a95808a94d4df1b94e07a099f06a7398>>
1111
*/
1212

1313
"use strict";
@@ -203,4 +203,4 @@ exports.useFormState = function (action, initialState, permalink) {
203203
exports.useFormStatus = function () {
204204
return ReactSharedInternals.H.useHostTransitionStatus();
205205
};
206-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
206+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.js‎

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

1313
/*
@@ -6645,18 +6645,11 @@ __DEV__ &&
66456645
: null !== current.memoizedState && (shellBoundary = handler));
66466646
}
66476647
function pushOffscreenSuspenseHandler(fiber) {
6648-
if (22 === fiber.tag) {
6649-
if (
6650-
(push(suspenseStackCursor, suspenseStackCursor.current, fiber),
6648+
22 === fiber.tag
6649+
? (push(suspenseStackCursor, suspenseStackCursor.current, fiber),
66516650
push(suspenseHandlerStackCursor, fiber, fiber),
6652-
null === shellBoundary)
6653-
) {
6654-
var current = fiber.alternate;
6655-
null !== current &&
6656-
null !== current.memoizedState &&
6657-
(shellBoundary = fiber);
6658-
}
6659-
} else reuseSuspenseHandlerOnStack(fiber);
6651+
null === shellBoundary && (shellBoundary = fiber))
6652+
: reuseSuspenseHandlerOnStack(fiber);
66606653
}
66616654
function reuseSuspenseHandlerOnStack(fiber) {
66626655
push(suspenseStackCursor, suspenseStackCursor.current, fiber);
@@ -25894,11 +25887,11 @@ __DEV__ &&
2589425887
};
2589525888
(function () {
2589625889
var isomorphicReactPackageVersion = React.version;
25897-
if ("19.2.0-native-fb-ebf7318e-20250422" !== isomorphicReactPackageVersion)
25890+
if ("19.2.0-native-fb-3fbd6b7b-20250422" !== isomorphicReactPackageVersion)
2589825891
throw Error(
2589925892
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2590025893
(isomorphicReactPackageVersion +
25901-
"\n - react-dom: 19.2.0-native-fb-ebf7318e-20250422\nLearn more: https://react.dev/warnings/version-mismatch")
25894+
"\n - react-dom: 19.2.0-native-fb-3fbd6b7b-20250422\nLearn more: https://react.dev/warnings/version-mismatch")
2590225895
);
2590325896
})();
2590425897
("function" === typeof Map &&
@@ -25935,10 +25928,10 @@ __DEV__ &&
2593525928
!(function () {
2593625929
var internals = {
2593725930
bundleType: 1,
25938-
version: "19.2.0-native-fb-ebf7318e-20250422",
25931+
version: "19.2.0-native-fb-3fbd6b7b-20250422",
2593925932
rendererPackageName: "react-dom",
2594025933
currentDispatcherRef: ReactSharedInternals,
25941-
reconcilerVersion: "19.2.0-native-fb-ebf7318e-20250422"
25934+
reconcilerVersion: "19.2.0-native-fb-3fbd6b7b-20250422"
2594225935
};
2594325936
internals.overrideHookState = overrideHookState;
2594425937
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26082,5 +26075,5 @@ __DEV__ &&
2608226075
listenToAllSupportedEvents(container);
2608326076
return new ReactDOMHydrationRoot(initialChildren);
2608426077
};
26085-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
26078+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";
2608626079
})();

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-prod.js‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<27c6fd481162e9971cf8888fbd80f7bf>>
10+
* @generated SignedSource<<a3127dff7a6fd83ac8ae0f4952eb99fa>>
1111
*/
1212

1313
/*
@@ -4396,18 +4396,11 @@ function pushPrimaryTreeSuspenseHandler(handler) {
43964396
: null !== current.memoizedState && (shellBoundary = handler));
43974397
}
43984398
function pushOffscreenSuspenseHandler(fiber) {
4399-
if (22 === fiber.tag) {
4400-
if (
4401-
(push(suspenseStackCursor, suspenseStackCursor.current),
4399+
22 === fiber.tag
4400+
? (push(suspenseStackCursor, suspenseStackCursor.current),
44024401
push(suspenseHandlerStackCursor, fiber),
4403-
null === shellBoundary)
4404-
) {
4405-
var current = fiber.alternate;
4406-
null !== current &&
4407-
null !== current.memoizedState &&
4408-
(shellBoundary = fiber);
4409-
}
4410-
} else reuseSuspenseHandlerOnStack(fiber);
4402+
null === shellBoundary && (shellBoundary = fiber))
4403+
: reuseSuspenseHandlerOnStack(fiber);
44114404
}
44124405
function reuseSuspenseHandlerOnStack() {
44134406
push(suspenseStackCursor, suspenseStackCursor.current);
@@ -16068,14 +16061,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1606816061
};
1606916062
var isomorphicReactPackageVersion$jscomp$inline_1805 = React.version;
1607016063
if (
16071-
"19.2.0-native-fb-ebf7318e-20250422" !==
16064+
"19.2.0-native-fb-3fbd6b7b-20250422" !==
1607216065
isomorphicReactPackageVersion$jscomp$inline_1805
1607316066
)
1607416067
throw Error(
1607516068
formatProdErrorMessage(
1607616069
527,
1607716070
isomorphicReactPackageVersion$jscomp$inline_1805,
16078-
"19.2.0-native-fb-ebf7318e-20250422"
16071+
"19.2.0-native-fb-3fbd6b7b-20250422"
1607916072
)
1608016073
);
1608116074
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16097,10 +16090,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1609716090
};
1609816091
var internals$jscomp$inline_2267 = {
1609916092
bundleType: 0,
16100-
version: "19.2.0-native-fb-ebf7318e-20250422",
16093+
version: "19.2.0-native-fb-3fbd6b7b-20250422",
1610116094
rendererPackageName: "react-dom",
1610216095
currentDispatcherRef: ReactSharedInternals,
16103-
reconcilerVersion: "19.2.0-native-fb-ebf7318e-20250422"
16096+
reconcilerVersion: "19.2.0-native-fb-3fbd6b7b-20250422"
1610416097
};
1610516098
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1610616099
var hook$jscomp$inline_2268 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16204,4 +16197,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1620416197
listenToAllSupportedEvents(container);
1620516198
return new ReactDOMHydrationRoot(initialChildren);
1620616199
};
16207-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
16200+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-profiling.js‎

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

1313
/*
@@ -4555,18 +4555,11 @@ function pushPrimaryTreeSuspenseHandler(handler) {
45554555
: null !== current.memoizedState && (shellBoundary = handler));
45564556
}
45574557
function pushOffscreenSuspenseHandler(fiber) {
4558-
if (22 === fiber.tag) {
4559-
if (
4560-
(push(suspenseStackCursor, suspenseStackCursor.current),
4558+
22 === fiber.tag
4559+
? (push(suspenseStackCursor, suspenseStackCursor.current),
45614560
push(suspenseHandlerStackCursor, fiber),
4562-
null === shellBoundary)
4563-
) {
4564-
var current = fiber.alternate;
4565-
null !== current &&
4566-
null !== current.memoizedState &&
4567-
(shellBoundary = fiber);
4568-
}
4569-
} else reuseSuspenseHandlerOnStack(fiber);
4561+
null === shellBoundary && (shellBoundary = fiber))
4562+
: reuseSuspenseHandlerOnStack(fiber);
45704563
}
45714564
function reuseSuspenseHandlerOnStack() {
45724565
push(suspenseStackCursor, suspenseStackCursor.current);
@@ -16758,14 +16751,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1675816751
};
1675916752
var isomorphicReactPackageVersion$jscomp$inline_1902 = React.version;
1676016753
if (
16761-
"19.2.0-native-fb-ebf7318e-20250422" !==
16754+
"19.2.0-native-fb-3fbd6b7b-20250422" !==
1676216755
isomorphicReactPackageVersion$jscomp$inline_1902
1676316756
)
1676416757
throw Error(
1676516758
formatProdErrorMessage(
1676616759
527,
1676716760
isomorphicReactPackageVersion$jscomp$inline_1902,
16768-
"19.2.0-native-fb-ebf7318e-20250422"
16761+
"19.2.0-native-fb-3fbd6b7b-20250422"
1676916762
)
1677016763
);
1677116764
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16787,10 +16780,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1678716780
};
1678816781
var internals$jscomp$inline_1909 = {
1678916782
bundleType: 0,
16790-
version: "19.2.0-native-fb-ebf7318e-20250422",
16783+
version: "19.2.0-native-fb-3fbd6b7b-20250422",
1679116784
rendererPackageName: "react-dom",
1679216785
currentDispatcherRef: ReactSharedInternals,
16793-
reconcilerVersion: "19.2.0-native-fb-ebf7318e-20250422",
16786+
reconcilerVersion: "19.2.0-native-fb-3fbd6b7b-20250422",
1679416787
getLaneLabelMap: function () {
1679516788
for (
1679616789
var map = new Map(), lane = 1, index$297 = 0;
@@ -16909,4 +16902,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1690916902
listenToAllSupportedEvents(container);
1691016903
return new ReactDOMHydrationRoot(initialChildren);
1691116904
};
16912-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
16905+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-dev.js‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<a9985603d46d67bdef79df00a4a15498>>
10+
* @generated SignedSource<<93513ba89942ff029fc57026db72661a>>
1111
*/
1212

1313
/*
@@ -6653,18 +6653,11 @@ __DEV__ &&
66536653
: null !== current.memoizedState && (shellBoundary = handler));
66546654
}
66556655
function pushOffscreenSuspenseHandler(fiber) {
6656-
if (22 === fiber.tag) {
6657-
if (
6658-
(push(suspenseStackCursor, suspenseStackCursor.current, fiber),
6656+
22 === fiber.tag
6657+
? (push(suspenseStackCursor, suspenseStackCursor.current, fiber),
66596658
push(suspenseHandlerStackCursor, fiber, fiber),
6660-
null === shellBoundary)
6661-
) {
6662-
var current = fiber.alternate;
6663-
null !== current &&
6664-
null !== current.memoizedState &&
6665-
(shellBoundary = fiber);
6666-
}
6667-
} else reuseSuspenseHandlerOnStack(fiber);
6659+
null === shellBoundary && (shellBoundary = fiber))
6660+
: reuseSuspenseHandlerOnStack(fiber);
66686661
}
66696662
function reuseSuspenseHandlerOnStack(fiber) {
66706663
push(suspenseStackCursor, suspenseStackCursor.current, fiber);
@@ -25955,11 +25948,11 @@ __DEV__ &&
2595525948
};
2595625949
(function () {
2595725950
var isomorphicReactPackageVersion = React.version;
25958-
if ("19.2.0-native-fb-ebf7318e-20250422" !== isomorphicReactPackageVersion)
25951+
if ("19.2.0-native-fb-3fbd6b7b-20250422" !== isomorphicReactPackageVersion)
2595925952
throw Error(
2596025953
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2596125954
(isomorphicReactPackageVersion +
25962-
"\n - react-dom: 19.2.0-native-fb-ebf7318e-20250422\nLearn more: https://react.dev/warnings/version-mismatch")
25955+
"\n - react-dom: 19.2.0-native-fb-3fbd6b7b-20250422\nLearn more: https://react.dev/warnings/version-mismatch")
2596325956
);
2596425957
})();
2596525958
("function" === typeof Map &&
@@ -25996,10 +25989,10 @@ __DEV__ &&
2599625989
!(function () {
2599725990
var internals = {
2599825991
bundleType: 1,
25999-
version: "19.2.0-native-fb-ebf7318e-20250422",
25992+
version: "19.2.0-native-fb-3fbd6b7b-20250422",
2600025993
rendererPackageName: "react-dom",
2600125994
currentDispatcherRef: ReactSharedInternals,
26002-
reconcilerVersion: "19.2.0-native-fb-ebf7318e-20250422"
25995+
reconcilerVersion: "19.2.0-native-fb-3fbd6b7b-20250422"
2600325996
};
2600425997
internals.overrideHookState = overrideHookState;
2600525998
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26459,7 +26452,7 @@ __DEV__ &&
2645926452
exports.useFormStatus = function () {
2646026453
return resolveDispatcher().useHostTransitionStatus();
2646126454
};
26462-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
26455+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";
2646326456
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2646426457
"function" ===
2646526458
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-prod.js‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<acdde4a372fd1e9a0a62374e97dc9590>>
10+
* @generated SignedSource<<8825c1fbeb6ed8b172e8e0efcd4e7e87>>
1111
*/
1212

1313
/*
@@ -4396,18 +4396,11 @@ function pushPrimaryTreeSuspenseHandler(handler) {
43964396
: null !== current.memoizedState && (shellBoundary = handler));
43974397
}
43984398
function pushOffscreenSuspenseHandler(fiber) {
4399-
if (22 === fiber.tag) {
4400-
if (
4401-
(push(suspenseStackCursor, suspenseStackCursor.current),
4399+
22 === fiber.tag
4400+
? (push(suspenseStackCursor, suspenseStackCursor.current),
44024401
push(suspenseHandlerStackCursor, fiber),
4403-
null === shellBoundary)
4404-
) {
4405-
var current = fiber.alternate;
4406-
null !== current &&
4407-
null !== current.memoizedState &&
4408-
(shellBoundary = fiber);
4409-
}
4410-
} else reuseSuspenseHandlerOnStack(fiber);
4402+
null === shellBoundary && (shellBoundary = fiber))
4403+
: reuseSuspenseHandlerOnStack(fiber);
44114404
}
44124405
function reuseSuspenseHandlerOnStack() {
44134406
push(suspenseStackCursor, suspenseStackCursor.current);
@@ -16079,14 +16072,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1607916072
};
1608016073
var isomorphicReactPackageVersion$jscomp$inline_1806 = React.version;
1608116074
if (
16082-
"19.2.0-native-fb-ebf7318e-20250422" !==
16075+
"19.2.0-native-fb-3fbd6b7b-20250422" !==
1608316076
isomorphicReactPackageVersion$jscomp$inline_1806
1608416077
)
1608516078
throw Error(
1608616079
formatProdErrorMessage(
1608716080
527,
1608816081
isomorphicReactPackageVersion$jscomp$inline_1806,
16089-
"19.2.0-native-fb-ebf7318e-20250422"
16082+
"19.2.0-native-fb-3fbd6b7b-20250422"
1609016083
)
1609116084
);
1609216085
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16108,10 +16101,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1610816101
};
1610916102
var internals$jscomp$inline_2270 = {
1611016103
bundleType: 0,
16111-
version: "19.2.0-native-fb-ebf7318e-20250422",
16104+
version: "19.2.0-native-fb-3fbd6b7b-20250422",
1611216105
rendererPackageName: "react-dom",
1611316106
currentDispatcherRef: ReactSharedInternals,
16114-
reconcilerVersion: "19.2.0-native-fb-ebf7318e-20250422"
16107+
reconcilerVersion: "19.2.0-native-fb-3fbd6b7b-20250422"
1611516108
};
1611616109
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1611716110
var hook$jscomp$inline_2271 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16369,4 +16362,4 @@ exports.useFormState = function (action, initialState, permalink) {
1636916362
exports.useFormStatus = function () {
1637016363
return ReactSharedInternals.H.useHostTransitionStatus();
1637116364
};
16372-
exports.version = "19.2.0-native-fb-ebf7318e-20250422";
16365+
exports.version = "19.2.0-native-fb-3fbd6b7b-20250422";

0 commit comments

Comments
 (0)