Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

SurfaceRegistryBinding: Display RedBox when RN$SurfaceRegistry isn't available

Browse Source 
Summary:
SurfaceRegistryBinding::startSurface [checks whether global.RN$SurfaceRegistry binding is installed](https://www.internalfb.com/code/fbsource/[7040bef7d4fe43298c5f9dc1fef10f47ec396e79]/xplat/js/react-native-github/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp?lines=28-29). If not, control flow goes directly into the bridge path: [callFunctionOnModule](https://www.internalfb.com/code/fbsource/[7040bef7d4fe43298c5f9dc1fef10f47ec396e79]/xplat/js/react-native-github/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp?lines=40-46). callMethodOfModule [react_native_asserts, if the requested callable JS module isn't available](https://www.internalfb.com/code/fbsource/[7040bef7d4fe43298c5f9dc1fef10f47ec396e79]/xplat/js/react-native-github/ReactCommon/react/renderer/uimanager/bindingUtils.cpp?lines=29) on the batched bridge. This crashes the app.

We could make this error experience better:
1. We shouldn't crash the app.
2. We should fail fast, and produce an error message that is more descriptive of the actual cause of the error.
3. We can leverage the RedBox infra to display this error on the screen.

## Fixes
This diff modifies the gating inside SurfaceRegistryBinding. Now, in bridgeless mode, if global.RN$SurfaceRegistry isn't instaled, we'll display a RedBox instead, that shows what the error is.

Changelog: [Internal]

Reviewed By: sshic

Differential Revision: D37223640

fbshipit-source-id: 8fbf57f5d9cf359046dc94f0a5f7d66624caee4e
This commit is contained in:
Ramanpreet Nara
2022-06-17 04:34:59 -07:00
committed by Facebook GitHub Bot
parent 4967e50989
commit ea29ae1ceb
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp
+28 -8
View File
@@ -25,11 +25,19 @@ void SurfaceRegistryBinding::startSurface(
parameters["initialProps"] = initalProps;
parameters["fabric"] = true;
if (runtime.global().hasProperty(runtime, "RN$SurfaceRegistry")) {
auto registry =
runtime.global().getPropertyAsObject(runtime, "RN$SurfaceRegistry");
auto method = registry.getPropertyAsFunction(runtime, "renderSurface");
auto global = runtime.global();
auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
global.getProperty(runtime, "RN$Bridgeless").asBool();
if (isBridgeless) {
if (!global.hasProperty(runtime, "RN$SurfaceRegistry")) {
throw std::runtime_error(
"SurfaceRegistryBinding::startSurface: Failed to start Surface \"" +
moduleName + "\". global.RN$SurfaceRegistry was not installed.");
}
auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
auto method = registry.getPropertyAsFunction(runtime, "renderSurface");
method.call(
runtime,
{jsi::String::createFromUtf8(runtime, moduleName),
@@ -58,9 +66,18 @@ void SurfaceRegistryBinding::setSurfaceProps(
parameters["initialProps"] = initalProps;
parameters["fabric"] = true;
if (runtime.global().hasProperty(runtime, "RN$SurfaceRegistry")) {
auto registry =
runtime.global().getPropertyAsObject(runtime, "RN$SurfaceRegistry");
auto global = runtime.global();
auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
global.getProperty(runtime, "RN$Bridgeless").asBool();
if (isBridgeless) {
if (!global.hasProperty(runtime, "RN$SurfaceRegistry")) {
throw std::runtime_error(
"SurfaceRegistryBinding::setSurfaceProps: Failed to set Surface props for \"" +
moduleName + "\". global.RN$SurfaceRegistry was not installed.");
}
auto registry = global.getPropertyAsObject(runtime, "RN$SurfaceRegistry");
auto method = registry.getPropertyAsFunction(runtime, "setSurfaceProps");
method.call(
@@ -83,7 +100,10 @@ void SurfaceRegistryBinding::stopSurface(
jsi::Runtime &runtime,
SurfaceId surfaceId) {
auto global = runtime.global();
if (global.hasProperty(runtime, "RN$Bridgeless")) {
auto isBridgeless = global.hasProperty(runtime, "RN$Bridgeless") &&
global.getProperty(runtime, "RN$Bridgeless").asBool();
if (isBridgeless) {
if (!global.hasProperty(runtime, "RN$stopSurface")) {
// ReactFabric module has not been loaded yet; there's no surface to stop.
return;