@rnx-kit/react-native-host 0.3.1 → 0.4.0

package/ReactNativeHost.podspec

@@ -20,7 +20,6 @@ preprocessor_definitions = [
 if new_arch_enabled
   preprocessor_definitions << 'RCT_NEW_ARCH_ENABLED=1'
   preprocessor_definitions << 'USE_FABRIC=1'
-  preprocessor_definitions << 'USE_TURBOMODULE=1'
 end
 
 Pod::Spec.new do |s|

package/cocoa/RNXTurboModuleAdapter.h

@@ -2,9 +2,9 @@
 
 #import <Foundation/Foundation.h>
 
-#if USE_TURBOMODULE
+#if USE_FABRIC
 #import <ReactCommon/RCTTurboModuleManager.h>
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 
 @class RCTBridge;
 
@@ -15,11 +15,11 @@ namespace facebook::react
 
 NS_ASSUME_NONNULL_BEGIN
 
-#if USE_TURBOMODULE
+#if USE_FABRIC
 @interface RNXTurboModuleAdapter : NSObject <RCTTurboModuleManagerDelegate>
 #else
 @interface RNXTurboModuleAdapter : NSObject
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:
     (RCTBridge *)bridge;

package/cocoa/RNXTurboModuleAdapter.mm

@@ -6,43 +6,41 @@
 #import <cxxreact/JSExecutor.h>
 #pragma clang diagnostic pop
 
-#if USE_TURBOMODULE
+#if USE_FABRIC
 #import <React/CoreModulesPlugins.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
 
 #if __has_include(<React/RCTAppSetupUtils.h>)  // <0.72
 #import <React/RCTAppSetupUtils.h>
-#define USE_RUNTIME_SCHEDULER 0
 #else
 #import <React-RCTAppDelegate/RCTAppSetupUtils.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 
 // We still get into this path because react-native-macos 0.71 picked up some
-// 0.72 bits. AFAICT, `RCTLegacyInteropComponents.h` is a new addition in 0.72
-// in both react-native and react-native-macos.
-#if __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
+// 0.72 bits. AFAICT, `SchedulerPriorityUtils.h` is a new addition in 0.72 in
+// both react-native and react-native-macos.
+#if __has_include(<react/renderer/runtimescheduler/SchedulerPriorityUtils.h>)
+#if __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)  // <0.74
 #import <React-RCTAppDelegate/RCTLegacyInteropComponents.h>
+#define MANUALLY_REGISTER_LEGACY_COMPONENTS 1
+#endif  // __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #if __has_include(<React/RCTRuntimeExecutorFromBridge.h>)
 #import <React/RCTRuntimeExecutorFromBridge.h>
 #endif  // __has_include(<React/RCTRuntimeExecutorFromBridge.h>)
-#define SUPPORTS_LEGACY_COMPONENTS 1
 #define USE_RUNTIME_SCHEDULER 1
-#else
-#define SUPPORTS_LEGACY_COMPONENTS 0
-#define USE_RUNTIME_SCHEDULER 0
-#endif  // __has_include(<React-RCTAppDelegate/RCTLegacyInteropComponents.h>)
+#endif  // __has_include(<react/renderer/runtimescheduler/SchedulerPriorityUtils.h>)
 
 #endif  // __has_include(<React/RCTAppSetupUtils.h>)
 
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 
 @implementation RNXTurboModuleAdapter {
-#if USE_TURBOMODULE
+#if USE_FABRIC
     RCTTurboModuleManager *_turboModuleManager;
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 #if USE_RUNTIME_SCHEDULER
     std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
 #endif  // USE_RUNTIME_SCHEDULER
@@ -51,17 +49,21 @@
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:
     (RCTBridge *)bridge
 {
-#if USE_TURBOMODULE
-    [self registerLegacyViewManagers];
-    // jsExecutorFactoryForBridge: (USE_TURBOMODULE=1)
+#if USE_FABRIC
+#if MANUALLY_REGISTER_LEGACY_COMPONENTS
+    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
+        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
+    }
+#endif  // MANUALLY_REGISTER_LEGACY_COMPONENTS
+    // jsExecutorFactoryForBridge: (USE_FABRIC=1)
     return [self initJsExecutorFactoryWithBridge:bridge];
 #else
-    // jsExecutorFactoryForBridge: (USE_TURBOMODULE=0)
+    // jsExecutorFactoryForBridge: (USE_FABRIC=0)
     return nullptr;
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 }
 
-#if USE_TURBOMODULE
+#if USE_FABRIC
 
 // MARK: - RCTTurboModuleManagerDelegate details
 
@@ -104,15 +106,6 @@
 #endif  // USE_RUNTIME_SCHEDULER
 }
 
-- (void)registerLegacyViewManagers
-{
-#if SUPPORTS_LEGACY_COMPONENTS
-    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
-        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
-    }
-#endif  // SUPPORTS_LEGACY_COMPONENTS
-}
-
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 
 @end

package/cocoa/ReactNativeHost.mm

@@ -53,7 +53,7 @@
         }
 
         _config = config;
-#if USE_FABRIC || USE_TURBOMODULE
+#if USE_FABRIC
         _turboModuleAdapter = [[RNXTurboModuleAdapter alloc] init];
 #endif
         _isShuttingDown = [[NSLock alloc] init];
@@ -144,13 +144,13 @@
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:
     (RCTBridge *)bridge
 {
-#if USE_TURBOMODULE
-    // jsExecutorFactoryForBridge: (USE_TURBOMODULE=1)
+#if USE_FABRIC
+    // jsExecutorFactoryForBridge: (USE_FABRIC=1)
     return [_turboModuleAdapter jsExecutorFactoryForBridge:bridge];
 #else
-    // jsExecutorFactoryForBridge: (USE_TURBOMODULE=0)
+    // jsExecutorFactoryForBridge: (USE_FABRIC=0)
     return nullptr;
-#endif  // USE_TURBOMODULE
+#endif  // USE_FABRIC
 }
 
 // MARK: - Private

package/package.json

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