Merge branch 'v2' of https://github.com/wix/react-native-navigation into v2

docs/README.md

@@ -1,6 +1,6 @@
 [![npm (tag)](https://img.shields.io/npm/v/react-native-navigation/alpha.svg)](https://github.com/wix/react-native-navigation/tree/v2#react-native-navigation-v2-wip)
 [![Build Status](https://travis-ci.org/wix/react-native-navigation.svg?branch=v2)](https://travis-ci.org/wix/react-native-navigation)
-[![Build Status Jenkins](http://34.201.210.182/job/react-native-navigation/job/v2/badge/icon)](http://34.201.210.182/job/react-native-navigation/job/v2)
+[![Build Status](http://34.201.210.182/buildStatus/icon?job=react-native-navigation-merge)](http://34.201.210.182/job/react-native-navigation-merge/)
 [![Join us on Discord](https://img.shields.io/badge/discord-react--native--navigation-738bd7.svg?style=flat)](https://discord.gg/DhkZjq2)
 [![StackExchange](https://img.shields.io/stackexchange/stackoverflow/t/react-native-navigation.svg)](https://stackoverflow.com/questions/tagged/react-native-navigation)
 

lib/ios/RNNBridgeManager.h

@@ -5,6 +5,8 @@
 
 - (instancetype)initWithJsCodeLocation:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions;
 
+- (void)registerExternalComponent:(NSString *)name callback:(UIViewController *(^)(void))callback;
+
 @property (readonly, nonatomic, strong) RCTBridge *bridge;
 
 @end

lib/ios/RNNBridgeManager.m

@@ -49,6 +49,10 @@
 	return self;
 }
 
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
+	[_store registerExternalComponent:name callback:callback];
+}
+
 # pragma mark - RCTBridgeDelegate
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {

lib/ios/RNNControllerFactory.m

@@ -44,7 +44,7 @@
 	UIViewController<RNNRootViewProtocol> *result;
 	
 	if (node.isComponent) {
-		result = [self createComponent:node nativeComponent:NO];
+		result = [self createComponent:node];
 	}
 	
 	else if (node.isStack)	{
@@ -76,7 +76,7 @@
 	}
 	
 	else if (node.isExternalComponent) {
-		result = [self createComponent:node nativeComponent:YES];
+		result = [self createExternalComponent:node];
 	}
 	
 	if (!result) {
@@ -88,13 +88,13 @@
 	return result;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node nativeComponent:(BOOL)nativeComponent {
+- (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node {
 	NSString* name = node.data[@"name"];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
 	[options mergeWith:node.data[@"options"]];
 
 	NSString* componentId = node.nodeId;
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:nativeComponent];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:NO];
 	if (!component.isCustomViewController) {
 		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
 		[_bridge.uiManager setAvailableSize:availableSize forRootView:component.view];
@@ -102,6 +102,25 @@
 	return component;
 }
 
+- (UIViewController<RNNRootViewProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
+	NSString* name = node.data[@"name"];
+	
+	UIViewController* externalVC = [_store getExternalComponent:name];
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
+	[options mergeWith:node.data[@"options"]];
+	
+	NSString* componentId = node.nodeId;
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES];
+	
+	[component addChildViewController:externalVC];
+	component.view = [[UIView alloc] init];
+	component.view.backgroundColor = [UIColor whiteColor];
+	[component.view addSubview:externalVC.view];
+	
+	return component;
+}
+
+
 - (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
 	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
 	NSDictionary* options = node.data[@"options"];

lib/ios/RNNRootViewController.m

@@ -28,9 +28,7 @@
 	self.creator = creator;
 	self.isExternalComponent = isExternalComponent;
 	
-	if (self.isExternalComponent) {
-		[self addExternalVC:name];
-	} else {
+	if (!self.isExternalComponent) {
 		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
 	}
 	
@@ -164,27 +162,6 @@
 	[self.options.topTab applyOn:self];
 }
 
--(void)addExternalVC:(NSString*)className {
-	if (className != nil) {
-		Class class = NSClassFromString(className);
-		if (class != NULL) {
-			id obj = [[class alloc] init];
-			if (obj != nil && [obj isKindOfClass:[UIViewController class]]) {
-				UIViewController *viewController = (UIViewController*)obj;
-				[self addChildViewController:viewController];
-				self.view = [[UIView alloc] init];
-				self.view.backgroundColor = [UIColor whiteColor];
-				[self.view addSubview:viewController.view];
-			}
-			else {
-				NSLog(@"addExternalVC: could not create instance. Make sure that your class is a UIViewController whihc confirms to RCCExternalViewControllerProtocol");
-			}
-		}
-		else {
-			NSLog(@"addExternalVC: could not create class from string. Check that the proper class name wass passed in ExternalNativeScreenClass");
-		}
-	}
-}
 
 /**
  *	fix for #877, #878

lib/ios/RNNStore.h

@@ -4,6 +4,7 @@
 #import "RNNRootViewController.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
+typedef UIViewController * (^RNNExternalViewCreator)(void);
 
 @interface RNNStore : NSObject
 
@@ -12,6 +13,9 @@ typedef void (^RNNTransitionCompletionBlock)(void);
 -(void) removeComponent:(NSString*)componentId;
 -(void) removeComponentByViewControllerInstance:(UIViewController*)componentInstance;
 
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
+- (UIViewController *)getExternalComponent:(NSString *)name;
+
 -(NSString*)componentKeyForInstance:(UIViewController*)instance;
 
 -(void) setReadyToReceiveCommands:(BOOL)isReady;

lib/ios/RNNStore.m

@@ -8,6 +8,7 @@
 @implementation RNNStore {
 	NSMapTable* _componentStore;
 	NSMutableArray* _pendingModalIdsToDismiss;
+	NSMutableDictionary* _externalComponentCreators;
 	BOOL _isReadyToReceiveCommands;
 }
 
@@ -16,6 +17,7 @@
 	_isReadyToReceiveCommands = false;
 	_componentStore = [NSMapTable strongToWeakObjectsMapTable];
 	_pendingModalIdsToDismiss = [NSMutableArray new];
+	_externalComponentCreators = [NSMutableDictionary new];
 	return self;
 }
 
@@ -71,4 +73,13 @@
 	return nil;
 }
 
+- (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
+	[_externalComponentCreators setObject:[callback copy] forKey:name];
+}
+
+- (UIViewController *)getExternalComponent:(NSString *)name {
+	RNNExternalViewCreator creator = [_externalComponentCreators objectForKey:name];
+	return creator();
+}
+
 @end

lib/ios/ReactNativeNavigation.h

@@ -1,7 +1,12 @@
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef UIViewController * (^RNNExternalViewCreator)(void);
 
 @interface ReactNativeNavigation : NSObject
 
 +(void)bootstrap:(NSURL*)jsCodeLocation launchOptions:(NSDictionary *)launchOptions;
 
++ (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
+
 @end

lib/ios/ReactNativeNavigation.m

@@ -1,6 +1,5 @@
 #import "ReactNativeNavigation.h"
 
-#import <UIKit/UIKit.h>
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
@@ -21,6 +20,10 @@
 	[[ReactNativeNavigation sharedInstance] bootstrap:jsCodeLocation launchOptions:launchOptions];
 }
 
++ (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
+	[[ReactNativeNavigation sharedInstance].bridgeManager registerExternalComponent:name callback:callback];
+}
+
 # pragma mark - instance
 
 + (instancetype) sharedInstance {

playground/ios/playground/AppDelegate.m

@@ -1,4 +1,5 @@
 #import "AppDelegate.h"
+#import "RNNCustomViewController.h"
 
 // **********************************************
 // *** DON'T MISS: THE NEXT LINE IS IMPORTANT ***
@@ -21,6 +22,10 @@
 	NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
 	[ReactNativeNavigation bootstrap:jsCodeLocation launchOptions:launchOptions];
 	
+	[ReactNativeNavigation registerExternalComponent:@"RNNCustomComponent" callback:^UIViewController *{
+		return [[RNNCustomViewController alloc] init];
+	}];
+	
 	/*
 	// original RN bootstrap - remove this part
 	RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation