Skip to content

Commit 7273329

Browse files
committed
[Flight] Allow aborting during render (#29764)
Stacked on #29491 Previously if you aborted during a render the currently rendering task would itself be aborted which will cause the entire model to be replaced by the aborted error rather than just the slot currently being rendered. This change updates the abort logic to mark currently rendering tasks as aborted but allowing the current render to emit a partially serialized model with an error reference in place of the current model. The intent is to support aborting from rendering synchronously, in microtasks (after an await or in a .then) and in lazy initializers. We don't specifically support aborting from things like proxies that might be triggered during serialization of props DiffTrain build for commit c4b433f.
1 parent d7d9c34 commit 7273329

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
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.0.0-native-fb-fe5ce4e3e9-20240606
1+
19.0.0-native-fb-c4b433f8cb-20240606

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-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<<79b96a4fc869a84ced8571ec9aca49db>>
10+
* @generated SignedSource<<032d7dd89691171b14786d598e0bbc99>>
1111
*/
1212

1313
'use strict';
@@ -23580,7 +23580,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
2358023580
return root;
2358123581
}
2358223582

23583-
var ReactVersion = '19.0.0-native-fb-fe5ce4e3e9-20240606';
23583+
var ReactVersion = '19.0.0-native-fb-c4b433f8cb-20240606';
2358423584

2358523585
/*
2358623586
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-prod.js

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

1313
"use strict";
@@ -9336,7 +9336,7 @@ var devToolsConfig$jscomp$inline_1048 = {
93369336
throw Error("TestRenderer does not support findFiberByHostInstance()");
93379337
},
93389338
bundleType: 0,
9339-
version: "19.0.0-native-fb-fe5ce4e3e9-20240606",
9339+
version: "19.0.0-native-fb-c4b433f8cb-20240606",
93409340
rendererPackageName: "react-test-renderer"
93419341
};
93429342
var internals$jscomp$inline_1235 = {
@@ -9367,7 +9367,7 @@ var internals$jscomp$inline_1235 = {
93679367
scheduleRoot: null,
93689368
setRefreshHandler: null,
93699369
getCurrentFiber: null,
9370-
reconcilerVersion: "19.0.0-native-fb-fe5ce4e3e9-20240606"
9370+
reconcilerVersion: "19.0.0-native-fb-c4b433f8cb-20240606"
93719371
};
93729372
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
93739373
var hook$jscomp$inline_1236 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react-test-renderer/cjs/ReactTestRenderer-profiling.js

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

1313
"use strict";
@@ -9958,7 +9958,7 @@ var devToolsConfig$jscomp$inline_1131 = {
99589958
throw Error("TestRenderer does not support findFiberByHostInstance()");
99599959
},
99609960
bundleType: 0,
9961-
version: "19.0.0-native-fb-fe5ce4e3e9-20240606",
9961+
version: "19.0.0-native-fb-c4b433f8cb-20240606",
99629962
rendererPackageName: "react-test-renderer"
99639963
};
99649964
(function (internals) {
@@ -10002,7 +10002,7 @@ var devToolsConfig$jscomp$inline_1131 = {
1000210002
scheduleRoot: null,
1000310003
setRefreshHandler: null,
1000410004
getCurrentFiber: null,
10005-
reconcilerVersion: "19.0.0-native-fb-fe5ce4e3e9-20240606"
10005+
reconcilerVersion: "19.0.0-native-fb-c4b433f8cb-20240606"
1000610006
});
1000710007
exports._Scheduler = Scheduler;
1000810008
exports.act = act;

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-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<<93337348c12276aa93054ba1825fec71>>
10+
* @generated SignedSource<<68dbc7308bfbb7d05227a50e3eeb3e57>>
1111
*/
1212

1313
'use strict';
@@ -24,7 +24,7 @@ if (
2424
}
2525
var dynamicFlagsUntyped = require('ReactNativeInternalFeatureFlags');
2626

27-
var ReactVersion = '19.0.0-native-fb-fe5ce4e3e9-20240606';
27+
var ReactVersion = '19.0.0-native-fb-c4b433f8cb-20240606';
2828

2929
// Re-export dynamic flags from the internal module.
3030
var dynamicFlags = dynamicFlagsUntyped; // We destructure each value before re-exporting to avoid a dynamic look-up on

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-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<<87ebec9d5b39b75bcc2aa62aac2d4035>>
10+
* @generated SignedSource<<f1665633ce08787576402deeb5531665>>
1111
*/
1212

1313
"use strict";
@@ -604,4 +604,4 @@ exports.useSyncExternalStore = function (
604604
exports.useTransition = function () {
605605
return ReactSharedInternals.H.useTransition();
606606
};
607-
exports.version = "19.0.0-native-fb-fe5ce4e3e9-20240606";
607+
exports.version = "19.0.0-native-fb-c4b433f8cb-20240606";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/react/cjs/React-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<<98a105f1ba00ae86ccf86db6ce3be7f4>>
10+
* @generated SignedSource<<36642fd62ebc527de38ec42de81f2eee>>
1111
*/
1212

1313
"use strict";
@@ -608,7 +608,7 @@ exports.useSyncExternalStore = function (
608608
exports.useTransition = function () {
609609
return ReactSharedInternals.H.useTransition();
610610
};
611-
exports.version = "19.0.0-native-fb-fe5ce4e3e9-20240606";
611+
exports.version = "19.0.0-native-fb-c4b433f8cb-20240606";
612612
"undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ &&
613613
"function" ===
614614
typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop &&
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fe5ce4e3e969aca4705b9973a6fdb5f132e03025
1+
c4b433f8cb31d6f73d4a800fcf11ed55c8689daf

compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-dev.fb.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<<3d8f4a54e6c0dd5a88266eed23105ef6>>
10+
* @generated SignedSource<<f6a834b91eb2d202c2962a8e94dd5f1d>>
1111
*/
1212

1313
'use strict';
@@ -26316,7 +26316,7 @@ identifierPrefix, onUncaughtError, onCaughtError, onRecoverableError, transition
2631626316
return root;
2631726317
}
2631826318

26319-
var ReactVersion = '19.0.0-native-fb-fe5ce4e3e9-20240606';
26319+
var ReactVersion = '19.0.0-native-fb-c4b433f8cb-20240606';
2632026320

2632126321
/*
2632226322
* The `'' + value` pattern (used in perf-sensitive code) throws for Symbol

compiled-rn/facebook-fbsource/xplat/js/react-native-github/Libraries/Renderer/implementations/ReactFabric-prod.fb.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<b2f0771bf06d8c268fe704d80550efec>>
10+
* @generated SignedSource<<92715300fd590ddea9ce1dd72306e4db>>
1111
*/
1212

1313
"use strict";
@@ -10591,7 +10591,7 @@ var roots = new Map(),
1059110591
devToolsConfig$jscomp$inline_1125 = {
1059210592
findFiberByHostInstance: getInstanceFromNode,
1059310593
bundleType: 0,
10594-
version: "19.0.0-native-fb-fe5ce4e3e9-20240606",
10594+
version: "19.0.0-native-fb-c4b433f8cb-20240606",
1059510595
rendererPackageName: "react-native-renderer",
1059610596
rendererConfig: {
1059710597
getInspectorDataForInstance: getInspectorDataForInstance,
@@ -10634,7 +10634,7 @@ var internals$jscomp$inline_1351 = {
1063410634
scheduleRoot: null,
1063510635
setRefreshHandler: null,
1063610636
getCurrentFiber: null,
10637-
reconcilerVersion: "19.0.0-native-fb-fe5ce4e3e9-20240606"
10637+
reconcilerVersion: "19.0.0-native-fb-c4b433f8cb-20240606"
1063810638
};
1063910639
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
1064010640
var hook$jscomp$inline_1352 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

0 commit comments

Comments
 (0)