Skip to content

Commit ea06e7b

Browse files
committed
Make RefStatic and LayoutStatic the same bit (#31965)
Refs are basically just fancy Layout Effects. These are conceptually the same thing and are always visited together so they don't need to be different flags. Whenever we disappear/reappear Offscreen content we need to do both Refs and Layout Effects. This is just indicating which phase needs to be visited and these are always the same phase. DiffTrain build for [3b009b4](3b009b4)
1 parent 9619b0d commit ea06e7b

23 files changed

+216
-216
lines changed

Diff for: compiled-rn/VERSION_NATIVE_FB

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.1.0-native-fb-c81312e3-20250102
1+
19.1.0-native-fb-3b009b4c-20250102

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<02a6ea8d2bfe1b4a480a21cbc05c590b>>
10+
* @generated SignedSource<<9bd134138f5b06cd767f897c60d22200>>
1111
*/
1212

1313
"use strict";
@@ -420,5 +420,5 @@ __DEV__ &&
420420
exports.useFormStatus = function () {
421421
return resolveDispatcher().useHostTransitionStatus();
422422
};
423-
exports.version = "19.1.0-native-fb-c81312e3-20250102";
423+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";
424424
})();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<355537d2f428007d2a3d9028e140f67d>>
10+
* @generated SignedSource<<0948aeab04f6f5ed7045a019b211bcec>>
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.1.0-native-fb-c81312e3-20250102";
206+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<355537d2f428007d2a3d9028e140f67d>>
10+
* @generated SignedSource<<0948aeab04f6f5ed7045a019b211bcec>>
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.1.0-native-fb-c81312e3-20250102";
206+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<745520964ed6c79b6f2de315054c84d6>>
10+
* @generated SignedSource<<03613344aa6068afaba47c44eeaf2e5f>>
1111
*/
1212

