Options rewrite (#3979)

* Renamed RNNRootViewProtocol to RNNParentProtocol and added RNNLeafProtocol

* fixed unit test

* Better options resolving

* Revert "Revert "Refactor options (#3962)""

This reverts commit c266041b85.

* Revert "Revert "Fixes shared element transition""

This reverts commit 005f039f7c.

* Revert "Revert "Adresses #3963 - stack options applied to children""

This reverts commit be09cb0e9a.

* Revert "Revert "Added unit test coverage for RNNNavigationController""

This reverts commit 199cebd221.

* Merge stack options

This commits adds support for merging stack options by the stack’s componentId

Also while I’m at it - use fade animation when setting root

* Merge BottomTabs options

Merge BottomTabs options when calling mergeOptions with BottomTabs componentId

* Fixes options

e2e/ScreenStyle.test.js

@@ -31,7 +31,7 @@ describe('screen style', () => {
   );
 
   test(
-    'hides Tab Bar when pressing on Hide Top Bar and shows it when pressing on Show Top Bar',
+    'hides TopBar when pressing on Hide TopBar and shows it when pressing on Show TopBar',
     async () => {
       await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
       await elementById(testIDs.HIDE_TOP_BAR_BUTTON).tap();

lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsOptionsPresenter.java

@@ -48,6 +48,10 @@ public class BottomTabsOptionsPresenter {
         applyDrawBehind(withDefaultOptions.bottomTabsOptions, tabIndex);
     }
 
+    public void mergeOptions(Options options) {
+        mergeBottomTabsOptions(options.bottomTabsOptions, options.animations);
+    }
+
     public void present(Options options) {
         Options withDefaultOptions = options.copy().withDefaultOptions(defaultOptions);
         applyBottomTabsOptions(withDefaultOptions.bottomTabsOptions, withDefaultOptions.animations);

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackOptionsPresenter.java

@@ -115,6 +115,14 @@ public class StackOptionsPresenter {
         }
     }
 
+    public void mergeOptions(Options options, Component currentChild) {
+        mergeOrientation(options.layout.orientation);
+//        mergeButtons(topBar, withDefault.topBar.buttons, child);
+        mergeTopBarOptions(options.topBar, options.animations, currentChild);
+        mergeTopTabsOptions(options.topTabs);
+        mergeTopTabOptions(options.topTabOptions);
+    }
+
     public void applyInitialChildLayoutOptions(Options options) {
         Options withDefault = options.copy().withDefaultOptions(defaultOptions);
         setInitialTopBarVisibility(withDefault.topBar);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -80,6 +80,12 @@ public class BottomTabsController extends ParentController implements AHBottomNa
         tabPresenter.present();
     }
 
+    @Override
+    public void mergeOptions(Options options) {
+        presenter.mergeOptions(options);
+        super.mergeOptions(options);
+    }
+
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -68,6 +68,12 @@ public class StackController extends ParentController<StackLayout> {
         return stack.peek();
     }
 
+    @Override
+    public void mergeOptions(Options options) {
+        presenter.mergeOptions(options, (Component) getCurrentChild().getView());
+        super.mergeOptions(options);
+    }
+
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);

lib/ios/RCTConvert+Modal.h

@@ -0,0 +1,28 @@
+#import <React/RCTConvert.h>
+
+@interface RCTConvert (Modal)
+
+@end
+
+@implementation RCTConvert (Modal)
+
+RCT_ENUM_CONVERTER(UIModalTransitionStyle,
+				   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
+					  @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
+					  @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
+					  @"partialCurl": @(UIModalTransitionStylePartialCurl)
+					  }), UIModalTransitionStyleCoverVertical, integerValue)
+
+RCT_ENUM_CONVERTER(UIModalPresentationStyle,
+				   (@{@"fullScreen": @(UIModalPresentationFullScreen),
+					  @"pageSheet": @(UIModalPresentationPageSheet),
+					  @"formSheet": @(UIModalPresentationFormSheet),
+					  @"currentContext": @(UIModalPresentationCurrentContext),
+					  @"custom": @(UIModalPresentationCustom),
+					  @"overFullScreen": @(UIModalPresentationOverFullScreen),
+					  @"overCurrentContext": @(UIModalPresentationOverCurrentContext),
+					  @"popover": @(UIModalPresentationPopover),
+					  @"none": @(UIModalPresentationNone)
+					  }), UIModalPresentationFullScreen, integerValue)
+@end
+

lib/ios/RNNBackButtonOptions.m

@@ -4,35 +4,39 @@
 @implementation RNNBackButtonOptions
 
 - (void)applyOn:(UIViewController *)viewController {
+	if (self.visible) {
+		viewController.navigationItem.hidesBackButton = ![self.visible boolValue];
+	}
+	
+	[self applyOnNavigationController:viewController.navigationController];
+}
+
+- (void)applyOnNavigationController:(UINavigationController *)navigationController {
 	if (self.showTitle && ![self.showTitle boolValue]) {
 		self.title = @"";
 	}
 	
 	if (self.icon) {
 		UIImage *image = self.tintedIcon;
-		[viewController.navigationController.navigationBar setBackIndicatorImage:[UIImage new]];
-		[viewController.navigationController.navigationBar setBackIndicatorTransitionMaskImage:[UIImage new]];
+		[navigationController.navigationBar setBackIndicatorImage:[UIImage new]];
+		[navigationController.navigationBar setBackIndicatorTransitionMaskImage:[UIImage new]];
 		
 		UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithImage:image style:UIBarButtonItemStylePlain target:nil action:nil];
-		[self setBackItem:backItem onViewController:viewController];
+		[self setBackItem:backItem onNavigationController:navigationController];
 	} else if (self.title) {
 		UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithTitle:self.title
 																	 style:UIBarButtonItemStylePlain
 																	target:nil
 																	action:nil];
 		
-		[self setBackItem:backItem onViewController:viewController];
-	}
-	
-	if (self.visible) {
-		viewController.navigationItem.hidesBackButton = ![self.visible boolValue];
+		[self setBackItem:backItem onNavigationController:navigationController];
+		
 	}
 }
 
