Skip to content

Commit 54d3118

Browse files
hoxyqhoxyq
committed
fix: log renders from passive effects for only newly finished work (#33797)
This fixes displaying incorrect component render entries on a timeline, when we are reconnecting passive effects. ### Before <img width="2318" height="1127" alt="1" src="https://github.com/user-attachments/assets/9b6b2824-d2de-43a3-8615-2c45d67c3668" /> The cloned nodes will persist original `actualStartTime`, when these were first mounted. When we "replay", the end time will be "now" or whatever the actual start time of the sibling. Depending on when this is being recorded, the diff between end and start could be tens of seconds and doesn't represent what React was doing. We shouldn't log these entries at all. ### After We are only logging newly finished renders, but could potentially loose renders that never commit. DiffTrain build for [9fec565](9fec565)
1 parent 981b703 commit 54d3118

24 files changed

+95
-87
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-fe813143-20250715
1+
19.2.0-native-fb-9fec565a-20250716

‎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<<adfb41125b5186ad3fa8b5c4f31b0d4e>>
10+
* @generated SignedSource<<916c3c8c614b681c717503025a8db5f4>>
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-fe813143-20250715";
407+
exports.version = "19.2.0-native-fb-9fec565a-20250716";
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<<62ae8072c8b4ccd14bfb2b8130c3dce9>>
10+
* @generated SignedSource<<ad091e9f5aca4188a467d80783eb7576>>
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-fe813143-20250715";
206+
exports.version = "19.2.0-native-fb-9fec565a-20250716";

‎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<<62ae8072c8b4ccd14bfb2b8130c3dce9>>
10+
* @generated SignedSource<<ad091e9f5aca4188a467d80783eb7576>>
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-fe813143-20250715";
206+
exports.version = "19.2.0-native-fb-9fec565a-20250716";

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

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

1313
/*
@@ -16390,6 +16390,7 @@ __DEV__ &&
1639016390
prevEffectErrors = pushComponentEffectErrors(),
1639116391
prevDeepEquality = alreadyWarnedForDeepEquality;
1639216392
enableComponentPerformanceTrack &&
16393+
includeWorkInProgressEffects &&
1639316394
(finishedWork.mode & ProfileMode) !== NoMode &&
1639416395
0 < finishedWork.actualStartTime &&
1639516396
0 !== (finishedWork.flags & 1) &&
@@ -29006,11 +29007,11 @@ __DEV__ &&
2900629007
};
2900729008
(function () {
2900829009
var isomorphicReactPackageVersion = React.version;
29009-
if ("19.2.0-native-fb-fe813143-20250715" !== isomorphicReactPackageVersion)
29010+
if ("19.2.0-native-fb-9fec565a-20250716" !== isomorphicReactPackageVersion)
2901029011
throw Error(
2901129012
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2901229013
(isomorphicReactPackageVersion +
29013-
"\n - react-dom: 19.2.0-native-fb-fe813143-20250715\nLearn more: https://react.dev/warnings/version-mismatch")
29014+
"\n - react-dom: 19.2.0-native-fb-9fec565a-20250716\nLearn more: https://react.dev/warnings/version-mismatch")
2901429015
);
2901529016
})();
2901629017
("function" === typeof Map &&
@@ -29047,10 +29048,10 @@ __DEV__ &&
2904729048
!(function () {
2904829049
var internals = {
2904929050
bundleType: 1,
29050-
version: "19.2.0-native-fb-fe813143-20250715",
29051+
version: "19.2.0-native-fb-9fec565a-20250716",
2905129052
rendererPackageName: "react-dom",
2905229053
currentDispatcherRef: ReactSharedInternals,
29053-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715"
29054+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716"
2905429055
};
2905529056
internals.overrideHookState = overrideHookState;
2905629057
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -29188,5 +29189,5 @@ __DEV__ &&
2918829189
listenToAllSupportedEvents(container);
2918929190
return new ReactDOMHydrationRoot(initialChildren);
2919029191
};
29191-
exports.version = "19.2.0-native-fb-fe813143-20250715";
29192+
exports.version = "19.2.0-native-fb-9fec565a-20250716";
2919229193
})();

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

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

1313
/*
@@ -17123,14 +17123,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1712317123
};
1712417124
var isomorphicReactPackageVersion$jscomp$inline_2004 = React.version;
1712517125
if (
17126-
"19.2.0-native-fb-fe813143-20250715" !==
17126+
"19.2.0-native-fb-9fec565a-20250716" !==
1712717127
isomorphicReactPackageVersion$jscomp$inline_2004
1712817128
)
1712917129
throw Error(
1713017130
formatProdErrorMessage(
1713117131
527,
1713217132
isomorphicReactPackageVersion$jscomp$inline_2004,
17133-
"19.2.0-native-fb-fe813143-20250715"
17133+
"19.2.0-native-fb-9fec565a-20250716"
1713417134
)
1713517135
);
1713617136
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17152,10 +17152,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1715217152
};
1715317153
var internals$jscomp$inline_2523 = {
1715417154
bundleType: 0,
17155-
version: "19.2.0-native-fb-fe813143-20250715",
17155+
version: "19.2.0-native-fb-9fec565a-20250716",
1715617156
rendererPackageName: "react-dom",
1715717157
currentDispatcherRef: ReactSharedInternals,
17158-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715"
17158+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716"
1715917159
};
1716017160
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1716117161
var hook$jscomp$inline_2524 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17253,4 +17253,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1725317253
listenToAllSupportedEvents(container);
1725417254
return new ReactDOMHydrationRoot(initialChildren);
1725517255
};
17256-
exports.version = "19.2.0-native-fb-fe813143-20250715";
17256+
exports.version = "19.2.0-native-fb-9fec565a-20250716";

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

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

1313
/*
@@ -12224,6 +12224,7 @@ function reconnectPassiveEffects(
1222412224
prevEffectDuration = pushComponentEffectDuration(),
1222512225
prevEffectErrors = pushComponentEffectErrors();
1222612226
enableComponentPerformanceTrack &&
12227+
includeWorkInProgressEffects &&
1222712228
0 !== (finishedWork.mode & 2) &&
1222812229
0 < finishedWork.actualStartTime &&
1222912230
0 !== (finishedWork.flags & 1) &&
@@ -19080,14 +19081,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1908019081
};
1908119082
var isomorphicReactPackageVersion$jscomp$inline_2244 = React.version;
1908219083
if (
19083-
"19.2.0-native-fb-fe813143-20250715" !==
19084+
"19.2.0-native-fb-9fec565a-20250716" !==
1908419085
isomorphicReactPackageVersion$jscomp$inline_2244
1908519086
)
1908619087
throw Error(
1908719088
formatProdErrorMessage(
1908819089
527,
1908919090
isomorphicReactPackageVersion$jscomp$inline_2244,
19090-
"19.2.0-native-fb-fe813143-20250715"
19091+
"19.2.0-native-fb-9fec565a-20250716"
1909119092
)
1909219093
);
1909319094
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19109,10 +19110,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1910919110
};
1911019111
var internals$jscomp$inline_2251 = {
1911119112
bundleType: 0,
19112-
version: "19.2.0-native-fb-fe813143-20250715",
19113+
version: "19.2.0-native-fb-9fec565a-20250716",
1911319114
rendererPackageName: "react-dom",
1911419115
currentDispatcherRef: ReactSharedInternals,
19115-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715",
19116+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716",
1911619117
getLaneLabelMap: function () {
1911719118
for (
1911819119
var map = new Map(), lane = 1, index$319 = 0;
@@ -19225,4 +19226,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1922519226
listenToAllSupportedEvents(container);
1922619227
return new ReactDOMHydrationRoot(initialChildren);
1922719228
};
19228-
exports.version = "19.2.0-native-fb-fe813143-20250715";
19229+
exports.version = "19.2.0-native-fb-9fec565a-20250716";

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

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

1313
/*
@@ -16398,6 +16398,7 @@ __DEV__ &&
1639816398
prevEffectErrors = pushComponentEffectErrors(),
1639916399
prevDeepEquality = alreadyWarnedForDeepEquality;
1640016400
enableComponentPerformanceTrack &&
16401+
includeWorkInProgressEffects &&
1640116402
(finishedWork.mode & ProfileMode) !== NoMode &&
1640216403
0 < finishedWork.actualStartTime &&
1640316404
0 !== (finishedWork.flags & 1) &&
@@ -29062,11 +29063,11 @@ __DEV__ &&
2906229063
};
2906329064
(function () {
2906429065
var isomorphicReactPackageVersion = React.version;
29065-
if ("19.2.0-native-fb-fe813143-20250715" !== isomorphicReactPackageVersion)
29066+
if ("19.2.0-native-fb-9fec565a-20250716" !== isomorphicReactPackageVersion)
2906629067
throw Error(
2906729068
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2906829069
(isomorphicReactPackageVersion +
29069-
"\n - react-dom: 19.2.0-native-fb-fe813143-20250715\nLearn more: https://react.dev/warnings/version-mismatch")
29070+
"\n - react-dom: 19.2.0-native-fb-9fec565a-20250716\nLearn more: https://react.dev/warnings/version-mismatch")
2907029071
);
2907129072
})();
2907229073
("function" === typeof Map &&
@@ -29103,10 +29104,10 @@ __DEV__ &&
2910329104
!(function () {
2910429105
var internals = {
2910529106
bundleType: 1,
29106-
version: "19.2.0-native-fb-fe813143-20250715",
29107+
version: "19.2.0-native-fb-9fec565a-20250716",
2910729108
rendererPackageName: "react-dom",
2910829109
currentDispatcherRef: ReactSharedInternals,
29109-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715"
29110+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716"
2911029111
};
2911129112
internals.overrideHookState = overrideHookState;
2911229113
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -29560,7 +29561,7 @@ __DEV__ &&
2956029561
exports.useFormStatus = function () {
2956129562
return resolveDispatcher().useHostTransitionStatus();
2956229563
};
29563-
exports.version = "19.2.0-native-fb-fe813143-20250715";
29564+
exports.version = "19.2.0-native-fb-9fec565a-20250716";
2956429565
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2956529566
"function" ===
2956629567
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

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

1313
/*
@@ -17134,14 +17134,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1713417134
};
1713517135
var isomorphicReactPackageVersion$jscomp$inline_2005 = React.version;
1713617136
if (
17137-
"19.2.0-native-fb-fe813143-20250715" !==
17137+
"19.2.0-native-fb-9fec565a-20250716" !==
1713817138
isomorphicReactPackageVersion$jscomp$inline_2005
1713917139
)
1714017140
throw Error(
1714117141
formatProdErrorMessage(
1714217142
527,
1714317143
isomorphicReactPackageVersion$jscomp$inline_2005,
17144-
"19.2.0-native-fb-fe813143-20250715"
17144+
"19.2.0-native-fb-9fec565a-20250716"
1714517145
)
1714617146
);
1714717147
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17163,10 +17163,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1716317163
};
1716417164
var internals$jscomp$inline_2526 = {
1716517165
bundleType: 0,
17166-
version: "19.2.0-native-fb-fe813143-20250715",
17166+
version: "19.2.0-native-fb-9fec565a-20250716",
1716717167
rendererPackageName: "react-dom",
1716817168
currentDispatcherRef: ReactSharedInternals,
17169-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715"
17169+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716"
1717017170
};
1717117171
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1717217172
var hook$jscomp$inline_2527 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17417,4 +17417,4 @@ exports.useFormState = function (action, initialState, permalink) {
1741717417
exports.useFormStatus = function () {
1741817418
return ReactSharedInternals.H.useHostTransitionStatus();
1741917419
};
17420-
exports.version = "19.2.0-native-fb-fe813143-20250715";
17420+
exports.version = "19.2.0-native-fb-9fec565a-20250716";

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

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

1313
/*
@@ -12228,6 +12228,7 @@ function reconnectPassiveEffects(
1222812228
prevEffectDuration = pushComponentEffectDuration(),
1222912229
prevEffectErrors = pushComponentEffectErrors();
1223012230
enableComponentPerformanceTrack &&
12231+
includeWorkInProgressEffects &&
1223112232
0 !== (finishedWork.mode & 2) &&
1223212233
0 < finishedWork.actualStartTime &&
1223312234
0 !== (finishedWork.flags & 1) &&
@@ -19095,14 +19096,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1909519096
};
1909619097
var isomorphicReactPackageVersion$jscomp$inline_2245 = React.version;
1909719098
if (
19098-
"19.2.0-native-fb-fe813143-20250715" !==
19099+
"19.2.0-native-fb-9fec565a-20250716" !==
1909919100
isomorphicReactPackageVersion$jscomp$inline_2245
1910019101
)
1910119102
throw Error(
1910219103
formatProdErrorMessage(
1910319104
527,
1910419105
isomorphicReactPackageVersion$jscomp$inline_2245,
19105-
"19.2.0-native-fb-fe813143-20250715"
19106+
"19.2.0-native-fb-9fec565a-20250716"
1910619107
)
1910719108
);
1910819109
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -19124,10 +19125,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1912419125
};
1912519126
var internals$jscomp$inline_2252 = {
1912619127
bundleType: 0,
19127-
version: "19.2.0-native-fb-fe813143-20250715",
19128+
version: "19.2.0-native-fb-9fec565a-20250716",
1912819129
rendererPackageName: "react-dom",
1912919130
currentDispatcherRef: ReactSharedInternals,
19130-
reconcilerVersion: "19.2.0-native-fb-fe813143-20250715",
19131+
reconcilerVersion: "19.2.0-native-fb-9fec565a-20250716",
1913119132
getLaneLabelMap: function () {
1913219133
for (
1913319134
var map = new Map(), lane = 1, index$319 = 0;
@@ -19393,7 +19394,7 @@ exports.useFormState = function (action, initialState, permalink) {
1939319394
exports.useFormStatus = function () {
1939419395
return ReactSharedInternals.H.useHostTransitionStatus();
1939519396
};
19396-
exports.version = "19.2.0-native-fb-fe813143-20250715";
19397+
exports.version = "19.2.0-native-fb-9fec565a-20250716";
1939719398
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1939819399
"function" ===
1939919400
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)