Skip to content

Commit 2baa9b4

Browse files
eps1loneps1lon
committed
[Fiber] Fix missing render times when we cancel a pending commit (#31065)
DiffTrain build for commit 778e1ed.
1 parent 64e263f commit 2baa9b4

23 files changed

+267
-284
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.0.0-native-fb-0f1856c4-20240925
1+
19.0.0-native-fb-778e1ed2-20240926

‎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<<abebda03294fad7cb3858d1b5d97fe36>>
10+
* @generated SignedSource<<1d391b897b28e0a40b463f0cd330ecb9>>
1111
*/
1212

1313
"use strict";
@@ -420,5 +420,5 @@ __DEV__ &&
420420
exports.useFormStatus = function () {
421421
return resolveDispatcher().useHostTransitionStatus();
422422
};
423-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
423+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";
424424
})();

‎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<<80a716efe68d232a2259f9d368a23144>>
10+
* @generated SignedSource<<8f65f0b5da0551267ae8d9135836943a>>
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.0.0-native-fb-0f1856c4-20240925";
206+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";

‎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<<80a716efe68d232a2259f9d368a23144>>
10+
* @generated SignedSource<<8f65f0b5da0551267ae8d9135836943a>>
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.0.0-native-fb-0f1856c4-20240925";
206+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-dev.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<<2741b53e4737f118fb569f1df2d8ce24>>
10+
* @generated SignedSource<<f5ffc0c36bad3a894dfe63de67ba82c1>>
1111
*/
1212

1313
/*
@@ -15333,7 +15333,9 @@ __DEV__ &&
1533315333
spawnedLane,
1533415334
updatedLanes,
1533515335
suspendedRetryLanes,
15336-
SUSPENDED_COMMIT
15336+
SUSPENDED_COMMIT,
15337+
completedRenderStartTime,
15338+
completedRenderEndTime
1533715339
)
1533815340
);
1533915341
markRootSuspended(
@@ -16089,7 +16091,6 @@ __DEV__ &&
1608916091
(ReactSharedInternals.T = prevTransition),
1609016092
(ReactDOMSharedInternals.p = previousUpdateLanePriority);
1609116093
}
16092-
return null;
1609316094
}
1609416095
function commitRootImpl(
1609516096
root,
@@ -25471,11 +25472,11 @@ __DEV__ &&
2547125472
};
2547225473
(function () {
2547325474
var isomorphicReactPackageVersion = React.version;
25474-
if ("19.0.0-native-fb-0f1856c4-20240925" !== isomorphicReactPackageVersion)
25475+
if ("19.0.0-native-fb-778e1ed2-20240926" !== isomorphicReactPackageVersion)
2547525476
throw Error(
2547625477
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2547725478
(isomorphicReactPackageVersion +
25478-
"\n - react-dom: 19.0.0-native-fb-0f1856c4-20240925\nLearn more: https://react.dev/warnings/version-mismatch")
25479+
"\n - react-dom: 19.0.0-native-fb-778e1ed2-20240926\nLearn more: https://react.dev/warnings/version-mismatch")
2547925480
);
2548025481
})();
2548125482
("function" === typeof Map &&
@@ -25512,11 +25513,11 @@ __DEV__ &&
2551225513
!(function () {
2551325514
var internals = {
2551425515
bundleType: 1,
25515-
version: "19.0.0-native-fb-0f1856c4-20240925",
25516+
version: "19.0.0-native-fb-778e1ed2-20240926",
2551625517
rendererPackageName: "react-dom",
2551725518
currentDispatcherRef: ReactSharedInternals,
2551825519
findFiberByHostInstance: getClosestInstanceFromNode,
25519-
reconcilerVersion: "19.0.0-native-fb-0f1856c4-20240925"
25520+
reconcilerVersion: "19.0.0-native-fb-778e1ed2-20240926"
2552025521
};
2552125522
internals.overrideHookState = overrideHookState;
2552225523
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -25660,5 +25661,5 @@ __DEV__ &&
2566025661
listenToAllSupportedEvents(container);
2566125662
return new ReactDOMHydrationRoot(initialChildren);
2566225663
};
25663-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
25664+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";
2566425665
})();

‎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<<e2c8a02e5b63c8974893a2fea67e32b3>>
10+
* @generated SignedSource<<4015a32f0a281b58a4049cc13ffda2fe>>
1111
*/
1212

