@rnx-kit/react-native-host 0.4.8 → 0.4.10

package/cocoa/RNXBridgelessHeaders.h

@@ -12,6 +12,12 @@
 
 #import <react/config/ReactNativeConfig.h>
 
+#if __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+#import <react/featureflags/ReactNativeFeatureFlags.h>
+#import <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
+#define USE_FEATURE_FLAGS
+#endif  // __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+
 #if __has_include(<react/runtime/JSEngineInstance.h>)
 using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSEngineInstance>;
 #else
@@ -42,6 +48,28 @@ using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSRuntimeFactory
 - (RCTSurfacePresenter *)getSurfacePresenter;  // Deprecated in 0.74, and removed in 0.75
 @end
 
+#ifdef USE_FEATURE_FLAGS
+// 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:
+    bool useModernRuntimeScheduler() override
+    {
+        return true;
+    }
+
+    bool enableMicrotasks() override
+    {
+        return true;
+    }
+
+    bool batchRenderingUpdatesInEventLoop() override
+    {
+        return true;
+    }
+};
+#endif  // USE_FEATURE_FLAGS
+
 #elif USE_FABRIC
 
 #import <React/RCTSurfacePresenterBridgeAdapter.h>

package/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.

package/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 @@ static NSString *const kReactConcurrentRoot = @"concurrentRoot";
     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

package/cocoa/ReactNativeHost.mm

@@ -49,6 +49,23 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
 - (instancetype)initWithConfig:(id<RNXHostConfig>)config launchOptions:(NSDictionary *)launchOptions
 {
     if (self = [super init]) {
+        _config = config;
+        _launchOptions = launchOptions;
+        [self enableTurboModule];
+        _isShuttingDown = [[NSLock alloc] init];
+
+        if ([config respondsToSelector:@selector(shouldReleaseBridgeWhenBackgrounded)] &&
+            [config shouldReleaseBridgeWhenBackgrounded]) {
+            _hostReleaser = [[RNXHostReleaser alloc] initWithHost:self];
+        }
+
+#ifdef USE_FEATURE_FLAGS
+        if (self.isBridgelessEnabled) {
+            facebook::react::ReactNativeFeatureFlags::override(
+                std::make_unique<RNXBridgelessFeatureFlags>());
+        }
+#endif  // USE_FEATURE_FLAGS
+
         if ([config respondsToSelector:@selector(isDevLoadingViewEnabled)]) {
             RCTDevLoadingViewSetEnabled([config isDevLoadingViewEnabled]);
         }
@@ -69,16 +86,6 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
             });
         }
 
-        _config = config;
-        _launchOptions = launchOptions;
-        [self enableTurboModule];
-        _isShuttingDown = [[NSLock alloc] init];
-
-        if ([config respondsToSelector:@selector(shouldReleaseBridgeWhenBackgrounded)] &&
-            [config shouldReleaseBridgeWhenBackgrounded]) {
-            _hostReleaser = [[RNXHostReleaser alloc] initWithHost:self];
-        }
-
         [self initializeReactHost];
     }
     return self;
@@ -108,6 +115,11 @@ using ReactNativeConfig = facebook::react::EmptyReactNativeConfig const;
     }
 }
 
+- (RCTHost *)reactHost
+{
+    return _reactHost;
+}
+
 - (RCTSurfacePresenter *)surfacePresenter
 {
 #if USE_BRIDGELESS

package/package.json

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