-- (void)setBackItem:(UIBarButtonItem *)backItem onViewController:(UIViewController *)viewController {
-	UINavigationController* nvc = viewController.navigationController;
-	if (nvc.viewControllers.count >= 2) {
-		UIViewController* lastViewControllerInStack = nvc.viewControllers[nvc.viewControllers.count - 2];
+- (void)setBackItem:(UIBarButtonItem *)backItem onNavigationController:(UINavigationController *)navigationController {
+	if (navigationController.viewControllers.count >= 2) {
+		UIViewController* lastViewControllerInStack = navigationController.viewControllers[navigationController.viewControllers.count - 2];
 		lastViewControllerInStack.navigationItem.backBarButtonItem = backItem;
 	}
 }

lib/ios/RNNBackgroundOptions.m

@@ -2,10 +2,10 @@
 
 @implementation RNNBackgroundOptions
 
-- (void)applyOn:(UIViewController *)viewController {
+- (void)applyOnNavigationController:(UINavigationController *)navigationController {
 	if (self.color && ![self.color isKindOfClass:[NSNull class]]) {
 		UIColor* backgroundColor = [RCTConvert UIColor:self.color];
-		viewController.navigationController.navigationBar.barTintColor = backgroundColor;
+		navigationController.navigationBar.barTintColor = backgroundColor;
 	}
 }
 

lib/ios/RNNBasePresenter.h

@@ -0,0 +1,27 @@
+#import <Foundation/Foundation.h>
+#import "RNNNavigationOptions.h"
+
+@protocol RNNPresenterDelegate <NSObject>
+
+- (void)optionsUpdated;
+
+@end
+
+@interface RNNBasePresenter : NSObject
+
+@property (nonatomic, weak) id<RNNPresenterDelegate> delegate;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+
+- (instancetype)initWithOptions:(RNNNavigationOptions *)options;
+
+- (RNNNavigationOptions *)presentWithChildOptions:(RNNNavigationOptions *)childOptions on:(UIViewController *)viewController;
+
+- (void)present:(RNNNavigationOptions *)options on:(UIViewController *)viewController;
+
+- (void)presentOn:(UIViewController *)viewController;
+
+- (void)presentOnLoad:(UIViewController *)viewController;
+
+- (void)overrideOptions:(RNNNavigationOptions *)options;
+
+@end

lib/ios/RNNBasePresenter.m

@@ -0,0 +1,36 @@
+#import "RNNBasePresenter.h"
+
+@implementation RNNBasePresenter
+
+- (instancetype)initWithOptions:(RNNNavigationOptions *)options {
+	self = [super init];
+	if (self) {
+		self.options = options;
+	}
+	return self;
+}
+
+- (void)presentOn:(UIViewController *)viewController {
+	[self.options applyOn:viewController];
+}
+
+- (void)present:(RNNNavigationOptions *)options on:(UIViewController *)viewController {
+	
+}
+
+- (RNNNavigationOptions *)presentWithChildOptions:(RNNNavigationOptions *)childOptions on:(UIViewController *)viewController {
+	RNNNavigationOptions* options = [self.options combineWithOptions:childOptions];
+	[self present:options on:viewController];
+	
+	return options;
+}
+
+- (void)presentOnLoad:(UIViewController *)viewController {
+	
+}
+
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[_options mergeOptions:options overrideOptions:YES];
+}
+
+@end

lib/ios/RNNBottomTabOptions.m

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

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

lib/ios/RNNControllerFactory.h

@@ -4,7 +4,8 @@
 #import "RNNRootViewCreator.h"
 #import "RNNStore.h"
 #import "RNNEventEmitter.h"
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
+#import "RNNOptionsManager.h"
 
 @interface RNNControllerFactory : NSObject
 
@@ -13,11 +14,9 @@
 						  eventEmitter:(RNNEventEmitter*)eventEmitter
 							 andBridge:(RCTBridge*)bridge;
 
--(UIViewController<RNNRootViewProtocol, UIViewControllerPreviewingDelegate> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
+-(UIViewController<RNNParentProtocol, 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,17 @@
-
 #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"
+#import "RNNViewControllerPresenter.h"
+#import "RNNTabBarPresenter.h"
+#import "RNNRootViewController.h"
 
 @implementation RNNControllerFactory {
 	id<RNNRootViewCreator> _creator;
@@ -25,24 +28,26 @@
 							  andBridge:(RCTBridge *)bridge {
 	
 	self = [super init];
+	
 	_creator = creator;
 	_store = store;
 	_eventEmitter = eventEmitter;
 	_bridge = bridge;
+	_optionsManager = [RNNOptionsManager new];
 	
 	return self;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout {
+- (UIViewController<RNNParentProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout {
 	return [self fromTree:layout];
 }
 
 # pragma mark private
 
-- (UIViewController<RNNRootViewProtocol> *)fromTree:(NSDictionary*)json {
+- (UIViewController<RNNParentProtocol> *)fromTree:(NSDictionary*)json {
 	RNNLayoutNode* node = [RNNLayoutNode create:json];
 	
-	UIViewController<RNNRootViewProtocol> *result;
+	UIViewController<RNNParentProtocol> *result;
 	
 	if (node.isComponent) {
 		result = [self createComponent:node];
@@ -93,75 +98,78 @@
 	return result;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createComponent:(RNNLayoutNode*)node {
-	NSString* name = node.data[@"name"];
-	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
+- (UIViewController<RNNParentProtocol> *)createComponent:(RNNLayoutNode*)node {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:options];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:NO presenter:presenter];
 
-	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];
 	}
-	return (UIViewController<RNNRootViewProtocol> *)component;
+	return (UIViewController<RNNParentProtocol> *)component;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
-	NSString* name = node.data[@"name"];
-	NSDictionary* props = node.data[@"passProps"];
-	
-	UIViewController* externalVC = [_store getExternalComponent:name props:props bridge:_bridge];
-	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
+- (UIViewController<RNNParentProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+
+	UIViewController* externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
 	
-	NSString* componentId = node.nodeId;
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:options];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES presenter:presenter];
 	
 	[component addChildViewController:externalVC];
 	[component.view addSubview:externalVC.view];
 	[externalVC didMoveToParentViewController:component];
 	
-	return (UIViewController<RNNRootViewProtocol> *)component;
+	return (UIViewController<RNNParentProtocol> *)component;
 }
 
 
-- (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
-	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
-	RNNNavigationController* vc = [[RNNNavigationController alloc] initWithOptions:options];
-	[vc setComponentId:node.nodeId];
+- (UIViewController<RNNParentProtocol> *)createStack:(RNNLayoutNode*)node {
+	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+
+	vc.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:options];
+	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	
 	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 {
+-(UIViewController<RNNParentProtocol> *)createTabs:(RNNLayoutNode*)node {
 	RNNTabBarController* vc = [[RNNTabBarController alloc] initWithEventEmitter:_eventEmitter];
-	RNNNavigationOptions* options = [self createOptions:node.data[@"options"]];
-
+	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	vc.presenter = [[RNNTabBarPresenter alloc] initWithOptions:options];
+	
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
-		UIViewController<RNNRootViewProtocol>* childVc = [self fromTree:child];
-		[childVc applyTabBarItem];
-		
+		UIViewController<RNNParentProtocol>* childVc = [self fromTree:child];
 		[controllers addObject:childVc];
 	}
 	[vc setViewControllers:controllers];
-	[vc.getLeafViewController mergeOptions:options];
 	
 	return vc;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createTopTabs:(RNNLayoutNode*)node {
+- (UIViewController<RNNParentProtocol> *)createTopTabs:(RNNLayoutNode*)node {
 	RNNTopTabsViewController* vc = [[RNNTopTabsViewController alloc] init];
+	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	
 	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,7 +179,9 @@
 	return vc;
 }
 
-- (UIViewController<RNNRootViewProtocol> *)createSideMenu:(RNNLayoutNode*)node {
+- (UIViewController<RNNParentProtocol> *)createSideMenu:(RNNLayoutNode*)node {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	for (NSDictionary *child in node.children) {
@@ -179,38 +189,24 @@
 		[childrenVCs addObject:vc];
 	}
 	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs];
-	[sideMenu.getLeafViewController mergeOptions:[self createOptions:node.data[@"options"]]];
+	sideMenu.layoutInfo = layoutInfo;
+	
 	return sideMenu;
 }
 
 
-- (UIViewController<RNNRootViewProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
-	UIViewController<RNNRootViewProtocol>* child = [self fromTree:node.children[0]];
+- (UIViewController<RNNParentProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
+	UIViewController<RNNParentProtocol>* child = [self fromTree:node.children[0]];
 	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
 	
 	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 {
+- (UIViewController<RNNParentProtocol> *)createSplitView:(RNNLayoutNode*)node {
 
 	NSString* componentId = node.nodeId;
 	
-	RNNSplitViewOptions* options = [[RNNSplitViewOptions alloc] initWithDict:_defaultOptionsDict];
+	RNNSplitViewOptions* options = [[RNNSplitViewOptions alloc] initWithDict:_optionsManager.defaultOptionsDict];
 	[options mergeWith:node.data[@"options"]];
 
 	RNNSplitViewController* svc = [[RNNSplitViewController alloc] initWithOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter];
@@ -230,11 +226,4 @@
 	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

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

lib/ios/RNNLayoutInfo.m

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

lib/ios/RNNLayoutProtocol.h

@@ -0,0 +1,11 @@
+#import "RNNLayoutInfo.h"
+#import "RNNBasePresenter.h"
+
+@protocol RNNLayoutProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
+
+@required
+
+@property (nonatomic, retain) RNNBasePresenter* presenter;
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+
+@end

lib/ios/RNNLeafProtocol.h

@@ -0,0 +1,11 @@
+#import "RNNLayoutProtocol.h"
+
+typedef void (^RNNReactViewReadyCompletionBlock)(void);
+
+@protocol RNNLeafProtocol <RNNLayoutProtocol>
+
+- (UIViewController<RNNLeafProtocol> *)getLeafViewController;
+
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+
+@end

lib/ios/RNNModalManager.m

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

lib/ios/RNNNavigationController.h

@@ -1,11 +1,10 @@
 #import <UIKit/UIKit.h>
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
+#import "RNNNavigationControllerPresenter.h"
 
-@interface RNNNavigationController : UINavigationController <RNNRootViewProtocol>
+@interface RNNNavigationController : UINavigationController <RNNParentProtocol>
 
-- (instancetype)initWithOptions:(RNNNavigationOptions *)options;
-
-@property (nonatomic, strong) NSString* componentId;
-@property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNNavigationControllerPresenter* presenter;
 
 @end

lib/ios/RNNNavigationController.m

@@ -1,18 +1,10 @@
 
 #import "RNNNavigationController.h"
 #import "RNNModalAnimation.h"
+#import "RNNRootViewController.h"
 
 @implementation RNNNavigationController
 
-- (instancetype)initWithOptions:(RNNNavigationOptions *)options {
-	self = [super init];
-	if (self) {
-		_options = options;
-	}
-	
-	return self;
-}
-
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
@@ -34,38 +26,47 @@
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[rnnController.options applyOn:rnnController];
+			[rnnController.presenter presentOn: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.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.presenter.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.presenter.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)getLeafViewController {
-	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
+	return ((UIViewController<RNNParentProtocol>*)self.topViewController);
 }
 
 - (UIViewController *)childViewControllerForStatusBarStyle {
 	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];
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
+	}
+}
+
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
 }
 
 @end

lib/ios/RNNNavigationControllerPresenter.h

@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+#import "RNNBasePresenter.h"
+
+@interface RNNNavigationControllerPresenter : RNNBasePresenter
+
+
+@end

lib/ios/RNNNavigationControllerPresenter.m

@@ -0,0 +1,9 @@
+#import "RNNNavigationControllerPresenter.h"
+
+@implementation RNNNavigationControllerPresenter
+
+- (void)present:(RNNOptions *)options on:(UINavigationController *)navigationController {
+	[options applyOnNavigationController:navigationController];
+}
+
+@end

lib/ios/RNNNavigationOptions.h

@@ -11,6 +11,7 @@
 #import "RNNStatusBarOptions.h"
 #import "RNNPreviewOptions.h"
 #import "RNNLayoutOptions.h"
+#import "RCTConvert+Modal.h"
 
 extern const NSInteger BLUR_TOPBAR_TAG;
 extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
@@ -30,8 +31,6 @@ 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;
@@ -39,6 +38,6 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) NSString* modalPresentationStyle;
 @property (nonatomic, strong) NSString* modalTransitionStyle;
 
-- (void)applyModalOptions:(UIViewController*)viewController;
+- (RNNNavigationOptions *)combineWithOptions:(RNNOptions *)options;
 
 @end

lib/ios/RNNNavigationOptions.m

@@ -8,42 +8,17 @@
 #import "RNNSplitViewController.h"
 #import "RNNNavigationButtons.h"
 
-const NSInteger BLUR_STATUS_TAG = 78264801;
-const NSInteger BLUR_TOPBAR_TAG = 78264802;
-const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
-
-@implementation RCTConvert (UIModalPresentationStyle)
-
-RCT_ENUM_CONVERTER(UIModalPresentationStyle,
-				   (@{@"fullScreen": @(UIModalPresentationFullScreen),
-					  @"pageSheet": @(UIModalPresentationPageSheet),
-					  @"formSheet": @(UIModalPresentationFormSheet),
-					  @"currentContext": @(UIModalPresentationCurrentContext),
-					  @"custom": @(UIModalPresentationCustom),
-					  @"overFullScreen": @(UIModalPresentationOverFullScreen),
-					  @"overCurrentContext": @(UIModalPresentationOverCurrentContext),
-					  @"popover": @(UIModalPresentationPopover),
-					  @"none": @(UIModalPresentationNone)
-					  }), UIModalPresentationFullScreen, integerValue)
-
-@end
-
-@implementation RCTConvert (UIModalTransitionStyle)
-
-RCT_ENUM_CONVERTER(UIModalTransitionStyle,
-				   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
-					  @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
-					  @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
-					  @"partialCurl": @(UIModalTransitionStylePartialCurl)
-					  }), UIModalTransitionStyleCoverVertical, integerValue)
-
-@end
-
 @implementation RNNNavigationOptions
 
+- (RNNNavigationOptions *)combineWithOptions:(RNNOptions *)options {
+	RNNNavigationOptions *navigationOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
+	[navigationOptions mergeOptions:self overrideOptions:YES];
+	[navigationOptions mergeOptions:options overrideOptions:YES];
+	
+	return navigationOptions;
+}
 
--(void)applyOn:(UIViewController<RNNRootViewProtocol> *)viewController {
-	[self mergeOptions:_defaultOptions overrideOptions:NO];
+- (void)applyOn:(UIViewController *)viewController {
 	[self.topBar applyOn:viewController];
 	[self.bottomTabs applyOn:viewController];
 	[self.topTab applyOn:viewController];
@@ -52,52 +27,59 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 	[self.overlay applyOn:viewController];
 	[self.statusBar applyOn:viewController];
 	[self.layout applyOn:viewController];
-	[self applyOtherOptionsOn:viewController];
-	
-	[viewController.getLeafViewController optionsUpdated];
+	[self applyOtherOptions:self on:viewController];
+}
+
+- (void)applyOnNavigationController:(UINavigationController *)navigationController {
+	[self.topBar applyOnNavigationController:navigationController];
+	[self.statusBar applyOn:navigationController];
+	[self.layout applyOn:navigationController];
+	[self.bottomTab applyOn:navigationController];
+	[self applyOtherOptions:self onNavigationController:navigationController];
 }
 
-- (void)applyOtherOptionsOn:(UIViewController*)viewController {
-	if (self.popGesture) {
-		viewController.navigationController.interactivePopGestureRecognizer.enabled = [self.popGesture boolValue];
+- (void)applyOnTabBarController:(UITabBarController *)tabBarController {
+	[self.bottomTabs applyOnTabBarController:tabBarController];
+}
+
+- (void)applyOtherOptions:(RNNNavigationOptions *)options onNavigationController:(UINavigationController*)navigationController {
+	if (options.popGesture) {
+		navigationController.interactivePopGestureRecognizer.enabled = [options.popGesture boolValue];
 	}
 	
-	if (self.backgroundImage) {
-		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
+	if (options.rootBackgroundImage) {
+		UIImageView* backgroundImageView = (navigationController.view.subviews.count > 0) ? navigationController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
-			backgroundImageView = [[UIImageView alloc] initWithFrame:viewController.view.bounds];
-			[viewController.view insertSubview:backgroundImageView atIndex:0];
+			backgroundImageView = [[UIImageView alloc] initWithFrame:navigationController.view.bounds];
+			[navigationController.view insertSubview:backgroundImageView atIndex:0];
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = [self.backgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.backgroundImage : [RCTConvert UIImage:self.backgroundImage];
+		backgroundImageView.image = [options.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)options.rootBackgroundImage : [RCTConvert UIImage:options.rootBackgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-	
-	if (self.rootBackgroundImage) {
-		UIImageView* backgroundImageView = (viewController.navigationController.view.subviews.count > 0) ? viewController.navigationController.view.subviews[0] : nil;
+}
+
+- (void)applyOtherOptions:(RNNNavigationOptions *)options on:(UIViewController*)viewController {
+	if (options.backgroundImage) {
+		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
 			backgroundImageView = [[UIImageView alloc] initWithFrame:viewController.view.bounds];
-			[viewController.navigationController.view insertSubview:backgroundImageView atIndex:0];
+			[viewController.view insertSubview:backgroundImageView atIndex:0];
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = [self.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.rootBackgroundImage : [RCTConvert UIImage:self.rootBackgroundImage];
+		backgroundImageView.image = [options.backgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)options.backgroundImage : [RCTConvert UIImage:options.backgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
-	
-	[self applyModalOptions:viewController];
-}
 
-- (void)applyModalOptions:(UIViewController*)viewController {
-	if (self.modalPresentationStyle) {
-		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:self.modalPresentationStyle];
+	if (options.modalPresentationStyle) {
+		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:options.modalPresentationStyle];
 		[viewController.view setBackgroundColor:[UIColor clearColor]];
 	}
-	if (self.modalTransitionStyle) {
-		viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:self.modalTransitionStyle];
+	if (options.modalTransitionStyle) {
+		viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:options.modalTransitionStyle];
 	}
 }
 
-
 @end

lib/ios/RNNOptions.h

@@ -8,7 +8,11 @@
 
 @optional
 - (void)resetOptions;
+
+@required
 - (void)applyOn:(UIViewController *)viewController;
+- (void)applyOnNavigationController:(UINavigationController *)navigationController;
+- (void)applyOnTabBarController:(UITabBarController *)tabBarController;
 
 @end
 

lib/ios/RNNOptions.m

@@ -4,7 +4,7 @@
 
 @implementation RNNOptions
 
--(instancetype)	initWithDict:(NSDictionary *)dict {
+- (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];
 	[self initializeOptionsPropertiesWithDict:dict];
 	
@@ -17,7 +17,19 @@
 	[self applyOn:viewController];
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
+- (void)applyOn:(UIViewController *)viewController {
+	
+}
+
+- (void)applyOnNavigationController:(UINavigationController *)navigationController {
+	
+}
+
+- (void)applyOnTabBarController:(UITabBarController *)tabBarController {
+	
+}
+
+- (void)mergeWith:(NSDictionary *)otherOptions {
 	for (id key in otherOptions) {
 		if ([self hasProperty:key]) {
 			if ([[self valueForKey:key] isKindOfClass:[RNNOptions class]]) {

lib/ios/RNNOptionsManager.h

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

lib/ios/RNNOptionsManager.m

@@ -0,0 +1,12 @@
+#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,6 +14,7 @@
 - (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/RNNParentProtocol.h

@@ -0,0 +1,15 @@
+#import "RNNLayoutProtocol.h"
+#import "RNNLeafProtocol.h"
+
+@protocol RNNParentProtocol <RNNLayoutProtocol, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
+
+@required
+
+- (UIViewController<RNNLeafProtocol> *)getLeafViewController;
+
+@optional
+
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)options;
+- (void)performOnChildLoad:(RNNNavigationOptions *)options;
+
+@end

lib/ios/RNNRootViewController.h

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

lib/ios/RNNRootViewController.m

@@ -4,6 +4,7 @@
 #import "RNNCustomTitleView.h"
 #import "RNNPushAnimation.h"
 #import "RNNReactView.h"
+#import "RNNParentProtocol.h"
 
 @interface RNNRootViewController() {
 	RNNReactView* _customTitleView;
@@ -12,11 +13,7 @@
 	BOOL _isBeingPresented;
 }
 
-@property (nonatomic, strong) NSString* componentName;
-@property (nonatomic) BOOL _statusBarHidden;
 @property (nonatomic) BOOL isExternalComponent;
-@property (nonatomic) BOOL _optionsApplied;
-@property (nonatomic, copy) void (^rotationBlock)(void);
 @property (nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;
 
 @end
@@ -25,23 +22,23 @@
 
 @synthesize previewCallback;
 
--(instancetype)initWithName:(NSString*)name
-				withOptions:(RNNNavigationOptions*)options
-			withComponentId:(NSString*)componentId
-			rootViewCreator:(id<RNNRootViewCreator>)creator
-			   eventEmitter:(RNNEventEmitter*)eventEmitter
-		isExternalComponent:(BOOL)isExternalComponent {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
+				   rootViewCreator:(id<RNNRootViewCreator>)creator
+					  eventEmitter:(RNNEventEmitter*)eventEmitter
+			   isExternalComponent:(BOOL)isExternalComponent
+						 presenter:(RNNViewControllerPresenter *)presenter {
 	self = [super init];
-	self.componentId = componentId;
-	self.componentName = name;
-	self.options = options;
 	self.eventEmitter = eventEmitter;
-	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.options.customTransition];
 	self.creator = creator;
 	self.isExternalComponent = isExternalComponent;
+	self.layoutInfo = layoutInfo;
+	self.presenter = presenter;
+	self.presenter.delegate = self;
+	
+	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.presenter.options.customTransition];
 	
 	if (!self.isExternalComponent) {
-		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
+		self.view = [creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId];
 		[[NSNotificationCenter defaultCenter] addObserver:self
 												 selector:@selector(reactViewReady)
 													 name: @"RCTContentDidAppearNotification"
@@ -53,22 +50,22 @@
 												 name:RCTJavaScriptWillStartLoadingNotification
 											   object:nil];
 	self.navigationController.delegate = self;
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(orientationDidChange:)
-												 name:UIDeviceOrientationDidChangeNotification
-											   object:nil];
+
 	return self;
 }
 
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	_isBeingPresented = YES;
-	[self.options applyOn:self];
+	[_presenter presentOn:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:_presenter.options];
+	}
 }
 
 -(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	[self.eventEmitter sendComponentDidAppear:self.componentId componentName:self.componentName];
+	[self.eventEmitter sendComponentDidAppear:self.layoutInfo.componentId componentName:self.layoutInfo.name];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -78,7 +75,13 @@
 
 -(void)viewDidDisappear:(BOOL)animated {
 	[super viewDidDisappear:animated];
-	[self.eventEmitter sendComponentDidDisappear:self.componentId componentName:self.componentName];
+	[self.eventEmitter sendComponentDidDisappear:self.layoutInfo.componentId componentName:self.layoutInfo.name];
+}
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
+	}
 }
 
 - (void)reactViewReady {
@@ -90,6 +93,7 @@
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 }
 
+
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
 	if (wait && !_isExternalComponent) {
 		[self onReactViewReady:readyBlock];
@@ -111,17 +115,13 @@
 }
 
 -(void)updateSearchResultsForSearchController:(UISearchController *)searchController {
-	[self.eventEmitter sendOnSearchBarUpdated:self.componentId
+	[self.eventEmitter sendOnSearchBarUpdated:self.layoutInfo.componentId
 										 text:searchController.searchBar.text
 									isFocused:searchController.searchBar.isFirstResponder];
 }
 
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
-	[self.eventEmitter sendOnSearchBarCancelPressed:self.componentId];
-}
-
-- (void)viewDidLoad {
-	[super viewDidLoad];
+	[self.eventEmitter sendOnSearchBarCancelPressed:self.layoutInfo.componentId];
 }
 
 - (void)optionsUpdated {
@@ -130,22 +130,13 @@
 	[self setCustomNavigationComponentBackground];
 }
 
-- (void)applyModalOptions {
-	[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.options.topBar.title.component.name) {
-			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.options.topBar.title.component];
+		if (self.presenter.options.topBar.title.component.name) {
+			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.title.component];
 			_customTitleView.backgroundColor = UIColor.clearColor;
-			[_customTitleView setAlignment:self.options.topBar.title.component.alignment];
-			BOOL isCenter = [self.options.topBar.title.component.alignment isEqualToString:@"center"];
+			[_customTitleView setAlignment:self.presenter.options.topBar.title.component.alignment];
+			BOOL isCenter = [self.presenter.options.topBar.title.component.alignment isEqualToString:@"center"];
 			__weak RNNReactView *weakTitleView = _customTitleView;
 			CGRect frame = self.navigationController.navigationBar.bounds;
 			[_customTitleView setFrame:frame];
@@ -169,8 +160,8 @@
 
 - (void)setCustomNavigationBarView {
 	if (!_customTopBar) {
-		if (self.options.topBar.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.component];
+		if (self.presenter.options.topBar.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.component];
 			
 			_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			reactView.backgroundColor = UIColor.clearColor;
@@ -189,8 +180,8 @@
 
 - (void)setCustomNavigationComponentBackground {
 	if (!_customTopBarBackground) {
-		if (self.options.topBar.background.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.background.component];
+		if (self.presenter.options.topBar.background.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.background.component];
 			
 			_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
@@ -198,7 +189,7 @@
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
 		}
 		
-		if (self.options.topBar.background.clipToBounds) {
+		if (self.presenter.options.topBar.background.clipToBounds) {
 			self.navigationController.navigationBar.clipsToBounds = YES;
 		} else {
 			self.navigationController.navigationBar.clipsToBounds = NO;
@@ -213,7 +204,7 @@
 }
 
 -(BOOL)isCustomTransitioned {
-	return self.options.customTransition.animations != nil;
+	return self.presenter.options.customTransition.animations != nil;
 }
 
 - (BOOL)isCustomViewController {
@@ -221,9 +212,9 @@
 }
 
 - (BOOL)prefersStatusBarHidden {
-	if (self.options.statusBar.visible) {
-		return ![self.options.statusBar.visible boolValue];
-	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
+	if (self.presenter.options.statusBar.visible) {
+		return ![self.presenter.options.statusBar.visible boolValue];
+	} else if ([self.presenter.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
 	
@@ -231,7 +222,7 @@
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	if (self.options.statusBar.style && [self.options.statusBar.style isEqualToString:@"light"]) {
+	if (self.presenter.options.statusBar.style && [self.presenter.options.statusBar.style isEqualToString:@"light"]) {
 		return UIStatusBarStyleLightContent;
 	} else {
 		return UIStatusBarStyleDefault;
@@ -239,20 +230,20 @@
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	return self.options.layout.supportedOrientations;
+	return self.presenter.options.layout.supportedOrientations;
 }
 
 - (BOOL)hidesBottomBarWhenPushed
 {
-	if (self.options.bottomTabs && self.options.bottomTabs.visible) {
-		return ![self.options.bottomTabs.visible boolValue];
+	if (self.presenter.options.bottomTabs && self.presenter.options.bottomTabs.visible) {
+		return ![self.presenter.options.bottomTabs.visible boolValue];
 	}
 	return NO;
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
-	if (![vc.options.topBar.backButton.transition isEqualToString:@"custom"]){
+	if (![vc.presenter.options.topBar.backButton.transition isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}
 }
@@ -264,10 +255,10 @@
 	{
 		if (self.animator) {
 			return self.animator;
-		} 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 if (operation == UINavigationControllerOperationPush && self.presenter.options.animations.push.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.presenter.options.animations.push];
+		} else if (operation == UINavigationControllerOperationPop && self.presenter.options.animations.pop.hasCustomAnimation) {
+			return [[RNNPushAnimation alloc] initWithScreenTransition:self.presenter.options.animations.pop];
 		} else {
 			return nil;
 		}
@@ -276,30 +267,11 @@
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.presenter.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	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 {
-	_rotationBlock = block;
-}
-
-- (void)orientationDidChange:(NSNotification*)notification {
-	if (_rotationBlock) {
-		_rotationBlock();
-	}
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.presenter.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location{
@@ -314,7 +286,7 @@
 }
 
 - (void)onActionPress:(NSString *)id {
-	[_eventEmitter sendOnNavigationButtonPressed:self.componentId buttonId:id];
+	[_eventEmitter sendOnNavigationButtonPressed:self.layoutInfo.componentId buttonId:id];
 }
 
 - (UIPreviewAction *) convertAction:(NSDictionary *)action {
@@ -334,7 +306,7 @@
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems {
 	NSMutableArray *actions = [[NSMutableArray alloc] init];
-	for (NSDictionary *previewAction in self.options.preview.actions) {
+	for (NSDictionary *previewAction in self.presenter.options.preview.actions) {
 		UIPreviewAction *action = [self convertAction:previewAction];
 		NSDictionary *actionActions = previewAction[@"actions"];
 		if (actionActions.count > 0) {
@@ -352,7 +324,7 @@
 }
 
 -(void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem {
-	[self.eventEmitter sendOnNavigationButtonPressed:self.componentId buttonId:barButtonItem.buttonId];
+	[self.eventEmitter sendOnNavigationButtonPressed:self.layoutInfo.componentId buttonId:barButtonItem.buttonId];
 }
 
 /**

lib/ios/RNNRootViewProtocol.h

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

lib/ios/RNNSideMenuChildVC.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 
 typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 	RNNSideMenuChildTypeCenter,
@@ -16,11 +16,14 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 };
 
 
-@interface RNNSideMenuChildVC : UIViewController <RNNRootViewProtocol>
+@interface RNNSideMenuChildVC : UIViewController <RNNParentProtocol>
 
 @property (readonly) RNNSideMenuChildType type;
-@property (readonly) UIViewController<RNNRootViewProtocol> *child;
+@property (readonly) UIViewController<RNNParentProtocol> *child;
 
--(instancetype) initWithChild:(UIViewController<RNNRootViewProtocol>*)child type:(RNNSideMenuChildType)type;
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNBasePresenter* presenter;
+
+-(instancetype) initWithChild:(UIViewController<RNNParentProtocol>*)child type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -11,13 +11,13 @@
 @interface RNNSideMenuChildVC ()
 
 @property (readwrite) RNNSideMenuChildType type;
-@property (readwrite) UIViewController<RNNRootViewProtocol> *child;
+@property (readwrite) UIViewController<RNNParentProtocol> *child;
 
 @end
 
 @implementation RNNSideMenuChildVC
 
--(instancetype) initWithChild:(UIViewController<RNNRootViewProtocol>*)child type:(RNNSideMenuChildType)type {
+-(instancetype) initWithChild:(UIViewController<RNNParentProtocol>*)child type:(RNNSideMenuChildType)type {
 	self = [super init];
 	
 	self.child = child;	
@@ -31,7 +31,7 @@
 	return self;
 }
 
-- (RNNRootViewController *)getLeafViewController {
+- (UIViewController *)getLeafViewController {
 	return [self.child getLeafViewController];
 }
 

lib/ios/RNNSideMenuController.h

@@ -9,15 +9,18 @@
 #import <UIKit/UIKit.h>
 #import "RNNSideMenuChildVC.h"
 #import "MMDrawerController.h"
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 
-@interface RNNSideMenuController : UIViewController <RNNRootViewProtocol>
+@interface RNNSideMenuController : UIViewController <RNNParentProtocol>
 
 @property (readonly) RNNSideMenuChildVC *center;
 @property (readonly) RNNSideMenuChildVC *left;
 @property (readonly) RNNSideMenuChildVC *right;
 @property (readonly) MMDrawerController *sideMenu;
 
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNBasePresenter* presenter;
+
 -(instancetype)initWithControllers:(NSArray*)controllers;
 
 -(void)showSideMenu:(MMDrawerSide)side animated:(BOOL)animated;

lib/ios/RNNSideMenuController.m

@@ -89,12 +89,9 @@
 	}
 }
 
-- (RNNRootViewController *)getLeafViewController {
+- (UIViewController<RNNLayoutProtocol> *)getLeafViewController {
 	return [self.center getLeafViewController];
 }
 
-- (void)mergeOptions:(RNNOptions *)options {
-	[self.center.getLeafViewController mergeOptions:options];
-}
 
 @end

lib/ios/RNNSplitViewController.h

@@ -8,13 +8,15 @@
 #import "RNNSplitViewOptions.h"
 #import "RNNAnimator.h"
 #import "RNNTopTabsViewController.h"
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 
-@interface RNNSplitViewController : UISplitViewController	<RNNRootViewProtocol>
+@interface RNNSplitViewController : UISplitViewController	<RNNParentProtocol>
 
 @property (nonatomic, strong) RNNSplitViewOptions* options;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, strong) NSString* componentId;
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNBasePresenter* presenter;
 @property (nonatomic) id<RNNRootViewCreator> creator;
 
 -(instancetype)initWithOptions:(RNNSplitViewOptions*)options

lib/ios/RNNSplitViewController.m

@@ -1,10 +1,5 @@
 #import "RNNSplitViewController.h"
 
-@interface RNNSplitViewController()
-@property (nonatomic) BOOL _optionsApplied;
-@property (nonatomic, copy) void (^rotationBlock)(void);
-@end
-
 @implementation RNNSplitViewController
 
 -(instancetype)initWithOptions:(RNNSplitViewOptions*)options
@@ -31,12 +26,4 @@
 	return self;
 }
 
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	readyBlock();
-}
-
-- (void)mergeOptions:(RNNOptions *)options {
-	[self.options mergeOptions:options];
-}
-
 @end

lib/ios/RNNSplitViewOptions.m

@@ -1,9 +1,9 @@
 #import "RNNSplitViewOptions.h"
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 
 @implementation RNNSplitViewOptions
 
--(void)applyOn:(UIViewController<RNNRootViewProtocol> *)viewController {
+-(void)applyOn:(UIViewController<RNNParentProtocol> *)viewController {
 	
 	UISplitViewController *svc = (UISplitViewController*) viewController;
 

lib/ios/RNNStatusBarOptions.m

@@ -1,5 +1,7 @@
 #import "RNNStatusBarOptions.h"
 #define kStatusBarAnimationDuration 0.35
+const NSInteger BLUR_STATUS_TAG = 78264801;
+const NSInteger BLUR_TOPBAR_TAG = 78264802;
 
 @implementation RNNStatusBarOptions
 

lib/ios/RNNStore.h

@@ -1,7 +1,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
@@ -17,7 +17,7 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, N
 - (void)removeAllComponents;
 
 - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback;
-- (UIViewController *)getExternalComponent:(NSString *)name props:(NSDictionary*)props bridge:(RCTBridge*)bridge;
+- (UIViewController *)getExternalComponent:(RNNLayoutInfo *)layoutInfo bridge:(RCTBridge *)bridge;
 
 - (NSString*)componentKeyForInstance:(UIViewController*)instance;
 

lib/ios/RNNStore.m

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

lib/ios/RNNTabBarController.h

@@ -1,12 +1,15 @@
 
 #import <UIKit/UIKit.h>
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 #import "RNNEventEmitter.h"
 
-@interface RNNTabBarController : UITabBarController <RNNRootViewProtocol, UITabBarControllerDelegate>
+@interface RNNTabBarController : UITabBarController <RNNParentProtocol, UITabBarControllerDelegate>
 
 - (instancetype)initWithEventEmitter:(RNNEventEmitter*)eventEmitter;
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID;
 
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNBasePresenter* presenter;
+
 @end

lib/ios/RNNTabBarController.m

@@ -15,15 +15,22 @@
 	return self;
 }
 
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	[_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:childOptions];
+	}
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 	return self.selectedViewController.supportedInterfaceOrientations;
 }
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID {
 	for (id child in self.childViewControllers) {
-		RNNRootViewController* vc = child;
+		UIViewController<RNNParentProtocol>* vc = child;
 
-		if ([vc.componentId isEqualToString:componentID]) {
+		if ([vc.layoutInfo.componentId isEqualToString:componentID]) {
 			[self setSelectedIndex:[self.childViewControllers indexOfObject:child]];
 		}
 	}
@@ -34,16 +41,16 @@
 	[super setSelectedIndex:selectedIndex];
 }
 
-- (void)mergeOptions:(RNNOptions *)options {
-	[self.getLeafViewController mergeOptions:options];
-}
-
 - (UIViewController *)getLeafViewController {
-	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).getLeafViewController;
+	return ((UIViewController<RNNParentProtocol>*)self.selectedViewController).getLeafViewController;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).preferredStatusBarStyle;
+	return ((UIViewController<RNNParentProtocol>*)self.selectedViewController).preferredStatusBarStyle;
+}
+
+- (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControllers {
+	[super setViewControllers:viewControllers];
 }
 
 #pragma mark UITabBarControllerDelegate

lib/ios/RNNTabBarPresenter.h

@@ -0,0 +1,6 @@
+#import <Foundation/Foundation.h>
+#import "RNNBasePresenter.h"
+
+@interface RNNTabBarPresenter : RNNBasePresenter
+
+@end

lib/ios/RNNTabBarPresenter.m

@@ -0,0 +1,9 @@
+#import "RNNTabBarPresenter.h"
+
+@implementation RNNTabBarPresenter
+
+- (void)presentOn:(UITabBarController *)tabBarController {
+	[self.options applyOnTabBarController:tabBarController];
+}
+
+@end

lib/ios/RNNTopBarOptions.m

@@ -3,6 +3,8 @@
 #import "RNNCustomTitleView.h"
 
 extern const NSInteger BLUR_TOPBAR_TAG;
+const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
+
 
 @interface RNNTopBarOptions ()
 
@@ -29,7 +31,6 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 - (void)applyOn:(UIViewController*)viewController {
 	[self.title applyOn:viewController];
 	[self.largeTitle applyOn:viewController];
-	[self.background applyOn:viewController];
 	[self.backButton applyOn:viewController];
 	
 	if (@available(iOS 11.0, *)) {
@@ -52,59 +53,96 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		}
 	}
 	
+	if (self.drawBehind) {
+		if ([self.drawBehind boolValue]) {
+			viewController.edgesForExtendedLayout |= UIRectEdgeTop;
+		} else {
+			viewController.edgesForExtendedLayout &= ~UIRectEdgeTop;
+		}
+	} else {
+		viewController.edgesForExtendedLayout = UIRectEdgeAll;
+	}
+	
+	if (self.rightButtons || self.leftButtons) {
+		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
+		[_navigationButtons applyLeftButtons:self.leftButtons rightButtons:self.rightButtons defaultLeftButtonStyle:self.leftButtonStyle defaultRightButtonStyle:self.rightButtonStyle];
+	}
+	
+	[self applyOnNavigationController:viewController.navigationController];
+	
+	self.rightButtons = nil;
+	self.leftButtons = nil;
+}
+
+- (void)applyOnNavigationController:(UINavigationController *)navigationController {
+	[self.background applyOnNavigationController:navigationController];
+	if (self.testID) {
+		navigationController.navigationBar.accessibilityIdentifier = self.testID;
+	}
+	
 	if (self.visible) {
-		[viewController.navigationController setNavigationBarHidden:![self.visible boolValue] animated:[self.animate boolValue]];
+		[navigationController setNavigationBarHidden:![self.visible boolValue] animated:[self.animate boolValue]];
 	} else {
-		[viewController.navigationController setNavigationBarHidden:NO animated:NO];
+		[navigationController setNavigationBarHidden:NO animated:NO];
 	}
 	
 	if (self.hideOnScroll) {
-		viewController.navigationController.hidesBarsOnSwipe = [self.hideOnScroll boolValue];
+		navigationController.hidesBarsOnSwipe = [self.hideOnScroll boolValue];
 	} else {
-		viewController.navigationController.hidesBarsOnSwipe = NO;
+		navigationController.hidesBarsOnSwipe = NO;
+	}
+	
+	if (self.noBorder) {
+		if ([self.noBorder boolValue]) {
+			navigationController.navigationBar
+			.shadowImage = [[UIImage alloc] init];
+		} else {
+			navigationController.navigationBar
+			.shadowImage = nil;
+		}
 	}
 	
 	if ([self.blur boolValue]) {
-		if (![viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
+		if (![navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
 			
-			[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-			viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+			[navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+			navigationController.navigationBar.shadowImage = [UIImage new];
 			UIVisualEffectView *blur = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
 			CGRect statusBarFrame = [[UIApplication sharedApplication] statusBarFrame];
-			blur.frame = CGRectMake(0, -1 * statusBarFrame.size.height, viewController.navigationController.navigationBar.frame.size.width, viewController.navigationController.navigationBar.frame.size.height + statusBarFrame.size.height);
+			blur.frame = CGRectMake(0, -1 * statusBarFrame.size.height, navigationController.navigationBar.frame.size.width, navigationController.navigationBar.frame.size.height + statusBarFrame.size.height);
 			blur.userInteractionEnabled = NO;
 			blur.tag = BLUR_TOPBAR_TAG;
-			[viewController.navigationController.navigationBar insertSubview:blur atIndex:0];
-			[viewController.navigationController.navigationBar sendSubviewToBack:blur];
+			[navigationController.navigationBar insertSubview:blur atIndex:0];
+			[navigationController.navigationBar sendSubviewToBack:blur];
 		}
 	} else {
-		UIView *blur = [viewController.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG];
+		UIView *blur = [navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG];
 		if (blur) {
-			[viewController.navigationController.navigationBar setBackgroundImage: nil forBarMetrics:UIBarMetricsDefault];
-			viewController.navigationController.navigationBar.shadowImage = nil;
+			[navigationController.navigationBar setBackgroundImage: nil forBarMetrics:UIBarMetricsDefault];
+			navigationController.navigationBar.shadowImage = nil;
 			[blur removeFromSuperview];
 		}
 	}
 	
 	void (^disableTopBarTransparent)(void) = ^ {
-		UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
+		UIView *transparentView = [navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
 		if (transparentView){
 			[transparentView removeFromSuperview];
-			[viewController.navigationController.navigationBar setBackgroundImage:self.originalTopBarImages[@"backgroundImage"] forBarMetrics:UIBarMetricsDefault];
-			viewController.navigationController.navigationBar.shadowImage = self.originalTopBarImages[@"shadowImage"];
+			[navigationController.navigationBar setBackgroundImage:self.originalTopBarImages[@"backgroundImage"] forBarMetrics:UIBarMetricsDefault];
+			navigationController.navigationBar.shadowImage = self.originalTopBarImages[@"shadowImage"];
 			self.originalTopBarImages = nil;
 		}
 	};
 	
 	if (self.transparent) {
 		if ([self.transparent boolValue]) {
-			if (![viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
-				[self storeOriginalTopBarImages:viewController];
-				[viewController.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-				viewController.navigationController.navigationBar.shadowImage = [UIImage new];
+			if (![navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
+				[self storeOriginalTopBarImages:navigationController];
+				[navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+				navigationController.navigationBar.shadowImage = [UIImage new];
 				UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
 				transparentView.tag = TOP_BAR_TRANSPARENT_TAG;
-				[viewController.navigationController.navigationBar insertSubview:transparentView atIndex:0];
+				[navigationController.navigationBar insertSubview:transparentView atIndex:0];
 			}
 		} else {
 			disableTopBarTransparent();
@@ -114,48 +152,16 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	}
 	
 	if (self.barStyle) {
-		viewController.navigationController.navigationBar.barStyle = [RCTConvert UIBarStyle:self.barStyle];
+		navigationController.navigationBar.barStyle = [RCTConvert UIBarStyle:self.barStyle];
 	} else {
-		viewController.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+		navigationController.navigationBar.barStyle = UIBarStyleDefault;
 	}
 	
 	if (self.translucent) {
-		viewController.navigationController.navigationBar.translucent = [self.translucent boolValue];
+		navigationController.navigationBar.translucent = [self.translucent boolValue];
 	} else {
-		viewController.navigationController.navigationBar.translucent = NO;
-	}
-	
-	if (self.drawBehind) {
-		if ([self.drawBehind boolValue]) {
-			viewController.edgesForExtendedLayout |= UIRectEdgeTop;
-		} else {
-			viewController.edgesForExtendedLayout &= ~UIRectEdgeTop;
-		}
-	} else {
-		viewController.edgesForExtendedLayout = UIRectEdgeAll;
-	}
-	
-	if (self.noBorder) {
-		if ([self.noBorder boolValue]) {
-			viewController.navigationController.navigationBar
-			.shadowImage = [[UIImage alloc] init];
-		} else {
-			viewController.navigationController.navigationBar
-			.shadowImage = nil;
-		}
+		navigationController.navigationBar.translucent = NO;
 	}
-	
-	if (self.testID) {
-		viewController.navigationController.navigationBar.accessibilityIdentifier = self.testID;
-	}
-	
-	if (self.rightButtons || self.leftButtons) {
-		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
-		[_navigationButtons applyLeftButtons:self.leftButtons rightButtons:self.rightButtons defaultLeftButtonStyle:self.leftButtonStyle defaultRightButtonStyle:self.rightButtonStyle];
-	}
-	
-	self.rightButtons = nil;
-	self.leftButtons = nil;
 }
 
 - (void)setRightButtonColor:(NSNumber *)rightButtonColor {
@@ -206,13 +212,13 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	}
 }
 
--(void)storeOriginalTopBarImages:(UIViewController*)viewController {
+-(void)storeOriginalTopBarImages:(UINavigationController *)navigationController {
 	NSMutableDictionary *originalTopBarImages = [@{} mutableCopy];
-	UIImage *bgImage = [viewController.navigationController.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault];
+	UIImage *bgImage = [navigationController.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault];
 	if (bgImage != nil) {
 		originalTopBarImages[@"backgroundImage"] = bgImage;
 	}
-	UIImage *shadowImage = viewController.navigationController.navigationBar.shadowImage;
+	UIImage *shadowImage = navigationController.navigationBar.shadowImage;
 	if (shadowImage != nil) {
 		originalTopBarImages[@"shadowImage"] = shadowImage;
 	}

lib/ios/RNNTopTabsViewController.h

@@ -1,11 +1,13 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTUIManager.h>
-#import "RNNRootViewProtocol.h"
+#import "RNNParentProtocol.h"
 
-@interface RNNTopTabsViewController : UIViewController <RNNRootViewProtocol>
+@interface RNNTopTabsViewController : UIViewController <RNNParentProtocol>
 
 @property (nonatomic, retain) UIView* contentView;
+@property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, retain) RNNBasePresenter* presenter;
 
 - (void)setViewControllers:(NSArray*)viewControllers;
 - (void)viewController:(UIViewController*)vc changedTitle:(NSString*)title;

lib/ios/RNNTopTabsViewController.m

@@ -1,10 +1,11 @@
 #import "RNNTopTabsViewController.h"
 #import "RNNSegmentedControl.h"
 #import "ReactNativeNavigation.h"
+#import "RNNRootViewController.h"
 
 @interface RNNTopTabsViewController () {
 	NSArray* _viewControllers;
-	UIViewController<RNNRootViewProtocol>* _currentViewController;
+	UIViewController<RNNParentProtocol>* _currentViewController;
 	RNNSegmentedControl* _segmentedControl;
 }
 
@@ -46,7 +47,7 @@
 }
 
 - (void)setSelectedViewControllerIndex:(NSUInteger)index {
-	UIViewController<RNNRootViewProtocol> *toVC = _viewControllers[index];
+	UIViewController<RNNParentProtocol> *toVC = _viewControllers[index];
 	[_contentView addSubview:toVC.view];
 	[_currentViewController.view removeFromSuperview];
 	_currentViewController = toVC;
@@ -56,7 +57,7 @@
 	_viewControllers = viewControllers;
 	for (RNNRootViewController* childVc in viewControllers) {
 		[childVc.view setFrame:_contentView.bounds];
-		[childVc applyTopTabsOptions];
+		[childVc.presenter.options.topTab applyOn:childVc];
 	}
 	
 	[self setSelectedViewControllerIndex:0];
@@ -71,7 +72,7 @@
     [super viewDidLoad];
 }
 
-#pragma mark RNNRootViewProtocol
+#pragma mark RNNParentProtocol
 
 - (UIViewController *)getLeafViewController {
 	return _currentViewController;

lib/ios/RNNViewControllerPresenter.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "RNNBasePresenter.h"
+
+@interface RNNViewControllerPresenter : RNNBasePresenter
+
+- (void)presentOn:(UIViewController *)viewController;
+
+@end

lib/ios/RNNViewControllerPresenter.m

@@ -0,0 +1,13 @@
+#import "RNNViewControllerPresenter.h"
+
+@implementation RNNViewControllerPresenter
+
+- (void)presentOn:(UIViewController *)viewController {
+	[self.options applyOn:viewController];
+	
+	if ([self.delegate respondsToSelector:@selector(optionsUpdated)]) {
+		[self.delegate optionsUpdated];
+	}
+}
+
+@end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -67,8 +67,14 @@
 		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 */; };
+		50215750214FE005000703F7 /* RNNTabBarPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5021574E214FE005000703F7 /* RNNTabBarPresenter.h */; };
+		50215751214FE005000703F7 /* RNNTabBarPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5021574F214FE005000703F7 /* RNNTabBarPresenter.m */; };
 		50220F48212ABDFD004C2B0A /* RNNReactRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50220F46212ABDFD004C2B0A /* RNNReactRootView.h */; };
 		50220F49212ABDFD004C2B0A /* RNNReactRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = 50220F47212ABDFD004C2B0A /* RNNReactRootView.m */; };
 		502CB43A20CBCA180019B2FE /* RNNBridgeManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 502CB43920CBCA140019B2FE /* RNNBridgeManagerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -94,6 +100,15 @@
 		50570B272061473D006A1B5C /* RNNTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570B252061473D006A1B5C /* RNNTitleOptions.m */; };
 		50570BEA2063E09B006A1B5C /* RNNTitleViewHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */; };
 		50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */; };
+		505EDD32214E4BE80071C7DE /* RNNNavigationControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */; };
+		505EDD34214E7B7B0071C7DE /* RNNLeafProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD33214E7A6A0071C7DE /* RNNLeafProtocol.h */; };
+		505EDD3C214FA8000071C7DE /* RNNViewControllerPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */; };
+		505EDD3D214FA8000071C7DE /* RNNViewControllerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */; };
+		505EDD41214FBCBE0071C7DE /* RNNNavigationControllerPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD3F214FBCBE0071C7DE /* RNNNavigationControllerPresenter.h */; };
+		505EDD42214FBCBE0071C7DE /* RNNNavigationControllerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD40214FBCBE0071C7DE /* RNNNavigationControllerPresenter.m */; };
+		505EDD45214FBD3C0071C7DE /* RNNBasePresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD43214FBD3C0071C7DE /* RNNBasePresenter.h */; };
+		505EDD46214FBD3C0071C7DE /* RNNBasePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD44214FBD3C0071C7DE /* RNNBasePresenter.m */; };
+		505EDD4A214FDA800071C7DE /* RCTConvert+Modal.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD48214FDA800071C7DE /* RCTConvert+Modal.h */; };
 		5064495D20DC62B90026709C /* RNNSideMenuSideOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */; };
 		5064495E20DC62B90026709C /* RNNSideMenuSideOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */; };
 		50644A2020E11A720026709C /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 50644A1E20E11A720026709C /* Constants.h */; };
@@ -114,7 +129,7 @@
 		507F43F51FF4FCFE00D9425B /* HMSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 507F43F31FF4FCFE00D9425B /* HMSegmentedControl.m */; };
 		507F43F81FF525B500D9425B /* RNNSegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43F61FF525B500D9425B /* RNNSegmentedControl.h */; };
 		507F43F91FF525B500D9425B /* RNNSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 507F43F71FF525B500D9425B /* RNNSegmentedControl.m */; };
-		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
+		507F44201FFA8A8800D9425B /* RNNParentProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNParentProtocol.h */; };
 		50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887C1320ECC5C200D06111 /* RNNButtonOptions.h */; };
 		50887C1620ECC5C200D06111 /* RNNButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887C1420ECC5C200D06111 /* RNNButtonOptions.m */; };
 		50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */; };
@@ -295,8 +310,14 @@
 		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>"; };
+		5021574E214FE005000703F7 /* RNNTabBarPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarPresenter.h; sourceTree = "<group>"; };
+		5021574F214FE005000703F7 /* RNNTabBarPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarPresenter.m; sourceTree = "<group>"; };
 		50220F46212ABDFD004C2B0A /* RNNReactRootView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNReactRootView.h; sourceTree = "<group>"; };
 		50220F47212ABDFD004C2B0A /* RNNReactRootView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootView.m; sourceTree = "<group>"; };
 		502CB43920CBCA140019B2FE /* RNNBridgeManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBridgeManagerDelegate.h; sourceTree = "<group>"; };
@@ -321,6 +342,16 @@
 		50570B252061473D006A1B5C /* RNNTitleOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleOptions.m; sourceTree = "<group>"; };
 		50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTitleViewHelper.h; sourceTree = "<group>"; };
 		50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleViewHelper.m; sourceTree = "<group>"; };
+		505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerTest.m; sourceTree = "<group>"; };
+		505EDD33214E7A6A0071C7DE /* RNNLeafProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLeafProtocol.h; sourceTree = "<group>"; };
+		505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNViewControllerPresenter.h; sourceTree = "<group>"; };
+		505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNViewControllerPresenter.m; sourceTree = "<group>"; };
+		505EDD3F214FBCBE0071C7DE /* RNNNavigationControllerPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationControllerPresenter.h; sourceTree = "<group>"; };
+		505EDD40214FBCBE0071C7DE /* RNNNavigationControllerPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerPresenter.m; sourceTree = "<group>"; };
+		505EDD43214FBD3C0071C7DE /* RNNBasePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBasePresenter.h; sourceTree = "<group>"; };
+		505EDD44214FBD3C0071C7DE /* RNNBasePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBasePresenter.m; sourceTree = "<group>"; };
+		505EDD47214FC4A60071C7DE /* RNNLayoutProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLayoutProtocol.h; sourceTree = "<group>"; };
+		505EDD48214FDA800071C7DE /* RCTConvert+Modal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Modal.h"; sourceTree = "<group>"; };
 		5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuSideOptions.h; sourceTree = "<group>"; };
 		5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuSideOptions.m; sourceTree = "<group>"; };
 		50644A1E20E11A720026709C /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
@@ -341,7 +372,7 @@
 		507F43F31FF4FCFE00D9425B /* HMSegmentedControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSegmentedControl.m; sourceTree = "<group>"; };
 		507F43F61FF525B500D9425B /* RNNSegmentedControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSegmentedControl.h; sourceTree = "<group>"; };
 		507F43F71FF525B500D9425B /* RNNSegmentedControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSegmentedControl.m; sourceTree = "<group>"; };
-		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
+		507F441F1FFA8A8800D9425B /* RNNParentProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNParentProtocol.h; sourceTree = "<group>"; };
 		50887C1320ECC5C200D06111 /* RNNButtonOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNButtonOptions.h; sourceTree = "<group>"; };
 		50887C1420ECC5C200D06111 /* RNNButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNButtonOptions.m; sourceTree = "<group>"; };
 		50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayWindow.m; sourceTree = "<group>"; };
@@ -492,6 +523,7 @@
 				50644A1F20E11A720026709C /* Constants.m */,
 				50706E6B20CE7CA5003345C3 /* UIImage+tint.h */,
 				50706E6C20CE7CA5003345C3 /* UIImage+tint.m */,
+				505EDD48214FDA800071C7DE /* RCTConvert+Modal.h */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -620,6 +652,21 @@
 			name = Options;
 			sourceTree = "<group>";
 		};
+		505EDD39214FA7E80071C7DE /* Presenters */ = {
+			isa = PBXGroup;
+			children = (
+				505EDD43214FBD3C0071C7DE /* RNNBasePresenter.h */,
+				505EDD44214FBD3C0071C7DE /* RNNBasePresenter.m */,
+				505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */,
+				505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */,
+				505EDD3F214FBCBE0071C7DE /* RNNNavigationControllerPresenter.h */,
+				505EDD40214FBCBE0071C7DE /* RNNNavigationControllerPresenter.m */,
+				5021574E214FE005000703F7 /* RNNTabBarPresenter.h */,
+				5021574F214FE005000703F7 /* RNNTabBarPresenter.m */,
+			);
+			name = Presenters;
+			sourceTree = "<group>";
+		};
 		507F43F11FF4FCD800D9425B /* HMSegmentControl */ = {
 			isa = PBXGroup;
 			children = (
@@ -638,6 +685,8 @@
 				261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */,
 				50D031322005149000386B3D /* RNNOverlayManager.h */,
 				50D031332005149000386B3D /* RNNOverlayManager.m */,
+				501CD321214A5CA900A6E225 /* RNNOptionsManager.h */,
+				501CD322214A5CA900A6E225 /* RNNOptionsManager.m */,
 			);
 			name = Managers;
 			sourceTree = "<group>";
@@ -649,7 +698,10 @@
 				E8AEDB461F58414D000F5A6A /* Animations */,
 				504AFE611FFE52EF0076E904 /* Options */,
 				50D031312005146C00386B3D /* Managers */,
+				505EDD39214FA7E80071C7DE /* Presenters */,
 				50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */,
+				501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */,
+				501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */,
 				50220F46212ABDFD004C2B0A /* RNNReactRootView.h */,
 				50220F47212ABDFD004C2B0A /* RNNReactRootView.m */,
 				501E0215213E7EA3003365C5 /* RNNReactView.h */,
@@ -682,7 +734,9 @@
 				507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */,
 				507F43F61FF525B500D9425B /* RNNSegmentedControl.h */,
 				507F43F71FF525B500D9425B /* RNNSegmentedControl.m */,
-				507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */,
+				507F441F1FFA8A8800D9425B /* RNNParentProtocol.h */,
+				505EDD33214E7A6A0071C7DE /* RNNLeafProtocol.h */,
+				505EDD47214FC4A60071C7DE /* RNNLayoutProtocol.h */,
 				E33AC1FF20B5BA0B0090DB8A /* RNNSplitViewController.m */,
 				E33AC20120B5BA550090DB8A /* RNNSplitViewController.h */,
 				50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */,
@@ -700,6 +754,7 @@
 				7B49FEC91E95098500DEB3EA /* RNNCommandsHandlerTest.m */,
 				7B49FECA1E95098500DEB3EA /* RNNNavigationStackManagerTest.m */,
 				504753772109C13C00FFFBE6 /* RNNOverlayManagerTest.m */,
+				505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */,
 				7B49FEBF1E95090800DEB3EA /* Info.plist */,
 				E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */,
 				E83BAD781F27416B00A9F3DD /* RNNRootViewControllerTest.m */,
@@ -832,6 +887,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				261F0E6A1E6F028A00989DE2 /* RNNNavigationStackManager.h in Headers */,
+				505EDD45214FBD3C0071C7DE /* RNNBasePresenter.h in Headers */,
 				50EB4ED72068EBE000D6ED34 /* RNNBackgroundOptions.h in Headers */,
 				504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */,
 				504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */,
@@ -844,6 +900,7 @@
 				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 */,
@@ -855,15 +912,18 @@
 				50415CBA20553B8E00BB682E /* RNNScreenTransition.h in Headers */,
 				263905C21E4C6F440023D7D3 /* SidebarAnimation.h in Headers */,
 				E8E518361F83B94A000467AC /* RNNViewLocation.h in Headers */,
+				505EDD34214E7B7B0071C7DE /* RNNLeafProtocol.h in Headers */,
 				263905B51E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.h in Headers */,
 				50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */,
 				507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */,
 				263905C61E4C6F440023D7D3 /* SidebarFeedlyAnimation.h in Headers */,
+				505EDD3C214FA8000071C7DE /* RNNViewControllerPresenter.h in Headers */,
 				502CB46E20CD1DDA0019B2FE /* RNNBackButtonOptions.h in Headers */,
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
 				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 */,
@@ -875,15 +935,17 @@
 				263905BE1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.h in Headers */,
 				263905CE1E4C6F440023D7D3 /* TheSidebarController.h in Headers */,
 				50D031342005149000386B3D /* RNNOverlayManager.h in Headers */,
+				505EDD41214FBCBE0071C7DE /* RNNNavigationControllerPresenter.h in Headers */,
 				7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */,
 				E8A430111F9CB87B00B61A20 /* RNNAnimatedView.h in Headers */,
 				50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */,
 				50C4A496206BDDBB00DB292E /* RNNSubtitleOptions.h in Headers */,
 				268692821E5054F800E2C612 /* RNNStore.h in Headers */,
 				E8AEDB3C1F55A1C2000F5A6A /* RNNElementView.h in Headers */,
+				50215750214FE005000703F7 /* RNNTabBarPresenter.h in Headers */,
 				E8E518321F83B3E0000467AC /* RNNUtils.h in Headers */,
 				50BE951320B5A787004F5DF5 /* RNNStatusBarOptions.h in Headers */,
-				507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */,
+				507F44201FFA8A8800D9425B /* RNNParentProtocol.h in Headers */,
 				50570BEA2063E09B006A1B5C /* RNNTitleViewHelper.h in Headers */,
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				4534E72520CB6724009F8185 /* RNNLargeTitleOptions.h in Headers */,
@@ -913,6 +975,7 @@
 				50451D0D2042F70900695F00 /* RNNTransition.h in Headers */,
 				507F43F81FF525B500D9425B /* RNNSegmentedControl.h in Headers */,
 				50175CD1207A2AA1004FE91B /* RNNComponentOptions.h in Headers */,
+				505EDD4A214FDA800071C7DE /* RCTConvert+Modal.h in Headers */,
 				50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1012,6 +1075,7 @@
 				504753782109C13C00FFFBE6 /* RNNOverlayManagerTest.m in Sources */,
 				7B49FECE1E95098500DEB3EA /* RNNCommandsHandlerTest.m in Sources */,
 				E83BAD681F2734B500A9F3DD /* RNNNavigationOptionsTest.m in Sources */,
+				505EDD32214E4BE80071C7DE /* RNNNavigationControllerTest.m in Sources */,
 				7B49FECF1E95098500DEB3EA /* RNNNavigationStackManagerTest.m in Sources */,
 				7B49FECB1E95098500DEB3EA /* RNNControllerFactoryTest.m in Sources */,
 				7B49FECD1E95098500DEB3EA /* RNNModalManagerTest.m in Sources */,
@@ -1032,7 +1096,9 @@
 				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 */,
@@ -1082,7 +1148,9 @@
 				5064495E20DC62B90026709C /* RNNSideMenuSideOptions.m in Sources */,
 				214545251F4DC125006E8DA1 /* RNNUIBarButtonItem.m in Sources */,
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,
+				505EDD3D214FA8000071C7DE /* RNNViewControllerPresenter.m in Sources */,
 				263905CD1E4C6F440023D7D3 /* SidebarWunderlistAnimation.m in Sources */,
+				505EDD42214FBCBE0071C7DE /* RNNNavigationControllerPresenter.m in Sources */,
 				E33AC20820B5C4F90090DB8A /* RNNSplitViewOptions.m in Sources */,
 				E33AC20020B5BA0B0090DB8A /* RNNSplitViewController.m in Sources */,
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
@@ -1108,6 +1176,8 @@
 				263905B61E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.m in Sources */,
 				E8E518331F83B3E0000467AC /* RNNUtils.m in Sources */,
 				50451D062042DAEB00695F00 /* RNNPushAnimation.m in Sources */,
+				50215751214FE005000703F7 /* RNNTabBarPresenter.m in Sources */,
+				505EDD46214FBD3C0071C7DE /* RNNBasePresenter.m in Sources */,
 				50F5DFC61F407AA0001A00BC /* RNNNavigationController.m in Sources */,
 				21B85E5D1F44480200B314B5 /* RNNNavigationButtons.m in Sources */,
 				E8E518371F83B94A000467AC /* RNNViewLocation.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -5,8 +5,9 @@
 #import "RNNTestRootViewCreator.h"
 #import "RNNRootViewController.h"
 #import "RNNNavigationStackManager.h"
+#import "RNNNavigationController.h"
 
-@interface MockUINavigationController : UINavigationController
+@interface MockUINavigationController : RNNNavigationController
 @property (nonatomic, strong) NSArray* willReturnVCs;
 @end
 
@@ -95,13 +96,14 @@
 -(void)testDynamicStylesMergeWithStaticStyles {
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = @"the title";
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithName:@"name"
-																withOptions:initialOptions
-															withComponentId:@"componentId"
-															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
-															   eventEmitter:nil
-														  isExternalComponent:NO];
-	UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:vc];
+	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
+	
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:initialOptions];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil isExternalComponent:NO presenter:presenter];
+	
+	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
+	nav.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:initialOptions];
+	
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 
@@ -117,6 +119,27 @@
 	}];
 }
 
+- (void)testMergeOptions_shouldOverrideOptions {
+	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
+	initialOptions.topBar.title.text = @"the title";
+	
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:initialOptions];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil isExternalComponent:NO presenter:presenter];
+	
+	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
+	[vc viewWillAppear:false];
+	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
+	
+	[self.store setReadyToReceiveCommands:true];
+	[self.store setComponent:vc componentId:@"componentId"];
+	
+	NSDictionary* dictFromJs = @{@"topBar": @{@"title" : @{@"text" : @"new title"}}};
+	
+	[self.uut mergeOptions:@"componentId" options:dictFromJs completion:^{
+		XCTAssertTrue([vc.navigationItem.title isEqual:@"new title"]);
+	}];
+}
+
 - (void)testPop_removeTopVCFromStore {
 	[self.store setReadyToReceiveCommands:true];
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

@@ -6,6 +6,7 @@
 #import "RNNSideMenuChildVC.h"
 #import "RNNNavigationController.h"
 #import "RNNTabBarController.h"
+#import "RNNSplitViewController.h"
 
 @interface RNNControllerFactoryTest : XCTestCase
 
@@ -32,7 +33,6 @@
 	XCTAssertThrows([self.factory createLayoutAndSaveToStore:@{}]);
 }
 
-
 - (void)testCreateLayout_ComponentLayout {
 	
 	id ans = [self.factory createLayoutAndSaveToStore:
@@ -43,6 +43,19 @@
 	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",
@@ -52,6 +65,23 @@
 	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",
@@ -91,10 +121,26 @@
 	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:
@@ -142,9 +188,6 @@
 	XCTAssertTrue([right.child isMemberOfClass:[RNNRootViewController class]]);
 }
 
-
-
-
 - (void)testCreateLayout_addComponentToStore {
 	NSString *componentId = @"cntId";
 	UIViewController *ans = [self.factory createLayoutAndSaveToStore:
@@ -158,5 +201,4 @@
 }
 
 
-
 @end

lib/ios/ReactNativeNavigationTests/RNNModalManagerTest.m

@@ -1,5 +1,6 @@
 #import <XCTest/XCTest.h>
 #import "RNNModalManager.h"
+#import "RNNRootViewController.h"
 
 @interface MockViewController : UIViewController
 

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -0,0 +1,43 @@
+#import <XCTest/XCTest.h>
+#import "RNNNavigationController.h"
+#import "RNNRootViewController.h"
+
+@interface RNNNavigationControllerTest : XCTestCase
+
+@property (nonatomic, strong) RNNNavigationController *uut;
+
+@end
+
+@implementation RNNNavigationControllerTest {
+	RNNRootViewController* _vc1;
+	RNNRootViewController* _vc2;
+	UIViewController* _vc3;
+	RNNViewControllerPresenter* _presenter;
+}
+
+- (void)setUp {
+    [super setUp];
+	
+	_presenter = [[RNNViewControllerPresenter alloc] initWithOptions:[[RNNNavigationOptions alloc] initWithDict:@{}]];
+	self.uut = [[RNNNavigationController alloc] init];
+	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil isExternalComponent:NO presenter:_presenter];
+	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil isExternalComponent:NO presenter:_presenter];
+	_vc3 = [UIViewController new];
+}
+
+- (void)testChildViewControllerForStatusBarStyle_shouldReturnTopViewController {
+	XCTAssertTrue(self.uut.childViewControllerForStatusBarStyle == self.uut.topViewController);
+}
+
+- (void)testGetLeafViewController_shouldReturnTopViewController {
+	XCTAssertTrue(self.uut.getLeafViewController == self.uut.topViewController);
+}
+
+- (void)testPreferredStatusBarStyle_shouldReturnLeafPreferredStatusBarStyle {
+	[self.uut setViewControllers:@[_vc1]];
+	self.uut.getLeafViewController.presenter.options.statusBar.style = @"light";
+	XCTAssertTrue(self.uut.preferredStatusBarStyle == self.uut.getLeafViewController.preferredStatusBarStyle);
+}
+
+
+@end

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

@@ -1,11 +1,12 @@
 #import <XCTest/XCTest.h>
 #import "RNNStore.h"
 #import "RNNNavigationStackManager.h"
-
+#import "RNNRootViewController.h"
+#import "RNNNavigationController.h"
 
 @interface RNNNavigationStackManagerTest : XCTestCase
 
-@property (nonatomic, strong) UINavigationController *nvc;
+@property (nonatomic, strong) RNNNavigationController *nvc;
 @property (nonatomic, strong) UIViewController *vc1;
 @property (nonatomic, strong) UIViewController *vc2;
 @property (nonatomic, strong) UIViewController *vc3;
@@ -18,7 +19,7 @@
 - (void)setUp {
     [super setUp];
 	
-	self.nvc = [[UINavigationController alloc] init];
+	self.nvc = [[RNNNavigationController alloc] init];
 	self.vc1 = [RNNRootViewController new];
 	self.vc2 = [RNNRootViewController new];
 	self.vc3 = [RNNRootViewController new];

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -30,6 +30,7 @@
 @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
 
@@ -42,13 +43,19 @@
 	self.componentId = @"cntId";
 	self.emitter = nil;
 	self.options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withComponentId:self.componentId rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO];
+	
+	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
+	layoutInfo.componentId = self.componentId;
+	layoutInfo.name = self.pageName;
+	
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:self.options];
+	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO presenter:presenter];
 }
 
 -(void)testTopBarBackgroundColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
 	self.options.topBar.background.color = inputColor;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
@@ -63,7 +70,7 @@
 }
 
 - (void)testStatusBarHidden_default {
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -71,7 +78,7 @@
 
 - (void)testStatusBarVisible_false {
 	self.options.statusBar.visible = @(0);
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut prefersStatusBarHidden]);
@@ -79,7 +86,7 @@
 
 - (void)testStatusBarVisible_true {
 	self.options.statusBar.visible = @(1);
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -88,7 +95,7 @@
 - (void)testStatusBarHideWithTopBar_false {
 	self.options.statusBar.hideWithTopBar = @(0);
 	self.options.topBar.visible = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -97,7 +104,7 @@
 - (void)testStatusBarHideWithTopBar_true {
 	self.options.statusBar.hideWithTopBar = @(1);
 	self.options.topBar.visible = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut prefersStatusBarHidden]);
@@ -106,14 +113,14 @@
 -(void)testTitle_string{
 	NSString* title =@"some title";
 	self.options.topBar.title.text = title;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue([self.uut.navigationItem.title isEqual:title]);
 }
 
 -(void)testTitle_default{
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 
 	[self.uut viewWillAppear:false];
 	XCTAssertNil(self.uut.navigationItem.title);
@@ -122,7 +129,7 @@
 -(void)testTopBarTextColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
 	self.options.topBar.title.color = inputColor;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
@@ -139,7 +146,7 @@
 -(void)testPopGestureEnabled_true{
 	NSNumber* popGestureEnabled = @(1);
 	self.options.popGesture = popGestureEnabled;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue(self.uut.navigationController.interactivePopGestureRecognizer.enabled);
 }
@@ -147,14 +154,15 @@
 -(void)testPopGestureEnabled_false{
 	NSNumber* popGestureEnabled = @(0);
 	self.options.popGesture = popGestureEnabled;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
+	
 	[self.uut viewWillAppear:false];
 	XCTAssertFalse(self.uut.navigationController.interactivePopGestureRecognizer.enabled);
 }
 
 -(void)testTopBarTextFontFamily_validFont{
 	NSString* inputFont = @"HelveticaNeue";
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	self.options.topBar.title.fontFamily = inputFont;
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:17];
@@ -163,7 +171,7 @@
 
 -(void)testTopBarHideOnScroll_true {
 	NSNumber* hideOnScrollInput = @(1);
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	self.options.topBar.hideOnScroll = hideOnScrollInput;
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue(self.uut.navigationController.hidesBarsOnSwipe);
@@ -172,7 +180,7 @@
 -(void)testTopBarTranslucent {
 	NSNumber* topBarTranslucentInput = @(0);
 	self.options.topBar.translucent = topBarTranslucentInput;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertFalse(self.uut.navigationController.navigationBar.translucent);
 }
@@ -194,7 +202,7 @@
 -(void)testTopBarTransparent_BOOL_True {
 	NSNumber* topBarTransparentInput = @(1);
 	self.options.topBar.transparent = topBarTransparentInput;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIView* transparentView = [self.uut.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
 	XCTAssertTrue(transparentView);
@@ -203,7 +211,7 @@
 
 -(void)testTopBarTransparent_BOOL_false {
 	NSNumber* topBarTransparentInput = @(0);
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	self.options.topBar.transparent = topBarTransparentInput;
 	[self.uut viewWillAppear:false];
 	UIView* transparentView = [self.uut.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
@@ -217,21 +225,21 @@
 
 
 -(void)testTopBarLargeTitle_default {
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode,  UINavigationItemLargeTitleDisplayModeNever);
 }
 -(void)testTopBarLargeTitle_true {
 	self.options.topBar.largeTitle.visible = @(1);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode, UINavigationItemLargeTitleDisplayModeAlways);
 }
 -(void)testTopBarLargeTitle_false {
 	self.options.topBar.largeTitle.visible  = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode, UINavigationItemLargeTitleDisplayModeNever);
@@ -241,7 +249,7 @@
 -(void)testTopBarLargeTitleFontSize_withoutTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	self.options.topBar.largeTitle.fontSize = topBarTextFontSizeInput;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -252,7 +260,7 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 	self.options.topBar.largeTitle.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.largeTitle.color = inputColor;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -267,7 +275,7 @@
 	self.options.topBar.largeTitle.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.largeTitle.color = inputColor;
 	self.options.topBar.largeTitle.fontFamily = inputFont;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
@@ -280,7 +288,7 @@
 	NSString* inputFont = @"HelveticaNeue";
 	self.options.topBar.largeTitle.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.largeTitle.fontFamily = inputFont;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -290,7 +298,7 @@
 -(void)testTopBarTextFontSize_withoutTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	self.options.topBar.title.fontSize = topBarTextFontSizeInput;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -301,7 +309,7 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 	self.options.topBar.title.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.title.color = inputColor;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -316,7 +324,7 @@
 	self.options.topBar.title.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.title.color = inputColor;
 	self.options.topBar.title.fontFamily = inputFont;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
@@ -329,7 +337,7 @@
 	NSString* inputFont = @"HelveticaNeue";
 	self.options.topBar.title.fontSize = topBarTextFontSizeInput;
 	self.options.topBar.title.fontFamily = inputFont;
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -338,7 +346,7 @@
 // TODO: Currently not passing
 -(void)testTopBarTextFontFamily_invalidFont{
 	NSString* inputFont = @"HelveticaNeueeeee";
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	self.options.topBar.title.fontFamily = inputFont;
 	//	XCTAssertThrows([self.uut viewWillAppear:false]);
 }
@@ -346,7 +354,7 @@
 -(void)testOrientation_portrait {
 	NSArray* supportedOrientations = @[@"portrait"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskPortrait;
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -355,7 +363,7 @@
 -(void)testOrientation_portraitString {
 	NSString* supportedOrientation = @"portrait";
 	self.options.layout.orientation = supportedOrientation;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait);
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -364,7 +372,7 @@
 -(void)testOrientation_portraitAndLandscape {
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscape);
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -373,7 +381,7 @@
 -(void)testOrientation_all {
 	NSArray* supportedOrientations = @[@"all"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskAll;
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -382,7 +390,7 @@
 -(void)testOrientation_default {
 	NSString* supportedOrientations = @"default";
 	self.options.layout.orientation = supportedOrientations;
-	__unused UINavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -433,7 +441,7 @@
 
 -(void)testRightButtonsWithTitle_withoutStyle {
 	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"text": @"test"}];
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.rightBarButtonItems objectAtIndex:0];
@@ -448,7 +456,7 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 
 	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"text": @"test", @"enabled": @false, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.rightBarButtonItems objectAtIndex:0];
@@ -464,7 +472,7 @@
 
 -(void)testLeftButtonsWithTitle_withoutStyle {
 	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"text": @"test"}];
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.leftBarButtonItems objectAtIndex:0];
@@ -479,7 +487,7 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 
 	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"text": @"test", @"enabled": @false, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.leftBarButtonItems objectAtIndex:0];
@@ -495,7 +503,7 @@
 -(void)testTopBarNoBorderOn {
 	NSNumber* topBarNoBorderInput = @(1);
 	self.options.topBar.noBorder = topBarNoBorderInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil(self.uut.navigationController.navigationBar.shadowImage);
 }
@@ -503,7 +511,7 @@
 -(void)testTopBarNoBorderOff {
 	NSNumber* topBarNoBorderInput = @(0);
 	self.options.topBar.noBorder = topBarNoBorderInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil(self.uut.navigationController.navigationBar.shadowImage);
 }
@@ -511,7 +519,7 @@
 -(void)testStatusBarBlurOn {
 	NSNumber* statusBarBlurInput = @(1);
 	self.options.statusBar.blur = statusBarBlurInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil([self.uut.view viewWithTag:BLUR_STATUS_TAG]);
 }
@@ -519,13 +527,13 @@
 -(void)testStatusBarBlurOff {
 	NSNumber* statusBarBlurInput = @(0);
 	self.options.statusBar.blur = statusBarBlurInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.view viewWithTag:BLUR_STATUS_TAG]);
 }
 
 - (void)testTabBarHidden_default {
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut hidesBottomBarWhenPushed]);
@@ -534,7 +542,7 @@
 
 - (void)testTabBarHidden_true {
 	self.options.bottomTabs.visible = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut hidesBottomBarWhenPushed]);
@@ -542,14 +550,14 @@
 
 - (void)testTabBarHidden_false {
 	self.options.bottomTabs.visible = @(1);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut hidesBottomBarWhenPushed]);
 }
 
 -(void)testTopBarBlur_default {
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -557,7 +565,7 @@
 -(void)testTopBarBlur_false {
 	NSNumber* topBarBlurInput = @(0);
 	self.options.topBar.blur = topBarBlurInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -565,7 +573,7 @@
 -(void)testTopBarBlur_true {
 	NSNumber* topBarBlurInput = @(1);
 	self.options.topBar.blur = topBarBlurInput;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -573,7 +581,7 @@
 -(void)testBackgroundImage {
 	UIImage* backgroundImage = [[UIImage alloc] init];
 	self.options.backgroundImage = backgroundImage;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:backgroundImage]);
@@ -582,14 +590,14 @@
 -(void)testRootBackgroundImage {
 	UIImage* rootBackgroundImage = [[UIImage alloc] init];
 	self.options.rootBackgroundImage = rootBackgroundImage;
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue([[(UIImageView*)self.uut.navigationController.view.subviews[0] image] isEqual:rootBackgroundImage]);
 }
 
 -(void)testTopBarDrawUnder_true {
 	self.options.topBar.drawBehind = @(1);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
@@ -597,7 +605,7 @@
 
 -(void)testTopBarDrawUnder_false {
 	self.options.topBar.drawBehind = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
@@ -605,7 +613,7 @@
 
 -(void)testBottomTabsDrawUnder_true {
 	self.options.bottomTabs.drawBehind = @(1);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
@@ -613,7 +621,7 @@
 
 -(void)testBottomTabsDrawUnder_false {
 	self.options.bottomTabs.drawBehind = @(0);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
@@ -714,17 +722,31 @@
 
 - (void)testTopBarBackgroundClipToBounds_true {
 	self.options.topBar.background.clipToBounds = @(1);
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue(self.uut.navigationController.navigationBar.clipsToBounds);
 }
 
 - (void)testTopBarBackgroundClipToBounds_false {
-	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse(self.uut.navigationController.navigationBar.clipsToBounds);
 }
 
+- (void)testWillMoveToParent_shouldPassOptionsToParent {
+	__unused RNNNavigationController* nav = [self createNavigationController];
+	self.uut.presenter.options.topBar.visible = @(0);
+	[self.uut willMoveToParentViewController:nav];
+	XCTAssertTrue(nav.navigationBarHidden);
+}
+
+- (RNNNavigationController *)createNavigationController {
+	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
+	nav.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:[[RNNNavigationOptions alloc] initWithDict:@{}]];
+	
+	return nav;
+}
+
 @end

lib/ios/ReactNativeNavigationTests/RNNStoreTest.m

@@ -89,12 +89,13 @@
 
 - (void)testGetExternalComponentShouldRetrunSavedComponent {
 	UIViewController* testVC = [UIViewController new];
-	NSString *externalComponentId = @"extId1";
-	[self.store registerExternalComponent:externalComponentId callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] init];
+	layoutInfo.name = @"extId1";
+	[self.store registerExternalComponent:layoutInfo.name callback:^UIViewController *(NSDictionary *props, RCTBridge *bridge) {
 		return testVC;
 	}];
 	
-	UIViewController* savedComponent = [self.store getExternalComponent:externalComponentId props:nil bridge:nil];
+	UIViewController* savedComponent = [self.store getExternalComponent:layoutInfo 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"
-      language = ""
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "NO">
       <Testables>
          <TestableReference
@@ -105,7 +105,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

playground/src/app.js

@@ -37,22 +37,15 @@ function start() {
           waitForRender: false,
         }
       },
-      _animations: {
+      animations: {
         setRoot: {
-          y: {
-            from: 1000,
-            to: 0,
-            duration: 500,
-            interpolation: 'accelerate',
-          },
           alpha: {
             from: 0,
             to: 1,
-            duration: 500,
-            interpolation: 'accelerate'
+            duration: 300
           }
         },
-        push: {
+        _push: {
           topBar: {
             id: 'TEST',
             alpha: {
@@ -91,7 +84,7 @@ function start() {
             }
           }
         },
-        pop: {
+        _pop: {
           topBar: {
             id: 'TEST',
             alpha: {

playground/src/screens/OptionsScreen.js

@@ -233,7 +233,7 @@ class OptionsScreen extends Component {
   }
 
   onClickShowTopBar = () => {
-    Navigation.mergeOptions(this.props.componentId, {
+    Navigation.mergeOptions('TEST', {
       topBar: {
         visible: true,
         animate: true

playground/src/screens/TextScreen.js

@@ -1,7 +1,7 @@
 const React = require('react');
 const { Component } = require('react');
 
-const { View, Text, Button } = require('react-native');
+const { View, Text, Button, Platform } = require('react-native');
 
 const { Navigation } = require('react-native-navigation');
 const testIDs = require('../testIDs');
@@ -28,8 +28,9 @@ class TextScreen extends Component {
         <Button title={'Set Tab Badge'} testID={testIDs.SET_TAB_BADGE_BUTTON} onPress={() => this.onClickSetBadge()} />
         <Button title={'Switch To Tab 2'} testID={testIDs.SWITCH_SECOND_TAB_BUTTON} onPress={() => this.onClickSwitchToTab()} />
         <Button title={'Switch To Tab 1 by componentID'} testID={testIDs.SWITCH_FIRST_TAB_BUTTON} onPress={() => this.onClickSwitchToTabByComponentID()} />
-        <Button title='Hide Tab Bar' testID={testIDs.HIDE_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(false)} />
-        <Button title='Show Tab Bar' testID={testIDs.SHOW_BOTTOM_TABS_BUTTON} onPress={() => this.hideTabBar(true)} />
+        {/* tslint:disable-next-line:max-line-length */}
+        { Platform.OS === 'android' && <Button title='Hide Tab Bar' testID={testIDs.HIDE_BOTTOM_TABS_BUTTON} onPress={() => this.toggleTabBarVisibility(this.props.componentId, false)} /> }
+        { Platform.OS === 'android' && <Button title='Show Tab Bar' testID={testIDs.SHOW_BOTTOM_TABS_BUTTON} onPress={() => this.toggleTabBarVisibility('BottomTabs', true)} /> }
         <Button title='Hide Tab Bar on Push' testID={testIDs.HIDE_BOTTOM_TABS_ON_PUSH_BUTTON} onPress={() => this.hideTabBarOnPush()} />
         <Button title='Show Left Side Menu' testID={testIDs.SHOW_LEFT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('left')} />
         <Button title='Show Right Side Menu' testID={testIDs.SHOW_RIGHT_SIDE_MENU_BUTTON} onPress={() => this.showSideMenu('right')} />
@@ -87,8 +88,8 @@ class TextScreen extends Component {
     });
   }
 
-  hideTabBar(visible) {
-    Navigation.mergeOptions(this.props.componentId, {
+  toggleTabBarVisibility(componentId, visible) {
+    Navigation.mergeOptions(componentId, {
       bottomTabs: {
         visible,
         drawBehind: true,

playground/src/screens/WelcomeScreen.js

@@ -63,6 +63,7 @@ class WelcomeScreen extends Component {
     Navigation.setRoot({
       root: {
         bottomTabs: {
+          id: 'BottomTabs',
           children: [
             {
               stack: {