@rnx-kit/react-native-host 0.5.5 → 0.5.7

package/cocoa/RNXBridgelessHeaders.h

@@ -1,5 +1,9 @@
 #if USE_BRIDGELESS
 
+// clang-format off
+#import "RNXFeatureMacros.h"
+// clang-format on
+
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <ReactCommon/RCTHost+Internal.h>
 #import <ReactCommon/RCTHost.h>
@@ -10,22 +14,19 @@
 #import <ReactCommon/RCTJscInstance.h>
 #endif  // USE_HERMES
 
-#if __has_include(<react/config/ReactNativeConfig.h>)
+#ifdef USE_REACT_NATIVE_CONFIG
 #import <react/config/ReactNativeConfig.h>
-#define USE_REACT_NATIVE_CONFIG
-#endif  // __has_include(<react/config/ReactNativeConfig.h>)
+#endif  // USE_REACT_NATIVE_CONFIG
 
-#if __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+#ifdef USE_FEATURE_FLAGS
 #import <react/featureflags/ReactNativeFeatureFlags.h>
 #import <react/featureflags/ReactNativeFeatureFlagsDefaults.h>
-#define USE_FEATURE_FLAGS
-#endif  // __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+#endif  // USE_FEATURE_FLAGS
 
-#if __has_include(<ReactCodegen/RCTThirdPartyComponentsProvider.h>)
-#define USE_CODEGEN_PROVIDER 1
-#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+#ifdef USE_CODEGEN_PROVIDER
 #import <React/RCTComponentViewFactory.h>
-#endif // __has_include(<ReactCodegen/RCTThirdPartyComponentsProvider.h>)
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+#endif  // USE_CODEGEN_PROVIDER
 
 #if __has_include(<react/runtime/JSEngineInstance.h>)
 using SharedJSRuntimeFactory = std::shared_ptr<facebook::react::JSEngineInstance>;
@@ -58,9 +59,6 @@ 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
@@ -83,12 +81,22 @@ public:
     {
         return true;
     }
-#if !__has_include(<React-RCTAppDelegate/RCTReactNativeFactory.h>) && !__has_include(<React_RCTAppDelegate/RCTReactNativeFactory.h>)  // 0.77
+#if USE_VIEW_COMMAND_RACE_FIX  // 0.77
     bool enableFixForViewCommandRace() override
     {
         return true;
     }
-#endif  // 0.77
+#endif                                             // USE_VIEW_COMMAND_RACE_FIX
+#if USE_UPDATE_RUNTIME_SHADOW_NODE_REFS_ON_COMMIT  // >= 0.79
+    bool updateRuntimeShadowNodeReferencesOnCommit() override
+    {
+        return true;
+    }
+    bool useShadowNodeStateOnClone() override
+    {
+        return true;
+    }
+#endif  // USE_UPDATE_RUNTIME_SHADOW_NODE_REFS_ON_COMMIT
 #else   // < 0.77
     bool useModernRuntimeScheduler() override
     {

package/cocoa/RNXFeatureMacros.h

@@ -0,0 +1,31 @@
+#if USE_BRIDGELESS
+
+#if __has_include(<react/config/ReactNativeConfig.h>)
+#define USE_REACT_NATIVE_CONFIG 1
+#endif  // __has_include(<react/config/ReactNativeConfig.h>)
+
+#if __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+#define USE_FEATURE_FLAGS 1
+#endif  // __has_include(<react/featureflags/ReactNativeFeatureFlags.h>)
+
+#if __has_include(<ReactCodegen/RCTThirdPartyComponentsProvider.h>)
+#define USE_CODEGEN_PROVIDER 1
+#endif  // __has_include(<ReactCodegen/RCTThirdPartyComponentsProvider.h>)
+
+#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>)
+
+#if !__has_include(<React-RCTAppDelegate/RCTReactNativeFactory.h>) && !__has_include(<React_RCTAppDelegate/RCTReactNativeFactory.h>)
+#define USE_VIEW_COMMAND_RACE_FIX 1
+#endif  // !__has_include(<React-RCTAppDelegate/RCTReactNativeFactory.h>)
+
+#if __has_include(<React-RCTAppDelegate/RCTJSRuntimeConfiguratorProtocol.h>) || __has_include(<React_RCTAppDelegate/RCTJSRuntimeConfiguratorProtocol.h>)
+#define USE_UPDATE_RUNTIME_SHADOW_NODE_REFS_ON_COMMIT 1
+#endif  // __has_include(<React-RCTAppDelegate/RCTJSRuntimeConfiguratorProtocol.h>)
+
+#endif  // USE_FEATURE_FLAGS
+
+#endif  // USE_BRIDGELESS

package/cocoa/RNXTurboModuleAdapter.h

@@ -1,6 +1,7 @@
 #include <memory>
 
 #import <Foundation/Foundation.h>
+#include <cxxreact/JSExecutor.h>
 
 #if USE_FABRIC
 #import <ReactCommon/RCTTurboModuleManager.h>
@@ -8,11 +9,6 @@
 
 @class RCTBridge;
 
-namespace facebook::react
-{
-    class JSExecutorFactory;
-}  // namespace facebook::react
-
 NS_ASSUME_NONNULL_BEGIN
 
 #if USE_FABRIC

package/cocoa/ReactNativeHost+View.mm

@@ -59,8 +59,19 @@ static NSString *const kReactConcurrentRoot = @"concurrentRoot";
 #elif USE_BRIDGELESS
     RCTFabricSurface *surface = [self.reactHost createSurfaceWithModuleName:moduleName
                                                           initialProperties:initialProps];
+#if __has_include(<react/renderer/graphics/LinearGradient.h>)  // >=0.77
     return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
 #else
+    // `-initWithSurface:` implicitly calls `start` and causes race conditions.
+    // This was fixed in 0.76.7, but for backwards compatibility, we should call
+    // `-initWithSurface:sizeMeasureMode` when possible. For more details, see
+    // https://github.com/facebook/react-native/pull/47313.
+    RCTSurfaceSizeMeasureMode sizeMeasureMode =
+        RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact;
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface
+                                                   sizeMeasureMode:sizeMeasureMode];
+#endif  // __has_include(<react/renderer/graphics/LinearGradient.h>)
+#else   // __has_include(<React/RCTFabricSurfaceHostingProxyRootView.h>)
     RCTFabricSurface *surface =
         [[RCTFabricSurface alloc] initWithSurfacePresenter:self.surfacePresenter
                                                 moduleName:moduleName

package/package.json

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