feat: migrate RNTester and HelloWorld to RCTSceneDelegate

Adopt RCTSceneDelegate in sample apps, wire push notifications on AppDelegate
for the scene path, fix native example views to use RCTGetActiveReactNativeFactory,
and preserve legacy AppDelegate bootstrap behind compile flags.

Author: artus9033

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

@@ -23,18 +23,56 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * For AppDelegate-only apps, use `RCTAppDelegate` or `RCTReactNativeFactory` directly.
  *
- * To use it, make your SceneDelegate a subclass of RCTSceneDelegate:
+ * Usage:
+ * 1. Declare `UIApplicationSceneManifest` in Info.plist with your SceneDelegate class.
+ * 2. Subclass `RCTSceneDelegate` and configure it before calling `[super ...]` in
+ *    `scene:willConnectToSession:options:`.
  *
  * ```objc
  * #import <React_RCTAppDelegate/RCTSceneDelegate.h>
- * @interface SceneDelegate : RCTSceneDelegate
+ *
+ * @implementation SceneDelegate
+ *
+ * - (void)scene:(UIScene *)scene
+ *     willConnectToSession:(UISceneSession *)session
+ *                  options:(UISceneConnectionOptions *)connectionOptions
+ * {
+ *   self.moduleName = @"MyApp"; // required: JS module name registered in AppRegistry
+ *   self.initialProps = @{
+ *     // optional root props
+ *   };
+ *   self.dependencyProvider = [[RCTAppDependencyProvider alloc] init]; // if using codegen
+ *   [super scene:scene willConnectToSession:session options:connectionOptions];
+ * }
+ *
+ * - (NSURL *)bundleURL
+ * {
+ *   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+ * }
+ *
  * @end
  * ```
  *
- * Requires `UIApplicationSceneManifest` in Info.plist with your SceneDelegate class configured.
+ * Required configuration (set before `[super scene:willConnectToSession:options:]`):
+ *   - `moduleName` — the AppRegistry component name to mount.
+ *   - `bundleURL` — override to return the JS bundle URL (raises if not implemented).
+ *
+ * Optional configuration:
+ *   - `initialProps` — props passed to the root component.
+ *   - `dependencyProvider` — codegen module/component provider.
+ *   - `automaticallyLoadReactNativeWindow` — defaults to `YES`; set to `NO` to call
+ *     `loadReactNativeWindow:` yourself after custom setup.
+ *
+ * Linking is forwarded automatically via `RCTLinkingManager`. Push notifications and other
+ * `UIApplicationDelegate` callbacks should remain on your AppDelegate.
  *
