feat: add Swift entrypoint

okwasniewski · okwasniewski · commit 799f942509fb · 2024-01-16T10:57:36.000+01:00
[wip] add module maps to some RN modules to allow for swift c++ imports

feat: implement RCTReactController and RCTSwiftUIAppDelegate

feat: introduce new method to RCTAppDelegate
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h
@@ -159,7 +159,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)bridgelessEnabled;
 
 /// Return the bundle URL for the main bundle.
-- (NSURL *)bundleURL;
+- (NSURL *__nullable)bundleURL;
+
+/// Don't use this method, it's going to be removed soon.
+- (UIView *)viewWithModuleName:(NSString *)moduleName initialProperties:(NSDictionary*)initialProperties launchOptions:(NSDictionary*)launchOptions;
 
 @end
 
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -83,51 +83,16 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
   RCTSetNewArchEnabled([self newArchEnabled]);
   BOOL enableTM = self.turboModuleEnabled;
-  BOOL fabricEnabled = self.fabricEnabled;
-  BOOL enableBridgeless = self.bridgelessEnabled;
-
-  NSDictionary *initProps = updateInitialProps([self prepareInitialProps], fabricEnabled);
 
   RCTAppSetupPrepareApp(application, enableTM, *_reactNativeConfig);
-
-  UIView *rootView;
-  if (enableBridgeless) {
-    // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
-    RCTSetUseNativeViewConfigsInBridgelessMode(fabricEnabled);
-
-    // Enable TurboModule interop by default in Bridgeless mode
-    RCTEnableTurboModuleInterop(YES);
-    RCTEnableTurboModuleInteropBridgeProxy(YES);
-
-    [self createReactHost];
-    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-    RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
-
-    RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
-        initWithSurface:surface
-        sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
-
-    rootView = (RCTRootView *)surfaceHostingProxyRootView;
-  } else {
-    if (!self.bridge) {
-      self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
-    }
-    if ([self newArchEnabled]) {
-      self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
-                                                                   contextContainer:_contextContainer];
-      self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
-
-      [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
-    }
-    rootView = [self createRootViewWithBridge:self.bridge moduleName:self.moduleName initProps:initProps];
-  }
-
-  [self customizeRootView:(RCTRootView *)rootView];
+    
 #if TARGET_OS_VISION
-  self.window = [[UIWindow alloc] initWithFrame:RCTForegroundWindow().bounds];
+  /// Bail out of UIWindow initializaiton to support multi-window scenarios in SwiftUI lifecycle.
+  return YES;
 #else
+  UIView* rootView = [self viewWithModuleName:self.moduleName initialProperties:[self prepareInitialProps] launchOptions:launchOptions];
+    
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-#endif
   
   UIViewController *rootViewController = [self createRootViewController];
   [self setRootView:rootView toRootViewController:rootViewController];
@@ -136,13 +101,59 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   [self.window makeKeyAndVisible];
 
   return YES;
+#endif
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
   // Noop
 }
 
