fix(react-native-host): fix SurfaceRegistryBinding::startSurface fa…

…iled (#3130)
microsoft · May 7, 2024 · 76f92c1 · 76f92c1
1 parent d7758b4
commit 76f92c1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/.changeset/orange-paws-cry.md b/.changeset/orange-paws-cry.md
@@ -0,0 +1,5 @@
+---
+"@rnx-kit/react-native-host": patch
+---
+
+Fix `SurfaceRegistryBinding::startSurface` failed on startup with New Architecture
diff --git a/packages/react-native-host/cocoa/ReactNativeHost+Private.h b/packages/react-native-host/cocoa/ReactNativeHost+Private.h
@@ -1,11 +1,17 @@
 #import "ReactNativeHost.h"
 
+@class RCTHost;
 @class RCTSurfacePresenter;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ReactNativeHost (Private)
 
+/// Returns the current ``RCTHost`` instance.
+///
+/// - Note: Returns `nil` if New Architecture is not enabled.
+@property (nonatomic, readonly, nullable) RCTHost *reactHost;
+
 /// Returns the current ``RCTSurfacePresenter`` instance.
 ///
 /// - Note: Returns `nil` if New Architecture is not enabled.

diff --git a/packages/react-native-host/cocoa/ReactNativeHost+View.mm b/packages/react-native-host/cocoa/ReactNativeHost+View.mm
@@ -7,8 +7,11 @@
 #import <React/RCTFabricSurface.h>
 #import <React/RCTSurfaceHostingProxyRootView.h>
 #endif  // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
+#ifdef USE_BRIDGELESS
+#import <ReactCommon/RCTHost.h>
+#endif  // USE_BRIDGELESS
 static NSString *const kReactConcurrentRoot = @"concurrentRoot";
-#else
+#else  // USE_FABRIC
 #import <React/RCTRootView.h>
 #endif  // USE_FABRIC
 
@@ -53,6 +56,13 @@ - (RNXView *)viewWithModuleName:(NSString *)moduleName
     return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:self.bridge
                                                              moduleName:moduleName
                                                       initialProperties:initialProps];
+#elif USE_BRIDGELESS
+    RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName
+                                                          initialProperties:initialProps];
+    RCTSurfaceSizeMeasureMode sizeMeasureMode =
+        RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface
+                                                   sizeMeasureMode:sizeMeasureMode];
 #else
     RCTFabricSurface *surface =
         [[RCTFabricSurface alloc] initWithSurfacePresenter:self.surfacePresenter

diff --git a/packages/react-native-host/cocoa/ReactNativeHost.mm b/packages/react-native-host/cocoa/ReactNativeHost.mm
@@ -108,6 +108,11 @@ - (RCTBridge *)bridge
     }
 }
 
+- (RCTHost *)reactHost
+{
+    return _reactHost;
+}
+
 - (RCTSurfacePresenter *)surfacePresenter
 {
 #if USE_BRIDGELESS