Skip to content

Commit bb4b9e4

Browse files
sebmarkbagesebmarkbage
committed
Reset currentEventTransitionLane after flushing sync work (#33159)
This keeps track of the transition lane allocated for this event. I want to be able to use the current one within sync work flushing to know which lane needs its loading indicator cleared. It's also a bit weird that transition work scheduled inside sync updates in the same event aren't entangled with other transitions in that event when `flushSync` is. Therefore this moves it to reset after flushing. It should have no impact. Just splitting it out into a separate PR for an abundance of caution. The only thing this might affect would be if the React internals throws and it doesn't reset after. But really it doesn't really have to reset and they're all entangled anyway. DiffTrain build for [676f087](676f087)
1 parent 4a0575d commit bb4b9e4

24 files changed

+159
-177
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-0cac32d6-20250513
1+
19.2.0-native-fb-676f0879-20250513

‎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<<0f52cfad487070feec8dc822fddc969c>>
10+
* @generated SignedSource<<c8cd9640bf679d0908e5d46ec54f3189>>
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-0cac32d6-20250513";
407+
exports.version = "19.2.0-native-fb-676f0879-20250513";
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<<dd3f276e77b7c33875d1134c3da76c74>>
10+
* @generated SignedSource<<dccf9a8410699996ea709daa7a5df85f>>
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-0cac32d6-20250513";
206+
exports.version = "19.2.0-native-fb-676f0879-20250513";

‎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<<dd3f276e77b7c33875d1134c3da76c74>>
10+
* @generated SignedSource<<dccf9a8410699996ea709daa7a5df85f>>
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-0cac32d6-20250513";
206+
exports.version = "19.2.0-native-fb-676f0879-20250513";

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

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

1313
/*
@@ -15616,7 +15616,8 @@ __DEV__ &&
1561615616
return null !== transition
1561715617
? (transition._updatedFibers || (transition._updatedFibers = new Set()),
1561815618
transition._updatedFibers.add(fiber),
15619-
requestTransitionLane())
15619+
(fiber = currentEntangledLane),
15620+
0 !== fiber ? fiber : requestTransitionLane())
1562015621
: resolveUpdatePriority();
1562115622
}
1562215623
function requestDeferredLane() {
@@ -17667,11 +17668,8 @@ __DEV__ &&
1766717668
});
1766817669
}
1766917670
function requestTransitionLane() {
17670-
if (0 === currentEventTransitionLane) {
17671-
var actionScopeLane = currentEntangledLane;
17672-
currentEventTransitionLane =
17673-
0 !== actionScopeLane ? actionScopeLane : claimNextTransitionLane();
17674-
}
17671+
0 === currentEventTransitionLane &&
17672+
(currentEventTransitionLane = claimNextTransitionLane());
1767517673
return currentEventTransitionLane;
1767617674
}
1767717675
function coerceFormActionProp(actionProp) {
@@ -26960,11 +26958,11 @@ __DEV__ &&
2696026958
};
2696126959
(function () {
2696226960
var isomorphicReactPackageVersion = React.version;
26963-
if ("19.2.0-native-fb-0cac32d6-20250513" !== isomorphicReactPackageVersion)
26961+
if ("19.2.0-native-fb-676f0879-20250513" !== isomorphicReactPackageVersion)
2696426962
throw Error(
2696526963
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2696626964
(isomorphicReactPackageVersion +
26967-
"\n - react-dom: 19.2.0-native-fb-0cac32d6-20250513\nLearn more: https://react.dev/warnings/version-mismatch")
26965+
"\n - react-dom: 19.2.0-native-fb-676f0879-20250513\nLearn more: https://react.dev/warnings/version-mismatch")
2696826966
);
2696926967
})();
2697026968
("function" === typeof Map &&
@@ -27001,10 +26999,10 @@ __DEV__ &&
2700126999
!(function () {
2700227000
var internals = {
2700327001
bundleType: 1,
27004-
version: "19.2.0-native-fb-0cac32d6-20250513",
27002+
version: "19.2.0-native-fb-676f0879-20250513",
2700527003
rendererPackageName: "react-dom",
2700627004
currentDispatcherRef: ReactSharedInternals,
27007-
reconcilerVersion: "19.2.0-native-fb-0cac32d6-20250513"
27005+
reconcilerVersion: "19.2.0-native-fb-676f0879-20250513"
2700827006
};
2700927007
internals.overrideHookState = overrideHookState;
2701027008
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -27142,5 +27140,5 @@ __DEV__ &&
2714227140
listenToAllSupportedEvents(container);
2714327141
return new ReactDOMHydrationRoot(initialChildren);
2714427142
};
27145-
exports.version = "19.2.0-native-fb-0cac32d6-20250513";
27143+
exports.version = "19.2.0-native-fb-676f0879-20250513";
2714627144
})();

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

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

1313
/*
@@ -11350,7 +11350,8 @@ function requestUpdateLane(fiber) {
1135011350
: 0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes
1135111351
? workInProgressRootRenderLanes & -workInProgressRootRenderLanes
1135211352
: null !== ReactSharedInternals.T
11353-
? requestTransitionLane()
11353+
? ((fiber = currentEntangledLane),
11354+
0 !== fiber ? fiber : requestTransitionLane())
1135411355
: resolveUpdatePriority();
1135511356
}
1135611357
function requestDeferredLane() {
@@ -12828,11 +12829,8 @@ function scheduleImmediateRootScheduleTask() {
1282812829
});
1282912830
}
1283012831
function requestTransitionLane() {
12831-
if (0 === currentEventTransitionLane) {
12832-
var actionScopeLane = currentEntangledLane;
12833-
currentEventTransitionLane =
12834-
0 !== actionScopeLane ? actionScopeLane : claimNextTransitionLane();
12835-
}
12832+
0 === currentEventTransitionLane &&
12833+
(currentEventTransitionLane = claimNextTransitionLane());
1283612834
return currentEventTransitionLane;
1283712835
}
1283812836
function coerceFormActionProp(actionProp) {
@@ -17051,14 +17049,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1705117049
};
1705217050
var isomorphicReactPackageVersion$jscomp$inline_2015 = React.version;
1705317051
if (
17054-
"19.2.0-native-fb-0cac32d6-20250513" !==
17052+
"19.2.0-native-fb-676f0879-20250513" !==
1705517053
isomorphicReactPackageVersion$jscomp$inline_2015
1705617054
)
1705717055
throw Error(
1705817056
formatProdErrorMessage(
1705917057
527,
1706017058
isomorphicReactPackageVersion$jscomp$inline_2015,
17061-
"19.2.0-native-fb-0cac32d6-20250513"
17059+
"19.2.0-native-fb-676f0879-20250513"
1706217060
)
1706317061
);
1706417062
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17080,10 +17078,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1708017078
};
1708117079
var internals$jscomp$inline_2534 = {
1708217080
bundleType: 0,
17083-
version: "19.2.0-native-fb-0cac32d6-20250513",
17081+
version: "19.2.0-native-fb-676f0879-20250513",
1708417082
rendererPackageName: "react-dom",
1708517083
currentDispatcherRef: ReactSharedInternals,
17086-
reconcilerVersion: "19.2.0-native-fb-0cac32d6-20250513"
17084+
reconcilerVersion: "19.2.0-native-fb-676f0879-20250513"
1708717085
};
1708817086
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1708917087
var hook$jscomp$inline_2535 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17181,4 +17179,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1718117179
listenToAllSupportedEvents(container);
1718217180
return new ReactDOMHydrationRoot(initialChildren);
1718317181
};
17184-
exports.version = "19.2.0-native-fb-0cac32d6-20250513";
17182+
exports.version = "19.2.0-native-fb-676f0879-20250513";

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

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

1313
/*
@@ -11911,7 +11911,8 @@ function requestUpdateLane(fiber) {
1191111911
: 0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes
1191211912
? workInProgressRootRenderLanes & -workInProgressRootRenderLanes
1191311913
: null !== ReactSharedInternals.T
11914-
? requestTransitionLane()
11914+
? ((fiber = currentEntangledLane),
11915+
0 !== fiber ? fiber : requestTransitionLane())
1191511916
: resolveUpdatePriority();
1191611917
}
1191711918
function requestDeferredLane() {
@@ -13530,11 +13531,8 @@ function scheduleImmediateRootScheduleTask() {
1353013531
});
1353113532
}
1353213533
function requestTransitionLane() {
13533-
if (0 === currentEventTransitionLane) {
13534-
var actionScopeLane = currentEntangledLane;
13535-
currentEventTransitionLane =
13536-
0 !== actionScopeLane ? actionScopeLane : claimNextTransitionLane();
13537-
}
13534+
0 === currentEventTransitionLane &&
13535+
(currentEventTransitionLane = claimNextTransitionLane());
1353813536
return currentEventTransitionLane;
1353913537
}
1354013538
function coerceFormActionProp(actionProp) {
@@ -17761,14 +17759,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1776117759
};
1776217760
var isomorphicReactPackageVersion$jscomp$inline_2118 = React.version;
1776317761
if (
17764-
"19.2.0-native-fb-0cac32d6-20250513" !==
17762+
"19.2.0-native-fb-676f0879-20250513" !==
1776517763
isomorphicReactPackageVersion$jscomp$inline_2118
1776617764
)
1776717765
throw Error(
1776817766
formatProdErrorMessage(
1776917767
527,
1777017768
isomorphicReactPackageVersion$jscomp$inline_2118,
17771-
"19.2.0-native-fb-0cac32d6-20250513"
17769+
"19.2.0-native-fb-676f0879-20250513"
1777217770
)
1777317771
);
1777417772
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17790,10 +17788,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1779017788
};
1779117789
var internals$jscomp$inline_2125 = {
1779217790
bundleType: 0,
17793-
version: "19.2.0-native-fb-0cac32d6-20250513",
17791+
version: "19.2.0-native-fb-676f0879-20250513",
1779417792
rendererPackageName: "react-dom",
1779517793
currentDispatcherRef: ReactSharedInternals,
17796-
reconcilerVersion: "19.2.0-native-fb-0cac32d6-20250513",
17794+
reconcilerVersion: "19.2.0-native-fb-676f0879-20250513",
1779717795
getLaneLabelMap: function () {
1779817796
for (
1779917797
var map = new Map(), lane = 1, index$313 = 0;
@@ -17906,4 +17904,4 @@ exports.hydrateRoot = function (container, initialChildren, options) {
1790617904
listenToAllSupportedEvents(container);
1790717905
return new ReactDOMHydrationRoot(initialChildren);
1790817906
};
17909-
exports.version = "19.2.0-native-fb-0cac32d6-20250513";
17907+
exports.version = "19.2.0-native-fb-676f0879-20250513";

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

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

1313
/*
@@ -15624,7 +15624,8 @@ __DEV__ &&
1562415624
return null !== transition
1562515625
? (transition._updatedFibers || (transition._updatedFibers = new Set()),
1562615626
transition._updatedFibers.add(fiber),
15627-
requestTransitionLane())
15627+
(fiber = currentEntangledLane),
15628+
0 !== fiber ? fiber : requestTransitionLane())
1562815629
: resolveUpdatePriority();
1562915630
}
1563015631
function requestDeferredLane() {
@@ -17675,11 +17676,8 @@ __DEV__ &&
1767517676
});
1767617677
}
1767717678
function requestTransitionLane() {
17678-
if (0 === currentEventTransitionLane) {
17679-
var actionScopeLane = currentEntangledLane;
17680-
currentEventTransitionLane =
17681-
0 !== actionScopeLane ? actionScopeLane : claimNextTransitionLane();
17682-
}
17679+
0 === currentEventTransitionLane &&
17680+
(currentEventTransitionLane = claimNextTransitionLane());
1768317681
return currentEventTransitionLane;
1768417682
}
1768517683
function coerceFormActionProp(actionProp) {
@@ -27016,11 +27014,11 @@ __DEV__ &&
2701627014
};
2701727015
(function () {
2701827016
var isomorphicReactPackageVersion = React.version;
27019-
if ("19.2.0-native-fb-0cac32d6-20250513" !== isomorphicReactPackageVersion)
27017+
if ("19.2.0-native-fb-676f0879-20250513" !== isomorphicReactPackageVersion)
2702027018
throw Error(
2702127019
'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' +
2702227020
(isomorphicReactPackageVersion +
27023-
"\n - react-dom: 19.2.0-native-fb-0cac32d6-20250513\nLearn more: https://react.dev/warnings/version-mismatch")
27021+
"\n - react-dom: 19.2.0-native-fb-676f0879-20250513\nLearn more: https://react.dev/warnings/version-mismatch")
2702427022
);
2702527023
})();
2702627024
("function" === typeof Map &&
@@ -27057,10 +27055,10 @@ __DEV__ &&
2705727055
!(function () {
2705827056
var internals = {
2705927057
bundleType: 1,
27060-
version: "19.2.0-native-fb-0cac32d6-20250513",
27058+
version: "19.2.0-native-fb-676f0879-20250513",
2706127059
rendererPackageName: "react-dom",
2706227060
currentDispatcherRef: ReactSharedInternals,
27063-
reconcilerVersion: "19.2.0-native-fb-0cac32d6-20250513"
27061+
reconcilerVersion: "19.2.0-native-fb-676f0879-20250513"
2706427062
};
2706527063
internals.overrideHookState = overrideHookState;
2706627064
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -27514,7 +27512,7 @@ __DEV__ &&
2751427512
exports.useFormStatus = function () {
2751527513
return resolveDispatcher().useHostTransitionStatus();
2751627514
};
27517-
exports.version = "19.2.0-native-fb-0cac32d6-20250513";
27515+
exports.version = "19.2.0-native-fb-676f0879-20250513";
2751827516
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
2751927517
"function" ===
2752027518
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

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

1313
/*
@@ -11350,7 +11350,8 @@ function requestUpdateLane(fiber) {
1135011350
: 0 !== (executionContext & 2) && 0 !== workInProgressRootRenderLanes
1135111351
? workInProgressRootRenderLanes & -workInProgressRootRenderLanes
1135211352
: null !== ReactSharedInternals.T
11353-
? requestTransitionLane()
11353+
? ((fiber = currentEntangledLane),
11354+
0 !== fiber ? fiber : requestTransitionLane())
1135411355
: resolveUpdatePriority();
1135511356
}
1135611357
function requestDeferredLane() {
@@ -12828,11 +12829,8 @@ function scheduleImmediateRootScheduleTask() {
1282812829
});
1282912830
}
1283012831
function requestTransitionLane() {
12831-
if (0 === currentEventTransitionLane) {
12832-
var actionScopeLane = currentEntangledLane;
12833-
currentEventTransitionLane =
12834-
0 !== actionScopeLane ? actionScopeLane : claimNextTransitionLane();
12835-
}
12832+
0 === currentEventTransitionLane &&
12833+
(currentEventTransitionLane = claimNextTransitionLane());
1283612834
return currentEventTransitionLane;
1283712835
}
1283812836
function coerceFormActionProp(actionProp) {
@@ -17062,14 +17060,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) {
1706217060
};
1706317061
var isomorphicReactPackageVersion$jscomp$inline_2016 = React.version;
1706417062
if (
17065-
"19.2.0-native-fb-0cac32d6-20250513" !==
17063+
"19.2.0-native-fb-676f0879-20250513" !==
1706617064
isomorphicReactPackageVersion$jscomp$inline_2016
1706717065
)
1706817066
throw Error(
1706917067
formatProdErrorMessage(
1707017068
527,
1707117069
isomorphicReactPackageVersion$jscomp$inline_2016,
17072-
"19.2.0-native-fb-0cac32d6-20250513"
17070+
"19.2.0-native-fb-676f0879-20250513"
1707317071
)
1707417072
);
1707517073
ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
@@ -17091,10 +17089,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) {
1709117089
};
1709217090
var internals$jscomp$inline_2537 = {
1709317091
bundleType: 0,
17094-
version: "19.2.0-native-fb-0cac32d6-20250513",
17092+
version: "19.2.0-native-fb-676f0879-20250513",
1709517093
rendererPackageName: "react-dom",
1709617094
currentDispatcherRef: ReactSharedInternals,
17097-
reconcilerVersion: "19.2.0-native-fb-0cac32d6-20250513"
17095+
reconcilerVersion: "19.2.0-native-fb-676f0879-20250513"
1709817096
};
1709917097
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1710017098
var hook$jscomp$inline_2538 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -17345,4 +17343,4 @@ exports.useFormState = function (action, initialState, permalink) {
1734517343
exports.useFormStatus = function () {
1734617344
return ReactSharedInternals.H.useHostTransitionStatus();
1734717345
};
17348-
exports.version = "19.2.0-native-fb-0cac32d6-20250513";
17346+
exports.version = "19.2.0-native-fb-676f0879-20250513";

0 commit comments

Comments
 (0)