@rnx-kit/react-native-host 0.5.1 → 0.5.3

package/cocoa/RNXBridgelessHeaders.h

@@ -10,7 +10,10 @@
 #import <ReactCommon/RCTJscInstance.h>
 #endif  // USE_HERMES
 
+#if __has_include(<react/config/ReactNativeConfig.h>)
 #import <react/config/ReactNativeConfig.h>
+#define USE_REACT_NATIVE_CONFIG
+#endif  // __has_include(<react/config/ReactNativeConfig.h>)
 
 #if __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
 #import <react/featureflags/ReactNativeFeatureFlags.h>
@@ -49,10 +52,36 @@ using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSRuntimeFactory
 @end
 
 #ifdef USE_FEATURE_FLAGS
+#if __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>) || __has_include(<React_RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
+#define USE_UNIFIED_FEATURE_FLAGS 1
+#endif  // __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
+
 // https://github.com/facebook/react-native/blob/0.74-stable/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm#L272-L286
 class RNXBridgelessFeatureFlags : public facebook::react::ReactNativeFeatureFlagsDefaults
 {
 public:
+#ifdef USE_UNIFIED_FEATURE_FLAGS  // >= 0.77
+    bool enableBridgelessArchitecture() override
+    {
+        return true;
+    }
+    bool enableFabricRenderer() override
+    {
+        return true;
+    }
+    bool useTurboModules() override
+    {
+        return true;
+    }
+    bool useNativeViewConfigsInBridgelessMode() override
+    {
+        return true;
+    }
+    bool enableFixForViewCommandRace() override
+    {
+        return true;
+    }
+#else   // < 0.77
     bool useModernRuntimeScheduler() override
     {
         return true;
@@ -67,6 +96,7 @@ public:
     {
         return true;
     }
+#endif  // USE_UNIFIED_FEATURE_FLAGS
 };
 #endif  // USE_FEATURE_FLAGS
 

package/cocoa/RNXTurboModuleAdapter.mm

@@ -98,7 +98,11 @@
 
 - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
 {
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>) || __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+    return RCTAppSetupDefaultModuleFromClass(moduleClass, nil);
+#else
     return RCTAppSetupDefaultModuleFromClass(moduleClass);
+#endif  // __has_include(<React-RCTAppDelegate/RCTArchConfiguratorProtocol.h>)
 }
 
 // MARK: - Private

package/cocoa/ReactNativeHost+View.mm

@@ -59,10 +59,7 @@ static NSString *const kReactConcurrentRoot = @"concurrentRoot";
 #elif USE_BRIDGELESS
     RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName
                                                           initialProperties:initialProps];
-    RCTSurfaceSizeMeasureMode sizeMeasureMode =
-        RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
-    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface
-                                                   sizeMeasureMode:sizeMeasureMode];
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
 #else
     RCTFabricSurface *surface =
         [[RCTFabricSurface alloc] initWithSurfacePresenter:self.surfacePresenter

package/cocoa/ReactNativeHost.mm

@@ -16,7 +16,9 @@
 
 @class RCTSurfacePresenter;
 
+#ifdef USE_REACT_NATIVE_CONFIG
 using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
+#endif  // USE_REACT_NATIVE_CONFIG
 
 #if USE_BRIDGELESS
 @interface ReactNativeHost () <RCTContextContainerHandling>
@@ -34,7 +36,9 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     RCTHost *_reactHost;
     NSLock *_isShuttingDown;
     RNXHostReleaser *_hostReleaser;
+#ifdef USE_REACT_NATIVE_CONFIG
     std::shared_ptr<ReactNativeConfig> _reactNativeConfig;
+#endif  // USE_REACT_NATIVE_CONFIG
 }
 
 - (instancetype)initWithConfig:(id<RNXHostConfig>)config
@@ -197,7 +201,9 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 - (void)didCreateContextContainer:
     (std::shared_ptr<facebook::react::ContextContainer>)contextContainer
 {
+#ifdef USE_REACT_NATIVE_CONFIG
     contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+#endif  // USE_REACT_NATIVE_CONFIG
 }
 
 #else  // USE_BRIDGELESS
@@ -248,19 +254,27 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     }
 
 #if USE_BRIDGELESS
+#ifndef USE_UNIFIED_FEATURE_FLAGS
     RCTSetUseNativeViewConfigsInBridgelessMode(YES);
+#endif
     RCTEnableTurboModuleInterop(YES);
     RCTEnableTurboModuleInteropBridgeProxy(YES);
 
+#ifdef USE_REACT_NATIVE_CONFIG
     _reactNativeConfig = std::make_shared<ReactNativeConfig>();
     std::weak_ptr<ReactNativeConfig> reactNativeConfig{_reactNativeConfig};
+#endif  // USE_REACT_NATIVE_CONFIG
 
     SharedJSRuntimeFactory (^jsEngineProvider)() = ^SharedJSRuntimeFactory {
 #if USE_HERMES
+#ifdef USE_REACT_NATIVE_CONFIG
       auto config = reactNativeConfig.lock();
       NSAssert(config, @"Expected nonnull ReactNativeConfig instance");
       return std::make_shared<facebook::react::RCTHermesInstance>(config, nullptr);
 #else
+      return std::make_shared<facebook::react::RCTHermesInstance>(nullptr, false);
+#endif  // USE_REACT_NATIVE_CONFIG
+#else  // USE_HERMES
       return std::make_shared<facebook::react::RCTJscInstance>();
 #endif  // USE_HERMES
     };

package/package.json

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