1313
/*
@@ -11099,7 +11099,9 @@ function commitRootWhenReady(
1109911099
spawnedLane,
1110011100
updatedLanes,
1110111101
suspendedRetryLanes,
11102-
1
11102+
1,
11103+
completedRenderStartTime,
11104+
completedRenderEndTime
1110311105
)
1110411106
);
1110511107
markRootSuspended(root, lanes, spawnedLane, !didSkipSuspendedSiblings);
@@ -11698,7 +11700,6 @@ function commitRoot(
1169811700
(ReactSharedInternals.T = prevTransition),
1169911701
(ReactDOMSharedInternals.p = previousUpdateLanePriority);
1170011702
}
11701-
return null;
1170211703
}
1170311704
function commitRootImpl(
1170411705
root,
@@ -15752,14 +15753,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1575215753
};
1575315754
var isomorphicReactPackageVersion$jscomp$inline_1708 = React.version;
1575415755
if (
15755-
"19.0.0-native-fb-0f1856c4-20240925" !==
15756+
"19.0.0-native-fb-778e1ed2-20240926" !==
1575615757
isomorphicReactPackageVersion$jscomp$inline_1708
1575715758
)
1575815759
throw Error(
1575915760
formatProdErrorMessage(
1576015761
527,
1576115762
isomorphicReactPackageVersion$jscomp$inline_1708,
15762-
"19.0.0-native-fb-0f1856c4-20240925"
15763+
"19.0.0-native-fb-778e1ed2-20240926"
1576315764
)
1576415765
);
1576515766
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15781,11 +15782,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1578115782
};
1578215783
var internals$jscomp$inline_2151 = {
1578315784
bundleType: 0,
15784-
version: "19.0.0-native-fb-0f1856c4-20240925",
15785+
version: "19.0.0-native-fb-778e1ed2-20240926",
1578515786
rendererPackageName: "react-dom",
1578615787
currentDispatcherRef: ReactSharedInternals,
1578715788
findFiberByHostInstance: getClosestInstanceFromNode,
15788-
reconcilerVersion: "19.0.0-native-fb-0f1856c4-20240925"
15789+
reconcilerVersion: "19.0.0-native-fb-778e1ed2-20240926"
1578915790
};
1579015791
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1579115792
var hook$jscomp$inline_2152 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15889,4 +15890,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1588915890
listenToAllSupportedEvents(container);
1589015891
return new ReactDOMHydrationRoot(initialChildren);
1589115892
};
15892-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
15893+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMClient-profiling.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<<fffc5eead357ce8f77731b891ba62820>>
10+
* @generated SignedSource<<e0edad628e3ae9cf5c58cd69e3f3278c>>
1111
*/
1212

