Merge branch 'master' into getLaunchArgs

ios/RCCManager.h

@@ -13,6 +13,7 @@
 -(UIWindow*)getAppWindow;
 -(void)setAppStyle:(NSDictionary*)appStyle;
 -(NSDictionary*)getAppStyle;
+-(NSDictionary*)getInitialProps;
 
 -(void)registerController:(UIViewController*)controller componentId:(NSString*)componentId componentType:(NSString*)componentType;
 -(id)getControllerWithId:(NSString*)componentId componentType:(NSString*)componentType;

ios/RCCManager.m

@@ -10,6 +10,7 @@
 @property (nonatomic, strong) RCTBridge *sharedBridge;
 @property (nonatomic, strong) NSURL *bundleURL;
 @property (nonatomic, strong, readwrite) NSDictionary *globalAppStyle;
+@property (nonatomic, strong) NSDictionary *launchOptions;
 @end
 
 @implementation RCCManager
@@ -46,6 +47,10 @@
   return self;
 }
 
+- (NSDictionary *)getInitialProps {
+  return _launchOptions;
+}
+
 -(void)clearModuleRegistry
 {
   [self.modulesRegistry removeAllObjects];
@@ -155,6 +160,7 @@
 {
   if (self.sharedBridge) return;
   
+  self.launchOptions = launchOptions;
   self.bundleURL = bundleURL;
   self.sharedBridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
   

ios/RCCManagerModule.m

@@ -480,4 +480,9 @@ RCT_EXPORT_METHOD(
     [RCCManagerModule cancelAllRCCViewControllerReactTouches];
 }
 
+RCT_EXPORT_METHOD(getInitialProps:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    resolve([[RCCManager sharedInstance] getInitialProps]);
+}
+
 @end

src/deprecated/controllers/index.js

@@ -128,6 +128,9 @@ var Controllers = {
       _validateDrawerProps(layout);
       _processProperties(_.get(layout, 'props.appStyle', {}));
       return await RCCManager.setRootController(layout, animationType, passProps);
+    },
+    getInitialProps: async function() {
+      return await RCCManager.getInitialProps();
     }
   },
 

src/deprecated/platformSpecificDeprecated.ios.js

@@ -586,6 +586,10 @@ function dismissLightBox(params) {
   Modal.dismissLightBox();
 }
 
+async function getInitialProps() {
+  return await ControllerRegistry.getInitialProps();
+}
+
 function showInAppNotification(params) {
   if (!params.screen) {
     console.error('showInAppNotification(params): params.screen is required');
@@ -721,5 +725,6 @@ export default {
   navigatorToggleNavBar,
   showContextualMenu,
   dismissContextualMenu,
-  getCurrentlyVisibleScreenId
+  getCurrentlyVisibleScreenId,
+  getInitialProps
 };