+- (UIView *)viewWithModuleName:(NSString *)moduleName initialProperties:(NSDictionary*)initialProperties launchOptions:(NSDictionary*)launchOptions {
+    BOOL fabricEnabled = self.fabricEnabled;
+    BOOL enableBridgeless = self.bridgelessEnabled;
+
+    NSDictionary *initProps = updateInitialProps(initialProperties, fabricEnabled);
+    
+    UIView *rootView;
+    if (enableBridgeless) {
+      // Enable native view config interop only if both bridgeless mode and Fabric is enabled.
+      RCTSetUseNativeViewConfigsInBridgelessMode(self.fabricEnabled);
+
+      // Enable TurboModule interop by default in Bridgeless mode
+      RCTEnableTurboModuleInterop(YES);
+      RCTEnableTurboModuleInteropBridgeProxy(YES);
+
+      [self createReactHost];
+      [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+      RCTFabricSurface *surface = [_reactHost createSurfaceWithModuleName:self.moduleName initialProperties:initProps];
+
+      RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
+          initWithSurface:surface
+          sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
+
+      rootView = (RCTRootView *)surfaceHostingProxyRootView;
+    } else {
+      if (!self.bridge) {
+        self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
+      }
+      if ([self newArchEnabled]) {
+        if (!self.bridgeAdapter) {
+          self.bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:self.bridge
+                                                                       contextContainer:_contextContainer];
+          self.bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
+
+          [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+        }
+      }
+      rootView = [self createRootViewWithBridge:self.bridge moduleName:moduleName initProps:initProps];
+    }
+
+    [self customizeRootView:(RCTRootView *)rootView];
+    
+    return rootView;
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
   [NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h
@@ -21,7 +21,7 @@
 #elif __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>
 #endif
-#else // USE_HERMES
+#elif __has_include(<React/JSCExecutorFactory.h>) // USE_HERMES
 #import <React/JSCExecutorFactory.h>
 #endif // USE_HERMES
 
diff --git a/packages/react-native/Libraries/SwiftExtensions/RCTReactViewController.h b/packages/react-native/Libraries/SwiftExtensions/RCTReactViewController.h
@@ -0,0 +1,11 @@
+#import <UIKit/UIKit.h>
+
+@interface RCTReactViewController : UIViewController
+
+@property (nonatomic, strong) NSString *_Nonnull moduleName;
+@property (nonatomic, strong) NSDictionary *_Nullable initialProps;
+
+- (instancetype _Nonnull)initWithModuleName:(NSString *_Nonnull)moduleName
+                                   initProps:(NSDictionary *_Nullable)initProps;
+
+@end
diff --git a/packages/react-native/Libraries/SwiftExtensions/RCTReactViewController.m b/packages/react-native/Libraries/SwiftExtensions/RCTReactViewController.m
@@ -0,0 +1,31 @@
+#import "RCTReactViewController.h"
+
+@protocol RCTRootViewFactoryProtocol <NSObject>
+
+- (UIView *)viewWithModuleName:(NSString *)moduleName initialProperties:(NSDictionary*)initialProperties launchOptions:(NSDictionary*)launchOptions;
+
+@end
+
+@implementation RCTReactViewController
+
+- (instancetype)initWithModuleName:(NSString *)moduleName initProps:(NSDictionary *)initProps {
+    if (self = [super init]) {
+        _moduleName = moduleName;
+        _initialProps = initProps;
+    }
+    return self;
+}
+
+// TODO: Temporary solution for creating RCTRootView on demand. This should be done through factory pattern, see here: https://github.com/facebook/react-native/pull/42263
+- (void)loadView {
+    id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
+    if ([appDelegate respondsToSelector:@selector(viewWithModuleName:initialProperties:launchOptions:)]) {
+        id<RCTRootViewFactoryProtocol> delegate = (id<RCTRootViewFactoryProtocol>)appDelegate;
+        self.view = [delegate viewWithModuleName:_moduleName initialProperties:_initialProps launchOptions:@{}];
+    } else {
+        [NSException raise:@"UIApplicationDelegate:viewWithModuleName:initialProperties:launchOptions: not implemented"
+                    format:@"Make sure you subclass RCTAppDelegate"];
+    }
+}
+
+@end
diff --git a/packages/react-native/Libraries/SwiftExtensions/RCTRootViewRepresentable.swift b/packages/react-native/Libraries/SwiftExtensions/RCTRootViewRepresentable.swift
@@ -0,0 +1,29 @@
+import SwiftUI
+
+/*
+ * Use this struct in SwiftUI context to present React Native rootView.
+ *
+ * Example:
+ * ```
+ *  WindowGroup {
+ *    RCTRootViewRepresentable(moduleName: "RNTesterApp", initialProps: [:])
+ *  }
+ * ```
+ */
+public struct RCTRootViewRepresentable: UIViewControllerRepresentable {
+  var moduleName: String
+  var initialProps: [AnyHashable: Any]?
+  
+  public init(moduleName: String, initialProps: [AnyHashable : Any]?) {
+    self.moduleName = moduleName
+    self.initialProps = initialProps
+  }
+  
+  public func makeUIViewController(context: Context) -> UIViewController {
+    RCTReactViewController(moduleName: moduleName, initProps: initialProps)
+  }
+  
+  public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
+    // noop
+  }
+}
diff --git a/packages/react-native/Libraries/SwiftExtensions/React-RCTSwiftExtensions.podspec b/packages/react-native/Libraries/SwiftExtensions/React-RCTSwiftExtensions.podspec
@@ -0,0 +1,25 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
+version = package['version']
+
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "React-RCTSwiftExtensions"
+  s.version                = version
+  s.summary                = "A library for easier React Native integration with SwiftUI."
+  s.homepage               = "https://reactnative.dev/"
+  s.license                = package["license"]
+  s.author                 = "Callstack"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = "*.{swift,h,m}"
+  s.frameworks = ["UIKit", "SwiftUI"]
+end
diff --git a/packages/react-native/React/Base/RCTBridgeDelegate.h b/packages/react-native/React/Base/RCTBridgeDelegate.h
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
  * When running from a locally bundled JS file, this should be a `file://` url
  * pointing to a path inside the app resources, e.g. `file://.../main.jsbundle`.
  */
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge;
+- (NSURL *__nullable)sourceURLForBridge:(RCTBridge *)bridge;
 
 @optional
 
diff --git a/packages/react-native/React/Base/RCTBundleURLProvider.h b/packages/react-native/React/Base/RCTBundleURLProvider.h
@@ -22,6 +22,8 @@ RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
 #endif
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface RCTBundleURLProvider : NSObject
 
 /**
@@ -58,38 +60,38 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackURLProvider:(NSURL * (^)(void))fallbackURLProvider;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackURLProvider:(NSURL * (^)(void))fallbackURLProvider;
 
 /**
  * Returns the jsBundleURL for a given split bundle entrypoint in development
  */
-- (NSURL *)jsBundleURLForSplitBundleRoot:(NSString *)bundleRoot;
+- (NSURL *__nullable)jsBundleURLForSplitBundleRoot:(NSString *)bundleRoot;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  * if extension is nil, "jsbundle" will be used.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *)extension;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot fallbackExtension:(NSString *)extension;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
  */
-- (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot;
+- (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot;
 
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle. If extension is nil,
  * "jsbundle" will be used.
  */
-- (NSURL *)jsBundleURLForFallbackExtension:(NSString *)extension;
+- (NSURL *__nullable)jsBundleURLForFallbackExtension:(NSString *)extension;
 
 /**
  * Returns the resourceURL for a given bundle entrypoint and
  * the fallback offline resource file if the packager is not running.
  */
-- (NSURL *)resourceURLForResourceRoot:(NSString *)root
+- (NSURL *__nullable)resourceURLForResourceRoot:(NSString *)root
                          resourceName:(NSString *)name
                     resourceExtension:(NSString *)extension
                         offlineBundle:(NSBundle *)offlineBundle;
@@ -124,13 +126,13 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  * - runModule: When true, will run the main module after defining all modules. This is used in the main bundle but not
  *     in split bundles.
  */
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                        packagerHost:(NSString *)packagerHost
                           enableDev:(BOOL)enableDev
                  enableMinification:(BOOL)enableMinification
                     inlineSourceMap:(BOOL)inlineSourceMap;
 
-+ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
++ (NSURL *__nullable)jsBundleURLForBundleRoot:(NSString *)bundleRoot
                        packagerHost:(NSString *)packagerHost
                      packagerScheme:(NSString *)scheme
                           enableDev:(BOOL)enableDev
@@ -160,3 +162,5 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
                            queryItems:(NSArray<NSURLQueryItem *> *)queryItems;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/packages/react-native/React/CoreModules/RCTAppearance.mm b/packages/react-native/React/CoreModules/RCTAppearance.mm
@@ -70,7 +70,8 @@ @implementation RCTAppearance {
 - (instancetype)init
 {
   if ((self = [super init])) {
-    UITraitCollection *traitCollection = RCTSharedApplication().delegate.window.traitCollection;
+    // TODO: Remove this after merging this PR upstream: https://github.com/facebook/react-native/pull/42231
+    UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(appearanceChanged:)
diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb
@@ -133,6 +133,7 @@ def use_react_native! (
   pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
   pod 'React-nativeconfig', :path => "#{prefix}/ReactCommon"
   pod 'RCTDeprecation', :path => "#{prefix}/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
+  pod 'React-RCTSwiftExtensions', :path => "#{prefix}/Libraries/SwiftExtensions", :modular_headers => true
 
   if hermes_enabled
     setup_hermes!(:react_native_path => prefix)
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -1069,6 +1069,7 @@ PODS:
     - React-jsi
     - React-NativeModulesApple
     - ReactCommon
+  - React-RCTSwiftExtensions (1000.0.0)
   - React-RCTTest (1000.0.0):
     - RCT-Folly (= 2024.01.01.00)
     - React-Core (= 1000.0.0)
@@ -1264,6 +1265,7 @@ DEPENDENCIES:
   - React-RCTNetwork (from `../react-native/Libraries/Network`)
   - React-RCTPushNotification (from `../react-native/Libraries/PushNotificationIOS`)
   - React-RCTSettings (from `../react-native/Libraries/Settings`)
+  - React-RCTSwiftExtensions (from `../react-native/Libraries/SwiftExtensions`)
   - React-RCTTest (from `./RCTTest`)
   - React-RCTText (from `../react-native/Libraries/Text`)
   - React-RCTVibration (from `../react-native/Libraries/Vibration`)
@@ -1374,6 +1376,8 @@ EXTERNAL SOURCES:
     :path: "../react-native/Libraries/PushNotificationIOS"
   React-RCTSettings:
     :path: "../react-native/Libraries/Settings"
+  React-RCTSwiftExtensions:
+    :path: "../react-native/Libraries/SwiftExtensions"
   React-RCTTest:
     :path: "./RCTTest"
   React-RCTText:
diff --git a/packages/rn-tester/RNTester-visionOS/App.swift b/packages/rn-tester/RNTester-visionOS/App.swift
@@ -0,0 +1,14 @@
+import SwiftUI
+import React
+import React_RCTSwiftExtensions
+
+@main
+struct RNTesterApp: App {
+  @UIApplicationDelegateAdaptor var delegate: AppDelegate
+  
+  var body: some Scene {
+    WindowGroup {
+      RCTRootViewRepresentable(moduleName: "RNTesterApp", initialProps: nil)
+    }
+  }
+}
diff --git a/packages/rn-tester/RNTester-visionOS/AppDelegate.swift b/packages/rn-tester/RNTester-visionOS/AppDelegate.swift
@@ -0,0 +1,13 @@
+import UIKit
+import React
+import React_RCTAppDelegate
+
+class AppDelegate: RCTAppDelegate {
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    self.bundleURL()
+  }
+  
+  override func bundleURL() -> URL? {
+    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "js/RNTesterApp.ios")
+  }
+}
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
