resolves issue #34 and referenced in issue #26

talkol · talkol · commit 63bdf3ec7435 · 2016-04-01T12:14:57.000+03:00
diff --git a/README.md b/README.md
@@ -302,7 +302,7 @@ var { ControllerRegistry } = Controllers;
 ControllerRegistry.registerController('MoviesApp', () => MoviesApp);
 ```
 
- * **setRootController(controllerId, animationType = 'none')** - start the app with a root controller
+ * **setRootController(controllerId, animationType = 'none', passProps = {})** - start the app with a root controller
 
 ```js
 // example without animation
@@ -312,6 +312,10 @@ ControllerRegistry.setRootController('MoviesApp');
 // example with animation, useful for changing your app root during runtime (from a different controller)
 // animationType: 'none', 'slide-down', 'fade'
 ControllerRegistry.setRootController('LoginApp', 'slide-down');
+
+// example with props
+// these props will be passed to all top components in the layout hierarchy (eg. all tabs, side menus, etc.)
+ControllerRegistry.setRootController('MoviesApp', 'none', { greeting: 'hello world' });
 ```
 
 #### `Modal`
@@ -321,7 +325,7 @@ var Controllers = require('react-native-controllers');
 var { Modal } = Controllers;
 ```
 
- * **showController(controllerId, animationType = 'slide-up')** - display a controller modally
+ * **showController(controllerId, animationType = 'slide-up', passProps = {})** - display a controller modally
 
 ```js
 // example with default slide up animation
@@ -331,6 +335,10 @@ Modal.showController('MoviesApp');
 // example without animation
 // animationType: 'none', 'slide-up'
 Modal.showController('LoginApp', 'none');
+
+// example with props
+Modal.showController('MoviesApp', 'slide-up', { greeting: 'hello world' });
+
 ```
 
  * **dismissController(animationType = 'slide-down')** - dismiss the current modal controller
