feat: Implement RCTRootViewFactory

Author: okwasniewski

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h

@@ -7,6 +7,7 @@
 
 #import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
+#import "RCTRootViewFactory.h"
 
 @class RCTBridge;
 @protocol RCTBridgeDelegate;
@@ -58,9 +59,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// The window object, used to render the UViewControllers
 @property (nonatomic, strong, nonnull) UIWindow *window;
-@property (nonatomic, strong, nullable) RCTBridge *bridge;
 @property (nonatomic, strong, nullable) NSString *moduleName;
 @property (nonatomic, strong, nullable) NSDictionary *initialProps;
+@property (nonatomic, strong) RCTRootViewFactory* rootViewFactory;
 
 /**
  * It creates a `RCTBridge` using a delegate and some launch options.
@@ -127,13 +128,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
 
-/// This method controls whether the App will use RuntimeScheduler. Only applicable in the legacy architecture.
-///
-/// @return: `YES` to use RuntimeScheduler, `NO` to use JavaScript scheduler. The default value is `YES`.
-- (BOOL)runtimeSchedulerEnabled;
-
-@property (nonatomic, strong) RCTSurfacePresenterBridgeAdapter *bridgeAdapter;
-
 /// This method returns a map of Component Descriptors and Components classes that needs to be registered in the
 /// new renderer. The Component Descriptor is a string which represent the name used in JS to refer to the native
 /// component. The default implementation returns an empty dictionary. Subclasses can override this method to register

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -39,54 +39,47 @@
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #import <react/runtime/JSRuntimeFactory.h>
 
-static NSString *const kRNConcurrentRoot = @"concurrentRoot";
-
-@interface RCTAppDelegate () <
-    RCTTurboModuleManagerDelegate,
-    RCTComponentViewFactoryComponentProvider,
-    RCTContextContainerHandling> {
-  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-  facebook::react::ContextContainer::Shared _contextContainer;
-}
-@end
-
-static NSDictionary *updateInitialProps(NSDictionary *initialProps, BOOL isFabricEnabled)
-{
-  NSMutableDictionary *mutableProps = [initialProps mutableCopy] ?: [NSMutableDictionary new];
-  // Hardcoding the Concurrent Root as it it not recommended to
-  // have the concurrentRoot turned off when Fabric is enabled.
-  mutableProps[kRNConcurrentRoot] = @(isFabricEnabled);
-  return mutableProps;
-}
-
-@interface RCTAppDelegate () <RCTCxxBridgeDelegate> {
-  std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
-}
+@interface RCTAppDelegate () <RCTComponentViewFactoryComponentProvider>
 @end
 
-@implementation RCTAppDelegate {
-  RCTHost *_reactHost;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-    _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-    _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-  }
-  return self;
-}
+@implementation RCTAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   RCTSetNewArchEnabled([self newArchEnabled]);
   BOOL enableTM = self.turboModuleEnabled;
-    
-  RCTAppSetupPrepareApp(application, enableTM, *_reactNativeConfig);
 
-  UIView *rootView = [self viewWithModuleName:self.moduleName initialProperties:[self prepareInitialProps] launchOptions:launchOptions];
-    
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+  RCTAppSetupPrepareApp(application, enableTM);
+#pragma clang diagnostic pop
+  
+  RCTRootViewFactoryConfiguration *configuration = [[RCTRootViewFactoryConfiguration alloc] initWithBundleURL:self.bundleURL];
+  configuration.fabricEnabled = self.fabricEnabled;
+  configuration.turboModuleEnabled = self.turboModuleEnabled;
+  configuration.bridgelessEnabled = self.bridgelessEnabled;
+  
+  __weak __typeof(self) weakSelf = self;
+  configuration.createRootViewWithBridge = ^UIView* (RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) {
+    return [weakSelf createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
+  };
+  
+  configuration.createBridgeWithDelegate = ^RCTBridge* (id<RCTBridgeDelegate> delegate, NSDictionary* launchOptions) {
+    return [weakSelf createBridgeWithDelegate:delegate launchOptions:launchOptions];
+  };
+  
+  self.rootViewFactory = [[RCTRootViewFactory alloc] initWithConfiguration:configuration];
+  
+  UIView *rootView = [self.rootViewFactory viewWithModuleName:self.moduleName 
+                                            initialProperties:self.initialProps
+                                                launchOptions:launchOptions];
+  
+  if (self.newArchEnabled || self.bridgelessEnabled) {
+    [RCTComponentViewFactory currentComponentViewFactory].thirdPartyFabricComponentsProvider = self;
+  }
+
+  [self customizeRootView:(RCTRootView* )rootView];
+  
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [self createRootViewController];
   [self setRootView:rootView toRootViewController:rootViewController];
@@ -97,55 +90,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
-- (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(fabricEnabled);
-
-    // Enable TurboModule interop by default in Bridgeless mode
-    RCTEnableTurboModuleInterop(YES);
-    RCTEnableTurboModuleInteropBridgeProxy(YES);
-    
-    if (!_reactHost) {
-      [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:self.moduleName initProps:initProps];
-  }
-  [self customizeRootView:(RCTRootView *)rootView];
-  
-  return rootView;
-}
-
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
   // Noop
@@ -158,21 +102,11 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
   return nil;
 }
 
-- (NSDictionary *)prepareInitialProps
-{
-  return self.initialProps;
-}
-
 - (RCTBridge *)createBridgeWithDelegate:(id<RCTBridgeDelegate>)delegate launchOptions:(NSDictionary *)launchOptions
 {
   return [[RCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions];
 }
 
-- (void)customizeRootView:(RCTRootView *)rootView
-{
-  // Override point for customization after application launch.
-}
-
 - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
                           moduleName:(NSString *)moduleName
                            initProps:(NSDictionary *)initProps
@@ -211,9 +145,9 @@ - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)
   rootViewController.view = rootView;
 }
 
-- (BOOL)runtimeSchedulerEnabled
+- (void)customizeRootView:(RCTRootView *)rootView
 {
-  return YES;
+  // Override point for customization after application launch.
 }
 
 #pragma mark - UISceneDelegate
@@ -225,24 +159,6 @@ - (void)windowScene:(UIWindowScene *)windowScene
   [[NSNotificationCenter defaultCenter] postNotificationName:RCTWindowFrameDidChangeNotification object:self];
 }
 
-#pragma mark - RCTCxxBridgeDelegate
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
-{
-  _runtimeScheduler = std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-  if ([self newArchEnabled]) {
-    std::shared_ptr<facebook::react::CallInvoker> callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    RCTTurboModuleManager *turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                                                     delegate:self
-                                                                                    jsInvoker:callInvoker];
-    _contextContainer->erase("RuntimeScheduler");
-    _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, turboModuleManager, _runtimeScheduler);
-  } else {
-    return RCTAppSetupJsExecutorFactoryForOldArch(bridge, _runtimeScheduler);
-  }
-}
-
 #pragma mark - New Arch Enabled settings
 
 - (BOOL)newArchEnabled
@@ -269,79 +185,18 @@ - (BOOL)bridgelessEnabled
   return NO;
 }
 
-#pragma mark - RCTComponentViewFactoryComponentProvider
-
-- (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
-{
-  return @{};
-}
-
-#pragma mark - RCTTurboModuleManagerDelegate
-
-- (Class)getModuleClassFromName:(const char *)name
-{
-#if RN_DISABLE_OSS_PLUGIN_HEADER
-  return RCTTurboModulePluginClassProvider(name);
-#else
-  return RCTCoreModulesClassProvider(name);
-#endif
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return nullptr;
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
-{
+- (NSURL *)bundleURL { 
+  [NSException raise:@"RCTAppDelegate::bundleURL not implemented"
+                format:@"Subclasses must implement a valid getBundleURL method"];
   return nullptr;
 }
 
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
-{
-  return RCTAppSetupDefaultModuleFromClass(moduleClass);
-}
-
-#pragma mark - New Arch Utilities
-
-- (void)createReactHost
-{
-  __weak __typeof(self) weakSelf = self;
-  _reactHost = [[RCTHost alloc] initWithBundleURL:[self bundleURL]
-                                     hostDelegate:nil
-                       turboModuleManagerDelegate:self
-                                 jsEngineProvider:^std::shared_ptr<facebook::react::JSRuntimeFactory>() {
-                                   return [weakSelf createJSRuntimeFactory];
-                                 }];
-  [_reactHost setBundleURLProvider:^NSURL *() {
-    return [weakSelf bundleURL];
-  }];
-  [_reactHost setContextContainerHandler:self];
-  [_reactHost start];
-}
-
-- (std::shared_ptr<facebook::react::JSRuntimeFactory>)createJSRuntimeFactory
-{
-#if USE_HERMES
-  return std::make_shared<facebook::react::RCTHermesInstance>(_reactNativeConfig, nullptr);
-#else
-  return std::make_shared<facebook::react::RCTJscInstance>();
-#endif
-}
 
-- (void)didCreateContextContainer:(std::shared_ptr<facebook::react::ContextContainer>)contextContainer
-{
-  contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-}
+#pragma mark - RCTComponentViewFactoryComponentProvider
 
-- (NSURL *)bundleURL
+- (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
 {
-  [NSException raise:@"RCTAppDelegate::bundleURL not implemented"
-              format:@"Subclasses must implement a valid getBundleURL method"];
-  return nullptr;
+  return @{};
 }
 
 @end

packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h

@@ -51,6 +51,8 @@ void RCTAppSetupPrepareApp(
     BOOL turboModuleEnabled,
     const facebook::react::ReactNativeConfig &reactNativeConfig);
 
+void RCTAppSetupPrepareConfig(const facebook::react::ReactNativeConfig &reactNativeConfig);
+
 #endif // __cplusplus
 
 RCT_EXTERN_C_BEGIN

packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm

@@ -47,7 +47,11 @@ void RCTAppSetupPrepareApp(
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
   RCTAppSetupPrepareApp(application, turboModuleEnabled);
 #pragma clang diagnostic pop
+  RCTAppSetupPrepareConfig(reactNativeConfig);
+}
 
+void RCTAppSetupPrepareConfig(const facebook::react::ReactNativeConfig &reactNativeConfig)
+{
   auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
   inspectorFlags.initFromConfig(reactNativeConfig);
 }