pass props to external components

e2e/ApplicationLifecycleTest.test.js

@@ -20,7 +20,7 @@ describe('application lifecycle test', () => {
     await expect(elementById(testIDs.WELCOME_SCREEN_HEADER)).toBeVisible();
   });
 
-  it(':android: relaunch from background', async () => {
+  it('relaunch from background', async () => {
     await elementById(testIDs.PUSH_BUTTON).tap();
     await expect(elementByLabel('Pushed Screen')).toBeVisible();
 
@@ -40,7 +40,7 @@ describe('application lifecycle test', () => {
     await expect(elementByLabel('Pushed Screen')).toBeNotVisible();
   });
 
-  it(':android: device orientation does not destroy activity', async () => {
+  it('device orientation does not destroy activity', async () => {
     await elementById(testIDs.PUSH_BUTTON).tap();
     await expect(elementByLabel('Pushed Screen')).toBeVisible();
 

e2e/ScreenStack.test.js

@@ -69,7 +69,7 @@ describe('screen stack', () => {
     await expect(elementByLabel('Screen 1')).toBeVisible();
   });
 
-  it(':android: push external component with options', async () => {
+  it('push external component with options', async () => {
     await elementById(testIDs.PUSH_EXTERNAL_COMPONENT_BUTTON).tap();
     await expect(elementByLabel('This is an external component')).toBeVisible();
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();

lib/ios/RNNBridgeManager.h

@@ -1,11 +1,12 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTBridge.h>
+#import "ReactNativeNavigation.h"
 
 @interface RNNBridgeManager : NSObject <RCTBridgeDelegate>
 
 - (instancetype)initWithJsCodeLocation:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions;
 
-- (void)registerExternalComponent:(NSString *)name callback:(UIViewController *(^)(void))callback;
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
 
 @property (readonly, nonatomic, strong) RCTBridge *bridge;
 

lib/ios/RNNControllerFactory.m

@@ -104,8 +104,9 @@
 
 - (UIViewController<RNNRootViewProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
 	NSString* name = node.data[@"name"];
+	NSDictionary* props = node.data[@"passProps"];
 	
-	UIViewController* externalVC = [_store getExternalComponent:name];
+	UIViewController* externalVC = [_store getExternalComponent:name props:props];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
 	[options mergeWith:node.data[@"options"]];
 	

lib/ios/RNNCustomViewController.h

@@ -2,4 +2,6 @@
 
 @interface RNNCustomViewController : UIViewController
 
+- (instancetype)initWithProps:(NSDictionary*)props;
+
 @end

lib/ios/RNNCustomViewController.m

@@ -1,6 +1,15 @@
 #import "RNNCustomViewController.h"
 
-@implementation RNNCustomViewController
+@implementation RNNCustomViewController {
+	NSString* _text;
+}
+
+- (instancetype)initWithProps:(NSDictionary *)props {
+	self = [super init];
+	_text = props[@"text"];
+	
+	return self;
+}
 
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -8,9 +17,11 @@
 }
 
 - (void)addTestLabel {
-	UILabel* label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+	UILabel* label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+	label.textAlignment = NSTextAlignmentCenter;
+	label.numberOfLines = 2;
 	label.center = self.view.center;
-	label.text = @"Test label";
+	label.text = _text;
 	label.accessibilityIdentifier = @"TestLabel";
 	[self.view addSubview:label];
 }

lib/ios/RNNStore.h

@@ -2,9 +2,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNRootViewController.h"
+#import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
-typedef UIViewController * (^RNNExternalViewCreator)(void);
 
 @interface RNNStore : NSObject
 
@@ -14,7 +14,7 @@ typedef UIViewController * (^RNNExternalViewCreator)(void);
 -(void) removeComponentByViewControllerInstance:(UIViewController*)componentInstance;
 
 - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
-- (UIViewController *)getExternalComponent:(NSString *)name;
+- (UIViewController *)getExternalComponent:(NSString *)name props:(NSDictionary*)props;
 
 -(NSString*)componentKeyForInstance:(UIViewController*)instance;
 

lib/ios/RNNStore.m

@@ -77,9 +77,9 @@
 	[_externalComponentCreators setObject:[callback copy] forKey:name];
 }
 
-- (UIViewController *)getExternalComponent:(NSString *)name {
+- (UIViewController *)getExternalComponent:(NSString *)name props:(NSDictionary*)props {
 	RNNExternalViewCreator creator = [_externalComponentCreators objectForKey:name];
-	return creator();
+	return creator(props);
 }
 
 @end

lib/ios/ReactNativeNavigation.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-typedef UIViewController * (^RNNExternalViewCreator)(void);
+typedef UIViewController * (^RNNExternalViewCreator)(NSDictionary* props);
 
 @interface ReactNativeNavigation : NSObject
 

playground/ios/playground/AppDelegate.m

@@ -22,8 +22,8 @@
 	NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
 	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:launchOptions];
 	
-	[ReactNativeNavigation registerExternalComponent:@"RNNCustomComponent" callback:^UIViewController *{
-		return [[RNNCustomViewController alloc] init];
+	[ReactNativeNavigation registerExternalComponent:@"RNNCustomComponent" callback:^UIViewController *(NSDictionary *props) {
+		return [[RNNCustomViewController alloc] initWithProps:props];
 	}];
 	
 	/*