1313
/*
@@ -11637,7 +11637,9 @@ function commitRootWhenReady(
1163711637
spawnedLane,
1163811638
updatedLanes,
1163911639
suspendedRetryLanes,
11640-
1
11640+
1,
11641+
completedRenderStartTime,
11642+
completedRenderEndTime
1164111643
)
1164211644
);
1164311645
markRootSuspended(root, lanes, spawnedLane, !didSkipSuspendedSiblings);
@@ -12308,7 +12310,6 @@ function commitRoot(
1230812310
(ReactSharedInternals.T = prevTransition),
1230912311
(ReactDOMSharedInternals.p = previousUpdateLanePriority);
1231012312
}
12311-
return null;
1231212313
}
1231312314
function commitRootImpl(
1231412315
root,
@@ -16404,14 +16405,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1640416405
};
1640516406
var isomorphicReactPackageVersion$jscomp$inline_1798 = React.version;
1640616407
if (
16407-
"19.0.0-native-fb-0f1856c4-20240925" !==
16408+
"19.0.0-native-fb-778e1ed2-20240926" !==
1640816409
isomorphicReactPackageVersion$jscomp$inline_1798
1640916410
)
1641016411
throw Error(
1641116412
formatProdErrorMessage(
1641216413
527,
1641316414
isomorphicReactPackageVersion$jscomp$inline_1798,
16414-
"19.0.0-native-fb-0f1856c4-20240925"
16415+
"19.0.0-native-fb-778e1ed2-20240926"
1641516416
)
1641616417
);
1641716418
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -16433,11 +16434,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1643316434
};
1643416435
var internals$jscomp$inline_1805 = {
1643516436
bundleType: 0,
16436-
version: "19.0.0-native-fb-0f1856c4-20240925",
16437+
version: "19.0.0-native-fb-778e1ed2-20240926",
1643716438
rendererPackageName: "react-dom",
1643816439
currentDispatcherRef: ReactSharedInternals,
1643916440
findFiberByHostInstance: getClosestInstanceFromNode,
16440-
reconcilerVersion: "19.0.0-native-fb-0f1856c4-20240925",
16441+
reconcilerVersion: "19.0.0-native-fb-778e1ed2-20240926",
1644116442
getLaneLabelMap: function () {
1644216443
for (
1644316444
var map = new Map(), lane = 1, index$292 = 0;
@@ -16556,4 +16557,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1655616557
listenToAllSupportedEvents(container);
1655716558
return new ReactDOMHydrationRoot(initialChildren);
1655816559
};
16559-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
16560+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-dev.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<<273b9b0979bdda8333444bb84fedf515>>
10+
* @generated SignedSource<<7461bb5e8388b2ab269e15f33f1e8d01>>
1111
*/
1212

1313
/*
@@ -15345,7 +15345,9 @@ __DEV__ &&
1534515345
spawnedLane,
1534615346
updatedLanes,
1534715347
suspendedRetryLanes,
15348-
SUSPENDED_COMMIT
15348+
SUSPENDED_COMMIT,
15349+
completedRenderStartTime,
15350+
completedRenderEndTime
1534915351
)
1535015352
);
1535115353
markRootSuspended(
@@ -16101,7 +16103,6 @@ __DEV__ &&
1610116103
(ReactSharedInternals.T = prevTransition),
1610216104
(ReactDOMSharedInternals.p = previousUpdateLanePriority);
1610316105
}
16104-
return null;
1610516106
}
1610616107
function commitRootImpl(
1610716108
root,
@@ -25532,11 +25533,11 @@ __DEV__ &&
2553225533
};
2553325534
(function () {
2553425535
var isomorphicReactPackageVersion = React.version;
25535-
if ("19.0.0-native-fb-0f1856c4-20240925" !== isomorphicReactPackageVersion)
25536+
if ("19.0.0-native-fb-778e1ed2-20240926" !== isomorphicReactPackageVersion)
2553625537
throw Error(
2553725538
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2553825539
(isomorphicReactPackageVersion +
25539-
"\n - react-dom: 19.0.0-native-fb-0f1856c4-20240925\nLearn more: https://react.dev/warnings/version-mismatch")
25540+
"\n - react-dom: 19.0.0-native-fb-778e1ed2-20240926\nLearn more: https://react.dev/warnings/version-mismatch")
2554025541
);
2554125542
})();
2554225543
("function" === typeof Map &&
@@ -25573,11 +25574,11 @@ __DEV__ &&
2557325574
!(function () {
2557425575
var internals = {
2557525576
bundleType: 1,
25576-
version: "19.0.0-native-fb-0f1856c4-20240925",
25577+
version: "19.0.0-native-fb-778e1ed2-20240926",
2557725578
rendererPackageName: "react-dom",
2557825579
currentDispatcherRef: ReactSharedInternals,
2557925580
findFiberByHostInstance: getClosestInstanceFromNode,
25580-
reconcilerVersion: "19.0.0-native-fb-0f1856c4-20240925"
25581+
reconcilerVersion: "19.0.0-native-fb-778e1ed2-20240926"
2558125582
};
2558225583
internals.overrideHookState = overrideHookState;
2558325584
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -26037,7 +26038,7 @@ __DEV__ &&
2603726038
exports.useFormStatus = function () {
2603826039
return resolveDispatcher().useHostTransitionStatus();
2603926040
};
26040-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
26041+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";
2604126042
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2604226043
"function" ===
2604326044
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

‎compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-dom/cjs/ReactDOMProfiling-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<<12d0f35a67264fce7b09d1463c9fab19>>
10+
* @generated SignedSource<<74da68ece113c9837fd5a5f7ffa9656d>>
1111
*/
1212

