Skip to content

Commit 1bc9b2a

Browse files
committed
Implement ActivityInstance in FiberConfigDOM (#32842)
Stacked on #32851 and #32900. This implements the equivalent Configs for ActivityInstance as we have for SuspenseInstance. These can be implemented as comments but they don't have to be and can be implemented differently in the renderer. This seems like a lot duplication but it's actually ends mostly just calling the same methods underneath and the wrappers compiles out. This doesn't leave the Activity dehydrated yet. It just hydrates into it immediately. DiffTrain build for [17f88c8](17f88c8)
1 parent 0b9ba06 commit 1bc9b2a

37 files changed

+2451
-1884
lines changed

compiled/facebook-www/REVISION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3fbd6b7b50e3a174883633695586b892249e5635
1+
17f88c80ed20b4e5f21255d9e1268542a2fbc1bd
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3fbd6b7b50e3a174883633695586b892249e5635
1+
17f88c80ed20b4e5f21255d9e1268542a2fbc1bd

compiled/facebook-www/React-dev.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ __DEV__ &&
15381538
exports.useTransition = function () {
15391539
return resolveDispatcher().useTransition();
15401540
};
1541-
exports.version = "19.2.0-www-classic-3fbd6b7b-20250422";
1541+
exports.version = "19.2.0-www-classic-17f88c80-20250422";
15421542
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
15431543
"function" ===
15441544
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ __DEV__ &&
15381538
exports.useTransition = function () {
15391539
return resolveDispatcher().useTransition();
15401540
};
1541-
exports.version = "19.2.0-www-modern-3fbd6b7b-20250422";
1541+
exports.version = "19.2.0-www-modern-17f88c80-20250422";
15421542
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
15431543
"function" ===
15441544
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,4 +636,4 @@ exports.useSyncExternalStore = function (
636636
exports.useTransition = function () {
637637
return ReactSharedInternals.H.useTransition();
638638
};
639-
exports.version = "19.2.0-www-classic-3fbd6b7b-20250422";
639+
exports.version = "19.2.0-www-classic-17f88c80-20250422";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,4 +636,4 @@ exports.useSyncExternalStore = function (
636636
exports.useTransition = function () {
637637
return ReactSharedInternals.H.useTransition();
638638
};
639-
exports.version = "19.2.0-www-modern-3fbd6b7b-20250422";
639+
exports.version = "19.2.0-www-modern-17f88c80-20250422";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ exports.useSyncExternalStore = function (
640640
exports.useTransition = function () {
641641
return ReactSharedInternals.H.useTransition();
642642
};
643-
exports.version = "19.2.0-www-classic-3fbd6b7b-20250422";
643+
exports.version = "19.2.0-www-classic-17f88c80-20250422";
644644
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
645645
"function" ===
646646
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ exports.useSyncExternalStore = function (
640640
exports.useTransition = function () {
641641
return ReactSharedInternals.H.useTransition();
642642
};
643-
exports.version = "19.2.0-www-modern-3fbd6b7b-20250422";
643+
exports.version = "19.2.0-www-modern-17f88c80-20250422";
644644
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
645645
"function" ===
646646
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,8 @@ __DEV__ &&
14121412
return fiber.type;
14131413
case 16:
14141414
return "Lazy";
1415+
case 31:
1416+
return "Activity";
14151417
case 13:
14161418
return "Suspense";
14171419
case 19:
@@ -9350,7 +9352,6 @@ __DEV__ &&
93509352
function completeWork(current, workInProgress, renderLanes) {
93519353
var newProps = workInProgress.pendingProps;
93529354
switch (workInProgress.tag) {
9353-
case 31:
93549355
case 16:
93559356
case 15:
93569357
case 0:
@@ -9498,6 +9499,8 @@ __DEV__ &&
94989499
}
94999500
bubbleProperties(workInProgress);
95009501
return null;
9502+
case 31:
9503+
return bubbleProperties(workInProgress), null;
95019504
case 13:
95029505
newProps = workInProgress.memoizedState;
95039506
if (
@@ -11924,12 +11927,12 @@ __DEV__ &&
1192411927
suspenseCallback
1192511928
? runWithFiberInDEV(
1192611929
lanes,
11927-
hideSuspenseBoundary,
11930+
hideDehydratedBoundary,
1192811931
instance$jscomp$0
1192911932
)
1193011933
: runWithFiberInDEV(
1193111934
lanes,
11932-
unhideSuspenseBoundary,
11935+
unhideDehydratedBoundary,
1193311936
lanes.stateNode
1193411937
);
1193511938
} catch (error) {
@@ -16429,8 +16432,8 @@ __DEV__ &&
1642916432
registerSuspenseInstanceRetry = shim$2,
1643016433
clearSuspenseBoundary = shim$2,
1643116434
clearSuspenseBoundaryFromContainer = shim$2,
16432-
hideSuspenseBoundary = shim$2,
16433-
unhideSuspenseBoundary = shim$2,
16435+
hideDehydratedBoundary = shim$2,
16436+
unhideDehydratedBoundary = shim$2,
1643416437
prepareScopeUpdate = shim$1,
1643516438
getInstanceFromScope = shim$1,
1643616439
preloadResource = shim,
@@ -18573,10 +18576,10 @@ __DEV__ &&
1857318576
(function () {
1857418577
var internals = {
1857518578
bundleType: 1,
18576-
version: "19.2.0-www-classic-3fbd6b7b-20250422",
18579+
version: "19.2.0-www-classic-17f88c80-20250422",
1857718580
rendererPackageName: "react-art",
1857818581
currentDispatcherRef: ReactSharedInternals,
18579-
reconcilerVersion: "19.2.0-www-classic-3fbd6b7b-20250422"
18582+
reconcilerVersion: "19.2.0-www-classic-17f88c80-20250422"
1858018583
};
1858118584
internals.overrideHookState = overrideHookState;
1858218585
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -18610,7 +18613,7 @@ __DEV__ &&
1861018613
exports.Shape = Shape;
1861118614
exports.Surface = Surface;
1861218615
exports.Text = Text;
18613-
exports.version = "19.2.0-www-classic-3fbd6b7b-20250422";
18616+
exports.version = "19.2.0-www-classic-17f88c80-20250422";
1861418617
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1861518618
"function" ===
1861618619
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,6 +1318,8 @@ __DEV__ &&
13181318
return fiber.type;
13191319
case 16:
13201320
return "Lazy";
1321+
case 31:
1322+
return "Activity";
13211323
case 13:
13221324
return "Suspense";
13231325
case 19:
@@ -9182,7 +9184,6 @@ __DEV__ &&
91829184
function completeWork(current, workInProgress, renderLanes) {
91839185
var newProps = workInProgress.pendingProps;
91849186
switch (workInProgress.tag) {
9185-
case 31:
91869187
case 16:
91879188
case 15:
91889189
case 0:
@@ -9324,6 +9325,8 @@ __DEV__ &&
93249325
}
93259326
bubbleProperties(workInProgress);
93269327
return null;
9328+
case 31:
9329+
return bubbleProperties(workInProgress), null;
93279330
case 13:
93289331
newProps = workInProgress.memoizedState;
93299332
if (
@@ -11742,12 +11745,12 @@ __DEV__ &&
1174211745
suspenseCallback
1174311746
? runWithFiberInDEV(
1174411747
lanes,
11745-
hideSuspenseBoundary,
11748+
hideDehydratedBoundary,
1174611749
instance$jscomp$0
1174711750
)
1174811751
: runWithFiberInDEV(
1174911752
lanes,
11750-
unhideSuspenseBoundary,
11753+
unhideDehydratedBoundary,
1175111754
lanes.stateNode
1175211755
);
1175311756
} catch (error) {
@@ -16206,8 +16209,8 @@ __DEV__ &&
1620616209
registerSuspenseInstanceRetry = shim$2,
1620716210
clearSuspenseBoundary = shim$2,
1620816211
clearSuspenseBoundaryFromContainer = shim$2,
16209-
hideSuspenseBoundary = shim$2,
16210-
unhideSuspenseBoundary = shim$2,
16212+
hideDehydratedBoundary = shim$2,
16213+
unhideDehydratedBoundary = shim$2,
1621116214
prepareScopeUpdate = shim$1,
1621216215
getInstanceFromScope = shim$1,
1621316216
preloadResource = shim,
@@ -18345,10 +18348,10 @@ __DEV__ &&
1834518348
(function () {
1834618349
var internals = {
1834718350
bundleType: 1,
18348-
version: "19.2.0-www-modern-3fbd6b7b-20250422",
18351+
version: "19.2.0-www-modern-17f88c80-20250422",
1834918352
rendererPackageName: "react-art",
1835018353
currentDispatcherRef: ReactSharedInternals,
18351-
reconcilerVersion: "19.2.0-www-modern-3fbd6b7b-20250422"
18354+
reconcilerVersion: "19.2.0-www-modern-17f88c80-20250422"
1835218355
};
1835318356
internals.overrideHookState = overrideHookState;
1835418357
internals.overrideHookStateDeletePath = overrideHookStateDeletePath;
@@ -18382,7 +18385,7 @@ __DEV__ &&
1838218385
exports.Shape = Shape;
1838318386
exports.Surface = Surface;
1838418387
exports.Text = Text;
18385-
exports.version = "19.2.0-www-modern-3fbd6b7b-20250422";
18388+
exports.version = "19.2.0-www-modern-17f88c80-20250422";
1838618389
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
1838718390
"function" ===
1838818391
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&

0 commit comments

Comments
 (0)