1313
/*
@@ -5803,7 +5803,7 @@ __DEV__ &&
58035803
null;
58045804
hookTypesUpdateIndexDev = -1;
58055805
null !== current &&
5806-
(current.flags & 31457280) !== (workInProgress.flags & 31457280) &&
5806+
(current.flags & 29360128) !== (workInProgress.flags & 29360128) &&
58075807
(current.mode & ConcurrentMode) !== NoMode &&
58085808
error$jscomp$0(
58095809
"Internal React error: Expected static flag was missing. Please notify the React team."
@@ -9174,14 +9174,14 @@ __DEV__ &&
91749174
if (null === ref)
91759175
null !== current &&
91769176
null !== current.ref &&
9177-
(workInProgress.flags |= 2097664);
9177+
(workInProgress.flags |= 4194816);
91789178
else {
91799179
if ("function" !== typeof ref && "object" !== typeof ref)
91809180
throw Error(
91819181
"Expected ref to be a function, an object returned by React.createRef(), or undefined/null."
91829182
);
91839183
if (null === current || current.ref !== ref)
9184-
workInProgress.flags |= 2097664;
9184+
workInProgress.flags |= 4194816;
91859185
}
91869186
}
91879187
function updateFunctionComponent(
@@ -10033,7 +10033,7 @@ __DEV__ &&
1003310033
componentStack
1003410034
)),
1003510035
(JSCompiler_object_inline_stack_2404.subtreeFlags =
10036-
JSCompiler_temp.subtreeFlags & 31457280)),
10036+
JSCompiler_temp.subtreeFlags & 29360128)),
1003710037
null !== instance
1003810038
? (JSCompiler_object_inline_componentStack_2405 =
1003910039
createWorkInProgress(
@@ -14035,7 +14035,7 @@ __DEV__ &&
1403514035
(workInProgress.deletions = null),
1403614036
(workInProgress.actualDuration = -0),
1403714037
(workInProgress.actualStartTime = -1.1));
14038-
workInProgress.flags = current.flags & 31457280;
14038+
workInProgress.flags = current.flags & 29360128;
1403914039
workInProgress.childLanes = current.childLanes;
1404014040
workInProgress.lanes = current.lanes;
1404114041
workInProgress.child = current.child;
@@ -14073,7 +14073,7 @@ __DEV__ &&
1407314073
return workInProgress;
1407414074
}
1407514075
function resetWorkInProgress(workInProgress, renderLanes) {
14076-
workInProgress.flags &= 31457282;
14076+
workInProgress.flags &= 29360130;
1407714077
var current = workInProgress.alternate;
1407814078
null === current
1407914079
? ((workInProgress.childLanes = 0),
@@ -14383,8 +14383,8 @@ __DEV__ &&
1438314383

1438414384
)
1438514385
(newChildLanes |= _child2.lanes | _child2.childLanes),
14386-
(subtreeFlags |= _child2.subtreeFlags & 31457280),
14387-
(subtreeFlags |= _child2.flags & 31457280),
14386+
(subtreeFlags |= _child2.subtreeFlags & 29360128),
14387+
(subtreeFlags |= _child2.flags & 29360128),
1438814388
(_treeBaseDuration += _child2.treeBaseDuration),
1438914389
(_child2 = _child2.sibling);
1439014390
completedWork.treeBaseDuration = _treeBaseDuration;
@@ -14396,8 +14396,8 @@ __DEV__ &&
1439614396
)
1439714397
(newChildLanes |=
1439814398
_treeBaseDuration.lanes | _treeBaseDuration.childLanes),
14399-
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 31457280),
14400-
(subtreeFlags |= _treeBaseDuration.flags & 31457280),
14399+
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 29360128),
14400+
(subtreeFlags |= _treeBaseDuration.flags & 29360128),
1440114401
(_treeBaseDuration.return = completedWork),
1440214402
(_treeBaseDuration = _treeBaseDuration.sibling);
1440314403
else if ((completedWork.mode & ProfileMode) !== NoMode) {
@@ -25886,11 +25886,11 @@ __DEV__ &&
2588625886
};
2588725887
(function () {
2588825888
var isomorphicReactPackageVersion = React.version;
25889-
if ("19.1.0-native-fb-c81312e3-20250102" !== isomorphicReactPackageVersion)
25889+
if ("19.1.0-native-fb-3b009b4c-20250102" !== isomorphicReactPackageVersion)
2589025890
throw Error(
2589125891
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2589225892
(isomorphicReactPackageVersion +
25893-
"\n - react-dom: 19.1.0-native-fb-c81312e3-20250102\nLearn more: https://react.dev/warnings/version-mismatch")
25893+
"\n - react-dom: 19.1.0-native-fb-3b009b4c-20250102\nLearn more: https://react.dev/warnings/version-mismatch")
2589425894
);
2589525895
})();
2589625896
("function" === typeof Map &&
@@ -25927,10 +25927,10 @@ __DEV__ &&
2592725927
!(function () {
2592825928
var internals = {
2592925929
bundleType: 1,
25930-
version: "19.1.0-native-fb-c81312e3-20250102",
25930+
version: "19.1.0-native-fb-3b009b4c-20250102",
2593125931
rendererPackageName: "react-dom",
2593225932
currentDispatcherRef: ReactSharedInternals,
25933-
reconcilerVersion: "19.1.0-native-fb-c81312e3-20250102"
25933+
reconcilerVersion: "19.1.0-native-fb-3b009b4c-20250102"
2593425934
};
2593525935
internals.overrideHookState = overrideHookState;
2593625936
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26076,5 +26076,5 @@ __DEV__ &&
2607626076
listenToAllSupportedEvents(container);
2607726077
return new ReactDOMHydrationRoot(initialChildren);
2607826078
};
26079-
exports.version = "19.1.0-native-fb-c81312e3-20250102";
26079+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";
2608026080
})();

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<bb41d3131a5eec7fa65c17e87fad9c6f>>
10+
* @generated SignedSource<<4ed2f264bde385ff618b27f469c22dc6>>
1111
*/
1212