1313
/*
@@ -11099,7 +11099,9 @@ function commitRootWhenReady(
1109911099
spawnedLane,
1110011100
updatedLanes,
1110111101
suspendedRetryLanes,
11102-
1
11102+
1,
11103+
completedRenderStartTime,
11104+
completedRenderEndTime
1110311105
)
1110411106
);
1110511107
markRootSuspended(root, lanes, spawnedLane, !didSkipSuspendedSiblings);
@@ -11698,7 +11700,6 @@ function commitRoot(
1169811700
(ReactSharedInternals.T = prevTransition),
1169911701
(ReactDOMSharedInternals.p = previousUpdateLanePriority);
1170011702
}
11701-
return null;
1170211703
}
1170311704
function commitRootImpl(
1170411705
root,
@@ -15763,14 +15764,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1576315764
};
1576415765
var isomorphicReactPackageVersion$jscomp$inline_1709 = React.version;
1576515766
if (
15766-
"19.0.0-native-fb-0f1856c4-20240925" !==
15767+
"19.0.0-native-fb-778e1ed2-20240926" !==
1576715768
isomorphicReactPackageVersion$jscomp$inline_1709
1576815769
)
1576915770
throw Error(
1577015771
formatProdErrorMessage(
1577115772
527,
1577215773
isomorphicReactPackageVersion$jscomp$inline_1709,
15773-
"19.0.0-native-fb-0f1856c4-20240925"
15774+
"19.0.0-native-fb-778e1ed2-20240926"
1577415775
)
1577515776
);
1577615777
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -15792,11 +15793,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1579215793
};
1579315794
var internals$jscomp$inline_2154 = {
1579415795
bundleType: 0,
15795-
version: "19.0.0-native-fb-0f1856c4-20240925",
15796+
version: "19.0.0-native-fb-778e1ed2-20240926",
1579615797
rendererPackageName: "react-dom",
1579715798
currentDispatcherRef: ReactSharedInternals,
1579815799
findFiberByHostInstance: getClosestInstanceFromNode,
15799-
reconcilerVersion: "19.0.0-native-fb-0f1856c4-20240925"
15800+
reconcilerVersion: "19.0.0-native-fb-778e1ed2-20240926"
1580015801
};
1580115802
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1580215803
var hook$jscomp$inline_2155 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -16054,4 +16055,4 @@ exports.useFormState = function (action, initialState, permalink) {
1605416055
exports.useFormStatus = function () {
1605516056
return ReactSharedInternals.H.useHostTransitionStatus();
1605616057
};
16057-
exports.version = "19.0.0-native-fb-0f1856c4-20240925";
16058+
exports.version = "19.0.0-native-fb-778e1ed2-20240926";

0 commit comments

Comments
 (0)