Revert "Refactor options (#3962)"

This reverts commit 29faa36ddf.

lib/ios/RNNBottomTabOptions.m

@@ -13,9 +13,8 @@
 }
 
 - (void)applyOn:(UIViewController *)viewController {
-	UIViewController* topViewController = [self getTabControllerFirstChild:viewController];
 	if (self.text || self.icon || self.selectedIcon) {
-		UITabBarItem* tabItem = topViewController.tabBarItem;
+		UITabBarItem* tabItem = viewController.tabBarItem;
 		
 		tabItem.selectedImage = [self getSelectedIconImage];
 		tabItem.image = [self getIconImage];
@@ -39,7 +38,7 @@
 		
 		[self appendTitleAttributes:tabItem];
 		
-		[topViewController setTabBarItem:tabItem];
+		[viewController setTabBarItem:tabItem];
 	}
 	
 	if (self.badge) {
@@ -47,7 +46,10 @@
 		if (self.badge != nil && ![self.badge isEqual:[NSNull null]]) {
 			badge = [RCTConvert NSString:self.badge];
 		}
-		UITabBarItem *tabBarItem = topViewController.tabBarItem;
+		UITabBarItem *tabBarItem = viewController.tabBarItem;
+		if (viewController.navigationController) {
+			tabBarItem = viewController.navigationController.tabBarItem;
+		}
 		tabBarItem.badgeValue = badge;
 		if (self.badgeColor) {
 			tabBarItem.badgeColor = [RCTConvert UIColor:self.badgeColor];
@@ -59,7 +61,7 @@
 	}
 	
 	if (self.visible) {
-		[topViewController.tabBarController setSelectedIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
+		[viewController.tabBarController setSelectedIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
 	}
 	
 	[self resetOptions];
@@ -135,18 +137,6 @@
 	return self.fontSize ? [self.fontSize floatValue] : 10;
 }
 
-- (UIViewController *)getTabControllerFirstChild:(UIViewController *)viewController {
-	while (viewController != nil) {
-		if ([viewController.parentViewController isKindOfClass:[UITabBarController class]] || !viewController.parentViewController) {
-			return viewController;
-		}
-		
-		viewController = viewController.parentViewController;
-	}
-	
-	return nil;
-}
-
 -(void)resetOptions {
 	self.text = nil;
 	self.badge = nil;

lib/ios/RNNCommandsHandler.m

@@ -70,17 +70,17 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController<RNNRootViewProtocol>* vc = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	if ([vc conformsToProtocol:@protocol(RNNRootViewProtocol)] || [vc isKindOfClass:[RNNRootViewController class]]) {
-		[vc.getLeafViewController.layoutInfo.options mergeWith:options];
+		[vc.getLeafViewController.options mergeWith:options];
 		[CATransaction begin];
 		[CATransaction setCompletionBlock:completion];
-		[vc.getLeafViewController.layoutInfo.options applyOn:vc.getLeafViewController];
+		[vc.getLeafViewController.options applyOn:vc.getLeafViewController];
 		[CATransaction commit];
 	}
 }
 
 - (void)setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_controllerFactory.optionsManager setDefaultOptionsDict:optionsDict];
+	[_controllerFactory setDefaultOptionsDict:optionsDict];
 }
 
 - (void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
@@ -89,7 +89,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNRootViewController *newVc = (RNNRootViewController *)[_controllerFactory createLayoutAndSaveToStore:layout];
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	
-	if ([newVc.layoutInfo.options.preview.reactTag floatValue] > 0) {
+	if ([newVc.options.preview.reactTag floatValue] > 0) {
 		UIViewController* vc = [_store findComponentForId:componentId];
 		
 		if([vc isKindOfClass:[RNNRootViewController class]]) {
@@ -98,8 +98,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
       rootVc.previewCallback = ^(UIViewController *vcc) {
 				RNNRootViewController* rvc  = (RNNRootViewController*)vcc;
-				[self->_eventEmitter sendOnPreviewCompleted:componentId previewComponentId:newVc.layoutInfo.componentId];
-				if ([newVc.layoutInfo.options.preview.commit floatValue] > 0) {
+				[self->_eventEmitter sendOnPreviewCompleted:componentId previewComponentId:newVc.componentId];
+				if ([newVc.options.preview.commit floatValue] > 0) {
 					[CATransaction begin];
 					[CATransaction setCompletionBlock:^{
 						[self->_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
@@ -112,27 +112,27 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			
 			CGSize size = CGSizeMake(rootVc.view.frame.size.width, rootVc.view.frame.size.height);
 			
-			if (newVc.layoutInfo.options.preview.width) {
-				size.width = [newVc.layoutInfo.options.preview.width floatValue];
+			if (newVc.options.preview.width) {
+				size.width = [newVc.options.preview.width floatValue];
 			}
 			
-			if (newVc.layoutInfo.options.preview.height) {
-				size.height = [newVc.layoutInfo.options.preview.height floatValue];
+			if (newVc.options.preview.height) {
+				size.height = [newVc.options.preview.height floatValue];
 			}
 			
-			if (newVc.layoutInfo.options.preview.width || newVc.layoutInfo.options.preview.height) {
+			if (newVc.options.preview.width || newVc.options.preview.height) {
 				newVc.preferredContentSize = size;
 			}
       
 			RCTExecuteOnMainQueue(^{
-				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.layoutInfo.options.preview.reactTag];
+				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.options.preview.reactTag];
 				[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
 			});
 		}
 	} else {
-		id animationDelegate = (newVc.layoutInfo.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
-		[newVc waitForReactViewRender:(newVc.layoutInfo.options.animations.push.waitForRender || animationDelegate) perform:^{
-			[_stackManager push:newVc onTop:fromVC animated:newVc.layoutInfo.options.animations.push.enable animationDelegate:animationDelegate completion:^{
+		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
+		[newVc waitForReactViewRender:(newVc.options.animations.push.waitForRender || animationDelegate) perform:^{
+			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 				completion();
 			} rejection:rejection];
@@ -144,7 +144,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
-	RNNNavigationOptions* options = [newVC getLeafViewController].layoutInfo.options;
+	RNNNavigationOptions* options = [newVC getLeafViewController].options;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
 	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:options.animations.setStackRoot.enable completion:^{
@@ -157,12 +157,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.layoutInfo.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
 	UINavigationController *nvc = vc.navigationController;
 	
 	if ([nvc topViewController] == vc) {
-		if (vc.layoutInfo.options.animations.pop) {
+		if (vc.options.animations.pop) {
 			nvc.delegate = vc;
 		} else {
 			nvc.delegate = nil;
@@ -170,10 +170,10 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	} else {
 		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
 		[vcs removeObject:vc];
-		[nvc setViewControllers:vcs animated:vc.layoutInfo.options.animations.pop.enable];
+		[nvc setViewControllers:vcs animated:vc.options.animations.pop.enable];
 	}
 	
-	[_stackManager pop:vc animated:vc.layoutInfo.options.animations.pop.enable completion:^{
+	[_stackManager pop:vc animated:vc.options.animations.pop.enable completion:^{
 		[_store removeComponent:componentId];
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
@@ -185,9 +185,9 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)popTo:(NSString*)componentId mergeOptions:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.layoutInfo.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
-	[_stackManager popTo:vc animated:vc.layoutInfo.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popTo:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
 		[self removePopedViewControllers:poppedViewControllers];
 		completion();
@@ -197,7 +197,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)popToRoot:(NSString*)componentId mergeOptions:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.layoutInfo.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
@@ -205,7 +205,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_stackManager popToRoot:vc animated:vc.layoutInfo.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popToRoot:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[self removePopedViewControllers:poppedViewControllers];
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		
@@ -223,8 +223,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		[newVc.getLeafViewController applyModalOptions];
 	}
 	
-	[newVc.getLeafViewController waitForReactViewRender:newVc.getLeafViewController.layoutInfo.options.animations.showModal.waitForRender perform:^{
-		[_modalManager showModal:newVc animated:newVc.getLeafViewController.layoutInfo.options.animations.showModal.enable hasCustomAnimation:newVc.getLeafViewController.layoutInfo.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
+	[newVc.getLeafViewController waitForReactViewRender:newVc.getLeafViewController.options.animations.showModal.waitForRender perform:^{
+		[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable hasCustomAnimation:newVc.getLeafViewController.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
 			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 			completion(componentId);
 		}];
@@ -239,7 +239,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
 	}];
 	UIViewController<RNNRootViewProtocol> *modalToDismiss = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
-	[modalToDismiss.getLeafViewController.layoutInfo.options mergeWith:options];
+	[modalToDismiss.getLeafViewController.options mergeWith:options];
 	
 	[self removePopedViewControllers:modalToDismiss.navigationController.viewControllers];
 	
@@ -265,7 +265,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
 	[_overlayManager showOverlay:overlayVC];
 	[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
 	completion();
@@ -302,13 +302,13 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 #pragma mark - RNNModalManagerDelegate
 
-- (void)dismissedModal:(UIViewController<RNNRootViewProtocol> *)viewController {
-	[_eventEmitter sendModalsDismissedEvent:viewController.layoutInfo.componentId numberOfModalsDismissed:@(1)];
+- (void)dismissedModal:(UIViewController *)viewController {
+	[_eventEmitter sendModalsDismissedEvent:((RNNRootViewController *)viewController).componentId numberOfModalsDismissed:@(1)];
 }
 
 - (void)dismissedMultipleModals:(NSArray *)viewControllers {
 	if (viewControllers && viewControllers.count) {
-		[_eventEmitter sendModalsDismissedEvent:((UIViewController<RNNRootViewProtocol> *)viewControllers.lastObject).layoutInfo.componentId numberOfModalsDismissed:@(viewControllers.count)];
+		[_eventEmitter sendModalsDismissedEvent:((RNNRootViewController *)viewControllers.lastObject).componentId numberOfModalsDismissed:@(viewControllers.count)];
 	}
 }
 

lib/ios/RNNControllerFactory.h

@@ -5,7 +5,6 @@
 #import "RNNStore.h"
 #import "RNNEventEmitter.h"
 #import "RNNRootViewProtocol.h"
-#import "RNNOptionsManager.h"
 
 @interface RNNControllerFactory : NSObject
 
@@ -16,7 +15,9 @@
 
 -(UIViewController<RNNRootViewProtocol, UIViewControllerPreviewingDelegate> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
 
+- (UIViewController<RNNRootViewProtocol> *)createOverlay:(NSDictionary*)layout;
+
+@property (nonatomic, strong) NSDictionary* defaultOptionsDict;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
-@property (nonatomic, strong) RNNOptionsManager *optionsManager;
 
 @end

lib/ios/RNNControllerFactory.m

@@ -1,14 +1,14 @@
+
 #import "RNNControllerFactory.h"
 #import "RNNLayoutNode.h"
 #import "RNNSplitViewController.h"
 #import "RNNSplitViewOptions.h"
 #import "RNNSideMenuController.h"
 #import "RNNSideMenuChildVC.h"
+#import "RNNNavigationOptions.h"
 #import "RNNNavigationController.h"
 #import "RNNTabBarController.h"
 #import "RNNTopTabsViewController.h"
-#import "RNNLayoutInfo.h"
-#import "RNNOptionsManager.h"
 
 @implementation RNNControllerFactory {
 	id<RNNRootViewCreator> _creator;
@@ -25,12 +25,10 @@
 							  andBridge:(RCTBridge *)bridge {
 	
 	self = [super init];
-	
 	_creator = creator;
 	_store = store;
 	_eventEmitter = eventEmitter;
 	_bridge = bridge;
-	_optionsManager = [RNNOptionsManager new];
 	
 	return self;
 }
@@ -96,10 +94,11 @@
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node {
-	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
-
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:NO];
+	NSString* name = node.data[@"name"];
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
 
+	NSString* componentId = node.nodeId;
+	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];
@@ -108,11 +107,14 @@
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
-	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
-
-	UIViewController* externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
+	NSString* name = node.data[@"name"];
+	NSDictionary* props = node.data[@"passProps"];
 	
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES];
+	UIViewController* externalVC = [_store getExternalComponent:name props:props bridge:_bridge];
+	RNNNavigationOptions* options = [self createOptions: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 addSubview:externalVC.view];
@@ -123,44 +125,43 @@
 
 
 - (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
-	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
-	
-	RNNNavigationController* vc = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo];
-
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
+	RNNNavigationController* vc = [[RNNNavigationController alloc] initWithOptions:options];
+	[vc setComponentId:node.nodeId];
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary* child in node.children) {
 		[controllers addObject:[self fromTree:child]];
 	}
-	
 	[vc setViewControllers:controllers];
+	[vc.getLeafViewController mergeOptions:options];
 	
 	return vc;
 }
 
 -(UIViewController<RNNRootViewProtocol> *)createTabs:(RNNLayoutNode*)node {
 	RNNTabBarController* vc = [[RNNTabBarController alloc] initWithEventEmitter:_eventEmitter];
-	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
-	
+	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
+
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
 		UIViewController<RNNRootViewProtocol>* childVc = [self fromTree:child];
-		[childVc.layoutInfo.options applyOn:childVc];
-		[childVc.getLeafViewController.layoutInfo.options applyOn:childVc.getLeafViewController];
+		[childVc applyTabBarItem];
 		
 		[controllers addObject:childVc];
 	}
 	[vc setViewControllers:controllers];
+	[vc.getLeafViewController mergeOptions:options];
 	
 	return vc;
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createTopTabs:(RNNLayoutNode*)node {
 	RNNTopTabsViewController* vc = [[RNNTopTabsViewController alloc] init];
-	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
 	
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
 		RNNRootViewController* childVc = (RNNRootViewController*)[self fromTree:child];
+//		childVc.topTabsViewController = vc;
 		[controllers addObject:childVc];
 		[_bridge.uiManager setAvailableSize:vc.contentView.bounds.size forRootView:childVc.view];
 	}
@@ -171,8 +172,6 @@
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createSideMenu:(RNNLayoutNode*)node {
-	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node optionsManager:_optionsManager];
-
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	for (NSDictionary *child in node.children) {
@@ -180,8 +179,7 @@
 		[childrenVCs addObject:vc];
 	}
 	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs];
-	sideMenu.layoutInfo = layoutInfo;
-	
+	[sideMenu.getLeafViewController mergeOptions:[self createOptions:node.data[@"options"]]];
 	return sideMenu;
 }
 
@@ -193,11 +191,26 @@
 	return sideMenuChild;
 }
 
+- (UIViewController<RNNRootViewProtocol> *)createOverlay:(NSDictionary*)layout {
+	UIViewController<RNNRootViewProtocol> *vc = [self fromTree:layout];
+	__block RCTRootView* rootView = (RCTRootView*)vc.view;
+	[vc performOnRotation:^{
+		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
+		[_bridge.uiManager setSize:availableSize forView:rootView];
+	}];
+	rootView.backgroundColor = [UIColor clearColor];
+	CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
+	rootView.frame = CGRectMake(0, 0, availableSize.width, availableSize.height);
+	[_bridge.uiManager setAvailableSize:availableSize forRootView:vc.view];
+	
+	return vc;
+}
+
 - (UIViewController<RNNRootViewProtocol> *)createSplitView:(RNNLayoutNode*)node {
 
 	NSString* componentId = node.nodeId;
 	
-	RNNSplitViewOptions* options = [[RNNSplitViewOptions alloc] initWithDict:_optionsManager.defaultOptionsDict];
+	RNNSplitViewOptions* options = [[RNNSplitViewOptions alloc] initWithDict:_defaultOptionsDict];
 	[options mergeWith:node.data[@"options"]];
 
 	RNNSplitViewController* svc = [[RNNSplitViewController alloc] initWithOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter];
@@ -217,4 +230,11 @@
 	return svc;
 }
 
+- (RNNNavigationOptions *)createOptions:(NSDictionary *)optionsDict {
+	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:optionsDict];
+	options.defaultOptions = [[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict];
+	
+	return options;
+}
+
 @end

lib/ios/RNNLayoutInfo.h

@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "RNNOptionsManager.h"
-#import "RNNLayoutNode.h"
-
-@interface RNNLayoutInfo : NSObject
-
-- (instancetype)initWithNode:(RNNLayoutNode *)node optionsManager:(RNNOptionsManager *)optionsManager;
-
-@property (nonatomic, strong) NSString* componentId;
-@property (nonatomic, strong) NSString* name;
-@property (nonatomic, strong) NSDictionary* props;
-@property (nonatomic, strong) RNNNavigationOptions* options;
-
-@end

lib/ios/RNNLayoutInfo.m

@@ -1,16 +0,0 @@
-#import "RNNLayoutInfo.h"
-
-@implementation RNNLayoutInfo
-
-- (instancetype)initWithNode:(RNNLayoutNode *)node optionsManager:(RNNOptionsManager *)optionsManager {
-	self = [super init];
-	
-	self.componentId = node.nodeId;
-	self.name = node.data[@"name"];
-	self.props = node.data[@"passProps"];
-	self.options = [optionsManager createOptions:node.data[@"options"]];
-	
-	return self;
-}
-
-@end

lib/ios/RNNModalManager.m

@@ -60,7 +60,7 @@
 
 -(void)removePendingNextModalIfOnTop:(RNNTransitionCompletionBlock)completion {
 	UIViewController<RNNRootViewProtocol> *modalToDismiss = [_pendingModalIdsToDismiss lastObject];
-	RNNNavigationOptions* options = modalToDismiss.getLeafViewController.layoutInfo.options;
+	RNNNavigationOptions* options = modalToDismiss.getLeafViewController.options;
 
 	if(!modalToDismiss) {
 		return;
@@ -88,7 +88,7 @@
 	} else {
 		[modalToDismiss.view removeFromSuperview];
 		modalToDismiss.view = nil;
-		modalToDismiss.getLeafViewController.layoutInfo.options.animations.dismissModal.enable = NO;
+		modalToDismiss.getLeafViewController.options.animations.dismissModal.enable = NO;
 		[self dismissedModal:modalToDismiss];
 		
 		if (completion) {

lib/ios/RNNNavigationController.h

@@ -3,9 +3,9 @@
 
 @interface RNNNavigationController : UINavigationController <RNNRootViewProtocol>
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo;
-
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+- (instancetype)initWithOptions:(RNNNavigationOptions *)options;
 
+@property (nonatomic, strong) NSString* componentId;
+@property (nonatomic, strong) RNNNavigationOptions* options;
 
 @end

lib/ios/RNNNavigationController.m

@@ -4,10 +4,10 @@
 
 @implementation RNNNavigationController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo {
+- (instancetype)initWithOptions:(RNNNavigationOptions *)options {
 	self = [super init];
 	if (self) {
-		_layoutInfo = layoutInfo;
+		_options = options;
 	}
 	
 	return self;
@@ -34,19 +34,23 @@
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[rnnController.layoutInfo.options applyOn:rnnController];
+			[rnnController.options applyOn:rnnController];
 		}
 	}
 	
 	return [super popViewControllerAnimated:animated];
 }
 
+- (NSString *)componentId {
+	return _componentId ? _componentId : self.getLeafViewController.componentId;
+}
+
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.layoutInfo.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.layoutInfo.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)getLeafViewController {
@@ -57,5 +61,11 @@
 	return self.topViewController;
 }
 
+- (void)applyTabBarItem {
+	[self.options.bottomTab mergeOptions:((RNNNavigationOptions *)self.options.defaultOptions).bottomTab overrideOptions:NO];
+	[self.options.bottomTab applyOn:self];
+	[self.getLeafViewController.options.bottomTab mergeOptions:((RNNNavigationOptions *)self.getLeafViewController.options.defaultOptions).bottomTab overrideOptions:NO];
+	[self.getLeafViewController.options.bottomTab applyOn:self];
+}
 
 @end

lib/ios/RNNNavigationOptions.h

@@ -30,6 +30,8 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNPreviewOptions* preview;
 @property (nonatomic, strong) RNNLayoutOptions* layout;
 
+@property (nonatomic, strong) RNNOptions* defaultOptions;
+
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
 @property (nonatomic, strong) NSNumber* popGesture;
 @property (nonatomic, strong) NSDictionary* backgroundImage;

lib/ios/RNNNavigationOptions.m

@@ -43,6 +43,7 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 
 
 -(void)applyOn:(UIViewController<RNNRootViewProtocol> *)viewController {
+	[self mergeOptions:_defaultOptions overrideOptions:NO];
 	[self.topBar applyOn:viewController];
 	[self.bottomTabs applyOn:viewController];
 	[self.topTab applyOn:viewController];

lib/ios/RNNOptionsManager.h

@@ -1,10 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "RNNNavigationOptions.h"
-
-@interface RNNOptionsManager : NSObject
-
-- (RNNNavigationOptions *)createOptions:(NSDictionary *)optionsDict;
-
-@property (nonatomic, strong) NSDictionary* defaultOptionsDict;
-
-@end

lib/ios/RNNOptionsManager.m

@@ -1,12 +0,0 @@
-#import "RNNOptionsManager.h"
-
-@implementation RNNOptionsManager
-
-- (RNNNavigationOptions *)createOptions:(NSDictionary *)optionsDict {
-	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:optionsDict];
-	
-	[options mergeOptions:[[RNNNavigationOptions alloc] initWithDict:_defaultOptionsDict] overrideOptions:NO];
-	
-	return options;
-}
-@end

lib/ios/RNNOverlayManager.m

@@ -14,7 +14,6 @@
 - (void)showOverlay:(UIViewController *)viewController {
 	UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 	[_overlayWindows addObject:overlayWindow];
-	viewController.view.backgroundColor = [UIColor clearColor];
 	[overlayWindow setWindowLevel:UIWindowLevelNormal];
 	[overlayWindow setRootViewController:viewController];
 	[overlayWindow makeKeyAndVisible];

lib/ios/RNNRootViewController.h

@@ -6,28 +6,32 @@
 #import "RNNNavigationOptions.h"
 #import "RNNAnimator.h"
 #import "RNNUIBarButtonItem.h"
-#import "RNNLayoutInfo.h"
 
 typedef void (^RNNReactViewReadyCompletionBlock)(void);
 typedef void (^PreviewCallback)(UIViewController *vc);
 
 @interface RNNRootViewController : UIViewController	<UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
 
+@property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, strong) NSString* componentId;
 @property (nonatomic) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) RNNAnimator* animator;
 @property (nonatomic, strong) UIViewController* previewController;
 @property (nonatomic, copy) PreviewCallback previewCallback;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
+- (instancetype)initWithName:(NSString*)name
+				 withOptions:(RNNNavigationOptions*)options
+			 withComponentId:(NSString*)componentId
 			 rootViewCreator:(id<RNNRootViewCreator>)creator
 				eventEmitter:(RNNEventEmitter*)eventEmitter
 		 isExternalComponent:(BOOL)isExternalComponent;
 
+- (void)applyTopTabsOptions;
 - (BOOL)isCustomViewController;
 - (BOOL)isCustomTransitioned;
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+- (void)mergeOptions:(RNNOptions*)options;
 - (void)applyModalOptions;
 - (void)optionsUpdated;
 

lib/ios/RNNRootViewController.m

@@ -12,6 +12,7 @@
 	BOOL _isBeingPresented;
 }
 
+@property (nonatomic, strong) NSString* componentName;
 @property (nonatomic) BOOL _statusBarHidden;
 @property (nonatomic) BOOL isExternalComponent;
 @property (nonatomic) BOOL _optionsApplied;
@@ -24,19 +25,23 @@
 
 @synthesize previewCallback;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-				   rootViewCreator:(id<RNNRootViewCreator>)creator
-					  eventEmitter:(RNNEventEmitter*)eventEmitter
-			   isExternalComponent:(BOOL)isExternalComponent {
+-(instancetype)initWithName:(NSString*)name
+				withOptions:(RNNNavigationOptions*)options
+			withComponentId:(NSString*)componentId
+			rootViewCreator:(id<RNNRootViewCreator>)creator
+			   eventEmitter:(RNNEventEmitter*)eventEmitter
+		isExternalComponent:(BOOL)isExternalComponent {
 	self = [super init];
+	self.componentId = componentId;
+	self.componentName = name;
+	self.options = options;
 	self.eventEmitter = eventEmitter;
-	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.layoutInfo.options.customTransition];
+	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.options.customTransition];
 	self.creator = creator;
 	self.isExternalComponent = isExternalComponent;
-	self.layoutInfo = layoutInfo;
 	
 	if (!self.isExternalComponent) {
-		self.view = [creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId];
+		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
 		[[NSNotificationCenter defaultCenter] addObserver:self
 												 selector:@selector(reactViewReady)
 													 name: @"RCTContentDidAppearNotification"
@@ -58,12 +63,12 @@
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	_isBeingPresented = YES;
-	[self.layoutInfo.options applyOn:self];
+	[self.options applyOn:self];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	[self.eventEmitter sendComponentDidAppear:self.layoutInfo.componentId componentName:self.layoutInfo.name];
+	[self.eventEmitter sendComponentDidAppear:self.componentId componentName:self.componentName];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -73,7 +78,7 @@
 
 -(void)viewDidDisappear:(BOOL)animated {
 	[super viewDidDisappear:animated];
-	[self.eventEmitter sendComponentDidDisappear:self.layoutInfo.componentId componentName:self.layoutInfo.name];
+	[self.eventEmitter sendComponentDidDisappear:self.componentId componentName:self.componentName];
 }
 
 - (void)reactViewReady {
@@ -106,13 +111,13 @@
 }
 
 -(void)updateSearchResultsForSearchController:(UISearchController *)searchController {
-	[self.eventEmitter sendOnSearchBarUpdated:self.layoutInfo.componentId
+	[self.eventEmitter sendOnSearchBarUpdated:self.componentId
 										 text:searchController.searchBar.text
 									isFocused:searchController.searchBar.isFirstResponder];
 }
 
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
-	[self.eventEmitter sendOnSearchBarCancelPressed:self.layoutInfo.componentId];
+	[self.eventEmitter sendOnSearchBarCancelPressed:self.componentId];
 }
 
 - (void)viewDidLoad {
@@ -126,17 +131,21 @@
 }
 
 - (void)applyModalOptions {
-	[self.layoutInfo.options applyOn:self];
-	[self.layoutInfo.options applyModalOptions:self];
+	[self.options applyOn:self];
+	[self.options applyModalOptions:self];
+}
+
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.options mergeOptions:options overrideOptions:NO];
 }
 
 - (void)setCustomNavigationTitleView {
 	if (!_customTitleView && _isBeingPresented) {
-		if (self.layoutInfo.options.topBar.title.component.name) {
-			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.layoutInfo.options.topBar.title.component];
+		if (self.options.topBar.title.component.name) {
+			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.options.topBar.title.component];
 			_customTitleView.backgroundColor = UIColor.clearColor;
-			[_customTitleView setAlignment:self.layoutInfo.options.topBar.title.component.alignment];
-			BOOL isCenter = [self.layoutInfo.options.topBar.title.component.alignment isEqualToString:@"center"];
+			[_customTitleView setAlignment:self.options.topBar.title.component.alignment];
+			BOOL isCenter = [self.options.topBar.title.component.alignment isEqualToString:@"center"];
 			__weak RNNReactView *weakTitleView = _customTitleView;
 			CGRect frame = self.navigationController.navigationBar.bounds;
 			[_customTitleView setFrame:frame];
@@ -160,8 +169,8 @@
 
 - (void)setCustomNavigationBarView {
 	if (!_customTopBar) {
-		if (self.layoutInfo.options.topBar.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.layoutInfo.options.topBar.component];
+		if (self.options.topBar.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.component];
 			
 			_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			reactView.backgroundColor = UIColor.clearColor;
@@ -180,8 +189,8 @@
 
 - (void)setCustomNavigationComponentBackground {
 	if (!_customTopBarBackground) {
-		if (self.layoutInfo.options.topBar.background.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.layoutInfo.options.topBar.background.component];
+		if (self.options.topBar.background.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.background.component];
 			
 			_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
@@ -189,7 +198,7 @@
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
 		}
 		
-		if (self.layoutInfo.options.topBar.background.clipToBounds) {
+		if (self.options.topBar.background.clipToBounds) {
 			self.navigationController.navigationBar.clipsToBounds = YES;
 		} else {
 			self.navigationController.navigationBar.clipsToBounds = NO;
@@ -204,7 +213,7 @@
 }
 
 -(BOOL)isCustomTransitioned {
-	return self.layoutInfo.options.customTransition.animations != nil;
+	return self.options.customTransition.animations != nil;
 }
 
 - (BOOL)isCustomViewController {
@@ -212,9 +221,9 @@
 }
 
 - (BOOL)prefersStatusBarHidden {
-	if (self.layoutInfo.options.statusBar.visible) {
-		return ![self.layoutInfo.options.statusBar.visible boolValue];
-	} else if ([self.layoutInfo.options.statusBar.hideWithTopBar boolValue]) {
+	if (self.options.statusBar.visible) {
+		return ![self.options.statusBar.visible boolValue];
+	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
 	
@@ -222,7 +231,7 @@
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	if (self.layoutInfo.options.statusBar.style && [self.layoutInfo.options.statusBar.style isEqualToString:@"light"]) {
+	if (self.options.statusBar.style && [self.options.statusBar.style isEqualToString:@"light"]) {
 		return UIStatusBarStyleLightContent;
 	} else {
 		return UIStatusBarStyleDefault;
@@ -230,20 +239,20 @@
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	return self.layoutInfo.options.layout.supportedOrientations;
+	return self.options.layout.supportedOrientations;
 }
 
 - (BOOL)hidesBottomBarWhenPushed
 {
-	if (self.layoutInfo.options.bottomTabs && self.layoutInfo.options.bottomTabs.visible) {
-		return ![self.layoutInfo.options.bottomTabs.visible boolValue];
+	if (self.options.bottomTabs && self.options.bottomTabs.visible) {
+		return ![self.options.bottomTabs.visible boolValue];
 	}
 	return NO;
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
-	if (![vc.layoutInfo.options.topBar.backButton.transition isEqualToString:@"custom"]){
+	if (![vc.options.topBar.backButton.transition isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}
 }
@@ -255,10 +264,10 @@
 	{
 		if (self.animator) {
 			return self.animator;
-		} else if (operation == UINavigationControllerOperationPush && self.layoutInfo.options.animations.push.hasCustomAnimation) {
-			return [[RNNPushAnimation alloc] initWithScreenTransition:self.layoutInfo.options.animations.push];
-		} else if (operation == UINavigationControllerOperationPop && self.layoutInfo.options.animations.pop.hasCustomAnimation) {
-			return [[RNNPushAnimation alloc] initWithScreenTransition:self.layoutInfo.options.animations.pop];
+		} else if (operation == UINavigationControllerOperationPush && self.options.animations.push.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.push];
+		} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.pop];
 		} else {
 			return nil;
 		}
@@ -267,11 +276,20 @@
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.layoutInfo.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.layoutInfo.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.dismissModal isDismiss:YES];
+}
+
+-(void)applyTabBarItem {
+	[self.options.bottomTab mergeOptions:((RNNNavigationOptions *)self.options.defaultOptions).bottomTab overrideOptions:NO];
+	[self.options.bottomTab applyOn:self];
+}
+
+-(void)applyTopTabsOptions {
+	[self.options.topTab applyOn:self];
 }
 
 - (void)performOnRotation:(void (^)(void))block {
@@ -296,7 +314,7 @@
 }
 
 - (void)onActionPress:(NSString *)id {
-	[_eventEmitter sendOnNavigationButtonPressed:self.layoutInfo.componentId buttonId:id];
+	[_eventEmitter sendOnNavigationButtonPressed:self.componentId buttonId:id];
 }
 
 - (UIPreviewAction *) convertAction:(NSDictionary *)action {
@@ -316,7 +334,7 @@
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems {
 	NSMutableArray *actions = [[NSMutableArray alloc] init];
-	for (NSDictionary *previewAction in self.layoutInfo.options.preview.actions) {
+	for (NSDictionary *previewAction in self.options.preview.actions) {
 		UIPreviewAction *action = [self convertAction:previewAction];
 		NSDictionary *actionActions = previewAction[@"actions"];
 		if (actionActions.count > 0) {
@@ -334,7 +352,7 @@
 }
 
 -(void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem {
-	[self.eventEmitter sendOnNavigationButtonPressed:self.layoutInfo.componentId buttonId:barButtonItem.buttonId];
+	[self.eventEmitter sendOnNavigationButtonPressed:self.componentId buttonId:barButtonItem.buttonId];
 }
 
 /**

lib/ios/RNNRootViewProtocol.h

@@ -1,19 +1,16 @@
 #import "RNNNavigationOptions.h"
 #import "RNNRootViewController.h"
-#import "RNNLayoutInfo.h"
 
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
 @optional
 
 - (void)performOnRotation:(void (^)(void))block;
+- (void)applyTabBarItem;
 
 @required
-
 - (RNNRootViewController *)getLeafViewController;
 
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
-
 @end
 
 

lib/ios/RNNSideMenuChildVC.h

@@ -21,8 +21,6 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 @property (readonly) RNNSideMenuChildType type;
 @property (readonly) UIViewController<RNNRootViewProtocol> *child;
 
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
-
 -(instancetype) initWithChild:(UIViewController<RNNRootViewProtocol>*)child type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuController.h

@@ -18,8 +18,6 @@
 @property (readonly) RNNSideMenuChildVC *right;
 @property (readonly) MMDrawerController *sideMenu;
 
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
-
 -(instancetype)initWithControllers:(NSArray*)controllers;
 
 -(void)showSideMenu:(MMDrawerSide)side animated:(BOOL)animated;

lib/ios/RNNSideMenuController.m

@@ -93,5 +93,8 @@
 	return [self.center getLeafViewController];
 }
 
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.center.getLeafViewController mergeOptions:options];
+}
 
 @end

lib/ios/RNNSplitViewController.h

@@ -15,7 +15,6 @@
 @property (nonatomic, strong) RNNSplitViewOptions* options;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, strong) NSString* componentId;
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic) id<RNNRootViewCreator> creator;
 
 -(instancetype)initWithOptions:(RNNSplitViewOptions*)options

lib/ios/RNNSplitViewController.m

@@ -35,4 +35,8 @@
 	readyBlock();
 }
 
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.options mergeOptions:options];
+}
+
 @end

lib/ios/RNNStore.h

@@ -17,7 +17,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N
 - (void)removeAllComponents;
 
 - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
-- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge;
+- (UIViewController *)getExternalComponent:(NSString *)name props:(NSDictionary*)props bridge:(RCTBridge*)bridge;
 
 - (NSString*)componentKeyForInstance:(UIViewController*)instance;
 

lib/ios/RNNStore.m

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

lib/ios/RNNTabBarController.h

@@ -9,6 +9,4 @@
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID;
 
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
-
 @end

lib/ios/RNNTabBarController.m

@@ -21,9 +21,9 @@
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID {
 	for (id child in self.childViewControllers) {
-		UIViewController<RNNRootViewProtocol>* vc = child;
+		RNNRootViewController* vc = child;
 
-		if ([vc.layoutInfo.componentId isEqualToString:componentID]) {
+		if ([vc.componentId isEqualToString:componentID]) {
 			[self setSelectedIndex:[self.childViewControllers indexOfObject:child]];
 		}
 	}
@@ -34,6 +34,10 @@
 	[super setSelectedIndex:selectedIndex];
 }
 
+- (void)mergeOptions:(RNNOptions *)options {
+	[self.getLeafViewController mergeOptions:options];
+}
+
 - (UIViewController *)getLeafViewController {
 	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).getLeafViewController;
 }

lib/ios/RNNTopTabsViewController.h

@@ -6,7 +6,6 @@
 @interface RNNTopTabsViewController : UIViewController <RNNRootViewProtocol>
 
 @property (nonatomic, retain) UIView* contentView;
-@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 
 - (void)setViewControllers:(NSArray*)viewControllers;
 - (void)viewController:(UIViewController*)vc changedTitle:(NSString*)title;

lib/ios/RNNTopTabsViewController.m

@@ -56,7 +56,7 @@
 	_viewControllers = viewControllers;
 	for (RNNRootViewController* childVc in viewControllers) {
 		[childVc.view setFrame:_contentView.bounds];
-		[childVc.layoutInfo.options.topTab applyOn:childVc];
+		[childVc applyTopTabsOptions];
 	}
 	
 	[self setSelectedViewControllerIndex:0];

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -67,10 +67,6 @@
 		5016E8F020209690009D4F7C /* RNNCustomTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5016E8EE2020968F009D4F7C /* RNNCustomTitleView.m */; };
 		50175CD1207A2AA1004FE91B /* RNNComponentOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50175CCF207A2AA1004FE91B /* RNNComponentOptions.h */; };
 		50175CD2207A2AA1004FE91B /* RNNComponentOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50175CD0207A2AA1004FE91B /* RNNComponentOptions.m */; };
-		501CD31F214A5B6900A6E225 /* RNNLayoutInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */; };
-		501CD320214A5B6900A6E225 /* RNNLayoutInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */; };
-		501CD323214A5CA900A6E225 /* RNNOptionsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 501CD321214A5CA900A6E225 /* RNNOptionsManager.h */; };
-		501CD324214A5CA900A6E225 /* RNNOptionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 501CD322214A5CA900A6E225 /* RNNOptionsManager.m */; };
 		501E0217213E7EA3003365C5 /* RNNReactView.h in Headers */ = {isa = PBXBuildFile; fileRef = 501E0215213E7EA3003365C5 /* RNNReactView.h */; };
 		501E0218213E7EA3003365C5 /* RNNReactView.m in Sources */ = {isa = PBXBuildFile; fileRef = 501E0216213E7EA3003365C5 /* RNNReactView.m */; };
 		50220F48212ABDFD004C2B0A /* RNNReactRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50220F46212ABDFD004C2B0A /* RNNReactRootView.h */; };
@@ -299,10 +295,6 @@
 		5016E8EE2020968F009D4F7C /* RNNCustomTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNCustomTitleView.m; sourceTree = "<group>"; };
 		50175CCF207A2AA1004FE91B /* RNNComponentOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentOptions.h; sourceTree = "<group>"; };
 		50175CD0207A2AA1004FE91B /* RNNComponentOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentOptions.m; sourceTree = "<group>"; };
-		501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLayoutInfo.h; sourceTree = "<group>"; };
-		501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutInfo.m; sourceTree = "<group>"; };
-		501CD321214A5CA900A6E225 /* RNNOptionsManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOptionsManager.h; sourceTree = "<group>"; };
-		501CD322214A5CA900A6E225 /* RNNOptionsManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOptionsManager.m; sourceTree = "<group>"; };
 		501E0215213E7EA3003365C5 /* RNNReactView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNReactView.h; sourceTree = "<group>"; };
 		501E0216213E7EA3003365C5 /* RNNReactView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNReactView.m; sourceTree = "<group>"; };
 		50220F46212ABDFD004C2B0A /* RNNReactRootView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNReactRootView.h; sourceTree = "<group>"; };
@@ -646,8 +638,6 @@
 				261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */,
 				50D031322005149000386B3D /* RNNOverlayManager.h */,
 				50D031332005149000386B3D /* RNNOverlayManager.m */,
-				501CD321214A5CA900A6E225 /* RNNOptionsManager.h */,
-				501CD322214A5CA900A6E225 /* RNNOptionsManager.m */,
 			);
 			name = Managers;
 			sourceTree = "<group>";
@@ -660,8 +650,6 @@
 				504AFE611FFE52EF0076E904 /* Options */,
 				50D031312005146C00386B3D /* Managers */,
 				50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */,
-				501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */,
-				501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */,
 				50220F46212ABDFD004C2B0A /* RNNReactRootView.h */,
 				50220F47212ABDFD004C2B0A /* RNNReactRootView.m */,
 				501E0215213E7EA3003365C5 /* RNNReactView.h */,
@@ -856,7 +844,6 @@
 				263905BB1E4C6F440023D7D3 /* RCCDrawerHelper.h in Headers */,
 				263905CC1E4C6F440023D7D3 /* SidebarWunderlistAnimation.h in Headers */,
 				507F43F41FF4FCFE00D9425B /* HMSegmentedControl.h in Headers */,
-				501CD31F214A5B6900A6E225 /* RNNLayoutInfo.h in Headers */,
 				50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */,
 				7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */,
 				263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */,
@@ -877,7 +864,6 @@
 				261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
 				50644A2020E11A720026709C /* Constants.h in Headers */,
-				501CD323214A5CA900A6E225 /* RNNOptionsManager.h in Headers */,
 				E8367B801F7A8A4700675C05 /* VICMAImageView.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
 				263905C41E4C6F440023D7D3 /* SidebarFacebookAnimation.h in Headers */,
@@ -1046,9 +1032,7 @@
 				263905C51E4C6F440023D7D3 /* SidebarFacebookAnimation.m in Sources */,
 				50451D0E2042F70900695F00 /* RNNTransition.m in Sources */,
 				5048862E20BE976D000908DE /* RNNLayoutOptions.m in Sources */,
-				501CD320214A5B6900A6E225 /* RNNLayoutInfo.m in Sources */,
 				7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */,
-				501CD324214A5CA900A6E225 /* RNNOptionsManager.m in Sources */,
 				50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */,
 				263905C31E4C6F440023D7D3 /* SidebarAnimation.m in Sources */,
 				E8A5CD531F464F0400E89D0D /* RNNAnimator.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -95,11 +95,12 @@
 -(void)testDynamicStylesMergeWithStaticStyles {
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = @"the title";
-	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
-	layoutInfo.options = initialOptions;
-	
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil isExternalComponent:NO];
-	
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
+																withOptions:initialOptions
+															withComponentId:@"componentId"
+															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
+															   eventEmitter:nil
+														  isExternalComponent:NO];
 	UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

@@ -6,7 +6,6 @@
 #import "RNNSideMenuChildVC.h"
 #import "RNNNavigationController.h"
 #import "RNNTabBarController.h"
-#import "RNNSplitViewController.h"
 
 @interface RNNControllerFactoryTest : XCTestCase
 
@@ -33,6 +32,7 @@
 	XCTAssertThrows([self.factory createLayoutAndSaveToStore:@{}]);
 }
 
+
 - (void)testCreateLayout_ComponentLayout {
 	
 	id ans = [self.factory createLayoutAndSaveToStore:
@@ -43,19 +43,6 @@
 	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
 }
 
-- (void)testCreateLayout_ExternalComponentLayout {
-	[_store registerExternalComponent:@"externalComponent" callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
-		return [UIViewController new];
-	}];
-	
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"ExternalComponent",
-				@"data": @{@"name": @"externalComponent"},
-				@"children": @[]}];
-	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
-}
-
 - (void)testCreateLayout_ComponentStackLayout {
 	id ans = [self.factory createLayoutAndSaveToStore:
 			  @{@"id": @"cntId",
@@ -65,23 +52,6 @@
 	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
 }
 
-- (void)testCreateLayout_SplitViewLayout {
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"SplitView",
-				@"data": @{},
-				@"children": @[
-						@{@"id": @"cntId_2",
-						  @"type": @"Component",
-						  @"data": @{},
-						  @"children": @[]},
-			  @{@"id": @"cntId_3",
-				@"type": @"Component",
-				@"data": @{},
-				@"children": @[]}]}];
-	XCTAssertTrue([ans isMemberOfClass:[RNNSplitViewController class]]);
-}
-
 - (void)testCreateLayout_ComponentStackLayoutRecursive {
 	RNNNavigationController* ans = (RNNNavigationController*) [self.factory createLayoutAndSaveToStore:
 															 @{@"id": @"cntId",
@@ -121,27 +91,11 @@
 	UINavigationController *navController = tabBar.childViewControllers[0];
 	XCTAssertTrue(navController.childViewControllers.count == 1);
 	XCTAssertTrue([navController.childViewControllers[0] isMemberOfClass:[RNNRootViewController class]]);
-}
-
-- (void)testCreateLayout_TopTabsLayout {
-	RNNTopTabsViewController* tabBar = (RNNTopTabsViewController*) [self.factory createLayoutAndSaveToStore:
-														  @{
-															@"id": @"cntId",
-															@"type": @"TopTabs",
-															@"data": @{},
-															@"children": @[
-																	@{@"id": @"cntId_2",
-																	  @"type": @"Stack",
-																	  @"data": @{},
-																	  @"children": @[
-																			  @{@"id": @"cntId_3",
-																				@"type": @"Component",
-																				@"data": @{},
-																				@"children": @[]}]}]}];
 	
-	XCTAssertTrue([tabBar isMemberOfClass:[RNNTopTabsViewController class]]);
+	
 }
 
+
 - (void)testCreateLayout_ComponentSideMenuLayoutCenterLeftRight {
 	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayoutAndSaveToStore:
 														   @{@"id": @"cntId",
@@ -188,6 +142,9 @@
 	XCTAssertTrue([right.child isMemberOfClass:[RNNRootViewController class]]);
 }
 
+
+
+
 - (void)testCreateLayout_addComponentToStore {
 	NSString *componentId = @"cntId";
 	UIViewController *ans = [self.factory createLayoutAndSaveToStore:
@@ -201,4 +158,5 @@
 }
 
 
+
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -30,7 +30,6 @@
 @property (nonatomic, strong) NSString* componentId;
 @property (nonatomic, strong) id emitter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
-@property (nonatomic, strong) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, strong) RNNRootViewController* uut;
 @end
 
@@ -43,13 +42,7 @@
 	self.componentId = @"cntId";
 	self.emitter = nil;
 	self.options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	
-	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
-	layoutInfo.componentId = self.componentId;
-	layoutInfo.name = self.pageName;
-	layoutInfo.options = self.options;
-	
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO];
+	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withComponentId:self.componentId rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO];
 }
 
 -(void)testTopBarBackgroundColor_validColor{

lib/ios/ReactNativeNavigationTests/RNNStoreTest.m

@@ -89,13 +89,12 @@
 
 - (void)testGetExternalComponentShouldRetrunSavedComponent {
 	UIViewController* testVC = [UIViewController new];
-	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] init];
-	layoutInfo.name = @"extId1";
-	[self.store registerExternalComponent:layoutInfo.name callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
+	NSString *externalComponentId = @"extId1";
+	[self.store registerExternalComponent:externalComponentId callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
 		return testVC;
 	}];
 	
-	UIViewController* savedComponent = [self.store getExternalComponent:layoutInfo bridge:nil];
+	UIViewController* savedComponent = [self.store getExternalComponent:externalComponentId props:nil bridge:nil];
 	XCTAssertEqual(testVC, savedComponent);
 }
 

playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground.xcscheme

@@ -68,7 +68,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "NO">
       <Testables>
          <TestableReference
@@ -105,6 +105,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"