Skip to content

Commit 8a13948

Browse files
eps1loneps1lon
committed
Don't warn about concurrently rendering contexts if we finished rendering (#22797)
Closes #22796 DiffTrain build for [555ece0](555ece0) [View git log for this commit](https://github.com/facebook/react/commits/555ece0cd14779abd5a1fc50f71625f9ada42bef)
1 parent 6a673aa commit 8a13948

28 files changed

+182
-58
lines changed

‎compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0fce6bb498357feb4465859912004b2e20fe7084
1+
555ece0cd14779abd5a1fc50f71625f9ada42bef

‎compiled/facebook-www/REVISION_TRANSFORMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0fce6bb498357feb4465859912004b2e20fe7084
1+
555ece0cd14779abd5a1fc50f71625f9ada42bef

‎compiled/facebook-www/React-dev.classic.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-classic-0fce6bb49-20230111";
30+
var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
3131

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

‎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-0fce6bb49-20230111";
30+
var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
3131

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,4 +643,4 @@ exports.useSyncExternalStore = function(
643643
);
644644
};
645645
exports.useTransition = useTransition;
646-
exports.version = "18.3.0-www-classic-0fce6bb49-20230111";
646+
exports.version = "18.3.0-www-classic-555ece0cd-20230112";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,4 +635,4 @@ exports.useSyncExternalStore = function(
635635
);
636636
};
637637
exports.useTransition = useTransition;
638-
exports.version = "18.3.0-www-modern-0fce6bb49-20230111";
638+
exports.version = "18.3.0-www-modern-555ece0cd-20230112";

‎compiled/facebook-www/React-profiling.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ exports.useSyncExternalStore = function(
654654
);
655655
};
656656
exports.useTransition = useTransition;
657-
exports.version = "18.3.0-www-classic-0fce6bb49-20230111";
657+
exports.version = "18.3.0-www-classic-555ece0cd-20230112";
658658

659659
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
660660
if (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ exports.useSyncExternalStore = function(
646646
);
647647
};
648648
exports.useTransition = useTransition;
649-
exports.version = "18.3.0-www-modern-0fce6bb49-20230111";
649+
exports.version = "18.3.0-www-modern-555ece0cd-20230112";
650650