1313
/*
@@ -6404,12 +6404,12 @@ function markRef(current, workInProgress) {
64046404
if (null === ref)
64056405
null !== current &&
64066406
null !== current.ref &&
6407-
(workInProgress.flags |= 2097664);
6407+
(workInProgress.flags |= 4194816);
64086408
else {
64096409
if ("function" !== typeof ref && "object" !== typeof ref)
64106410
throw Error(formatProdErrorMessage(284));
64116411
if (null === current || current.ref !== ref)
6412-
workInProgress.flags |= 2097664;
6412+
workInProgress.flags |= 4194816;
64136413
}
64146414
}
64156415
function updateFunctionComponent(
@@ -7029,7 +7029,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
70297029
didSuspend
70307030
)),
70317031
(nextProps.subtreeFlags =
7032-
JSCompiler_temp$jscomp$0.subtreeFlags & 31457280)),
7032+
JSCompiler_temp$jscomp$0.subtreeFlags & 29360128)),
70337033
null !== digest
70347034
? (showFallback = createWorkInProgress(digest, showFallback))
70357035
: ((showFallback = createFiberFromFragment(
@@ -10012,7 +10012,7 @@ function createWorkInProgress(current, pendingProps) {
1001210012
(workInProgress.flags = 0),
1001310013
(workInProgress.subtreeFlags = 0),
1001410014
(workInProgress.deletions = null));
10015-
workInProgress.flags = current.flags & 31457280;
10015+
workInProgress.flags = current.flags & 29360128;
1001610016
workInProgress.childLanes = current.childLanes;
1001710017
workInProgress.lanes = current.lanes;
1001810018
workInProgress.child = current.child;
@@ -10031,7 +10031,7 @@ function createWorkInProgress(current, pendingProps) {
1003110031
return workInProgress;
1003210032
}
1003310033
function resetWorkInProgress(workInProgress, renderLanes) {
10034-
workInProgress.flags &= 31457282;
10034+
workInProgress.flags &= 29360130;
1003510035
var current = workInProgress.alternate;
1003610036
null === current
1003710037
? ((workInProgress.childLanes = 0),
@@ -10265,8 +10265,8 @@ function bubbleProperties(completedWork) {
1026510265
if (didBailout)
1026610266
for (var child$144 = completedWork.child; null !== child$144; )
1026710267
(newChildLanes |= child$144.lanes | child$144.childLanes),
10268-
(subtreeFlags |= child$144.subtreeFlags & 31457280),
10269-
(subtreeFlags |= child$144.flags & 31457280),
10268+
(subtreeFlags |= child$144.subtreeFlags & 29360128),
10269+
(subtreeFlags |= child$144.flags & 29360128),
1027010270
(child$144.return = completedWork),
1027110271
(child$144 = child$144.sibling);
1027210272
else
@@ -15904,14 +15904,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1590415904
};
1590515905
var isomorphicReactPackageVersion$jscomp$inline_1754 = React.version;
1590615906
if (
15907-
"19.1.0-native-fb-c81312e3-20250102" !==
15907+
"19.1.0-native-fb-3b009b4c-20250102" !==
1590815908
isomorphicReactPackageVersion$jscomp$inline_1754
1590915909
)
1591015910
throw Error(
1591115911
formatProdErrorMessage(
1591215912
527,
1591315913
isomorphicReactPackageVersion$jscomp$inline_1754,
15914-
"19.1.0-native-fb-c81312e3-20250102"
15914+
"19.1.0-native-fb-3b009b4c-20250102"
1591515915
)
1591615916
);
1591715917
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15933,10 +15933,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1593315933
};
1593415934
var internals$jscomp$inline_2202 = {
1593515935
bundleType: 0,
15936-
version: "19.1.0-native-fb-c81312e3-20250102",
15936+
version: "19.1.0-native-fb-3b009b4c-20250102",
1593715937
rendererPackageName: "react-dom",
1593815938
currentDispatcherRef: ReactSharedInternals,
15939-
reconcilerVersion: "19.1.0-native-fb-c81312e3-20250102"
15939+
reconcilerVersion: "19.1.0-native-fb-3b009b4c-20250102"
1594015940
};
1594115941
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1594215942
var hook$jscomp$inline_2203 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16042,4 +16042,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1604216042
listenToAllSupportedEvents(container);
1604316043
return new ReactDOMHydrationRoot(initialChildren);
1604416044
};
16045-
exports.version = "19.1.0-native-fb-c81312e3-20250102";
16045+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<53e0e8022b3f83c6e0ef6bcd5ac4e7e1>>
10+
* @generated SignedSource<<77dbda27b5049a4b3f2def588adb6ecc>>
1111
*/
1212

