Skip to content

Commit 6089abc

Browse files
sebmarkbagesebmarkbage
committed
Traverse down an updated tree even if it has no passive effects in profiling mode (#34667)
We need this to be able to log the renders that happened inside. This is the same thing we do here but for the offscreen special cases: https://github.com/facebook/react/blob/main/packages/react-reconciler/src/ReactFiberCommitWork.js#L3452-L3457 DiffTrain build for [bbc2d59](bbc2d59)
1 parent 87d26ce commit 6089abc

24 files changed

+247
-125
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-7bccdbd7-20251001
1+
19.2.0-native-fb-bbc2d596-20251001

‎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<<1b527d6f5c2b1029599a174f329bc5bb>>
10+
* @generated SignedSource<<a0f31236e4cdca23997be03e35d45853>>
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-7bccdbd7-20251001";
407+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";
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<<791d367971611913b7518e54b6ad53cb>>
10+
* @generated SignedSource<<363568772f23cd29a6bcfe638a45f464>>
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-7bccdbd7-20251001";
206+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";

‎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<<791d367971611913b7518e54b6ad53cb>>
10+
* @generated SignedSource<<363568772f23cd29a6bcfe638a45f464>>
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-7bccdbd7-20251001";
206+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";

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

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

1313
/*
@@ -16594,7 +16594,11 @@ __DEV__ &&
1659416594
finishedWork,
1659516595
committedLanes,
1659616596
committedTransitions,
16597-
0 !== (finishedWork.subtreeFlags & 10256),
16597+
0 !== (finishedWork.subtreeFlags & 10256) ||
16598+
(enableComponentPerformanceTrack &&
16599+
0 !== finishedWork.actualDuration &&
16600+
(null === finishedWork.alternate ||
16601+
finishedWork.alternate.child !== finishedWork.child)),
1659816602
endTime
1659916603
),
1660016604
enableComponentPerformanceTrack &&
@@ -16693,7 +16697,11 @@ __DEV__ &&
1669316697
) {
1669416698
includeWorkInProgressEffects =
1669516699
includeWorkInProgressEffects &&
16696-
0 !== (parentFiber.subtreeFlags & 10256);
16700+
(0 !== (parentFiber.subtreeFlags & 10256) ||
16701+
(enableComponentPerformanceTrack &&
16702+
0 !== parentFiber.actualDuration &&
16703+
(null === parentFiber.alternate ||
16704+
parentFiber.alternate.child !== parentFiber.child)));
1669716705
for (parentFiber = parentFiber.child; null !== parentFiber; )
1669816706
if (enableComponentPerformanceTrack) {
1669916707
var nextSibling = parentFiber.sibling;
@@ -16852,7 +16860,13 @@ __DEV__ &&
1685216860
committedTransitions,
1685316861
endTime
1685416862
) {
16855-
if (parentFiber.subtreeFlags & 10256)
16863+
if (
16864+
parentFiber.subtreeFlags & 10256 ||
16865+
(enableComponentPerformanceTrack &&
16866+
0 !== parentFiber.actualDuration &&
16867+
(null === parentFiber.alternate ||
16868+
parentFiber.alternate.child !== parentFiber.child))
16869+
)
1685616870
for (parentFiber = parentFiber.child; null !== parentFiber; )
1685716871
if (enableComponentPerformanceTrack) {
1685816872
var nextSibling = parentFiber.sibling;
@@ -30047,11 +30061,11 @@ __DEV__ &&
3004730061
};
3004830062
(function () {
3004930063
var isomorphicReactPackageVersion = React.version;
30050-
if ("19.2.0-native-fb-7bccdbd7-20251001" !== isomorphicReactPackageVersion)
30064+
if ("19.2.0-native-fb-bbc2d596-20251001" !== isomorphicReactPackageVersion)
3005130065
throw Error(
3005230066
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
3005330067
(isomorphicReactPackageVersion +
30054-
"\n - react-dom: 19.2.0-native-fb-7bccdbd7-20251001\nLearn more: https://react.dev/warnings/version-mismatch")
30068+
"\n - react-dom: 19.2.0-native-fb-bbc2d596-20251001\nLearn more: https://react.dev/warnings/version-mismatch")
3005530069
);
3005630070
})();
3005730071
("function" === typeof Map &&
@@ -30088,10 +30102,10 @@ __DEV__ &&
3008830102
!(function () {
3008930103
var internals = {
3009030104
bundleType: 1,
30091-
version: "19.2.0-native-fb-7bccdbd7-20251001",
30105+
version: "19.2.0-native-fb-bbc2d596-20251001",
3009230106
rendererPackageName: "react-dom",
3009330107
currentDispatcherRef: ReactSharedInternals,
30094-
reconcilerVersion: "19.2.0-native-fb-7bccdbd7-20251001"
30108+
reconcilerVersion: "19.2.0-native-fb-bbc2d596-20251001"
3009530109
};
3009630110
internals.overrideHookState = overrideHookState;
3009730111
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -30241,5 +30255,5 @@ __DEV__ &&
3024130255
listenToAllSupportedEvents(container);
3024230256
return new ReactDOMHydrationRoot(initialChildren);
3024330257
};
30244-
exports.version = "19.2.0-native-fb-7bccdbd7-20251001";
30258+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";
3024530259
})();

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

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

1313
/*
@@ -11113,7 +11113,7 @@ function commitPassiveMountOnFiber(
1111311113
finishedWork,
1111411114
committedLanes,
1111511115
committedTransitions,
11116-
0 !== (finishedWork.subtreeFlags & 10256)
11116+
0 !== (finishedWork.subtreeFlags & 10256) || !1
1111711117
));
1111811118
flags & 2048 && commitOffscreenPassiveMountEffects(id, finishedWork);
1111911119
break;
@@ -11144,7 +11144,8 @@ function recursivelyTraverseReconnectPassiveEffects(
1114411144
includeWorkInProgressEffects
1114511145
) {
1114611146
includeWorkInProgressEffects =
11147-
includeWorkInProgressEffects && 0 !== (parentFiber.subtreeFlags & 10256);
11147+
includeWorkInProgressEffects &&
11148+
(0 !== (parentFiber.subtreeFlags & 10256) || !1);
1114811149
for (parentFiber = parentFiber.child; null !== parentFiber; ) {
1114911150
var finishedRoot = finishedRoot$jscomp$0,
1115011151
finishedWork = parentFiber,
@@ -17577,14 +17578,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1757717578
};
1757817579
var isomorphicReactPackageVersion$jscomp$inline_2059 = React.version;
1757917580
if (
17580-
"19.2.0-native-fb-7bccdbd7-20251001" !==
17581+
"19.2.0-native-fb-bbc2d596-20251001" !==
1758117582
isomorphicReactPackageVersion$jscomp$inline_2059
1758217583
)
1758317584
throw Error(
1758417585
formatProdErrorMessage(
1758517586
527,
1758617587
isomorphicReactPackageVersion$jscomp$inline_2059,
17587-
"19.2.0-native-fb-7bccdbd7-20251001"
17588+
"19.2.0-native-fb-bbc2d596-20251001"
1758817589
)
1758917590
);
1759017591
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17606,10 +17607,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1760617607
};
1760717608
var internals$jscomp$inline_2636 = {
1760817609
bundleType: 0,
17609-
version: "19.2.0-native-fb-7bccdbd7-20251001",
17610+
version: "19.2.0-native-fb-bbc2d596-20251001",
1761017611
rendererPackageName: "react-dom",
1761117612
currentDispatcherRef: ReactSharedInternals,
17612-
reconcilerVersion: "19.2.0-native-fb-7bccdbd7-20251001"
17613+
reconcilerVersion: "19.2.0-native-fb-bbc2d596-20251001"
1761317614
};
1761417615
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1761517616
var hook$jscomp$inline_2637 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17716,4 +17717,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1771617717
listenToAllSupportedEvents(container);
1771717718
return new ReactDOMHydrationRoot(initialChildren);
1771817719
};
17719-
exports.version = "19.2.0-native-fb-7bccdbd7-20251001";
17720+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";

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

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

1313
/*
@@ -12269,7 +12269,11 @@ function commitPassiveMountOnFiber(
1226912269
finishedWork,
1227012270
committedLanes,
1227112271
committedTransitions,
12272-
0 !== (finishedWork.subtreeFlags & 10256),
12272+
0 !== (finishedWork.subtreeFlags & 10256) ||
12273+
(enableComponentPerformanceTrack &&
12274+
0 !== finishedWork.actualDuration &&
12275+
(null === finishedWork.alternate ||
12276+
finishedWork.alternate.child !== finishedWork.child)),
1227312277
endTime
1227412278
),
1227512279
enableComponentPerformanceTrack &&
@@ -12358,7 +12362,12 @@ function recursivelyTraverseReconnectPassiveEffects(
1235812362
endTime
1235912363
) {
1236012364
includeWorkInProgressEffects =
12361-
includeWorkInProgressEffects && 0 !== (parentFiber.subtreeFlags & 10256);
12365+
includeWorkInProgressEffects &&
12366+
(0 !== (parentFiber.subtreeFlags & 10256) ||
12367+
(enableComponentPerformanceTrack &&
12368+
0 !== parentFiber.actualDuration &&
12369+
(null === parentFiber.alternate ||
12370+
parentFiber.alternate.child !== parentFiber.child)));
1236212371
for (parentFiber = parentFiber.child; null !== parentFiber; )
1236312372
if (enableComponentPerformanceTrack) {
1236412373
var nextSibling = parentFiber.sibling;
@@ -12514,7 +12523,13 @@ function recursivelyTraverseAtomicPassiveEffects(
1251412523
committedTransitions,
1251512524
endTime
1251612525
) {
12517-
if (parentFiber.subtreeFlags & 10256)
12526+
if (
12527+
parentFiber.subtreeFlags & 10256 ||
12528+
(enableComponentPerformanceTrack &&
12529+
0 !== parentFiber.actualDuration &&
12530+
(null === parentFiber.alternate ||
12531+
parentFiber.alternate.child !== parentFiber.child))
12532+
)
1251812533
for (parentFiber = parentFiber.child; null !== parentFiber; )
1251912534
if (enableComponentPerformanceTrack) {
1252012535
var nextSibling = parentFiber.sibling;
@@ -19701,14 +19716,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1970119716
};
1970219717
var isomorphicReactPackageVersion$jscomp$inline_2374 = React.version;
1970319718
if (
19704-
"19.2.0-native-fb-7bccdbd7-20251001" !==
19719+
"19.2.0-native-fb-bbc2d596-20251001" !==
1970519720
isomorphicReactPackageVersion$jscomp$inline_2374
1970619721
)
1970719722
throw Error(
1970819723
formatProdErrorMessage(
1970919724
527,
1971019725
isomorphicReactPackageVersion$jscomp$inline_2374,
19711-
"19.2.0-native-fb-7bccdbd7-20251001"
19726+
"19.2.0-native-fb-bbc2d596-20251001"
1971219727
)
1971319728
);
1971419729
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19730,10 +19745,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1973019745
};
1973119746
var internals$jscomp$inline_2381 = {
1973219747
bundleType: 0,
19733-
version: "19.2.0-native-fb-7bccdbd7-20251001",
19748+
version: "19.2.0-native-fb-bbc2d596-20251001",
1973419749
rendererPackageName: "react-dom",
1973519750
currentDispatcherRef: ReactSharedInternals,
19736-
reconcilerVersion: "19.2.0-native-fb-7bccdbd7-20251001",
19751+
reconcilerVersion: "19.2.0-native-fb-bbc2d596-20251001",
1973719752
getLaneLabelMap: function () {
1973819753
for (
1973919754
var map = new Map(), lane = 1, index$331 = 0;
@@ -19856,4 +19871,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1985619871
listenToAllSupportedEvents(container);
1985719872
return new ReactDOMHydrationRoot(initialChildren);
1985819873
};
19859-
exports.version = "19.2.0-native-fb-7bccdbd7-20251001";
19874+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";

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

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

1313
/*
@@ -16602,7 +16602,11 @@ __DEV__ &&
1660216602
finishedWork,
1660316603
committedLanes,
1660416604
committedTransitions,
16605-
0 !== (finishedWork.subtreeFlags & 10256),
16605+
0 !== (finishedWork.subtreeFlags & 10256) ||
16606+
(enableComponentPerformanceTrack &&
16607+
0 !== finishedWork.actualDuration &&
16608+
(null === finishedWork.alternate ||
16609+
finishedWork.alternate.child !== finishedWork.child)),
1660616610
endTime
1660716611
),
1660816612
enableComponentPerformanceTrack &&
@@ -16701,7 +16705,11 @@ __DEV__ &&
1670116705
) {
1670216706
includeWorkInProgressEffects =
1670316707
includeWorkInProgressEffects &&
16704-
0 !== (parentFiber.subtreeFlags & 10256);
16708+
(0 !== (parentFiber.subtreeFlags & 10256) ||
16709+
(enableComponentPerformanceTrack &&
16710+
0 !== parentFiber.actualDuration &&
16711+
(null === parentFiber.alternate ||
16712+
parentFiber.alternate.child !== parentFiber.child)));
1670516713
for (parentFiber = parentFiber.child; null !== parentFiber; )
1670616714
if (enableComponentPerformanceTrack) {
1670716715
var nextSibling = parentFiber.sibling;
@@ -16860,7 +16868,13 @@ __DEV__ &&
1686016868
committedTransitions,
1686116869
endTime
1686216870
) {
16863-
if (parentFiber.subtreeFlags & 10256)
16871+
if (
16872+
parentFiber.subtreeFlags & 10256 ||
16873+
(enableComponentPerformanceTrack &&
16874+
0 !== parentFiber.actualDuration &&
16875+
(null === parentFiber.alternate ||
16876+
parentFiber.alternate.child !== parentFiber.child))
16877+
)
1686416878
for (parentFiber = parentFiber.child; null !== parentFiber; )
1686516879
if (enableComponentPerformanceTrack) {
1686616880
var nextSibling = parentFiber.sibling;
@@ -30103,11 +30117,11 @@ __DEV__ &&
3010330117
};
3010430118
(function () {
3010530119
var isomorphicReactPackageVersion = React.version;
30106-
if ("19.2.0-native-fb-7bccdbd7-20251001" !== isomorphicReactPackageVersion)
30120+
if ("19.2.0-native-fb-bbc2d596-20251001" !== isomorphicReactPackageVersion)
3010730121
throw Error(
3010830122
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
3010930123
(isomorphicReactPackageVersion +
30110-
"\n - react-dom: 19.2.0-native-fb-7bccdbd7-20251001\nLearn more: https://react.dev/warnings/version-mismatch")
30124+
"\n - react-dom: 19.2.0-native-fb-bbc2d596-20251001\nLearn more: https://react.dev/warnings/version-mismatch")
3011130125
);
3011230126
})();
3011330127
("function" === typeof Map &&
@@ -30144,10 +30158,10 @@ __DEV__ &&
3014430158
!(function () {
3014530159
var internals = {
3014630160
bundleType: 1,
30147-
version: "19.2.0-native-fb-7bccdbd7-20251001",
30161+
version: "19.2.0-native-fb-bbc2d596-20251001",
3014830162
rendererPackageName: "react-dom",
3014930163
currentDispatcherRef: ReactSharedInternals,
30150-
reconcilerVersion: "19.2.0-native-fb-7bccdbd7-20251001"
30164+
reconcilerVersion: "19.2.0-native-fb-bbc2d596-20251001"
3015130165
};
3015230166
internals.overrideHookState = overrideHookState;
3015330167
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -30613,7 +30627,7 @@ __DEV__ &&
3061330627
exports.useFormStatus = function () {
3061430628
return resolveDispatcher().useHostTransitionStatus();
3061530629
};
30616-
exports.version = "19.2.0-native-fb-7bccdbd7-20251001";
30630+
exports.version = "19.2.0-native-fb-bbc2d596-20251001";
3061730631
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
3061830632
"function" ===
3061930633
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)