Skip to content

Commit 5e1c596

Browse files
sophiebitssophiebits
committed
Setting transition pending flag shouldn't be part of a surrounding transition (#26243)
Fixes #26226. (Is this the right fix?) DiffTrain build for [05777ff](05777ff)
1 parent 976efdb commit 5e1c596

18 files changed

+72
-64
lines changed

‎compiled/facebook-www/REVISION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21f6dba6a71f16b56a96182233c897468324cf99
1+
05777ffb01515679d73541062a4ecc745af04a2f

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (
2727
}
2828
"use strict";
2929

30-
var ReactVersion = "18.3.0-www-modern-269fc792";
30+
var ReactVersion = "18.3.0-www-modern-3b134919";
3131

3232
// ATTENTION
3333
// When adding new symbols to this file,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
6969
return self;
7070
}
7171

72-
var ReactVersion = "18.3.0-www-classic-fb88bc59";
72+
var ReactVersion = "18.3.0-www-classic-5b5939f0";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -9357,10 +9357,10 @@ function startTransition(setPending, callback, options) {
93579357
setCurrentUpdatePriority(
93589358
higherEventPriority(previousPriority, ContinuousEventPriority)
93599359
);
9360-
setPending(true);
93619360
var prevTransition = ReactCurrentBatchConfig$2.transition;
9362-
ReactCurrentBatchConfig$2.transition = {};
9363-
var currentTransition = ReactCurrentBatchConfig$2.transition;
9361+
ReactCurrentBatchConfig$2.transition = null;
9362+
setPending(true);
9363+
var currentTransition = (ReactCurrentBatchConfig$2.transition = {});
93649364

93659365
if (enableTransitionTracing) {
93669366
if (options !== undefined && options.name !== undefined) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function _assertThisInitialized(self) {
6969
return self;
7070
}
7171

72-
var ReactVersion = "18.3.0-www-modern-80930f5c";
72+
var ReactVersion = "18.3.0-www-modern-2aeb9097";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -9113,10 +9113,10 @@ function startTransition(setPending, callback, options) {
91139113
setCurrentUpdatePriority(
91149114
higherEventPriority(previousPriority, ContinuousEventPriority)
91159115
);
9116-
setPending(true);
91179116
var prevTransition = ReactCurrentBatchConfig$2.transition;
9118-
ReactCurrentBatchConfig$2.transition = {};
9119-
var currentTransition = ReactCurrentBatchConfig$2.transition;
9117+
ReactCurrentBatchConfig$2.transition = null;
9118+
setPending(true);
9119+
var currentTransition = (ReactCurrentBatchConfig$2.transition = {});
91209120

91219121
if (enableTransitionTracing) {
91229122
if (options !== undefined && options.name !== undefined) {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2914,8 +2914,9 @@ function startTransition(setPending, callback, options) {
29142914
var previousPriority = currentUpdatePriority;
29152915
currentUpdatePriority =
29162916
0 !== previousPriority && 8 > previousPriority ? previousPriority : 8;
2917-
setPending(!0);
29182917
var prevTransition = ReactCurrentBatchConfig$2.transition;
2918+
ReactCurrentBatchConfig$2.transition = null;
2919+
setPending(!0);
29192920
ReactCurrentBatchConfig$2.transition = {};
29202921
enableTransitionTracing &&
29212922
void 0 !== options &&
@@ -9890,7 +9891,7 @@ var slice = Array.prototype.slice,
98909891
return null;
98919892
},
98929893
bundleType: 0,
9893-
version: "18.3.0-www-classic-92b5c33e",
9894+
version: "18.3.0-www-classic-94c4d651",
98949895
rendererPackageName: "react-art"
98959896
};
98969897
var internals$jscomp$inline_1303 = {
@@ -9921,7 +9922,7 @@ var internals$jscomp$inline_1303 = {
99219922
scheduleRoot: null,
99229923
setRefreshHandler: null,
99239924
getCurrentFiber: null,
9924-
reconcilerVersion: "18.3.0-www-classic-92b5c33e"
9925+
reconcilerVersion: "18.3.0-www-classic-94c4d651"
99259926
};
99269927
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
99279928
var hook$jscomp$inline_1304 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,8 +2720,9 @@ function startTransition(setPending, callback, options) {
27202720
var previousPriority = currentUpdatePriority;
27212721
currentUpdatePriority =
27222722
0 !== previousPriority && 8 > previousPriority ? previousPriority : 8;
2723-
setPending(!0);
27242723
var prevTransition = ReactCurrentBatchConfig$2.transition;
2724+
ReactCurrentBatchConfig$2.transition = null;
2725+
setPending(!0);
27252726
ReactCurrentBatchConfig$2.transition = {};
27262727
enableTransitionTracing &&
27272728
void 0 !== options &&
@@ -9555,7 +9556,7 @@ var slice = Array.prototype.slice,
95559556
return null;
95569557
},
95579558
bundleType: 0,
9558-
version: "18.3.0-www-modern-d2d40a82",
9559+
version: "18.3.0-www-modern-01e5635a",
95599560
rendererPackageName: "react-art"
95609561
};
95619562
var internals$jscomp$inline_1283 = {
@@ -9586,7 +9587,7 @@ var internals$jscomp$inline_1283 = {
95869587
scheduleRoot: null,
95879588
setRefreshHandler: null,
95889589
getCurrentFiber: null,
9589-
reconcilerVersion: "18.3.0-www-modern-d2d40a82"
9590+
reconcilerVersion: "18.3.0-www-modern-01e5635a"
95909591
};
95919592
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
95929593
var hook$jscomp$inline_1284 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

‎compiled/facebook-www/ReactDOM-dev.classic.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19002,10 +19002,10 @@ function startTransition(setPending, callback, options) {
1900219002
setCurrentUpdatePriority(
1900319003
higherEventPriority(previousPriority, ContinuousEventPriority)
1900419004
);
19005-
setPending(true);
1900619005
var prevTransition = ReactCurrentBatchConfig$3.transition;
19007-
ReactCurrentBatchConfig$3.transition = {};
19008-
var currentTransition = ReactCurrentBatchConfig$3.transition;
19006+
ReactCurrentBatchConfig$3.transition = null;
19007+
setPending(true);
19008+
var currentTransition = (ReactCurrentBatchConfig$3.transition = {});
1900919009

1901019010
if (enableTransitionTracing) {
1901119011
if (options !== undefined && options.name !== undefined) {
@@ -38325,7 +38325,7 @@ function createFiberRoot(
3832538325
return root;
3832638326
}
3832738327

38328-
var ReactVersion = "18.3.0-www-classic-da9cec21";
38328+
var ReactVersion = "18.3.0-www-classic-063e851c";
3832938329

3833038330
function createPortal$1(
3833138331
children,

‎compiled/facebook-www/ReactDOM-dev.modern.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13882,10 +13882,10 @@ function startTransition(setPending, callback, options) {
1388213882
setCurrentUpdatePriority(
1388313883
higherEventPriority(previousPriority, ContinuousEventPriority)
1388413884
);
13885-
setPending(true);
1388613885
var prevTransition = ReactCurrentBatchConfig$3.transition;
13887-
ReactCurrentBatchConfig$3.transition = {};
13888-
var currentTransition = ReactCurrentBatchConfig$3.transition;
13886+
ReactCurrentBatchConfig$3.transition = null;
13887+
setPending(true);
13888+
var currentTransition = (ReactCurrentBatchConfig$3.transition = {});
1388913889

1389013890
if (enableTransitionTracing) {
1389113891
if (options !== undefined && options.name !== undefined) {
@@ -33111,7 +33111,7 @@ function createFiberRoot(
3311133111
return root;
3311233112
}
3311333113

33114-
var ReactVersion = "18.3.0-www-modern-d2d40a82";
33114+
var ReactVersion = "18.3.0-www-modern-01e5635a";
3311533115

3311633116
function createPortal$1(
3311733117
children,

‎compiled/facebook-www/ReactDOM-prod.classic.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5156,8 +5156,9 @@ function startTransition(setPending, callback, options) {
51565156
var previousPriority = currentUpdatePriority;
51575157
currentUpdatePriority =
51585158
0 !== previousPriority && 8 > previousPriority ? previousPriority : 8;
5159-
setPending(!0);
51605159
var prevTransition = ReactCurrentBatchConfig$3.transition;
5160+
ReactCurrentBatchConfig$3.transition = null;
5161+
setPending(!0);
51615162
ReactCurrentBatchConfig$3.transition = {};
51625163
enableTransitionTracing &&
51635164
void 0 !== options &&
@@ -15702,7 +15703,7 @@ Internals.Events = [
1570215703
var devToolsConfig$jscomp$inline_1735 = {
1570315704
findFiberByHostInstance: getClosestInstanceFromNode,
1570415705
bundleType: 0,
15705-
version: "18.3.0-www-classic-55fee6a8",
15706+
version: "18.3.0-www-classic-aa13d003",
1570615707
rendererPackageName: "react-dom"
1570715708
};
1570815709
var internals$jscomp$inline_2127 = {
@@ -15732,7 +15733,7 @@ var internals$jscomp$inline_2127 = {
1573215733
scheduleRoot: null,
1573315734
setRefreshHandler: null,
1573415735
getCurrentFiber: null,
15735-
reconcilerVersion: "18.3.0-www-classic-55fee6a8"
15736+
reconcilerVersion: "18.3.0-www-classic-aa13d003"
1573615737
};
1573715738
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1573815739
var hook$jscomp$inline_2128 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15972,4 +15973,4 @@ exports.unstable_renderSubtreeIntoContainer = function (
1597215973
);
1597315974
};
1597415975
exports.unstable_runWithPriority = runWithPriority;
15975-
exports.version = "18.3.0-www-classic-55fee6a8";
15976+
exports.version = "18.3.0-www-classic-aa13d003";

‎compiled/facebook-www/ReactDOM-prod.modern.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3891,8 +3891,9 @@ function startTransition(setPending, callback, options) {
38913891
var previousPriority = currentUpdatePriority;
38923892
currentUpdatePriority =
38933893
0 !== previousPriority && 8 > previousPriority ? previousPriority : 8;
3894-
setPending(!0);
38953894
var prevTransition = ReactCurrentBatchConfig$3.transition;
3895+
ReactCurrentBatchConfig$3.transition = null;
3896+
setPending(!0);
38963897
ReactCurrentBatchConfig$3.transition = {};
38973898
enableTransitionTracing &&
38983899
void 0 !== options &&
@@ -15225,7 +15226,7 @@ Internals.Events = [
1522515226
var devToolsConfig$jscomp$inline_1705 = {
1522615227
findFiberByHostInstance: getClosestInstanceFromNode,
1522715228
bundleType: 0,
15228-
version: "18.3.0-www-modern-90982dde",
15229+
version: "18.3.0-www-modern-d91eb997",
1522915230
rendererPackageName: "react-dom"
1523015231
};
1523115232
var internals$jscomp$inline_2115 = {
@@ -15256,7 +15257,7 @@ var internals$jscomp$inline_2115 = {
1525615257
scheduleRoot: null,
1525715258
setRefreshHandler: null,
1525815259
getCurrentFiber: null,
15259-
reconcilerVersion: "18.3.0-www-modern-90982dde"
15260+
reconcilerVersion: "18.3.0-www-modern-d91eb997"
1526015261
};
1526115262
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1526215263
var hook$jscomp$inline_2116 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15425,4 +15426,4 @@ exports.unstable_createEventHandle = function (type, options) {
1542515426
return eventHandle;
1542615427
};
1542715428
exports.unstable_runWithPriority = runWithPriority;
15428-
exports.version = "18.3.0-www-modern-90982dde";
15429+
exports.version = "18.3.0-www-modern-d91eb997";

0 commit comments

Comments
 (0)