- * All methods implemented by RCTSceneDelegate can be overridden. Call `[super ...]` to use the default
- * implementation.
+ * Overridable methods (inherited from `RCTDefaultReactNativeFactoryDelegate`):
+ *   - (UIViewController *)createRootViewController;
+ *   - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController;
+ *   - (void)customizeRootView:(RCTRootView *)rootView;
+ *   - (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
+ *   - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+ *                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
  */
 @interface RCTSceneDelegate : RCTDefaultReactNativeFactoryDelegate <UIWindowSceneDelegate>
 

packages/rn-tester/RNTester/AppDelegate.mm

@@ -184,7 +184,62 @@ - (NSURL *)bundleURL
 
 @end
 #else
+
+#if !TARGET_OS_TV
+#import <UserNotifications/UserNotifications.h>
+#import <React/RCTPushNotificationManager.h>
+#endif
+
+#if !TARGET_OS_TV
+@interface AppDelegate () <UNUserNotificationCenterDelegate>
+@end
+#endif
+
 @implementation AppDelegate
 
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+#if !TARGET_OS_TV
+  [[UNUserNotificationCenter currentNotificationCenter] setDelegate:self];
+#endif
+  return YES;
+}
+
+#if !TARGET_OS_TV
+- (void)application:(__unused UIApplication *)application
+    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+{
+  [RCTPushNotificationManager didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+}
+
+- (void)application:(__unused UIApplication *)application
+    didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
+{
+  [RCTPushNotificationManager didFailToRegisterForRemoteNotificationsWithError:error];
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+{
+  [RCTPushNotificationManager didReceiveNotification:notification];
+  completionHandler(UNNotificationPresentationOptionNone);
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+    didReceiveNotificationResponse:(UNNotificationResponse *)response
+             withCompletionHandler:(void (^)(void))completionHandler
+{
+  UNNotification *notification = response.notification;
+
+  if ([response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier]) {
+    [RCTPushNotificationManager setInitialNotification:notification];
+  }
+
+  [RCTPushNotificationManager didReceiveNotification:notification];
+  completionHandler();
+}
+#endif
+
 @end
 #endif

packages/rn-tester/RNTester/NativeExampleViews/FlexibleSizeExampleView.mm

@@ -10,10 +10,9 @@
 #import <React/RCTBridge.h>
 #import <React/RCTRootView.h>
 #import <React/RCTRootViewDelegate.h>
+#import <React/RCTUtils.h>
 #import <React/RCTViewManager.h>
-
-#import "AppDelegate.h"
-#import "SceneDelegate.h"
+#import <RCTReactNativeFactory.h>
 
 @interface FlexibleSizeExampleViewManager : RCTViewManager
 
@@ -45,13 +44,7 @@ - (instancetype)initWithFrame:(CGRect)frame
   if ((self = [super initWithFrame:frame])) {
     _sizeUpdated = NO;
 
-#if RNTESTER_USE_APPDELEGATE
-    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-    RCTReactNativeFactory* reactNativeFactory = appDelegate.reactNativeFactory;
-#else
-    SceneDelegate *sceneDelegate = (SceneDelegate*)self.window.windowScene.delegate;
-    RCTReactNativeFactory* reactNativeFactory = sceneDelegate.reactNativeFactory;
-#endif
+    RCTReactNativeFactory *reactNativeFactory = RCTGetActiveReactNativeFactory();
 
     _resizableRootView = (RCTRootView *)[reactNativeFactory.rootViewFactory
         viewWithModuleName:@"RootViewSizeFlexibilityExampleApp"];

packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm

@@ -8,10 +8,9 @@
 #import "UpdatePropertiesExampleView.h"
 
 #import <React/RCTRootView.h>
+#import <React/RCTUtils.h>
 #import <React/RCTViewManager.h>
-
-#import "AppDelegate.h"
-#import "SceneDelegate.h"
+#import <RCTReactNativeFactory.h>
 
 @interface UpdatePropertiesExampleViewManager : RCTViewManager
 
@@ -40,13 +39,7 @@ - (instancetype)initWithFrame:(CGRect)frame
   if (self) {
     _beige = YES;
 
-#if RNTESTER_USE_APPDELEGATE
-    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
-    RCTReactNativeFactory* reactNativeFactory = appDelegate.reactNativeFactory;
-#else
-    SceneDelegate *sceneDelegate = (SceneDelegate*)self.window.windowScene.delegate;
-    RCTReactNativeFactory* reactNativeFactory = sceneDelegate.reactNativeFactory;
-#endif
+    RCTReactNativeFactory *reactNativeFactory = RCTGetActiveReactNativeFactory();
 
     _rootView =
         (RCTRootView *)[reactNativeFactory.rootViewFactory viewWithModuleName:@"SetPropertiesExampleApp"

packages/rn-tester/RNTester/SceneDelegate.h

@@ -5,23 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <RCTDefaultReactNativeFactoryDelegate.h>
-#import <RCTReactNativeFactory.h>
+#import <RCTSceneDelegate.h>
 #import <UIKit/UIKit.h>
 
-@class ReactNativeDelegate;
-@class RCTReactNativeFactory;
-
-@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-@property (strong, nonatomic) ReactNativeDelegate *reactNativeDelegate;
-@property (strong, nonatomic) RCTReactNativeFactory *reactNativeFactory;
+@interface SceneDelegate : RCTSceneDelegate
 
 - (NSDictionary *)prepareInitialProps;
 
 @end
-
-@interface ReactNativeDelegate : RCTDefaultReactNativeFactoryDelegate
-
-@end

packages/rn-tester/RNTester/SceneDelegate.mm

@@ -7,16 +7,11 @@
 
 #import "SceneDelegate.h"
 
-#import <UserNotifications/UserNotifications.h>
-
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTDefines.h>
-#import <React/RCTLinkingManager.h>
 #import <ReactCommon/RCTSampleTurboModule.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
 
-#import <React/RCTPushNotificationManager.h>
-
 #import <NativeCxxModuleExample/NativeCxxModuleExample.h>
 #ifndef RN_DISABLE_OSS_PLUGIN_HEADER
 #import <RNTMyNativeViewComponentView.h>
@@ -29,8 +24,11 @@
 #define USE_OSS_CODEGEN 0
 #endif
 
-@interface SceneDelegate ()
-@end
+#if RCT_DEV_MENU
+#import <React/RCTDevMenu.h>
+#endif
+
+static NSString *kBundlePath = @"js/RNTesterApp.ios";
 
 @implementation SceneDelegate
 
@@ -49,54 +47,54 @@ - (void)scene:(UIScene *)scene
     willConnectToSession:(UISceneSession *)session
                  options:(UISceneConnectionOptions *)connectionOptions
 {
-  if (![scene isKindOfClass:[UIWindowScene class]])
-    return;
-
-  UIWindowScene *windowScene = (UIWindowScene *)scene;
-  self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
-
-  ReactNativeDelegate *delegate = [[ReactNativeDelegate alloc] init];
-  RCTReactNativeFactory *factory = [[RCTReactNativeFactory alloc] initWithDelegate:delegate];
-
+  self.moduleName = @"RNTesterApp";
+  self.initialProps = [self prepareInitialProps];
 #if USE_OSS_CODEGEN
-  delegate.dependencyProvider = [[RCTAppDependencyProvider alloc] init];
+  self.dependencyProvider = [[RCTAppDependencyProvider alloc] init];
 #endif
 
-  self.reactNativeDelegate = delegate;
-  self.reactNativeFactory = factory;
+  [super scene:scene willConnectToSession:session options:connectionOptions];
 
-  [factory startReactNativeWithModuleName:@"RNTesterApp"
-                                 inWindow:self.window
-                        initialProperties:[self prepareInitialProps]
-                        connectionOptions:connectionOptions];
+#if RCT_DEV_MENU
+  RCTDevMenuConfiguration *devMenuConfiguration = [[RCTDevMenuConfiguration alloc] initWithDevMenuEnabled:true
+                                                                                      shakeGestureEnabled:true
+                                                                                 keyboardShortcutsEnabled:true];
+  [self.reactNativeFactory setDevMenuConfiguration:devMenuConfiguration];
+#endif
 }
 
-- (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-  [RCTLinkingManager scene:scene openURLContexts:URLContexts];
+  return [self bundleURL];
 }
 
-- (void)scene:(UIScene *)scene continueUserActivity:(NSUserActivity *)userActivity
+- (NSURL *)bundleURL
 {
-  [RCTLinkingManager scene:scene continueUserActivity:userActivity];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:kBundlePath];
 }
 
-@end
-
-@implementation ReactNativeDelegate
-
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
 {
-  return [self bundleURL];
+  if (name == facebook::react::NativeCxxModuleExample::kModuleName) {
+    return std::make_shared<facebook::react::NativeCxxModuleExample>(jsInvoker);
+  }
+
+  return [super getTurboModule:name jsInvoker:jsInvoker];
 }
 
-- (NSURL *)bundleURL
+#ifndef RN_DISABLE_OSS_PLUGIN_HEADER
+- (nonnull NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
 {
-#if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"js/RNTesterApp.ios"];
-#else
-  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#endif
+  NSMutableDictionary *dict = [super thirdPartyFabricComponents].mutableCopy;
+  if (!dict[@"RNTMyNativeView"]) {
+    dict[@"RNTMyNativeView"] = NSClassFromString(@"RNTMyNativeViewComponentView");
+  }
+  if (!dict[@"SampleNativeComponent"]) {
+    dict[@"SampleNativeComponent"] = NSClassFromString(@"RCTSampleNativeComponentComponentView");
+  }
+  return dict;
 }
+#endif
 
 @end

packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

@@ -1193,6 +1193,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PODFILE_DIR = "$(SRCROOT)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -1290,6 +1291,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				PODFILE_DIR = "$(SRCROOT)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;