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.

0 commit comments

Comments
 (0)