651651
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
652652
if (

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

Lines changed: 18 additions & 2 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-0fce6bb49-20230111";
72+
var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -16344,6 +16344,13 @@ function beginWork(current, workInProgress, renderLanes) {
1634416344
}
1634516345

1634616346
var valueCursor = createCursor(null);
16347+
16348+
var renderer2CursorDEV;
16349+
16350+
{
16351+
renderer2CursorDEV = createCursor(null);
16352+
}
16353+
1634716354
var rendererSigil$1;
1634816355

1634916356
{
@@ -16382,6 +16389,8 @@ function pushProvider(providerFiber, context, nextValue) {
1638216389
context._currentValue2 = nextValue;
1638316390

1638416391
{
16392+
push(renderer2CursorDEV, context._currentRenderer2, providerFiber);
16393+
1638516394
if (
1638616395
context._currentRenderer2 !== undefined &&
1638716396
context._currentRenderer2 !== null &&
@@ -16399,15 +16408,22 @@ function pushProvider(providerFiber, context, nextValue) {
1639916408
}
1640016409
function popProvider(context, providerFiber) {
1640116410
var currentValue = valueCursor.current;
16402-
pop(valueCursor, providerFiber);
1640316411

1640416412
{
1640516413
if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
1640616414
context._currentValue2 = context._defaultValue;
1640716415
} else {
1640816416
context._currentValue2 = currentValue;
1640916417
}
16418+
16419+
{
16420+
var currentRenderer2 = renderer2CursorDEV.current;
16421+
pop(renderer2CursorDEV, providerFiber);
16422+
context._currentRenderer2 = currentRenderer2;
16423+
}
1641016424
}
16425+
16426+
pop(valueCursor, providerFiber);
1641116427
}
1641216428
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
1641316429
// Update the child lanes of all the ancestors, including the alternates.

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

Lines changed: 18 additions & 2 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-0fce6bb49-20230111";
72+
var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
7373

7474
var LegacyRoot = 0;
7575
var ConcurrentRoot = 1;
@@ -16052,6 +16052,13 @@ function beginWork(current, workInProgress, renderLanes) {
1605216052
}
1605316053

1605416054
var valueCursor = createCursor(null);
16055+
16056+
var renderer2CursorDEV;
16057+
16058+
{
16059+
renderer2CursorDEV = createCursor(null);
16060+
}
16061+
1605516062
var rendererSigil$1;
1605616063

1605716064
{
@@ -16090,6 +16097,8 @@ function pushProvider(providerFiber, context, nextValue) {
1609016097
context._currentValue2 = nextValue;
1609116098

1609216099
{
16100+
push(renderer2CursorDEV, context._currentRenderer2, providerFiber);
16101+
1609316102
if (
1609416103
context._currentRenderer2 !== undefined &&
1609516104
context._currentRenderer2 !== null &&
@@ -16107,15 +16116,22 @@ function pushProvider(providerFiber, context, nextValue) {
1610716116
}
1610816117
function popProvider(context, providerFiber) {
1610916118
var currentValue = valueCursor.current;
16110-
pop(valueCursor, providerFiber);
1611116119

1611216120
{
1611316121
if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
1611416122
context._currentValue2 = context._defaultValue;
1611516123
} else {
1611616124
context._currentValue2 = currentValue;
1611716125
}
16126+
16127+
{
16128+
var currentRenderer2 = renderer2CursorDEV.current;
16129+
pop(renderer2CursorDEV, providerFiber);
16130+
context._currentRenderer2 = currentRenderer2;
16131+
}
1611816132
}
16133+
16134+
pop(valueCursor, providerFiber);
1611916135
}
1612016136
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
1612116137
// Update the child lanes of all the ancestors, including the alternates.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4795,11 +4795,11 @@ function pushProvider(providerFiber, context, nextValue) {
47954795
}
47964796
function popProvider(context) {
47974797
var currentValue = valueCursor.current;
4798-
pop(valueCursor);
47994798
context._currentValue2 =
48004799
currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
48014800
? context._defaultValue
48024801
: currentValue;
4802+
pop(valueCursor);
48034803
}
48044804
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
48054805
for (; null !== parent; ) {
@@ -9804,7 +9804,7 @@ var slice = Array.prototype.slice,
98049804
return null;
98059805
},
98069806
bundleType: 0,
9807-
version: "18.3.0-www-classic-0fce6bb49-20230111",
9807+
version: "18.3.0-www-classic-555ece0cd-20230112",
98089808
rendererPackageName: "react-art"
98099809
};
98109810
var internals$jscomp$inline_1318 = {
@@ -9835,7 +9835,7 @@ var internals$jscomp$inline_1318 = {
98359835
scheduleRoot: null,
98369836
setRefreshHandler: null,
98379837
getCurrentFiber: null,
9838-
reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
9838+
reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
98399839
};
98409840
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
98419841
var hook$jscomp$inline_1319 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4548,11 +4548,11 @@ function pushProvider(providerFiber, context, nextValue) {
45484548
}
45494549
function popProvider(context) {
45504550
var currentValue = valueCursor.current;
4551-
pop(valueCursor);
45524551
context._currentValue2 =
45534552
currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
45544553
? context._defaultValue
45554554
: currentValue;
4555+
pop(valueCursor);
45564556
}
45574557
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
45584558
for (; null !== parent; ) {
@@ -9471,7 +9471,7 @@ var slice = Array.prototype.slice,
94719471
return null;
94729472
},
94739473
bundleType: 0,
9474-
version: "18.3.0-www-modern-0fce6bb49-20230111",
9474+
version: "18.3.0-www-modern-555ece0cd-20230112",
94759475
rendererPackageName: "react-art"
94769476
};
94779477
var internals$jscomp$inline_1309 = {
@@ -9502,7 +9502,7 @@ var internals$jscomp$inline_1309 = {
95029502
scheduleRoot: null,
95039503
setRefreshHandler: null,
95049504
getCurrentFiber: null,
9505-
reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
9505+
reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
95069506
};
95079507
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
95089508
var hook$jscomp$inline_1310 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30982,6 +30982,12 @@ function beginWork(current, workInProgress, renderLanes) {
3098230982
}
3098330983

3098430984
var valueCursor = createCursor(null);
30985+
var rendererCursorDEV;
30986+
30987+
{
30988+
rendererCursorDEV = createCursor(null);
30989+
}
30990+
3098530991
var rendererSigil$1;
3098630992

3098730993
{
@@ -31020,6 +31026,8 @@ function pushProvider(providerFiber, context, nextValue) {
3102031026
context._currentValue = nextValue;
3102131027

3102231028
{
31029+
push(rendererCursorDEV, context._currentRenderer, providerFiber);
31030+
3102331031
if (
3102431032
context._currentRenderer !== undefined &&
3102531033
context._currentRenderer !== null &&
@@ -31037,15 +31045,22 @@ function pushProvider(providerFiber, context, nextValue) {
3103731045
}
3103831046
function popProvider(context, providerFiber) {
3103931047
var currentValue = valueCursor.current;
31040-
pop(valueCursor, providerFiber);
3104131048

3104231049
{
3104331050
if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
3104431051
context._currentValue = context._defaultValue;
3104531052
} else {
3104631053
context._currentValue = currentValue;
3104731054
}
31055+
31056+
{
31057+
var currentRenderer = rendererCursorDEV.current;
31058+
pop(rendererCursorDEV, providerFiber);
31059+
context._currentRenderer = currentRenderer;
31060+
}
3104831061
}
31062+
31063+
pop(valueCursor, providerFiber);
3104931064
}
3105031065
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
3105131066
// Update the child lanes of all the ancestors, including the alternates.
@@ -42690,7 +42705,7 @@ function createFiberRoot(
4269042705
return root;
4269142706
}
4269242707

42693-
var ReactVersion = "18.3.0-www-classic-0fce6bb49-20230111";
42708+
var ReactVersion = "18.3.0-www-classic-555ece0cd-20230112";
4269442709

4269542710
function createPortal(
4269642711
children,

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30725,6 +30725,12 @@ function beginWork(current, workInProgress, renderLanes) {
3072530725
}
3072630726

3072730727
var valueCursor = createCursor(null);
30728+
var rendererCursorDEV;
30729+
30730+
{
30731+
rendererCursorDEV = createCursor(null);
30732+
}
30733+
3072830734
var rendererSigil$1;
3072930735

3073030736
{
@@ -30763,6 +30769,8 @@ function pushProvider(providerFiber, context, nextValue) {
3076330769
context._currentValue = nextValue;
3076430770

3076530771
{
30772+
push(rendererCursorDEV, context._currentRenderer, providerFiber);
30773+
3076630774
if (
3076730775
context._currentRenderer !== undefined &&
3076830776
context._currentRenderer !== null &&
@@ -30780,15 +30788,22 @@ function pushProvider(providerFiber, context, nextValue) {
3078030788
}
3078130789
function popProvider(context, providerFiber) {
3078230790
var currentValue = valueCursor.current;
30783-
pop(valueCursor, providerFiber);
3078430791

3078530792
{
3078630793
if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
3078730794
context._currentValue = context._defaultValue;
3078830795
} else {
3078930796
context._currentValue = currentValue;
3079030797
}
30798+
30799+
{
30800+
var currentRenderer = rendererCursorDEV.current;
30801+
pop(rendererCursorDEV, providerFiber);
30802+
context._currentRenderer = currentRenderer;
30803+
}
3079130804
}
30805+
30806+
pop(valueCursor, providerFiber);
3079230807
}
3079330808
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
3079430809
// Update the child lanes of all the ancestors, including the alternates.
@@ -42414,7 +42429,7 @@ function createFiberRoot(
4241442429
return root;
4241542430
}
4241642431

42417-
var ReactVersion = "18.3.0-www-modern-0fce6bb49-20230111";
42432+
var ReactVersion = "18.3.0-www-modern-555ece0cd-20230112";
4241842433

4241942434
function createPortal(
4242042435
children,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9511,11 +9511,11 @@ function pushProvider(providerFiber, context, nextValue) {
95119511
}
95129512
function popProvider(context) {
95139513
var currentValue = valueCursor.current;
9514-
pop(valueCursor);
95159514
context._currentValue =
95169515
currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
95179516
? context._defaultValue
95189517
: currentValue;
9518+
pop(valueCursor);
95199519
}
95209520
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
95219521
for (; null !== parent; ) {
@@ -15534,7 +15534,7 @@ Internals.Events = [
1553415534
var devToolsConfig$jscomp$inline_1750 = {
1553515535
findFiberByHostInstance: getClosestInstanceFromNode,
1553615536
bundleType: 0,
15537-
version: "18.3.0-www-classic-0fce6bb49-20230111",
15537+
version: "18.3.0-www-classic-555ece0cd-20230112",
1553815538
rendererPackageName: "react-dom"
1553915539
};
1554015540
var internals$jscomp$inline_2134 = {
@@ -15564,7 +15564,7 @@ var internals$jscomp$inline_2134 = {
1556415564
scheduleRoot: null,
1556515565
setRefreshHandler: null,
1556615566
getCurrentFiber: null,
15567-
reconcilerVersion: "18.3.0-next-0fce6bb49-20230111"
15567+
reconcilerVersion: "18.3.0-next-555ece0cd-20230112"
1556815568
};
1556915569
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1557015570
var hook$jscomp$inline_2135 = __REACT_DEVTOOLS_GLOBAL_HOOK__;
@@ -15806,4 +15806,4 @@ exports.unstable_renderSubtreeIntoContainer = function(
1580615806
);
1580715807
};
1580815808
exports.unstable_runWithPriority = runWithPriority;
15809-
exports.version = "18.3.0-next-0fce6bb49-20230111";
15809+
exports.version = "18.3.0-next-555ece0cd-20230112";

0 commit comments

Comments
 (0)