@rnx-kit/react-native-host 0.4.2 → 0.4.4

package/cocoa/RNXTurboModuleAdapter.mm

@@ -67,13 +67,13 @@
 
 // MARK: - RCTTurboModuleManagerDelegate details
 
-- (Class)getModuleClassFromName:(const char *)name
+- (Class)getModuleClassFromName:(char const *)name
 {
     return RCTCoreModulesClassProvider(name);
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModule:(const std::string &)name
+    getTurboModule:(std::string const &)name
          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
 {
     return nullptr;

package/cocoa/ReactNativeHost+View.mm

@@ -7,6 +7,7 @@
 #import <React/RCTFabricSurface.h>
 #import <React/RCTSurfaceHostingProxyRootView.h>
 #endif  // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
+static NSString *const kReactConcurrentRoot = @"concurrentRoot";
 #else
 #import <React/RCTRootView.h>
 #endif  // USE_FABRIC
@@ -36,15 +37,27 @@
               initialProperties:(NSDictionary *)initialProperties;
 {
 #ifdef USE_FABRIC
+    // Having `concurrentRoot` disabled when Fabric is enabled is not recommended:
+    // https://github.com/facebook/react-native/commit/7eaabfb174b14a30c30c7017195e8110348e5f44
+    // As of 0.74, it won't be possible to opt-out:
+    // https://github.com/facebook/react-native/commit/30d186c3683228d4fb7a42f804eb2fdfa7c8ac03
+    NSMutableDictionary *initialProps =
+        initialProperties == nil
+            ? [NSMutableDictionary dictionaryWithObjectsAndKeys:@YES, kReactConcurrentRoot, nil]
+            : [initialProperties mutableCopy];
+    if (initialProps[kReactConcurrentRoot] == nil) {
+        initialProps[kReactConcurrentRoot] = @YES;
+    }
+
 #if __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
     return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:self.bridge
                                                              moduleName:moduleName
-                                                      initialProperties:initialProperties];
+                                                      initialProperties:initialProps];
 #else
     RCTFabricSurface *surface =
         [[RCTFabricSurface alloc] initWithSurfacePresenter:self.surfacePresenter
                                                 moduleName:moduleName
-                                         initialProperties:initialProperties];
+                                         initialProperties:initialProps];
     return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
 #endif  // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
 #else

package/cocoa/ReactNativeHost.mm

@@ -79,9 +79,10 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
 - (RCTBridge *)bridge
 {
-#if USE_BRIDGELESS
-    return nil;
-#else
+    if (self.isBridgelessEnabled) {
+        return nil;
+    }
+
     if (![_isShuttingDown tryLock]) {
         NSAssert(NO, @"Tried to access the bridge while shutting down");
         return nil;
@@ -98,7 +99,6 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     } @finally {
         [_isShuttingDown unlock];
     }
-#endif  // USE_BRIDGELESS
 }
 
 - (RCTSurfacePresenter *)surfacePresenter
@@ -126,7 +126,7 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
 - (void)usingModule:(Class)moduleClass block:(void (^)(id<RCTBridgeModule> _Nullable))block
 {
-    const BOOL requiresMainQueueSetup =
+    BOOL const requiresMainQueueSetup =
         [moduleClass respondsToSelector:@selector(requiresMainQueueSetup)] &&
         [moduleClass requiresMainQueueSetup];
     if (requiresMainQueueSetup && !RCTIsMainQueue()) {
@@ -137,8 +137,15 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
         return;
     }
 
-    id<RCTBridgeModule> bridgeModule = [self.bridge moduleForClass:moduleClass];
-    block(bridgeModule);
+    if (!self.isBridgelessEnabled) {
+        block([self.bridge moduleForClass:moduleClass]);
+        return;
+    }
+
+#if USE_BRIDGELESS
+    const char *moduleName = RCTBridgeModuleNameForClass(moduleClass).UTF8String;
+    block([[_reactHost getModuleRegistry] moduleForName:moduleName]);
+#endif  // USE_BRIDGELESS
 }
 
 // MARK: - RCTBridgeDelegate details
@@ -193,6 +200,18 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
 // MARK: - Private
 
+- (BOOL)isBridgelessEnabled
+{
+#if USE_BRIDGELESS
+    // Bridgeless mode is enabled if it was turned on with a build flag, unless
+    // `isBridgelessEnabled` is explicitly implemented and returns false.
+    return ![_config respondsToSelector:@selector(isBridgelessEnabled)] ||
+           [_config isBridgelessEnabled];
+#else
+    return NO;
+#endif  // USE_BRIDGELESS
+}
+
 - (void)enableTurboModule
 {
 #if USE_FABRIC
@@ -203,15 +222,12 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
 - (void)initializeReactHost
 {
-#if USE_BRIDGELESS
-    // Bridgeless mode is enabled if it was turned on with a build flag, unless
-    // `isBridgelessEnabled` is explicitly implemented and returns false.
-    if ([_config respondsToSelector:@selector(isBridgelessEnabled)] &&
-        ![_config isBridgelessEnabled]) {
+    if (!self.isBridgelessEnabled) {
         (void)self.bridge;  // Initialize the bridge now
         return;
     }
 
+#if USE_BRIDGELESS
     RCTSetUseNativeViewConfigsInBridgelessMode(YES);
     RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
@@ -241,8 +257,6 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 
     [_reactHost setContextContainerHandler:self];
     [_reactHost start];
-#else
-    (void)self.bridge;
 #endif  // USE_BRIDGELESS
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/react-native-host",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Simplify React Native initialization",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme",
   "license": "MIT",