Skip to content

Commit 9918c8b

Browse files
committed
Make RefStatic and LayoutStatic the same bit (facebook#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](facebook@3b009b4)
1 parent aebbe0e commit 9918c8b

34 files changed

+260
-260
lines changed

compiled/facebook-www/REVISION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
220dece92b9ab5f8867a589f8104b15717d68d2f
1+
3b009b4cd58d382cfde2a72232c87df1a34d56d5
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
220dece92b9ab5f8867a589f8104b15717d68d2f
1+
3b009b4cd58d382cfde2a72232c87df1a34d56d5

compiled/facebook-www/React-dev.classic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1942,7 +1942,7 @@ __DEV__ &&
19421942
exports.useTransition = function () {
19431943
return resolveDispatcher().useTransition();
19441944
};
1945-
exports.version = "19.1.0-www-classic-220dece9-20250102";
1945+
exports.version = "19.1.0-www-classic-3b009b4c-20250102";
19461946
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
19471947
"function" ===
19481948
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-dev.modern.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1942,7 +1942,7 @@ __DEV__ &&
19421942
exports.useTransition = function () {
19431943
return resolveDispatcher().useTransition();
19441944
};
1945-
exports.version = "19.1.0-www-modern-220dece9-20250102";
1945+
exports.version = "19.1.0-www-modern-3b009b4c-20250102";
19461946
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
19471947
"function" ===
19481948
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-prod.classic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,4 +630,4 @@ exports.useSyncExternalStore = function (
630630
exports.useTransition = function () {
631631
return ReactSharedInternals.H.useTransition();
632632
};
633-
exports.version = "19.1.0-www-classic-220dece9-20250102";
633+
exports.version = "19.1.0-www-classic-3b009b4c-20250102";

compiled/facebook-www/React-prod.modern.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -630,4 +630,4 @@ exports.useSyncExternalStore = function (
630630
exports.useTransition = function () {
631631
return ReactSharedInternals.H.useTransition();
632632
};
633-
exports.version = "19.1.0-www-modern-220dece9-20250102";
633+
exports.version = "19.1.0-www-modern-3b009b4c-20250102";

compiled/facebook-www/React-profiling.classic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ exports.useSyncExternalStore = function (
634634
exports.useTransition = function () {
635635
return ReactSharedInternals.H.useTransition();
636636
};
637-
exports.version = "19.1.0-www-classic-220dece9-20250102";
637+
exports.version = "19.1.0-www-classic-3b009b4c-20250102";
638638
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
639639
"function" ===
640640
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

compiled/facebook-www/React-profiling.modern.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ exports.useSyncExternalStore = function (
634634
exports.useTransition = function () {
635635
return ReactSharedInternals.H.useTransition();
636636
};
637-
exports.version = "19.1.0-www-modern-220dece9-20250102";
637+
exports.version = "19.1.0-www-modern-3b009b4c-20250102";
638638
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
639639
"function" ===
640640
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -3251,7 +3251,7 @@ __DEV__ &&
32513251
null;
32523252
hookTypesUpdateIndexDev = -1;
32533253
null !== current &&
3254-
(current.flags & 31457280) !== (workInProgress.flags & 31457280) &&
3254+
(current.flags & 29360128) !== (workInProgress.flags & 29360128) &&
32553255
error$jscomp$0(
32563256
"Internal React error: Expected static flag was missing. Please notify the React team."
32573257
);
@@ -6613,14 +6613,14 @@ __DEV__ &&
66136613
if (null === ref)
66146614
null !== current &&
66156615
null !== current.ref &&
6616-
(workInProgress.flags |= 2097664);
6616+
(workInProgress.flags |= 4194816);
66176617
else {
66186618
if ("function" !== typeof ref && "object" !== typeof ref)
66196619
throw Error(
66206620
"Expected ref to be a function, an object returned by React.createRef(), or undefined/null."
66216621
);
66226622
if (null === current || current.ref !== ref)
6623-
workInProgress.flags |= 2097664;
6623+
workInProgress.flags |= 4194816;
66246624
}
66256625
}
66266626
function updateFunctionComponent(
@@ -7655,7 +7655,7 @@ __DEV__ &&
76557655
mode: "hidden",
76567656
children: nextProps.children
76577657
});
7658-
nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280;
7658+
nextProps.subtreeFlags = didSuspend.subtreeFlags & 29360128;
76597659
null !== currentFallbackChildFragment
76607660
? (nextPrimaryChildren = createWorkInProgress(
76617661
currentFallbackChildFragment,
@@ -8907,8 +8907,8 @@ __DEV__ &&
89078907

89088908
)
89098909
(newChildLanes |= _child2.lanes | _child2.childLanes),
8910-
(subtreeFlags |= _child2.subtreeFlags & 31457280),
8911-
(subtreeFlags |= _child2.flags & 31457280),
8910+
(subtreeFlags |= _child2.subtreeFlags & 29360128),
8911+
(subtreeFlags |= _child2.flags & 29360128),
89128912
(_treeBaseDuration += _child2.treeBaseDuration),
89138913
(_child2 = _child2.sibling);
89148914
completedWork.treeBaseDuration = _treeBaseDuration;
@@ -8920,8 +8920,8 @@ __DEV__ &&
89208920
)
89218921
(newChildLanes |=
89228922
_treeBaseDuration.lanes | _treeBaseDuration.childLanes),
8923-
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 31457280),
8924-
(subtreeFlags |= _treeBaseDuration.flags & 31457280),
8923+
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 29360128),
8924+
(subtreeFlags |= _treeBaseDuration.flags & 29360128),
89258925
(_treeBaseDuration.return = completedWork),
89268926
(_treeBaseDuration = _treeBaseDuration.sibling);
89278927
else if (0 !== (completedWork.mode & 2)) {
@@ -14151,7 +14151,7 @@ __DEV__ &&
1415114151
(workInProgress.deletions = null),
1415214152
(workInProgress.actualDuration = -0),
1415314153
(workInProgress.actualStartTime = -1.1));
14154-
workInProgress.flags = current.flags & 31457280;
14154+
workInProgress.flags = current.flags & 29360128;
1415514155
workInProgress.childLanes = current.childLanes;
1415614156
workInProgress.lanes = current.lanes;
1415714157
workInProgress.child = current.child;
@@ -14189,7 +14189,7 @@ __DEV__ &&
1418914189
return workInProgress;
1419014190
}
1419114191
function resetWorkInProgress(workInProgress, renderLanes) {
14192-
workInProgress.flags &= 31457282;
14192+
workInProgress.flags &= 29360130;
1419314193
var current = workInProgress.alternate;
1419414194
null === current
1419514195
? ((workInProgress.childLanes = 0),
@@ -16914,10 +16914,10 @@ __DEV__ &&
1691416914
(function () {
1691516915
var internals = {
1691616916
bundleType: 1,
16917-
version: "19.1.0-www-classic-220dece9-20250102",
16917+
version: "19.1.0-www-classic-3b009b4c-20250102",
1691816918
rendererPackageName: "react-art",
1691916919
currentDispatcherRef: ReactSharedInternals,
16920-
reconcilerVersion: "19.1.0-www-classic-220dece9-20250102"
16920+
reconcilerVersion: "19.1.0-www-classic-3b009b4c-20250102"
1692116921
};
1692216922
internals.overrideHookState = overrideHookState;
1692316923
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -16951,7 +16951,7 @@ __DEV__ &&
1695116951
exports.Shape = Shape;
1695216952
exports.Surface = Surface;
1695316953
exports.Text = Text;
16954-
exports.version = "19.1.0-www-classic-220dece9-20250102";
16954+
exports.version = "19.1.0-www-classic-3b009b4c-20250102";
1695516955
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1695616956
"function" ===
1695716957
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -3143,7 +3143,7 @@ __DEV__ &&
31433143
null;
31443144
hookTypesUpdateIndexDev = -1;
31453145
null !== current &&
3146-
(current.flags & 31457280) !== (workInProgress.flags & 31457280) &&
3146+
(current.flags & 29360128) !== (workInProgress.flags & 29360128) &&
31473147
error$jscomp$0(
31483148
"Internal React error: Expected static flag was missing. Please notify the React team."
31493149
);
@@ -6505,14 +6505,14 @@ __DEV__ &&
65056505
if (null === ref)
65066506
null !== current &&
65076507
null !== current.ref &&
6508-
(workInProgress.flags |= 2097664);
6508+
(workInProgress.flags |= 4194816);
65096509
else {
65106510
if ("function" !== typeof ref && "object" !== typeof ref)
65116511
throw Error(
65126512
"Expected ref to be a function, an object returned by React.createRef(), or undefined/null."
65136513
);
65146514
if (null === current || current.ref !== ref)
6515-
workInProgress.flags |= 2097664;
6515+
workInProgress.flags |= 4194816;
65166516
}
65176517
}
65186518
function updateFunctionComponent(
@@ -7472,7 +7472,7 @@ __DEV__ &&
74727472
mode: "hidden",
74737473
children: nextProps.children
74747474
});
7475-
nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280;
7475+
nextProps.subtreeFlags = didSuspend.subtreeFlags & 29360128;
74767476
null !== currentFallbackChildFragment
74777477
? (nextPrimaryChildren = createWorkInProgress(
74787478
currentFallbackChildFragment,
@@ -8725,8 +8725,8 @@ __DEV__ &&
87258725

87268726
)
87278727
(newChildLanes |= _child2.lanes | _child2.childLanes),
8728-
(subtreeFlags |= _child2.subtreeFlags & 31457280),
8729-
(subtreeFlags |= _child2.flags & 31457280),
8728+
(subtreeFlags |= _child2.subtreeFlags & 29360128),
8729+
(subtreeFlags |= _child2.flags & 29360128),
87308730
(_treeBaseDuration += _child2.treeBaseDuration),
87318731
(_child2 = _child2.sibling);
87328732
completedWork.treeBaseDuration = _treeBaseDuration;
@@ -8738,8 +8738,8 @@ __DEV__ &&
87388738
)
87398739
(newChildLanes |=
87408740
_treeBaseDuration.lanes | _treeBaseDuration.childLanes),
8741-
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 31457280),
8742-
(subtreeFlags |= _treeBaseDuration.flags & 31457280),
8741+
(subtreeFlags |= _treeBaseDuration.subtreeFlags & 29360128),
8742+
(subtreeFlags |= _treeBaseDuration.flags & 29360128),
87438743
(_treeBaseDuration.return = completedWork),
87448744
(_treeBaseDuration = _treeBaseDuration.sibling);
87458745
else if (0 !== (completedWork.mode & 2)) {
@@ -13951,7 +13951,7 @@ __DEV__ &&
1395113951
(workInProgress.deletions = null),
1395213952
(workInProgress.actualDuration = -0),
1395313953
(workInProgress.actualStartTime = -1.1));
13954-
workInProgress.flags = current.flags & 31457280;
13954+
workInProgress.flags = current.flags & 29360128;
1395513955
workInProgress.childLanes = current.childLanes;
1395613956
workInProgress.lanes = current.lanes;
1395713957
workInProgress.child = current.child;
@@ -13989,7 +13989,7 @@ __DEV__ &&
1398913989
return workInProgress;
1399013990
}
1399113991
function resetWorkInProgress(workInProgress, renderLanes) {
13992-
workInProgress.flags &= 31457282;
13992+
workInProgress.flags &= 29360130;
1399313993
var current = workInProgress.alternate;
1399413994
null === current
1399513995
? ((workInProgress.childLanes = 0),
@@ -16677,10 +16677,10 @@ __DEV__ &&
1667716677
(function () {
1667816678
var internals = {
1667916679
bundleType: 1,
16680-
version: "19.1.0-www-modern-220dece9-20250102",
16680+
version: "19.1.0-www-modern-3b009b4c-20250102",
1668116681
rendererPackageName: "react-art",
1668216682
currentDispatcherRef: ReactSharedInternals,
16683-
reconcilerVersion: "19.1.0-www-modern-220dece9-20250102"
16683+
reconcilerVersion: "19.1.0-www-modern-3b009b4c-20250102"
1668416684
};
1668516685
internals.overrideHookState = overrideHookState;
1668616686
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -16714,7 +16714,7 @@ __DEV__ &&
1671416714
exports.Shape = Shape;
1671516715
exports.Surface = Surface;
1671616716
exports.Text = Text;
16717-
exports.version = "19.1.0-www-modern-220dece9-20250102";
16717+
exports.version = "19.1.0-www-modern-3b009b4c-20250102";
1671816718
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1671916719
"function" ===
1672016720
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -4927,12 +4927,12 @@ function markRef(current, workInProgress) {
49274927
if (null === ref)
49284928
null !== current &&
49294929
null !== current.ref &&
4930-
(workInProgress.flags |= 2097664);
4930+
(workInProgress.flags |= 4194816);
49314931
else {
49324932
if ("function" !== typeof ref && "object" !== typeof ref)
49334933
throw Error(formatProdErrorMessage(284));
49344934
if (null === current || current.ref !== ref)
4935-
workInProgress.flags |= 2097664;
4935+
workInProgress.flags |= 4194816;
49364936
}
49374937
}
49384938
function updateFunctionComponent(
@@ -5579,7 +5579,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
55795579
mode: "hidden",
55805580
children: nextProps.children
55815581
});
5582-
nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280;
5582+
nextProps.subtreeFlags = didSuspend.subtreeFlags & 29360128;
55835583
null !== currentFallbackChildFragment
55845584
? (nextPrimaryChildren = createWorkInProgress(
55855585
currentFallbackChildFragment,
@@ -6495,8 +6495,8 @@ function bubbleProperties(completedWork) {
64956495
if (didBailout)
64966496
for (var child$89 = completedWork.child; null !== child$89; )
64976497
(newChildLanes |= child$89.lanes | child$89.childLanes),
6498-
(subtreeFlags |= child$89.subtreeFlags & 31457280),
6499-
(subtreeFlags |= child$89.flags & 31457280),
6498+
(subtreeFlags |= child$89.subtreeFlags & 29360128),
6499+
(subtreeFlags |= child$89.flags & 29360128),
65006500
(child$89.return = completedWork),
65016501
(child$89 = child$89.sibling);
65026502
else
@@ -10347,7 +10347,7 @@ function createWorkInProgress(current, pendingProps) {
1034710347
(workInProgress.flags = 0),
1034810348
(workInProgress.subtreeFlags = 0),
1034910349
(workInProgress.deletions = null));
10350-
workInProgress.flags = current.flags & 31457280;
10350+
workInProgress.flags = current.flags & 29360128;
1035110351
workInProgress.childLanes = current.childLanes;
1035210352
workInProgress.lanes = current.lanes;
1035310353
workInProgress.child = current.child;
@@ -10366,7 +10366,7 @@ function createWorkInProgress(current, pendingProps) {
1036610366
return workInProgress;
1036710367
}
1036810368
function resetWorkInProgress(workInProgress, renderLanes) {
10369-
workInProgress.flags &= 31457282;
10369+
workInProgress.flags &= 29360130;
1037010370
var current = workInProgress.alternate;
1037110371
null === current
1037210372
? ((workInProgress.childLanes = 0),
@@ -10813,10 +10813,10 @@ var slice = Array.prototype.slice,
1081310813
})(React.Component);
1081410814
var internals$jscomp$inline_1510 = {
1081510815
bundleType: 0,
10816-
version: "19.1.0-www-classic-220dece9-20250102",
10816+
version: "19.1.0-www-classic-3b009b4c-20250102",
1081710817
rendererPackageName: "react-art",
1081810818
currentDispatcherRef: ReactSharedInternals,
10819-
reconcilerVersion: "19.1.0-www-classic-220dece9-20250102"
10819+
reconcilerVersion: "19.1.0-www-classic-3b009b4c-20250102"
1082010820
};
1082110821
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1082210822
var hook$jscomp$inline_1511 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -10842,4 +10842,4 @@ exports.RadialGradient = RadialGradient;
1084210842
exports.Shape = TYPES.SHAPE;
1084310843
exports.Surface = Surface;
1084410844
exports.Text = Text;
10845-
exports.version = "19.1.0-www-classic-220dece9-20250102";
10845+
exports.version = "19.1.0-www-classic-3b009b4c-20250102";

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -4790,12 +4790,12 @@ function markRef(current, workInProgress) {
47904790
if (null === ref)
47914791
null !== current &&
47924792
null !== current.ref &&
4793-
(workInProgress.flags |= 2097664);
4793+
(workInProgress.flags |= 4194816);
47944794
else {
47954795
if ("function" !== typeof ref && "object" !== typeof ref)
47964796
throw Error(formatProdErrorMessage(284));
47974797
if (null === current || current.ref !== ref)
4798-
workInProgress.flags |= 2097664;
4798+
workInProgress.flags |= 4194816;
47994799
}
48004800
}
48014801
function updateFunctionComponent(
@@ -5365,7 +5365,7 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) {
53655365
mode: "hidden",
53665366
children: nextProps.children
53675367
});
5368-
nextProps.subtreeFlags = didSuspend.subtreeFlags & 31457280;
5368+
nextProps.subtreeFlags = didSuspend.subtreeFlags & 29360128;
53695369
null !== currentFallbackChildFragment
53705370
? (nextPrimaryChildren = createWorkInProgress(
53715371
currentFallbackChildFragment,
@@ -6274,8 +6274,8 @@ function bubbleProperties(completedWork) {
62746274
if (didBailout)
62756275
for (var child$89 = completedWork.child; null !== child$89; )
62766276
(newChildLanes |= child$89.lanes | child$89.childLanes),
6277-
(subtreeFlags |= child$89.subtreeFlags & 31457280),
6278-
(subtreeFlags |= child$89.flags & 31457280),
6277+
(subtreeFlags |= child$89.subtreeFlags & 29360128),
6278+
(subtreeFlags |= child$89.flags & 29360128),
62796279
(child$89.return = completedWork),
62806280
(child$89 = child$89.sibling);
62816281
else
@@ -10103,7 +10103,7 @@ function createWorkInProgress(current, pendingProps) {
1010310103
(workInProgress.flags = 0),
1010410104
(workInProgress.subtreeFlags = 0),
1010510105
(workInProgress.deletions = null));
10106-
workInProgress.flags = current.flags & 31457280;
10106+
workInProgress.flags = current.flags & 29360128;
1010710107
workInProgress.childLanes = current.childLanes;
1010810108
workInProgress.lanes = current.lanes;
1010910109
workInProgress.child = current.child;
@@ -10122,7 +10122,7 @@ function createWorkInProgress(current, pendingProps) {
1012210122
return workInProgress;
1012310123
}
1012410124
function resetWorkInProgress(workInProgress, renderLanes) {
10125-
workInProgress.flags &= 31457282;
10125+
workInProgress.flags &= 29360130;
1012610126
var current = workInProgress.alternate;
1012710127
null === current
1012810128
? ((workInProgress.childLanes = 0),
@@ -10529,10 +10529,10 @@ var slice = Array.prototype.slice,
1052910529
})(React.Component);
1053010530
var internals$jscomp$inline_1489 = {
1053110531
bundleType: 0,
10532-
version: "19.1.0-www-modern-220dece9-20250102",
10532+
version: "19.1.0-www-modern-3b009b4c-20250102",
1053310533
rendererPackageName: "react-art",
1053410534
currentDispatcherRef: ReactSharedInternals,
10535-
reconcilerVersion: "19.1.0-www-modern-220dece9-20250102"
10535+
reconcilerVersion: "19.1.0-www-modern-3b009b4c-20250102"
1053610536
};
1053710537
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1053810538
var hook$jscomp$inline_1490 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -10558,4 +10558,4 @@ exports.RadialGradient = RadialGradient;
1055810558
exports.Shape = TYPES.SHAPE;
1055910559
exports.Surface = Surface;
1056010560
exports.Text = Text;
10561-
exports.version = "19.1.0-www-modern-220dece9-20250102";
10561+
exports.version = "19.1.0-www-modern-3b009b4c-20250102";

0 commit comments

Comments
 (0)