@rnx-kit/react-native-host 0.4.3 → 0.4.5

package/cocoa/RNXBridgelessHeaders.h

@@ -18,6 +18,15 @@ using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSEngineInstance
 using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSRuntimeFactory>;
 #endif  // __has_include(<react/runtime/JSEngineInstance.h>)
 
+// For details, see
+// https://github.com/facebook/react-native/commit/c3b0a8f1626939cf5c7b3864a5acf9d3dad26fb3
+@interface RCTHost (Compatibility)
+@property (nonatomic, readonly) RCTModuleRegistry *moduleRegistry;      // Introduced in 0.74
+@property (nonatomic, readonly) RCTSurfacePresenter *surfacePresenter;  // Introduced in 0.74
+- (RCTModuleRegistry *)getModuleRegistry;      // Deprecated in 0.74, and removed in 0.75
+- (RCTSurfacePresenter *)getSurfacePresenter;  // Deprecated in 0.74, and removed in 0.75
+@end
+
 #elif USE_FABRIC
 
 #import <React/RCTSurfacePresenterBridgeAdapter.h>

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,13 +99,14 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     } @finally {
         [_isShuttingDown unlock];
     }
-#endif  // USE_BRIDGELESS
 }
 
 - (RCTSurfacePresenter *)surfacePresenter
 {
 #if USE_BRIDGELESS
-    return [_reactHost getSurfacePresenter];
+    return [_reactHost respondsToSelector:@selector(surfacePresenter)]
+               ? _reactHost.surfacePresenter
+               : [_reactHost getSurfacePresenter];
 #elif USE_FABRIC
     return [_surfacePresenterBridgeAdapter surfacePresenter];
 #else
@@ -137,8 +139,18 @@ 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;
+    RCTModuleRegistry *moduleRegistry = [_reactHost respondsToSelector:@selector(moduleRegistry)]
+                                            ? _reactHost.moduleRegistry
+                                            : [_reactHost getModuleRegistry];
+    block([moduleRegistry moduleForName:moduleName]);
+#endif  // USE_BRIDGELESS
 }
 
 // MARK: - RCTBridgeDelegate details
@@ -193,6 +205,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 +227,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 +262,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.3",
+  "version": "0.4.5",
   "description": "Simplify React Native initialization",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/react-native-host#readme",
   "license": "MIT",