diff --git a/example/ModalScreen.js b/example/ModalScreen.js
@@ -28,6 +28,13 @@ var ModalScreen = React.createClass({
           Notice how the show modal was 100% native. This screen doesn't have any special styles applied.
         </Text>
 
+        {
+          !this.props.greeting ? false :
+          <Text style={{fontSize: 16, textAlign: 'center', marginHorizontal: 30, marginBottom: 20}}>
+            {this.props.greeting}
+          </Text>
+        }
+
         <TouchableOpacity onPress={ this.onPushClick }>
           <Text style={styles.button}>Push Plain Screen</Text>
         </TouchableOpacity>
diff --git a/example/MovieListScreen.js b/example/MovieListScreen.js
@@ -49,11 +49,14 @@ var MovieListScreen = React.createClass({
   },
 
   onShowModalVcClick: async function() {
-    Modal.showController('ModalScreenTester');
+    // defaults: Modal.showController('ModalScreenTester');
+    // this example shows animation type and passProps
+    Modal.showController('ModalScreenTester', 'slide-up', { greeting: 'hi there!' });
   },
 
   onReplaceRootAnimatedClick: function() {
-    ControllerRegistry.setRootController('ModalScreenTester', 'slide-down');
+    // this example shows animation type and passProps
+    ControllerRegistry.setRootController('ModalScreenTester', 'slide-down', { greeting: 'how you doin?' });
   },
 
   render: function() {
diff --git a/index.js b/index.js
@@ -86,11 +86,11 @@ var Controllers = {
     registerController: function (appKey, getControllerFunc) {
       _controllerRegistry[appKey] = getControllerFunc();
     },
-    setRootController: function (appKey, animationType = 'none') {
+    setRootController: function (appKey, animationType = 'none', passProps = {}) {
       var controller = _controllerRegistry[appKey];
       if (controller === undefined) return;
       var layout = controller.render();
-      RCCManager.setRootController(layout, animationType);
+      RCCManager.setRootController(layout, animationType, passProps);
     }
   },
 
@@ -200,11 +200,11 @@ var Controllers = {
     dismissLightBox: function() {
       RCCManager.modalDismissLightBox();
     },
-    showController: function(appKey, animationType = 'slide-down') {
+    showController: function(appKey, animationType = 'slide-up', passProps = {}) {
       var controller = _controllerRegistry[appKey];
       if (controller === undefined) return;
       var layout = controller.render();
-      RCCManager.showController(layout, animationType);
+      RCCManager.showController(layout, animationType, passProps);
     },
     dismissController: function(animationType = 'slide-down') {
       RCCManager.dismissController(animationType);
diff --git a/ios/RCCDrawerController.h b/ios/RCCDrawerController.h
@@ -4,7 +4,7 @@
 
 @interface RCCDrawerController : MMDrawerController
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge;
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge;
 
 @end
diff --git a/ios/RCCDrawerController.m b/ios/RCCDrawerController.m
@@ -4,23 +4,23 @@
 
 @implementation RCCDrawerController
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge
 {
   // center
   if ([children count] < 1) return nil;
-  UIViewController *centerViewController = [RCCViewController controllerWithLayout:children[0] bridge:bridge];
+  UIViewController *centerViewController = [RCCViewController controllerWithLayout:children[0] globalProps:globalProps bridge:bridge];
 
   // left
   UIViewController *leftViewController = nil;
   NSString *componentLeft = props[@"componentLeft"];
   NSDictionary *passPropsLeft = props[@"passPropsLeft"];
-  if (componentLeft) leftViewController = [[RCCViewController alloc] initWithComponent:componentLeft passProps:passPropsLeft navigatorStyle:nil bridge:bridge];
+  if (componentLeft) leftViewController = [[RCCViewController alloc] initWithComponent:componentLeft passProps:passPropsLeft navigatorStyle:nil globalProps:globalProps bridge:bridge];
 
   // right
   UIViewController *rightViewController = nil;
   NSString *componentRight = props[@"componentRight"];
   NSDictionary *passPropsRight = props[@"passPropsRight"];
-  if (componentRight) rightViewController = [[RCCViewController alloc] initWithComponent:componentRight passProps:passPropsRight navigatorStyle:nil bridge:bridge];
+  if (componentRight) rightViewController = [[RCCViewController alloc] initWithComponent:componentRight passProps:passPropsRight navigatorStyle:nil globalProps:globalProps bridge:bridge];
 
   self = [super initWithCenterViewController:centerViewController
                     leftDrawerViewController:leftViewController
diff --git a/ios/RCCManagerModule.m b/ios/RCCManagerModule.m
@@ -65,10 +65,10 @@ - (dispatch_queue_t)methodQueue
 }
 
 RCT_EXPORT_METHOD(
-setRootController:(NSDictionary*)layout animationType:(NSString*)animationType)
+setRootController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps)
 {
     // create the new controller
-    UIViewController *controller = [RCCViewController controllerWithLayout:layout bridge:[[RCCManager sharedInstance] getBridge]];
+    UIViewController *controller = [RCCViewController controllerWithLayout:layout globalProps:globalProps bridge:[[RCCManager sharedInstance] getBridge]];
     if (controller == nil) return;
 
     id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;
@@ -161,9 +161,9 @@ - (dispatch_queue_t)methodQueue
 }
 
 RCT_EXPORT_METHOD(
-showController:(NSDictionary*)layout animationType:(NSString*)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+showController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    UIViewController *controller = [RCCViewController controllerWithLayout:layout bridge:[[RCCManager sharedInstance] getBridge]];
+    UIViewController *controller = [RCCViewController controllerWithLayout:layout globalProps:globalProps bridge:[[RCCManager sharedInstance] getBridge]];
     if (controller == nil)
     {
         [RCCManagerModule handleRCTPromiseRejectBlock:reject
diff --git a/ios/RCCNavigationController.h b/ios/RCCNavigationController.h
@@ -3,7 +3,7 @@
 
 @interface RCCNavigationController : UINavigationController
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge;
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge;
 
 @end
diff --git a/ios/RCCNavigationController.m b/ios/RCCNavigationController.m
@@ -9,15 +9,15 @@ @implementation RCCNavigationController
 NSString const *CALLBACK_ASSOCIATED_KEY = @"RCCNavigationController.CALLBACK_ASSOCIATED_KEY";
 NSString const *CALLBACK_ASSOCIATED_ID = @"RCCNavigationController.CALLBACK_ASSOCIATED_ID";
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge
 {
   NSString *component = props[@"component"];
   if (!component) return nil;
 
   NSDictionary *passProps = props[@"passProps"];
   NSDictionary *navigatorStyle = props[@"style"];
 
-  RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle bridge:bridge];
+  RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle globalProps:globalProps bridge:bridge];
   if (!viewController) return nil;
 
   NSString *title = props[@"title"];
@@ -77,7 +77,7 @@ - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actio
       navigatorStyle = mergedStyle;
     }
 
-    RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle bridge:bridge];
+    RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle globalProps:nil bridge:bridge];
 
     NSString *title = actionParams[@"title"];
     if (title) viewController.title = title;
@@ -143,7 +143,7 @@ - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actio
     NSDictionary *passProps = actionParams[@"passProps"];
     NSDictionary *navigatorStyle = actionParams[@"style"];
     
-    RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle bridge:bridge];
+    RCCViewController *viewController = [[RCCViewController alloc] initWithComponent:component passProps:passProps navigatorStyle:navigatorStyle globalProps:nil bridge:bridge];
     
     NSString *title = actionParams[@"title"];
     if (title) viewController.title = title;
diff --git a/ios/RCCTabBarController.h b/ios/RCCTabBarController.h
@@ -3,7 +3,7 @@
 
 @interface RCCTabBarController : UITabBarController
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge;
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge;
 - (void)performAction:(NSString*)performAction actionParams:(NSDictionary*)actionParams bridge:(RCTBridge *)bridge completion:(void (^)(void))completion;
 
 @end
diff --git a/ios/RCCTabBarController.m b/ios/RCCTabBarController.m
@@ -21,7 +21,7 @@ - (UIImage *)image:(UIImage*)image withColor:(UIColor *)color1
   return newImage;
 }
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary*)globalProps bridge:(RCTBridge *)bridge
 {
   self = [super init];
   if (!self) return nil;
@@ -72,7 +72,7 @@ - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children
     if (![tabItemLayout[@"children"] isKindOfClass:[NSArray class]]) continue;
     if ([tabItemLayout[@"children"] count] < 1) continue;
     NSDictionary *childLayout = tabItemLayout[@"children"][0];
-    UIViewController *viewController = [RCCViewController controllerWithLayout:childLayout bridge:bridge];
+    UIViewController *viewController = [RCCViewController controllerWithLayout:childLayout globalProps:globalProps bridge:bridge];
     if (!viewController) continue;
 
     // create the tab icon and title
diff --git a/ios/RCCViewController.h b/ios/RCCViewController.h
@@ -6,10 +6,10 @@
 @property (nonatomic) NSMutableDictionary *navigatorStyle;
 @property (nonatomic) BOOL navBarHidden;
 
-+ (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBridge *)bridge;
++ (UIViewController*)controllerWithLayout:(NSDictionary *)layout globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge;
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge;
-- (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle bridge:(RCTBridge *)bridge;
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge;
+- (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge;
 - (void)setStyleOnAppear;
 - (void)setStyleOnInit;
 
diff --git a/ios/RCCViewController.m b/ios/RCCViewController.m
@@ -19,7 +19,7 @@ @interface RCCViewController()
 
 @implementation RCCViewController
 
-+ (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBridge *)bridge
++ (UIViewController*)controllerWithLayout:(NSDictionary *)layout globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
   UIViewController* controller = nil;
   if (!layout) return nil;
@@ -41,25 +41,25 @@ + (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBrid
   // regular view controller
   if ([type isEqualToString:@"ViewControllerIOS"])
   {
-    controller = [[RCCViewController alloc] initWithProps:props children:children bridge:bridge];
+    controller = [[RCCViewController alloc] initWithProps:props children:children globalProps:globalProps bridge:bridge];
   }
 
   // navigation controller
   if ([type isEqualToString:@"NavigationControllerIOS"])
   {
-    controller = [[RCCNavigationController alloc] initWithProps:props children:children bridge:bridge];
+    controller = [[RCCNavigationController alloc] initWithProps:props children:children globalProps:globalProps bridge:bridge];
   }
 
   // tab bar controller
   if ([type isEqualToString:@"TabBarControllerIOS"])
   {
-    controller = [[RCCTabBarController alloc] initWithProps:props children:children bridge:bridge];
+    controller = [[RCCTabBarController alloc] initWithProps:props children:children globalProps:globalProps bridge:bridge];
   }
 
   // side menu controller
   if ([type isEqualToString:@"DrawerControllerIOS"])
   {
-    controller = [[RCCDrawerController alloc] initWithProps:props children:children bridge:bridge];
+    controller = [[RCCDrawerController alloc] initWithProps:props children:children globalProps:globalProps bridge:bridge];
   }
 
   // register the controller if we have an id
@@ -72,15 +72,18 @@ + (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBrid
   return controller;
 }
 
-- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children bridge:(RCTBridge *)bridge
+- (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
   NSString *component = props[@"component"];
   if (!component) return nil;
 
   NSDictionary *passProps = props[@"passProps"];
   NSDictionary *navigatorStyle = props[@"style"];
 
-  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:passProps];
+  NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
+  [mergedProps addEntriesFromDictionary:passProps];
+  
+  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
   if (!reactView) return nil;
 
   self = [super init];
@@ -91,9 +94,12 @@ - (instancetype)initWithProps:(NSDictionary *)props children:(NSArray *)children
   return self;
 }
 
-- (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle bridge:(RCTBridge *)bridge
+- (instancetype)initWithComponent:(NSString *)component passProps:(NSDictionary *)passProps navigatorStyle:(NSDictionary*)navigatorStyle globalProps:(NSDictionary *)globalProps bridge:(RCTBridge *)bridge
 {
-  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:passProps];
+  NSMutableDictionary *mergedProps = [NSMutableDictionary dictionaryWithDictionary:globalProps];
+  [mergedProps addEntriesFromDictionary:passProps];
+  
+  RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:component initialProperties:mergedProps];
   if (!reactView) return nil;
 
   self = [super init];

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ - (dispatch_queue_t)methodQueue`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`RCT_EXPORT_METHOD(`
`68`		`-setRootController:(NSDictionary)layout animationType:(NSString)animationType)`
	`68`	`+setRootController:(NSDictionary)layout animationType:(NSString)animationType globalProps:(NSDictionary*)globalProps)`
`69`	`69`	`{`
`70`	`70`	`// create the new controller`
`71`		`- UIViewController *controller = [RCCViewController controllerWithLayout:layout bridge:[[RCCManager sharedInstance] getBridge]];`
	`71`	`+ UIViewController *controller = [RCCViewController controllerWithLayout:layout globalProps:globalProps bridge:[[RCCManager sharedInstance] getBridge]];`
`72`	`72`	`if (controller == nil) return;`
`73`	`73`
`74`	`74`	`id<UIApplicationDelegate> appDelegate = [UIApplication sharedApplication].delegate;`
`@@ -161,9 +161,9 @@ - (dispatch_queue_t)methodQueue`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`RCT_EXPORT_METHOD(`
`164`		`-showController:(NSDictionary)layout animationType:(NSString)animationType resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)`
	`164`	`+showController:(NSDictionary)layout animationType:(NSString)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)`
`165`	`165`	`{`
`166`		`- UIViewController *controller = [RCCViewController controllerWithLayout:layout bridge:[[RCCManager sharedInstance] getBridge]];`
	`166`	`+ UIViewController *controller = [RCCViewController controllerWithLayout:layout globalProps:globalProps bridge:[[RCCManager sharedInstance] getBridge]];`
`167`	`167`	`if (controller == nil)`
`168`	`168`	`{`
`169`	`169`	`[RCCManagerModule handleRCTPromiseRejectBlock:reject`