1313
/*
@@ -6547,12 +6547,12 @@ function markRef(current, workInProgress) {
65476547
if (null === ref)
65486548
null !== current &&
65496549
null !== current.ref &&
6550-
(workInProgress.flags |= 2097664);
6550+
(workInProgress.flags |= 4194816);
65516551
else {
65526552
if ("function" !== typeof ref && "object" !== typeof ref)
65536553
throw Error(formatProdErrorMessage(284));
65546554
if (null === current || current.ref !== ref)
6555-
workInProgress.flags |= 2097664;
6555+
workInProgress.flags |= 4194816;
65566556
}
65576557
}
65586558
function updateFunctionComponent(
@@ -7190,7 +7190,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
71907190
didSuspend
71917191
)),
71927192
(nextProps.subtreeFlags =
7193-
JSCompiler_temp$jscomp$0.subtreeFlags & 31457280)),
7193+
JSCompiler_temp$jscomp$0.subtreeFlags & 29360128)),
71947194
null !== digest
71957195
? (showFallback = createWorkInProgress(digest, showFallback))
71967196
: ((showFallback = createFiberFromFragment(
@@ -10445,7 +10445,7 @@ function createWorkInProgress(current, pendingProps) {
1044510445
(workInProgress.deletions = null),
1044610446
(workInProgress.actualDuration = -0),
1044710447
(workInProgress.actualStartTime = -1.1));
10448-
workInProgress.flags = current.flags & 31457280;
10448+
workInProgress.flags = current.flags & 29360128;
1044910449
workInProgress.childLanes = current.childLanes;
1045010450
workInProgress.lanes = current.lanes;
1045110451
workInProgress.child = current.child;
@@ -10466,7 +10466,7 @@ function createWorkInProgress(current, pendingProps) {
1046610466
return workInProgress;
1046710467
}
1046810468
function resetWorkInProgress(workInProgress, renderLanes) {
10469-
workInProgress.flags &= 31457282;
10469+
workInProgress.flags &= 29360130;
1047010470
var current = workInProgress.alternate;
1047110471
null === current
1047210472
? ((workInProgress.childLanes = 0),
@@ -10711,8 +10711,8 @@ function bubbleProperties(completedWork) {
1071110711

1071210712
)
1071310713
(newChildLanes |= child$156.lanes | child$156.childLanes),
10714-
(subtreeFlags |= child$156.subtreeFlags & 31457280),
10715-
(subtreeFlags |= child$156.flags & 31457280),
10714+
(subtreeFlags |= child$156.subtreeFlags & 29360128),
10715+
(subtreeFlags |= child$156.flags & 29360128),
1071610716
(treeBaseDuration$155 += child$156.treeBaseDuration),
1071710717
(child$156 = child$156.sibling);
1071810718
completedWork.treeBaseDuration = treeBaseDuration$155;
@@ -10724,8 +10724,8 @@ function bubbleProperties(completedWork) {
1072410724
)
1072510725
(newChildLanes |=
1072610726
treeBaseDuration$155.lanes | treeBaseDuration$155.childLanes),
10727-
(subtreeFlags |= treeBaseDuration$155.subtreeFlags & 31457280),
10728-
(subtreeFlags |= treeBaseDuration$155.flags & 31457280),
10727+
(subtreeFlags |= treeBaseDuration$155.subtreeFlags & 29360128),
10728+
(subtreeFlags |= treeBaseDuration$155.flags & 29360128),
1072910729
(treeBaseDuration$155.return = completedWork),
1073010730
(treeBaseDuration$155 = treeBaseDuration$155.sibling);
1073110731
else if (0 !== (completedWork.mode & 2)) {
@@ -16551,14 +16551,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1655116551
};
1655216552
var isomorphicReactPackageVersion$jscomp$inline_1849 = React.version;
1655316553
if (
16554-
"19.1.0-native-fb-c81312e3-20250102" !==
16554+
"19.1.0-native-fb-3b009b4c-20250102" !==
1655516555
isomorphicReactPackageVersion$jscomp$inline_1849
1655616556
)
1655716557
throw Error(
1655816558
formatProdErrorMessage(
1655916559
527,
1656016560
isomorphicReactPackageVersion$jscomp$inline_1849,
16561-
"19.1.0-native-fb-c81312e3-20250102"
16561+
"19.1.0-native-fb-3b009b4c-20250102"
1656216562
)
1656316563
);
1656416564
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16580,10 +16580,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1658016580
};
1658116581
var internals$jscomp$inline_1856 = {
1658216582
bundleType: 0,
16583-
version: "19.1.0-native-fb-c81312e3-20250102",
16583+
version: "19.1.0-native-fb-3b009b4c-20250102",
1658416584
rendererPackageName: "react-dom",
1658516585
currentDispatcherRef: ReactSharedInternals,
16586-
reconcilerVersion: "19.1.0-native-fb-c81312e3-20250102",
16586+
reconcilerVersion: "19.1.0-native-fb-3b009b4c-20250102",
1658716587
getLaneLabelMap: function () {
1658816588
for (
1658916589
var map = new Map(), lane = 1, index$294 = 0;
@@ -16704,4 +16704,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1670416704
listenToAllSupportedEvents(container);
1670516705
return new ReactDOMHydrationRoot(initialChildren);
1670616706
};
16707-
exports.version = "19.1.0-native-fb-c81312e3-20250102";
16707+
exports.version = "19.1.0-native-fb-3b009b4c-20250102";

0 commit comments

Comments
 (0)