[Initialization] Decouple script loading and environment setup from the root view

Examples/Movies/AppDelegate.m

@@ -2,14 +2,13 @@
 
 #import "AppDelegate.h"
 
-#import "RCTRootView.h"
+#import "RCTRootViewController.h"
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
-  RCTRootView *rootView = [[RCTRootView alloc] init];
 
   // Loading JavaScript code - uncomment the one you want.
 
@@ -30,13 +29,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // and uncomment the next following line
   // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
-  rootView.scriptURL = jsCodeLocation;
-  rootView.moduleName = @"MoviesApp";
+  RCTRootViewController *viewController = [[RCTRootViewController alloc] init];
+  viewController.moduleName = @"MoviesApp";
+  viewController.scriptURL = jsCodeLocation;
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [[UIViewController alloc] init];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
+  self.window.rootViewController = viewController;
   [self.window makeKeyAndVisible];
   return YES;
 }

Examples/TicTacToe/AppDelegate.m

@@ -2,14 +2,13 @@
 
 #import "AppDelegate.h"
 
-#import "RCTRootView.h"
+#import "RCTRootViewController.h"
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
-  RCTRootView *rootView = [[RCTRootView alloc] init];
 
   // Loading JavaScript code - uncomment the one you want.
 
@@ -30,13 +29,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // and uncomment the next following line
   // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
-  rootView.scriptURL = jsCodeLocation;
-  rootView.moduleName = @"TicTacToeApp";
+  RCTRootViewController *viewController = [[RCTRootViewController alloc] init];
+  viewController.moduleName = @"TicTacToeApp";
+  viewController.scriptURL = jsCodeLocation;
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [[UIViewController alloc] init];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
+  self.window.rootViewController = viewController;
   [self.window makeKeyAndVisible];
   return YES;
 }

Examples/UIExplorer/AppDelegate.m

@@ -2,14 +2,13 @@
 
 #import "AppDelegate.h"
 
-#import "RCTRootView.h"
+#import "RCTRootViewController.h"
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
-  RCTRootView *rootView = [[RCTRootView alloc] init];
 
   // Loading JavaScript code - uncomment the one you want.
 
@@ -30,13 +29,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // and uncomment the next following line
   // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
-  rootView.scriptURL = jsCodeLocation;
-  rootView.moduleName = @"UIExplorerApp";
+  RCTRootViewController *viewController = [[RCTRootViewController alloc] init];
+  viewController.moduleName = @"UIExplorerApp";
+  viewController.scriptURL = jsCodeLocation;
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [[UIViewController alloc] init];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
+  self.window.rootViewController = viewController;
   [self.window makeKeyAndVisible];
   return YES;
 }

IntegrationTests/AppDelegate.m

@@ -2,14 +2,13 @@
 
 #import "AppDelegate.h"
 
-#import "RCTRootView.h"
+#import "RCTRootViewController.h"
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
-  RCTRootView *rootView = [[RCTRootView alloc] init];
 
   // Loading JavaScript code - uncomment the one you want.
 
@@ -30,13 +29,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // and uncomment the next following line
   // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
-  rootView.scriptURL = jsCodeLocation;
-  rootView.moduleName = @"IntegrationTestsApp";
+  RCTRootViewController *viewController = [[RCTRootViewController alloc] init];
+  viewController.moduleName = @"IntegrationTestsApp";
+  viewController.scriptURL = jsCodeLocation;
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [[UIViewController alloc] init];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
+  self.window.rootViewController = viewController;
   [self.window makeKeyAndVisible];
   return YES;
 }

Libraries/RCTTest/RCTTestRunner.m

@@ -3,7 +3,7 @@
 #import "RCTTestRunner.h"
 
 #import "RCTRedBox.h"
-#import "RCTRootView.h"
+#import "RCTRootViewController.h"
 #import "RCTTestModule.h"
 #import "RCTUtils.h"
 
@@ -34,15 +34,14 @@ - (void)runTest:(NSString *)moduleName initialProps:(NSDictionary *)initialProps
 - (void)runTest:(NSString *)moduleName initialProps:(NSDictionary *)initialProps expectErrorBlock:(BOOL(^)(NSString *error))expectErrorBlock
 {
   RCTTestModule *testModule = [[RCTTestModule alloc] init];
-  RCTRootView *rootView = [[RCTRootView alloc] init];
-  UIViewController *vc = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
-  vc.view = rootView;
-  rootView.moduleProvider = ^(void){
+  RCTRootViewController *rootViewController = [[RCTRootViewController alloc] init];
+  [[UIApplication sharedApplication].delegate window].rootViewController = rootViewController;
+  rootViewController.moduleProvider = ^(void){
     return @[testModule];
   };
-  rootView.moduleName = moduleName;
-  rootView.initialProperties = initialProps;
-  rootView.scriptURL = [NSURL URLWithString:_script];
+  rootViewController.moduleName = moduleName;
+  rootViewController.initialProperties = initialProps;
+  rootViewController.scriptURL = [NSURL URLWithString:_script];
 
   NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
   NSString *error = [[RCTRedBox sharedInstance] currentErrorMessage];

ReactKit/Base/RCTRedBox.m

@@ -110,7 +110,7 @@ - (void)dismiss
 
 - (void)reload
 {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTReloadNotification" object:nil userInfo:nil];
+  [[NSNotificationCenter defaultCenter] postNotificationName:RCTReloadNotification object:self];
   [self dismiss];
 }
 

ReactKit/Base/RCTRootView.h

@@ -2,52 +2,6 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBridge.h"
-
 @interface RCTRootView : UIView
 
-/**
- * The URL of the bundled application script (required).
- * Setting this will clear the view contents, and trigger
- * an asynchronous load/download and execution of the script.
- */
-@property (nonatomic, strong) NSURL *scriptURL;
-
-/**
- * The name of the JavaScript module to execute within the
- * specified scriptURL (required). Setting this will not have
- * any immediate effect, but it must be done prior to loading
- * the script.
- */
-@property (nonatomic, copy) NSString *moduleName;
-
-/**
- * A block that returns an array of pre-allocated modules.  These
- * modules will take precedence over any automatically registered
- * modules of the same name.
- */
-@property (nonatomic, copy) RCTBridgeModuleProviderBlock moduleProvider;
-
-/**
- * The default properties to apply to the view when the script bundle
- * is first loaded. Defaults to nil/empty.
- */
-@property (nonatomic, copy) NSDictionary *initialProperties;
-
-/**
- * The class of the RCTJavaScriptExecutor to use with this view.
- * If not specified, it will default to using RCTContextExecutor.
- * Changes will take effect next time the bundle is reloaded.
- */
-@property (nonatomic, strong) Class executorClass;
-
-/**
- * Reload this root view, or all root views, respectively.
- */
-- (void)reload;
-+ (void)reloadAll;
-
-- (void)startOrResetInteractionTiming;
-- (NSDictionary *)endAndResetInteractionTiming;
-
 @end