Detached defaultOptions from presenters (#4219)

lib/ios/RNNBasePresenter.h

@@ -4,18 +4,14 @@
 
 @property (nonatomic, weak) id bindedViewController;
 
-@property (nonatomic, retain) RNNNavigationOptions* defaultOptions;
-
 - (void)bindViewController:(UIViewController *)bindedViewController;
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions;
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions;
+- (void)applyOptions:(RNNNavigationOptions *)options;
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
-
-- (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions;
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions;
 
 @end

lib/ios/RNNBasePresenter.m

@@ -1,23 +1,11 @@
 #import "RNNBasePresenter.h"
-#import "RNNBottomTabPresenter.h"
-
-@interface RNNBasePresenter()
-
-@property (nonatomic, strong) RNNBottomTabPresenter* bottomTabPresenter;
-
-@end
+#import "UIViewController+RNNOptions.h"
+#import "RNNTabBarItemCreator.h"
 
 @implementation RNNBasePresenter
 
-- (instancetype)init {
-	self = [super init];
-	self.bottomTabPresenter = [[RNNBottomTabPresenter alloc] init];
-	return self;
-}
-
 - (void)bindViewController:(UIViewController *)bindedViewController {
 	_bindedViewController = bindedViewController;
-	[self.bottomTabPresenter bindViewController:bindedViewController];
 }
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
@@ -25,20 +13,30 @@
 }
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
-	[self.bottomTabPresenter applyOptions:options];
+	UIViewController* viewController = self.bindedViewController;
+	if ((options.bottomTab.text.hasValue || options.bottomTab.icon.hasValue || options.bottomTab.selectedIcon.hasValue)) {
+		UITabBarItem* tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:options.bottomTab];
+		viewController.tabBarItem = tabItem;
+		[options.bottomTab.text consume];
+		[options.bottomTab.icon consume];
+		[options.bottomTab.selectedIcon consume];
+	}
 }
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions {
-	[self.bottomTabPresenter applyOptions:initialOptions];
+- (void)applyOptions:(RNNNavigationOptions *)options {
+	UIViewController* viewController = self.bindedViewController;
+	
+	if ([viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
+		[viewController rnn_setTabBarItemBadge:[options.bottomTab.badge getWithDefaultValue:nil]];
+	}
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	[self.bottomTabPresenter mergeOptions:options resolvedOptions:resolvedOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	UIViewController* viewController = self.bindedViewController;
+	if (newOptions.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
+		[viewController rnn_setTabBarItemBadge:newOptions.bottomTab.badge.get];
+	}
 }
 
-- (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {
-	_defaultOptions = defaultOptions;
-	[self.bottomTabPresenter setDefaultOptions:defaultOptions];
-}
 
 @end

lib/ios/RNNBottomTabPresenter.h

@@ -1,13 +0,0 @@
-#import "RNNBasePresenter.h"
-
-@interface RNNBottomTabPresenter : NSObject
-
-- (void)bindViewController:(UIViewController *)viewController;
-
-- (void)applyOptions:(RNNNavigationOptions *)options;
-
-- (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions;
-
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
-
-@end

lib/ios/RNNBottomTabPresenter.m

@@ -1,45 +0,0 @@
-#import "RNNBottomTabPresenter.h"
-#import "RNNTabBarItemCreator.h"
-#import "UIViewController+RNNOptions.h"
-
-@interface RNNBottomTabPresenter()
-
-@property (nonatomic, weak) id bindedViewController;
-@property (nonatomic, retain) RNNNavigationOptions* defaultOptions;
-
-@end
-
-@implementation RNNBottomTabPresenter
-
-- (void)bindViewController:(UIViewController *)viewController {
-	_bindedViewController = viewController;
-}
-
-- (void)applyOptions:(RNNNavigationOptions *)options {
-	UIViewController* viewController = self.bindedViewController;
-	if ((options.bottomTab.text.hasValue || options.bottomTab.icon.hasValue || options.bottomTab.selectedIcon.hasValue)) {
-		RNNNavigationOptions* withDefault = (RNNNavigationOptions *)[[options copy] withDefault:self.defaultOptions];
-		UITabBarItem* tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:withDefault.bottomTab];
-		viewController.tabBarItem = tabItem;
-		[options.bottomTab.text consume];
-		[options.bottomTab.icon consume];
-		[options.bottomTab.selectedIcon consume];
-	}
-	
-	if ([viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-		[viewController rnn_setTabBarItemBadge:[options.bottomTab.badge getWithDefaultValue:nil]];
-	}
-}
-
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	UIViewController* viewController = self.bindedViewController;
-	if (options.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-		[viewController rnn_setTabBarItemBadge:options.bottomTab.badge.get];
-	}
-}
-
-- (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {
-	_defaultOptions = defaultOptions;
-}
-
-@end

lib/ios/RNNCommandsHandler.m

@@ -75,7 +75,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		[CATransaction begin];
 		[CATransaction setCompletionBlock:completion];
 		
-		[vc.options overrideOptions:newOptions];
+		[vc overrideOptions:newOptions];
 		[vc mergeOptions:newOptions];
 
 		[CATransaction commit];
@@ -99,7 +99,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	UIViewController<RNNLayoutProtocol> *newVc = [_controllerFactory createLayout:layout saveToStore:_store];
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	
-	if ([[newVc.options.preview.reactTag getWithDefaultValue:@(0)] floatValue] > 0) {
+	if ([[newVc.resolveOptions.preview.reactTag getWithDefaultValue:@(0)] floatValue] > 0) {
 		UIViewController* vc = [_store findComponentForId:componentId];
 		
 		if([vc isKindOfClass:[RNNRootViewController class]]) {
@@ -109,7 +109,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
       		rootVc.previewCallback = ^(UIViewController *vcc) {
 				RNNRootViewController* rvc  = (RNNRootViewController*)vcc;
 				[self->_eventEmitter sendOnPreviewCompleted:componentId previewComponentId:newVc.layoutInfo.componentId];
-				if ([newVc.options.preview.commit getWithDefaultValue:NO]) {
+				if ([newVc.resolveOptions.preview.commit getWithDefaultValue:NO]) {
 					[CATransaction begin];
 					[CATransaction setCompletionBlock:^{
 						[self->_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
@@ -122,27 +122,27 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			
 			CGSize size = CGSizeMake(rootVc.view.frame.size.width, rootVc.view.frame.size.height);
 			
-			if (newVc.options.preview.width.hasValue) {
-				size.width = [newVc.options.preview.width.get floatValue];
+			if (newVc.resolveOptions.preview.width.hasValue) {
+				size.width = [newVc.resolveOptions.preview.width.get floatValue];
 			}
 			
-			if (newVc.options.preview.height.hasValue) {
-				size.height = [newVc.options.preview.height.get floatValue];
+			if (newVc.resolveOptions.preview.height.hasValue) {
+				size.height = [newVc.resolveOptions.preview.height.get floatValue];
 			}
 			
-			if (newVc.options.preview.width.hasValue || newVc.options.preview.height.hasValue) {
+			if (newVc.resolveOptions.preview.width.hasValue || newVc.resolveOptions.preview.height.hasValue) {
 				newVc.preferredContentSize = size;
 			}
       
 			RCTExecuteOnMainQueue(^{
-				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.options.preview.reactTag.get];
+				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.resolveOptions.preview.reactTag.get];
 				[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
 			});
 		}
 	} else {
-		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.getCurrentChild.isCustomTransitioned) ? newVc : nil;
-		[newVc.getCurrentChild 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.resolveOptions.animations.push.hasCustomAnimation || newVc.getCurrentChild.isCustomTransitioned) ? newVc : nil;
+		[newVc.getCurrentChild waitForReactViewRender:(newVc.resolveOptions.animations.push.waitForRender || animationDelegate) perform:^{
+			[_stackManager push:newVc onTop:fromVC animated:newVc.resolveOptions.animations.push.enable animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 				completion();
 			} rejection:rejection];
@@ -154,7 +154,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol> *newVC = [_controllerFactory createLayout:layout saveToStore:_store];
-	RNNNavigationOptions* options = [newVC getCurrentChild].options;
+	RNNNavigationOptions* options = [newVC getCurrentChild].resolveOptions;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
 	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:options.animations.setStackRoot.enable completion:^{
@@ -168,12 +168,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	[vc.options overrideOptions:options];
+	[vc overrideOptions:options];
 	
 	UINavigationController *nvc = vc.navigationController;
 	
 	if ([nvc topViewController] == vc) {
-		if (vc.options.animations.pop) {
+		if (vc.resolveOptions.animations.pop) {
 			nvc.delegate = vc;
 		} else {
 			nvc.delegate = nil;
@@ -181,10 +181,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.resolveOptions.animations.pop.enable];
 	}
 	
-	[_stackManager pop:vc animated:vc.options.animations.pop.enable completion:^{
+	[_stackManager pop:vc animated:vc.resolveOptions.animations.pop.enable completion:^{
 		[_store removeComponent:componentId];
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
@@ -195,9 +195,9 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	[vc.options overrideOptions:options];
+	[vc overrideOptions:options];
 	
-	[_stackManager popTo:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popTo:vc animated:vc.resolveOptions.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
 		[self removePopedViewControllers:poppedViewControllers];
 		completion();
@@ -208,7 +208,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	[vc.options overrideOptions:options];
+	[vc overrideOptions:options];
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
@@ -216,7 +216,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_stackManager popToRoot:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popToRoot:vc animated:vc.resolveOptions.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[self removePopedViewControllers:poppedViewControllers];
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		
@@ -230,8 +230,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayout:layout saveToStore:_store];
 	
-	[newVc.getCurrentChild waitForReactViewRender:newVc.getCurrentChild.options.animations.showModal.waitForRender perform:^{
-		[_modalManager showModal:newVc animated:newVc.getCurrentChild.options.animations.showModal.enable hasCustomAnimation:newVc.getCurrentChild.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
+	[newVc.getCurrentChild waitForReactViewRender:newVc.getCurrentChild.resolveOptions.animations.showModal.waitForRender perform:^{
+		[_modalManager showModal:newVc animated:newVc.getCurrentChild.resolveOptions.animations.showModal.enable hasCustomAnimation:newVc.getCurrentChild.resolveOptions.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
 			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 			completion(componentId);
 		}];
@@ -249,7 +249,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	}
 	
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	[modalToDismiss.getCurrentChild.options overrideOptions:options];
+	[modalToDismiss.getCurrentChild overrideOptions:options];
 	
 	[self removePopedViewControllers:modalToDismiss.navigationController.viewControllers];
 	

lib/ios/RNNControllerFactory.m

@@ -105,9 +105,9 @@
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
+
 	
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
 	
 	if (!component.isExternalViewController) {
 		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
@@ -121,11 +121,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 	
 	UIViewController* externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
 	
-	RNNRootViewController* component = [[RNNRootViewController alloc] initExternalComponentWithLayoutInfo:layoutInfo eventEmitter:_eventEmitter presenter:presenter options:options];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initExternalComponentWithLayoutInfo:layoutInfo eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
 	[component bindViewController:externalVC];
 	
 	return (UIViewController<RNNParentProtocol> *)component;
@@ -134,14 +133,13 @@
 
 - (UIViewController<RNNParentProtocol> *)createStack:(RNNLayoutNode*)node {
 	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 	
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:_defaultOptions presenter:presenter];
 	
 	return stack;
 }
@@ -150,11 +148,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter eventEmitter:_eventEmitter];
+	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:_defaultOptions presenter:presenter eventEmitter:_eventEmitter];
 	
 	return tabsController;
 }
@@ -163,11 +160,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNTopTabsViewController* topTabsController = [[RNNTopTabsViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	RNNTopTabsViewController* topTabsController = [[RNNTopTabsViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:_defaultOptions presenter:presenter];
 	
 	return topTabsController;
 }
@@ -176,11 +172,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	RNNSideMenuPresenter* presenter = [[RNNSideMenuPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:_defaultOptions presenter:presenter];
 	
 	return sideMenu;
 }
@@ -191,7 +186,7 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 
-	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo childViewControllers:@[childVc] options:options presenter:[[RNNViewControllerPresenter alloc] init] type:type];
+	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo childViewControllers:@[childVc] options:options defaultOptions:_defaultOptions presenter:[[RNNViewControllerPresenter alloc] init] type:type];
 	
 	return sideMenuChild;
 }
@@ -200,11 +195,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	[presenter setDefaultOptions:_defaultOptions];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 
-	RNNSplitViewController* splitViewController = [[RNNSplitViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	RNNSplitViewController* splitViewController = [[RNNSplitViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:_defaultOptions presenter:presenter];
 
 	return splitViewController;
 }

lib/ios/RNNDefaultOptionsHelper.m

@@ -4,11 +4,11 @@
 
 + (void)recrusivelySetDefaultOptions:(RNNNavigationOptions *)defaultOptions onRootViewController:(UIViewController *)rootViewController {
 	if ([rootViewController conformsToProtocol:@protocol(RNNLayoutProtocol)])
-		[((UIViewController<RNNLayoutProtocol> *)rootViewController).presenter setDefaultOptions:defaultOptions];
+		[((UIViewController<RNNLayoutProtocol> *)rootViewController) setDefaultOptions:defaultOptions];
 	
 	for (UIViewController<RNNLayoutProtocol>* childViewController in rootViewController.childViewControllers) {
 		if ([childViewController conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
-			[childViewController.presenter setDefaultOptions:defaultOptions];
+			[childViewController setDefaultOptions:defaultOptions];
 		}
 		
 		[self recrusivelySetDefaultOptions:defaultOptions onRootViewController:childViewController];

lib/ios/RNNLayoutProtocol.h

@@ -9,6 +9,7 @@
 @property (nonatomic, retain) RNNBasePresenter* presenter;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
 - (UIViewController<RNNLeafProtocol, RNNLayoutProtocol> *)getCurrentChild;
 
@@ -16,4 +17,8 @@
 
 - (RNNNavigationOptions *)resolveOptions;
 
+- (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions;
+
+- (void)overrideOptions:(RNNNavigationOptions *)options;
+
 @end

lib/ios/RNNModalManager.m

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

lib/ios/RNNNavigationController.h

@@ -8,6 +8,7 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNNavigationControllerPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
 - (void)setTopBarBackgroundColor:(UIColor *)backgroundColor;
 

lib/ios/RNNNavigationController.m

@@ -13,11 +13,13 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
 @implementation RNNNavigationController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNNavigationControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNNavigationControllerPresenter *)presenter {
 	self = [super init];
 
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
+	
+	self.defaultOptions = defaultOptions;
 	self.options = options;
 	
 	self.layoutInfo = layoutInfo;
@@ -29,7 +31,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
 	if (parent) {
-		[_presenter applyOptionsOnWillMoveToParentViewController:self.options];
+		[_presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
 	}
 }
 
@@ -39,14 +41,18 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (UITabBarItem *)tabBarItem {
 	return self.viewControllers.firstObject.tabBarItem;
 }
@@ -72,7 +78,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[self setTopBarBackgroundColor:[rnnController.options.topBar.background.color getWithDefaultValue:nil]];
+			[self setTopBarBackgroundColor:[rnnController.resolveOptions.topBar.background.color getWithDefaultValue:nil]];
 		}
 	}
 	
@@ -80,11 +86,11 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.resolveOptions.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.resolveOptions.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)getCurrentChild {

lib/ios/RNNNavigationControllerPresenter.m

@@ -5,10 +5,8 @@
 
 @implementation RNNNavigationControllerPresenter
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions {
-	[super applyOptions:initialOptions];
-	RNNNavigationOptions* options = [initialOptions withDefault:self.defaultOptions];
-	
+- (void)applyOptions:(RNNNavigationOptions *)options {
+	[super applyOptions:options];
 	
 	RNNNavigationController* navigationController = self.bindedViewController;
 	
@@ -37,72 +35,71 @@
 	[navigationController rnn_setBackButtonIcon:[options.topBar.backButton.icon getWithDefaultValue:nil] withColor:[options.topBar.backButton.color getWithDefaultValue:nil] title:[options.topBar.backButton.showTitle getWithDefaultValue:YES] ? [options.topBar.backButton.title getWithDefaultValue:nil] : @""];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	[super mergeOptions:options resolvedOptions:resolvedOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	[super mergeOptions:newOptions currentOptions:currentOptions defaultOptions:defaultOptions];
 	
 	RNNNavigationController* navigationController = self.bindedViewController;
-	RNNNavigationOptions* withDefault = (RNNNavigationOptions *)[options withDefault:self.defaultOptions];
 	
-	if (options.popGesture.hasValue) {
-		[navigationController rnn_setInteractivePopGestureEnabled:withDefault.popGesture.get];
+	if (newOptions.popGesture.hasValue) {
+		[navigationController rnn_setInteractivePopGestureEnabled:newOptions.popGesture.get];
 	}
 	
-	if (options.rootBackgroundImage.hasValue) {
-		[navigationController rnn_setRootBackgroundImage:withDefault.rootBackgroundImage.get];
+	if (newOptions.rootBackgroundImage.hasValue) {
+		[navigationController rnn_setRootBackgroundImage:newOptions.rootBackgroundImage.get];
 	}
 	
-	if (options.topBar.testID.hasValue) {
-		[navigationController rnn_setNavigationBarTestID:withDefault.topBar.testID.get];
+	if (newOptions.topBar.testID.hasValue) {
+		[navigationController rnn_setNavigationBarTestID:newOptions.topBar.testID.get];
 	}
 	
-	if (options.topBar.visible.hasValue) {
-		[navigationController rnn_setNavigationBarVisible:withDefault.topBar.visible.get animated:[withDefault.topBar.animate getWithDefaultValue:YES]];
+	if (newOptions.topBar.visible.hasValue) {
+		[navigationController rnn_setNavigationBarVisible:newOptions.topBar.visible.get animated:[newOptions.topBar.animate getWithDefaultValue:YES]];
 	}
 	
-	if (options.topBar.hideOnScroll.hasValue) {
-		[navigationController rnn_hideBarsOnScroll:[withDefault.topBar.hideOnScroll get]];
+	if (newOptions.topBar.hideOnScroll.hasValue) {
+		[navigationController rnn_hideBarsOnScroll:[newOptions.topBar.hideOnScroll get]];
 	}
 	
-	if (options.topBar.noBorder.hasValue) {
-		[navigationController rnn_setNavigationBarNoBorder:[withDefault.topBar.noBorder get]];
+	if (newOptions.topBar.noBorder.hasValue) {
+		[navigationController rnn_setNavigationBarNoBorder:[newOptions.topBar.noBorder get]];
 	}
 	
-	if (options.topBar.barStyle.hasValue) {
-		[navigationController rnn_setBarStyle:[RCTConvert UIBarStyle:withDefault.topBar.barStyle.get]];
+	if (newOptions.topBar.barStyle.hasValue) {
+		[navigationController rnn_setBarStyle:[RCTConvert UIBarStyle:newOptions.topBar.barStyle.get]];
 	}
 	
-	if (options.topBar.background.translucent.hasValue) {
-		[navigationController rnn_setNavigationBarTranslucent:[withDefault.topBar.background.translucent get]];
+	if (newOptions.topBar.background.translucent.hasValue) {
+		[navigationController rnn_setNavigationBarTranslucent:[newOptions.topBar.background.translucent get]];
 	}
 	
-	if (options.topBar.background.clipToBounds.hasValue) {
-		[navigationController rnn_setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds get]];
+	if (newOptions.topBar.background.clipToBounds.hasValue) {
+		[navigationController rnn_setNavigationBarClipsToBounds:[newOptions.topBar.background.clipToBounds get]];
 	}
 	
-	if (options.topBar.background.blur.hasValue) {
-		[navigationController rnn_setNavigationBarBlur:[withDefault.topBar.background.blur get]];
+	if (newOptions.topBar.background.blur.hasValue) {
+		[navigationController rnn_setNavigationBarBlur:[newOptions.topBar.background.blur get]];
 	}
 	
-	if (options.topBar.background.color.hasValue) {
-		[navigationController setTopBarBackgroundColor:withDefault.topBar.background.color.get];
+	if (newOptions.topBar.background.color.hasValue) {
+		[navigationController setTopBarBackgroundColor:newOptions.topBar.background.color.get];
 	}
 	
-	if (options.topBar.largeTitle.visible.hasValue) {
-		[navigationController rnn_setNavigationBarLargeTitleVisible:withDefault.topBar.largeTitle.visible.get];
+	if (newOptions.topBar.largeTitle.visible.hasValue) {
+		[navigationController rnn_setNavigationBarLargeTitleVisible:newOptions.topBar.largeTitle.visible.get];
 	}
 	
-	if (options.topBar.backButton.icon.hasValue) {
-		[navigationController rnn_setBackButtonIcon:[withDefault.topBar.backButton.icon getWithDefaultValue:nil] withColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil] title:[withDefault.topBar.backButton.showTitle getWithDefaultValue:YES] ? [withDefault.topBar.backButton.title getWithDefaultValue:nil] : @""];
+	if (newOptions.topBar.backButton.icon.hasValue) {
+		[navigationController rnn_setBackButtonIcon:[newOptions.topBar.backButton.icon getWithDefaultValue:nil] withColor:[newOptions.topBar.backButton.color getWithDefaultValue:nil] title:[newOptions.topBar.backButton.showTitle getWithDefaultValue:YES] ? [newOptions.topBar.backButton.title getWithDefaultValue:nil] : @""];
 		
 	}
 	
-	if (options.topBar.backButton.color.hasValue) {
-		[navigationController rnn_setBackButtonColor:options.topBar.backButton.color.get];
+	if (newOptions.topBar.backButton.color.hasValue) {
+		[navigationController rnn_setBackButtonColor:newOptions.topBar.backButton.color.get];
 	}
 	
-	[navigationController rnn_setNavigationBarLargeTitleFontFamily:[withDefault.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.largeTitle.color getWithDefaultValue:nil]];
+	[navigationController rnn_setNavigationBarLargeTitleFontFamily:[newOptions.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.largeTitle.color getWithDefaultValue:nil]];
 	
-	[navigationController rnn_setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
+	[navigationController rnn_setNavigationBarFontFamily:[newOptions.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.title.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.title.color getWithDefaultValue:nil]];
 	
 }
 

lib/ios/RNNParentProtocol.h

@@ -5,7 +5,7 @@
 
 @required
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter;
 
 - (void)onChildWillAppear;
 

lib/ios/RNNRootViewController.h

@@ -17,6 +17,7 @@ typedef void (^PreviewCallback)(UIViewController *vc);
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, strong) RNNViewControllerPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
 @property (nonatomic) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) RNNAnimator* animator;
@@ -27,15 +28,18 @@ typedef void (^PreviewCallback)(UIViewController *vc);
 				   rootViewCreator:(id<RNNRootViewCreator>)creator
 					  eventEmitter:(RNNEventEmitter*)eventEmitter
 						 presenter:(RNNViewControllerPresenter *)presenter
-						   options:(RNNNavigationOptions *)options;
+						   options:(RNNNavigationOptions *)options
+					defaultOptions:(RNNNavigationOptions *)defaultOptions;
 
 - (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
 									   eventEmitter:(RNNEventEmitter*)eventEmitter
 										  presenter:(RNNViewControllerPresenter *)presenter
-											options:(RNNNavigationOptions *)options;
+											options:(RNNNavigationOptions *)options
+									 defaultOptions:(RNNNavigationOptions *)defaultOptions;
 
 - (BOOL)isExternalViewController;
 
--(void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem;
+- (void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem;
+
 
 @end

lib/ios/RNNRootViewController.m

@@ -22,7 +22,7 @@
 
 @synthesize previewCallback;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
 	self = [super init];
 	
 	self.layoutInfo = layoutInfo;
@@ -39,9 +39,11 @@
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	self.options = options;
-	[self.presenter applyOptionsOnInit:self.options];
+	self.defaultOptions = defaultOptions;
 	
-	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.optionsWithDefault.customTransition];
+	[self.presenter applyOptionsOnInit:self.resolveOptions];
+	
+	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.resolveOptions.customTransition];
 	
 	[[NSNotificationCenter defaultCenter] addObserver:self
 											 selector:@selector(onJsReload)
@@ -52,8 +54,8 @@
 	return self;
 }
 
-- (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options {
-	self = [self initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:eventEmitter presenter:presenter options:options];
+- (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	self = [self initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:eventEmitter presenter:presenter options:options defaultOptions:defaultOptions];
 	return self;
 }
 
@@ -65,29 +67,33 @@
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
 	if (parent) {
-		[_presenter applyOptionsOnWillMoveToParentViewController:self.options];
+		[_presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
 	}
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 	
 	[self initCustomViews];
 }
 
--(void)viewWillAppear:(BOOL)animated{
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
+- (void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	_isBeingPresented = YES;
 	
-	[_presenter applyOptions:self.options];
+	[_presenter applyOptions:self.resolveOptions];
 	[((UIViewController<RNNParentProtocol> *)self.parentViewController) onChildWillAppear];
 	
 	[self initCustomViews];
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return self.options;
+	return [self.options withDefault:self.defaultOptions];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
@@ -156,18 +162,18 @@
 }
 
 - (void)setTitleViewWithSubtitle {
-	if (self.optionsWithDefault.topBar.subtitle.text.hasValue) {
-		RNNTitleViewHelper* titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:self.optionsWithDefault.topBar.title subTitleOptions:self.optionsWithDefault.topBar.subtitle viewController:self];
+	if (self.resolveOptions.topBar.subtitle.text.hasValue) {
+		RNNTitleViewHelper* titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:self.resolveOptions.topBar.title subTitleOptions:self.resolveOptions.topBar.subtitle viewController:self];
 		[titleViewHelper setup];
 	}
 }
 
 - (void)setCustomNavigationTitleView {
 	if (!_customTitleView && _isBeingPresented) {
-		if (self.optionsWithDefault.topBar.title.component.name.hasValue) {
-			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.optionsWithDefault.topBar.title.component];
+		if (self.resolveOptions.topBar.title.component.name.hasValue) {
+			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.resolveOptions.topBar.title.component];
 			_customTitleView.backgroundColor = UIColor.clearColor;
-			NSString* alignment = [self.optionsWithDefault.topBar.title.component.alignment getWithDefaultValue:@""];
+			NSString* alignment = [self.resolveOptions.topBar.title.component.alignment getWithDefaultValue:@""];
 			[_customTitleView setAlignment:alignment];
 			BOOL isCenter = [alignment isEqualToString:@"center"];
 			__weak RNNReactView *weakTitleView = _customTitleView;
@@ -193,8 +199,8 @@
 
 - (void)setCustomNavigationBarView {
 	if (!_customTopBar) {
-		if (self.optionsWithDefault.topBar.component.name.hasValue) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.optionsWithDefault.topBar.component];
+		if (self.resolveOptions.topBar.component.name.hasValue) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.resolveOptions.topBar.component];
 			
 			_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			reactView.backgroundColor = UIColor.clearColor;
@@ -213,8 +219,8 @@
 
 - (void)setCustomNavigationComponentBackground {
 	if (!_customTopBarBackground) {
-		if (self.optionsWithDefault.topBar.background.component.name.hasValue) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.optionsWithDefault.topBar.background.component];
+		if (self.resolveOptions.topBar.background.component.name.hasValue) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.resolveOptions.topBar.background.component];
 			
 			_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
@@ -230,12 +236,8 @@
 	}
 }
 
-- (RNNNavigationOptions *)optionsWithDefault {
-	return (RNNNavigationOptions *)[[self.options copy] withDefault:_presenter.defaultOptions];
-}
-
 -(BOOL)isCustomTransitioned {
-	return self.optionsWithDefault.customTransition.animations != nil;
+	return self.resolveOptions.customTransition.animations != nil;
 }
 
 - (BOOL)isExternalViewController {
@@ -243,9 +245,9 @@
 }
 
 - (BOOL)prefersStatusBarHidden {
-	if (self.optionsWithDefault.statusBar.visible.hasValue) {
-		return ![self.optionsWithDefault.statusBar.visible get];
-	} else if ([self.optionsWithDefault.statusBar.hideWithTopBar getWithDefaultValue:NO]) {
+	if (self.resolveOptions.statusBar.visible.hasValue) {
+		return ![self.resolveOptions.statusBar.visible get];
+	} else if ([self.resolveOptions.statusBar.hideWithTopBar getWithDefaultValue:NO]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
 	
@@ -253,7 +255,7 @@
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	if ([[self.optionsWithDefault.statusBar.style getWithDefaultValue:@"default"] isEqualToString:@"light"]) {
+	if ([[self.resolveOptions.statusBar.style getWithDefaultValue:@"default"] isEqualToString:@"light"]) {
 		return UIStatusBarStyleLightContent;
 	} else {
 		return UIStatusBarStyleDefault;
@@ -261,12 +263,12 @@
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	return self.optionsWithDefault.layout.supportedOrientations;
+	return self.resolveOptions.layout.supportedOrientations;
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
-	if (![[vc.optionsWithDefault.topBar.backButton.transition getWithDefaultValue:@""] isEqualToString:@"custom"]){
+	if (![[vc.self.resolveOptions.topBar.backButton.transition getWithDefaultValue:@""] isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}
 }
@@ -277,10 +279,10 @@
 												 toViewController:(UIViewController*)toVC {
 	if (self.animator) {
 		return self.animator;
-	} else if (operation == UINavigationControllerOperationPush && self.optionsWithDefault.animations.push.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.optionsWithDefault.animations.push];
-	} else if (operation == UINavigationControllerOperationPop && self.optionsWithDefault.animations.pop.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.optionsWithDefault.animations.pop];
+	} else if (operation == UINavigationControllerOperationPush && self.resolveOptions.animations.push.hasCustomAnimation) {
+		return [[RNNPushAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.push];
+	} else if (operation == UINavigationControllerOperationPop && self.resolveOptions.animations.pop.hasCustomAnimation) {
+		return [[RNNPushAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.pop];
 	} else {
 		return nil;
 	}
@@ -289,11 +291,11 @@
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.optionsWithDefault.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.optionsWithDefault.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location{
@@ -328,7 +330,7 @@
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems {
 	NSMutableArray *actions = [[NSMutableArray alloc] init];
-	for (NSDictionary *previewAction in self.options.preview.actions) {
+	for (NSDictionary *previewAction in self.resolveOptions.preview.actions) {
 		UIPreviewAction *action = [self convertAction:previewAction];
 		NSDictionary *actionActions = previewAction[@"actions"];
 		if (actionActions.count > 0) {

lib/ios/RNNSideMenuChildVC.h

@@ -16,7 +16,8 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNViewControllerPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter type:(RNNSideMenuChildType)type;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -9,15 +9,15 @@
 
 @implementation RNNSideMenuChildVC
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter type:(RNNSideMenuChildType)type {
-	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter type:(RNNSideMenuChildType)type {
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:defaultOptions presenter:presenter];
 	
 	self.type = type;
 
 	return self;
 }
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter {
 	self = [super init];
 	
 	self.child = childViewControllers[0];
@@ -25,7 +25,7 @@
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	
-	
+	self.defaultOptions = defaultOptions;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
 	
@@ -40,14 +40,18 @@
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (UITabBarItem *)tabBarItem {
 	return self.child.tabBarItem;
 }

lib/ios/RNNSideMenuController.h

@@ -12,6 +12,7 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNViewControllerPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
 - (void)side:(MMDrawerSide)side enabled:(BOOL)enabled;
 - (void)side:(MMDrawerSide)side visible:(BOOL)visible;

lib/ios/RNNSideMenuController.m

@@ -13,13 +13,14 @@
 
 @implementation RNNSideMenuController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter {
 	[self setControllers:childViewControllers];
 	self = [super initWithCenterViewController:self.center leftDrawerViewController:self.left rightDrawerViewController:self.right];
 	
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	
+	self.defaultOptions = defaultOptions;
 	self.options = options;
 	
 	self.layoutInfo = layoutInfo;
@@ -36,7 +37,7 @@
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
 	if (parent) {
-		[_presenter applyOptionsOnWillMoveToParentViewController:self.options];
+		[_presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
 	}
 }
 
@@ -50,14 +51,18 @@
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (void)setAnimationType:(NSString *)animationType {
 	MMDrawerControllerDrawerVisualStateBlock animationTypeStateBlock = nil;
 	if ([animationType isEqualToString:@"door"]) animationTypeStateBlock = [MMDrawerVisualState swingingDoorVisualStateBlock];

lib/ios/RNNSideMenuPresenter.m

@@ -3,11 +3,9 @@
 
 @implementation RNNSideMenuPresenter
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions {
-	[super applyOptions:initialOptions];
-	
-	RNNNavigationOptions* options = [initialOptions withDefault:self.defaultOptions];
-	
+- (void)applyOptions:(RNNNavigationOptions *)options {
+	[super applyOptions:options];
+		
 	RNNSideMenuController* sideMenuController = self.bindedViewController;
 	
 	[sideMenuController side:MMDrawerSideLeft enabled:[options.sideMenu.left.enabled getWithDefaultValue:YES]];
@@ -30,57 +28,57 @@
 	}
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	[super mergeOptions:options resolvedOptions:resolvedOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	[super mergeOptions:newOptions currentOptions:currentOptions defaultOptions:defaultOptions];
 	
 	RNNSideMenuController* sideMenuController = self.bindedViewController;
 	
-	if (options.sideMenu.left.enabled.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft enabled:options.sideMenu.left.enabled.get];
-		[options.sideMenu.left.enabled consume];
+	if (newOptions.sideMenu.left.enabled.hasValue) {
+		[sideMenuController side:MMDrawerSideLeft enabled:newOptions.sideMenu.left.enabled.get];
+		[newOptions.sideMenu.left.enabled consume];
 	}
 	
-	if (options.sideMenu.right.enabled.hasValue) {
-		[sideMenuController side:MMDrawerSideRight enabled:options.sideMenu.right.enabled.get];
-		[options.sideMenu.right.enabled consume];
+	if (newOptions.sideMenu.right.enabled.hasValue) {
+		[sideMenuController side:MMDrawerSideRight enabled:newOptions.sideMenu.right.enabled.get];
+		[newOptions.sideMenu.right.enabled consume];
 	}
 	
-	if (options.sideMenu.left.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft visible:options.sideMenu.left.visible.get];
-		[options.sideMenu.left.visible consume];
+	if (newOptions.sideMenu.left.visible.hasValue) {
+		[sideMenuController side:MMDrawerSideLeft visible:newOptions.sideMenu.left.visible.get];
+		[newOptions.sideMenu.left.visible consume];
 	}
 	
-	if (options.sideMenu.right.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideRight visible:options.sideMenu.right.visible.get];
-		[options.sideMenu.right.visible consume];
+	if (newOptions.sideMenu.right.visible.hasValue) {
+		[sideMenuController side:MMDrawerSideRight visible:newOptions.sideMenu.right.visible.get];
+		[newOptions.sideMenu.right.visible consume];
 	}
 	
-	if (options.sideMenu.left.width.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft width:options.sideMenu.left.width.get];
+	if (newOptions.sideMenu.left.width.hasValue) {
+		[sideMenuController side:MMDrawerSideLeft width:newOptions.sideMenu.left.width.get];
 	}
 	
-	if (options.sideMenu.right.width.hasValue) {
-		[sideMenuController side:MMDrawerSideRight width:options.sideMenu.right.width.get];
+	if (newOptions.sideMenu.right.width.hasValue) {
+		[sideMenuController side:MMDrawerSideRight width:newOptions.sideMenu.right.width.get];
 	}
 	
-	if (options.sideMenu.left.shouldStretchDrawer.hasValue) {
-		sideMenuController.shouldStretchLeftDrawer = options.sideMenu.left.shouldStretchDrawer.get;
+	if (newOptions.sideMenu.left.shouldStretchDrawer.hasValue) {
+		sideMenuController.shouldStretchLeftDrawer = newOptions.sideMenu.left.shouldStretchDrawer.get;
 	}
 	
-	if (options.sideMenu.right.shouldStretchDrawer.hasValue) {
-		sideMenuController.shouldStretchRightDrawer = options.sideMenu.right.shouldStretchDrawer.get;
+	if (newOptions.sideMenu.right.shouldStretchDrawer.hasValue) {
+		sideMenuController.shouldStretchRightDrawer = newOptions.sideMenu.right.shouldStretchDrawer.get;
 	}
 	
-	if (options.sideMenu.left.animationVelocity.hasValue) {
-		sideMenuController.animationVelocityLeft = options.sideMenu.left.animationVelocity.get;
+	if (newOptions.sideMenu.left.animationVelocity.hasValue) {
+		sideMenuController.animationVelocityLeft = newOptions.sideMenu.left.animationVelocity.get;
 	}
 	
-	if (options.sideMenu.right.animationVelocity.hasValue) {
-		sideMenuController.animationVelocityRight = options.sideMenu.right.animationVelocity.get;
+	if (newOptions.sideMenu.right.animationVelocity.hasValue) {
+		sideMenuController.animationVelocityRight = newOptions.sideMenu.right.animationVelocity.get;
 	}
 	
-	if (options.sideMenu.animationType.hasValue) {
-		[sideMenuController setAnimationType:options.sideMenu.animationType.get];
+	if (newOptions.sideMenu.animationType.hasValue) {
+		[sideMenuController setAnimationType:newOptions.sideMenu.animationType.get];
 	}
 }
 

lib/ios/RNNSplitViewController.h

@@ -12,6 +12,7 @@
 @interface RNNSplitViewController : UISplitViewController <RNNParentProtocol>
 
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNViewControllerPresenter* presenter;
 

lib/ios/RNNSplitViewController.m

@@ -2,12 +2,13 @@
 
 @implementation RNNSplitViewController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter {
 	self = [super init];
 	
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	
+	self.defaultOptions = defaultOptions;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
 	
@@ -24,14 +25,18 @@
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (void)bindChildViewControllers:(NSArray<UIViewController<RNNLayoutProtocol> *> *)viewControllers {
 	[self setViewControllers:viewControllers];
 	UIViewController<UISplitViewControllerDelegate>* masterViewController = viewControllers[0];

lib/ios/RNNTabBarController.h

@@ -5,13 +5,14 @@
 
 @interface RNNTabBarController : UITabBarController <RNNParentProtocol, UITabBarControllerDelegate>
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNTabBarPresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNTabBarPresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter;
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID;
 
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNTabBarPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 
 @end

lib/ios/RNNTabBarController.m

@@ -7,9 +7,10 @@
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
 			  childViewControllers:(NSArray *)childViewControllers
 						   options:(RNNNavigationOptions *)options
+					defaultOptions:(RNNNavigationOptions *)defaultOptions
 						 presenter:(RNNTabBarPresenter *)presenter
 					  eventEmitter:(RNNEventEmitter *)eventEmitter {
-	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:defaultOptions presenter:presenter];
 	
 	_eventEmitter = eventEmitter;
 	
@@ -19,11 +20,13 @@
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
 			  childViewControllers:(NSArray *)childViewControllers
 						   options:(RNNNavigationOptions *)options
+					defaultOptions:(RNNNavigationOptions *)defaultOptions
 						 presenter:(RNNTabBarPresenter *)presenter {
 	self = [super init];
 	
 	self.delegate = self;
 	self.options = options;
+	self.defaultOptions = defaultOptions;
 	self.layoutInfo = layoutInfo;
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
@@ -34,7 +37,7 @@
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
 	if (parent) {
-		[_presenter applyOptionsOnWillMoveToParentViewController:self.options];
+		[_presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
 	}
 }
 
@@ -44,14 +47,18 @@
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 	return self.selectedViewController.supportedInterfaceOrientations;
 }

lib/ios/RNNTabBarPresenter.m

@@ -3,11 +3,7 @@
 
 @implementation RNNTabBarPresenter
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions {
-	[super applyOptions:initialOptions];
-	
-	RNNNavigationOptions* options = [initialOptions withDefault:self.defaultOptions];
-	
+- (void)applyOptions:(RNNNavigationOptions *)options {
 	UITabBarController* tabBarController = self.bindedViewController;
 	
 	[tabBarController rnn_setTabBarTestID:[options.bottomTabs.testID getWithDefaultValue:nil]];
@@ -18,43 +14,43 @@
 	[tabBarController rnn_setTabBarVisible:[options.bottomTabs.visible getWithDefaultValue:YES]];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	[super mergeOptions:options resolvedOptions:resolvedOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	[super mergeOptions:newOptions currentOptions:currentOptions defaultOptions:defaultOptions];
 	
 	UITabBarController* tabBarController = self.bindedViewController;
 	
-	if (options.bottomTabs.currentTabIndex.hasValue) {
-		[tabBarController rnn_setCurrentTabIndex:options.bottomTabs.currentTabIndex.get];
-		[options.bottomTabs.currentTabIndex consume];
+	if (newOptions.bottomTabs.currentTabIndex.hasValue) {
+		[tabBarController rnn_setCurrentTabIndex:newOptions.bottomTabs.currentTabIndex.get];
+		[newOptions.bottomTabs.currentTabIndex consume];
 	}
 	
-	if (options.bottomTabs.currentTabId.hasValue) {
-		[tabBarController rnn_setCurrentTabID:options.bottomTabs.currentTabId.get];
-		[options.bottomTabs.currentTabId consume];
+	if (newOptions.bottomTabs.currentTabId.hasValue) {
+		[tabBarController rnn_setCurrentTabID:newOptions.bottomTabs.currentTabId.get];
+		[newOptions.bottomTabs.currentTabId consume];
 	}
 	
-	if (options.bottomTabs.testID.hasValue) {
-		[tabBarController rnn_setTabBarTestID:options.bottomTabs.testID.get];
+	if (newOptions.bottomTabs.testID.hasValue) {
+		[tabBarController rnn_setTabBarTestID:newOptions.bottomTabs.testID.get];
 	}
 	
-	if (options.bottomTabs.backgroundColor.hasValue) {
-		[tabBarController rnn_setTabBarBackgroundColor:options.bottomTabs.backgroundColor.get];
+	if (newOptions.bottomTabs.backgroundColor.hasValue) {
+		[tabBarController rnn_setTabBarBackgroundColor:newOptions.bottomTabs.backgroundColor.get];
 	}
 	
-	if (options.bottomTabs.barStyle.hasValue) {
-		[tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:options.bottomTabs.barStyle.get]];
+	if (newOptions.bottomTabs.barStyle.hasValue) {
+		[tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:newOptions.bottomTabs.barStyle.get]];
 	}
 	
-	if (options.bottomTabs.translucent.hasValue) {
-		[tabBarController rnn_setTabBarTranslucent:options.bottomTabs.translucent.get];
+	if (newOptions.bottomTabs.translucent.hasValue) {
+		[tabBarController rnn_setTabBarTranslucent:newOptions.bottomTabs.translucent.get];
 	}
 	
-	if (options.bottomTabs.hideShadow.hasValue) {
-		[tabBarController rnn_setTabBarHideShadow:options.bottomTabs.hideShadow.get];
+	if (newOptions.bottomTabs.hideShadow.hasValue) {
+		[tabBarController rnn_setTabBarHideShadow:newOptions.bottomTabs.hideShadow.get];
 	}
 	
-	if (options.bottomTabs.visible.hasValue) {
-		[tabBarController rnn_setTabBarVisible:options.bottomTabs.visible.get];
+	if (newOptions.bottomTabs.visible.hasValue) {
+		[tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get];
 	}
 }
 

lib/ios/RNNTopTabsViewController.h

@@ -8,6 +8,7 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNViewControllerPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
 - (void)setViewControllers:(NSArray*)viewControllers;
 - (void)viewController:(UIViewController*)vc changedTitle:(NSString*)title;

lib/ios/RNNTopTabsViewController.m

@@ -13,12 +13,13 @@
 
 @implementation RNNTopTabsViewController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNViewControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNViewControllerPresenter *)presenter {
 	self = [self init];
 	
 	self.presenter = presenter;
 	[self.presenter bindViewController:self];
 	
+	self.defaultOptions = defaultOptions;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
 	
@@ -45,14 +46,18 @@
 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return (RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options];
+	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options resolvedOptions:self.resolveOptions];
+	[_presenter mergeOptions:options currentOptions:self.options defaultOptions:self.defaultOptions];
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
+- (void)overrideOptions:(RNNNavigationOptions *)options {
+	[self.options overrideOptions:options];
+}
+
 - (void)createTabBar {
 	_segmentedControl = [[RNNSegmentedControl alloc] initWithSectionTitles:@[@"", @"", @""]];
 	_segmentedControl.frame = CGRectMake(0, 0, self.view.bounds.size.width, 50);

lib/ios/RNNViewControllerPresenter.m

@@ -12,9 +12,8 @@
 @implementation RNNViewControllerPresenter
 
 
-- (void)applyOptions:(RNNNavigationOptions *)initialOptions {
-	[super applyOptions:initialOptions];
-	RNNNavigationOptions* options = [initialOptions withDefault:self.defaultOptions];
+- (void)applyOptions:(RNNNavigationOptions *)options {
+	[super applyOptions:options];
 	
 	UIViewController* viewController = self.bindedViewController;
 	[viewController rnn_setBackgroundImage:[options.backgroundImage getWithDefaultValue:nil]];
@@ -38,7 +37,6 @@
 		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
 		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:options.topBar.leftButtonStyle defaultRightButtonStyle:options.topBar.rightButtonStyle];
 	}
-	
 }
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
@@ -51,78 +49,76 @@
 	[viewController rnn_setDrawBehindTabBar:[options.bottomTabs.drawBehind getWithDefaultValue:NO] || ![options.bottomTabs.visible getWithDefaultValue:YES]];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-	[super mergeOptions:options resolvedOptions:resolvedOptions];
-	
-	RNNNavigationOptions* withDefault = (RNNNavigationOptions *)[options withDefault:self.defaultOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
+	[super mergeOptions:newOptions currentOptions:currentOptions defaultOptions:defaultOptions];
 	
 	UIViewController* viewController = self.bindedViewController;
 	
-	if (options.backgroundImage.hasValue) {
-		[viewController rnn_setBackgroundImage:options.backgroundImage.get];
+	if (newOptions.backgroundImage.hasValue) {
+		[viewController rnn_setBackgroundImage:newOptions.backgroundImage.get];
 	}
 	
-	if (options.modalPresentationStyle.hasValue) {
-		[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:options.modalPresentationStyle.get]];
+	if (newOptions.modalPresentationStyle.hasValue) {
+		[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:newOptions.modalPresentationStyle.get]];
 	}
 	
-	if (options.modalTransitionStyle.hasValue) {
-		[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:options.modalTransitionStyle.get]];
+	if (newOptions.modalTransitionStyle.hasValue) {
+		[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:newOptions.modalTransitionStyle.get]];
 	}
 	
-	if (options.topBar.searchBar.hasValue) {
-		[viewController rnn_setSearchBarWithPlaceholder:[withDefault.topBar.searchBarPlaceholder getWithDefaultValue:@""]];
+	if (newOptions.topBar.searchBar.hasValue) {
+		[viewController rnn_setSearchBarWithPlaceholder:[newOptions.topBar.searchBarPlaceholder getWithDefaultValue:@""]];
 	}
 	
-	if (options.topBar.drawBehind.hasValue) {
-		[viewController rnn_setDrawBehindTopBar:options.topBar.drawBehind.get];
+	if (newOptions.topBar.drawBehind.hasValue) {
+		[viewController rnn_setDrawBehindTopBar:newOptions.topBar.drawBehind.get];
 	}
 	
-	if (options.topBar.title.text.hasValue) {
-		[viewController rnn_setNavigationItemTitle:options.topBar.title.text.get];
+	if (newOptions.topBar.title.text.hasValue) {
+		[viewController rnn_setNavigationItemTitle:newOptions.topBar.title.text.get];
 	}
 	
-	if (options.topBar.largeTitle.visible.hasValue) {
-		[viewController rnn_setTopBarPrefersLargeTitle:options.topBar.largeTitle.visible.get];
+	if (newOptions.topBar.largeTitle.visible.hasValue) {
+		[viewController rnn_setTopBarPrefersLargeTitle:newOptions.topBar.largeTitle.visible.get];
 	}
 	
-	if (options.bottomTabs.drawBehind.hasValue) {
-		[viewController rnn_setDrawBehindTabBar:options.bottomTabs.drawBehind.get];
+	if (newOptions.bottomTabs.drawBehind.hasValue) {
+		[viewController rnn_setDrawBehindTabBar:newOptions.bottomTabs.drawBehind.get];
 	}
 	
-	if (options.bottomTab.badgeColor.hasValue) {
-		[viewController rnn_setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
+	if (newOptions.bottomTab.badgeColor.hasValue) {
+		[viewController rnn_setTabBarItemBadgeColor:newOptions.bottomTab.badgeColor.get];
 	}
 	
-	if (options.layout.backgroundColor.hasValue) {
-		[viewController rnn_setBackgroundColor:options.layout.backgroundColor.get];
+	if (newOptions.layout.backgroundColor.hasValue) {
+		[viewController rnn_setBackgroundColor:newOptions.layout.backgroundColor.get];
 	}
 	
-	if (options.bottomTab.visible.hasValue) {
+	if (newOptions.bottomTab.visible.hasValue) {
 		[viewController.tabBarController rnn_setCurrentTabIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
 	}
 	
-	if (options.statusBar.blur.hasValue) {
-		[viewController rnn_setStatusBarBlur:options.statusBar.blur.get];
+	if (newOptions.statusBar.blur.hasValue) {
+		[viewController rnn_setStatusBarBlur:newOptions.statusBar.blur.get];
 	}
 	
-	if (options.statusBar.style.hasValue) {
-		[viewController rnn_setStatusBarStyle:options.statusBar.style.get animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
+	if (newOptions.statusBar.style.hasValue) {
+		[viewController rnn_setStatusBarStyle:newOptions.statusBar.style.get animated:[newOptions.statusBar.animate getWithDefaultValue:YES]];
 	}
 	
-	if (options.topBar.backButton.visible.hasValue) {
-		[viewController rnn_setBackButtonVisible:options.topBar.backButton.visible.get];
+	if (newOptions.topBar.backButton.visible.hasValue) {
+		[viewController rnn_setBackButtonVisible:newOptions.topBar.backButton.visible.get];
 	}
 	
-	if (options.topBar.leftButtons || options.topBar.rightButtons) {
-		RNNNavigationOptions* buttonsResolvedOptions = (RNNNavigationOptions *)[[resolvedOptions overrideOptions:options] withDefault:self.defaultOptions];
+	if (newOptions.topBar.leftButtons || newOptions.topBar.rightButtons) {
+		RNNNavigationOptions* buttonsResolvedOptions = [(RNNNavigationOptions *)[currentOptions overrideOptions:newOptions] withDefault:defaultOptions];
 		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
-		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
+		[_navigationButtons applyLeftButtons:newOptions.topBar.leftButtons rightButtons:newOptions.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
 	}
 	
-	if (options.overlay.interceptTouchOutside.hasValue) {
+	if (newOptions.overlay.interceptTouchOutside.hasValue) {
 		RCTRootView* rootView = (RCTRootView*)viewController.view;
-		rootView.passThroughTouches = !options.overlay.interceptTouchOutside.get;
+		rootView.passThroughTouches = !newOptions.overlay.interceptTouchOutside.get;
 	}
 }
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -72,8 +72,6 @@
 		5012240B21735959000F5F98 /* RNNSideMenuPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5012240921735959000F5F98 /* RNNSideMenuPresenter.m */; };
 		5012240E21735999000F5F98 /* RNNBasePresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012240C21735999000F5F98 /* RNNBasePresenter.h */; };
 		5012240F21735999000F5F98 /* RNNBasePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5012240D21735999000F5F98 /* RNNBasePresenter.m */; };
-		5012241221735F89000F5F98 /* RNNBottomTabPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012241021735F89000F5F98 /* RNNBottomTabPresenter.h */; };
-		5012241321735F89000F5F98 /* RNNBottomTabPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5012241121735F89000F5F98 /* RNNBottomTabPresenter.m */; };
 		5012241621736667000F5F98 /* Color.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012241421736667000F5F98 /* Color.h */; };
 		5012241721736667000F5F98 /* Color.m in Sources */ = {isa = PBXBuildFile; fileRef = 5012241521736667000F5F98 /* Color.m */; };
 		5012241A21736678000F5F98 /* Image.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012241821736678000F5F98 /* Image.h */; };
@@ -100,7 +98,7 @@
 		502CB46E20CD1DDA0019B2FE /* RNNBackButtonOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 502CB46C20CD1DDA0019B2FE /* RNNBackButtonOptions.h */; };
 		502CB46F20CD1DDA0019B2FE /* RNNBackButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 502CB46D20CD1DDA0019B2FE /* RNNBackButtonOptions.m */; };
 		502F0E142178CF8200367CC3 /* UIViewController+RNNOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 502F0E132178CF8200367CC3 /* UIViewController+RNNOptionsTest.m */; };
-		502F0E162178D09600367CC3 /* RNNBottomTabPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 502F0E152178D09600367CC3 /* RNNBottomTabPresenterTest.m */; };
+		502F0E162178D09600367CC3 /* RNNBasePresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 502F0E152178D09600367CC3 /* RNNBasePresenterTest.m */; };
 		502F0E182179C39900367CC3 /* RNNTabBarPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 502F0E172179C39900367CC3 /* RNNTabBarPresenterTest.m */; };
 		5038A374216CDDB6009280BC /* UIViewController+SideMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5038A372216CDDB6009280BC /* UIViewController+SideMenuController.h */; };
 		5038A375216CDDB6009280BC /* UIViewController+SideMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5038A373216CDDB6009280BC /* UIViewController+SideMenuController.m */; };
@@ -392,8 +390,6 @@
 		5012240921735959000F5F98 /* RNNSideMenuPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuPresenter.m; sourceTree = "<group>"; };
 		5012240C21735999000F5F98 /* RNNBasePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBasePresenter.h; sourceTree = "<group>"; };
 		5012240D21735999000F5F98 /* RNNBasePresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBasePresenter.m; sourceTree = "<group>"; };
-		5012241021735F89000F5F98 /* RNNBottomTabPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabPresenter.h; sourceTree = "<group>"; };
-		5012241121735F89000F5F98 /* RNNBottomTabPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabPresenter.m; sourceTree = "<group>"; };
 		5012241421736667000F5F98 /* Color.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Color.h; sourceTree = "<group>"; };
 		5012241521736667000F5F98 /* Color.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Color.m; sourceTree = "<group>"; };
 		5012241821736678000F5F98 /* Image.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Image.h; sourceTree = "<group>"; };
@@ -420,7 +416,7 @@
 		502CB46C20CD1DDA0019B2FE /* RNNBackButtonOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBackButtonOptions.h; sourceTree = "<group>"; };
 		502CB46D20CD1DDA0019B2FE /* RNNBackButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBackButtonOptions.m; sourceTree = "<group>"; };
 		502F0E132178CF8200367CC3 /* UIViewController+RNNOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+RNNOptionsTest.m"; sourceTree = "<group>"; };
-		502F0E152178D09600367CC3 /* RNNBottomTabPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabPresenterTest.m; sourceTree = "<group>"; };
+		502F0E152178D09600367CC3 /* RNNBasePresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBasePresenterTest.m; sourceTree = "<group>"; };
 		502F0E172179C39900367CC3 /* RNNTabBarPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarPresenterTest.m; sourceTree = "<group>"; };
 		5038A372216CDDB6009280BC /* UIViewController+SideMenuController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIViewController+SideMenuController.h"; sourceTree = "<group>"; };
 		5038A373216CDDB6009280BC /* UIViewController+SideMenuController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+SideMenuController.m"; sourceTree = "<group>"; };
@@ -922,8 +918,6 @@
 				501224052173592D000F5F98 /* RNNTabBarPresenter.m */,
 				5012240821735959000F5F98 /* RNNSideMenuPresenter.h */,
 				5012240921735959000F5F98 /* RNNSideMenuPresenter.m */,
-				5012241021735F89000F5F98 /* RNNBottomTabPresenter.h */,
-				5012241121735F89000F5F98 /* RNNBottomTabPresenter.m */,
 			);
 			name = Presenters;
 			sourceTree = "<group>";
@@ -1007,7 +1001,7 @@
 				509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */,
 				502F0E172179C39900367CC3 /* RNNTabBarPresenterTest.m */,
 				50CE8502217C6C9B00084EBF /* RNNSideMenuPresenterTest.m */,
-				502F0E152178D09600367CC3 /* RNNBottomTabPresenterTest.m */,
+				502F0E152178D09600367CC3 /* RNNBasePresenterTest.m */,
 				5038A378216D01F6009280BC /* RNNBottomTabOptionsTest.m */,
 				7B49FEBF1E95090800DEB3EA /* Info.plist */,
 				E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */,
@@ -1235,7 +1229,6 @@
 				50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */,
 				390AD477200F499D00A8250D /* RNNSwizzles.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
-				5012241221735F89000F5F98 /* RNNBottomTabPresenter.h in Headers */,
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
 				263905B31E4C6F440023D7D3 /* MMDrawerVisualState.h in Headers */,
 				502CB43A20CBCA180019B2FE /* RNNBridgeManagerDelegate.h in Headers */,
@@ -1371,7 +1364,7 @@
 				502F0E142178CF8200367CC3 /* UIViewController+RNNOptionsTest.m in Sources */,
 				5038A377216CF252009280BC /* UITabBarController+RNNOptionsTest.m in Sources */,
 				E83BAD7C1F27643000A9F3DD /* RNNTestRootViewCreator.m in Sources */,
-				502F0E162178D09600367CC3 /* RNNBottomTabPresenterTest.m in Sources */,
+				502F0E162178D09600367CC3 /* RNNBasePresenterTest.m in Sources */,
 				504753782109C13C00FFFBE6 /* RNNOverlayManagerTest.m in Sources */,
 				502F0E182179C39900367CC3 /* RNNTabBarPresenterTest.m in Sources */,
 				506F630F216A5AD700AD0D0A /* RNNViewControllerPresenterTest.m in Sources */,
@@ -1397,7 +1390,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				263905C71E4C6F440023D7D3 /* SidebarFeedlyAnimation.m in Sources */,
-				5012241321735F89000F5F98 /* RNNBottomTabPresenter.m in Sources */,
 				50C4A497206BDDBB00DB292E /* RNNSubtitleOptions.m in Sources */,
 				263905B41E4C6F440023D7D3 /* MMDrawerVisualState.m in Sources */,
 				5012240B21735959000F5F98 /* RNNSideMenuPresenter.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNBottomTabPresenterTest.m → lib/ios/ReactNativeNavigationTests/RNNBasePresenterTest.m

@@ -1,11 +1,11 @@
 #import <XCTest/XCTest.h>
-#import "RNNBottomTabPresenter.h"
+#import "RNNBasePresenter.h"
 #import <OCMock/OCMock.h>
 #import "UIViewController+RNNOptions.h"
 
 @interface RNNBottomTabPresenterTest : XCTestCase
 
-@property (nonatomic, strong) RNNBottomTabPresenter *uut;
+@property (nonatomic, strong) RNNBasePresenter *uut;
 @property (nonatomic, strong) RNNNavigationOptions *options;
 @property (nonatomic, strong) UIViewController* bindedViewController;
 @property (nonatomic, strong) id mockBindedViewController;
@@ -16,7 +16,7 @@
 
 - (void)setUp {
     [super setUp];
-    self.uut = [[RNNBottomTabPresenter alloc] init];
+    self.uut = [[RNNBasePresenter alloc] init];
 	self.bindedViewController = [UIViewController new];
     self.mockBindedViewController = [OCMockObject partialMockForObject:self.bindedViewController];
     [self.uut bindViewController:self.mockBindedViewController];

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -109,9 +109,9 @@
 	RNNTestRootViewCreator* creator = [[RNNTestRootViewCreator alloc] init];
 	
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:creator eventEmitter:nil presenter:presenter options:initialOptions];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:creator eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
 	
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[vc] options:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[[RNNNavigationControllerPresenter alloc] init]];
+	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[vc] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init]];
 	
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
@@ -133,7 +133,7 @@
 	initialOptions.topBar.title.text = [[Text alloc] initWithValue:@"the title"];
 	
 	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:presenter options:initialOptions];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
 	
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -1,4 +1,5 @@
 #import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
 #import "RNNNavigationController.h"
 #import "RNNRootViewController.h"
 
@@ -12,16 +13,17 @@
 	RNNRootViewController* _vc1;
 	RNNRootViewController* _vc2;
 	UIViewController* _vc3;
+	RNNNavigationOptions* _options;
 }
 
 - (void)setUp {
     [super setUp];
 	
-	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions]];
-	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:nil];
+	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions]  defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc3 = [UIViewController new];
-	
-	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	_options = [[RNNNavigationOptions alloc] initEmptyOptions];
+	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init]];
 }
 
 - (void)testInitWithLayoutInfo_shouldBindPresenter {
@@ -29,7 +31,7 @@
 }
 
 - (void)testInitWithLayoutInfo_shouldSetMultipleViewControllers {
-	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init]];
 	XCTAssertTrue(self.uut.viewControllers.count == 2);
 }
 
@@ -42,7 +44,7 @@
 }
 
 - (void)testPreferredStatusBarStyle_shouldReturnLeafPreferredStatusBarStyle {
-	self.uut.getCurrentChild.options.statusBar.style = [[Text alloc] initWithValue:@"light"];
+	self.uut.getCurrentChild.resolveOptions.statusBar.style = [[Text alloc] initWithValue:@"light"];
 	XCTAssertTrue(self.uut.preferredStatusBarStyle == self.uut.getCurrentChild.preferredStatusBarStyle);
 }
 
@@ -106,8 +108,37 @@
 	XCTAssertEqual(self.uut.supportedInterfaceOrientations, self.uut.getCurrentChild.supportedInterfaceOrientations);
 }
 
+- (void)testPopViewControllerReturnLastChildViewController {
+	RNNNavigationController* uut = [RNNNavigationController new];
+	[uut setViewControllers:@[_vc1, _vc2]];
+	XCTAssertEqual([uut popViewControllerAnimated:NO], _vc2);
+}
+
+- (void)testPopViewControllerSetTopBarBackgroundForPoppingViewController {
+	RNNNavigationController* uut = [RNNNavigationController new];
+	[uut setViewControllers:@[_vc1, _vc2]];
+	
+	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
+	[_vc1 overrideOptions:_options];
+	
+	[uut popViewControllerAnimated:NO];
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, uut.navigationBar.barTintColor);
+}
+
+- (void)testPopViewControllerSetDefaultTopBarBackgroundForPoppingViewController {
+	RNNNavigationController* uut = [RNNNavigationController new];
+	[uut setViewControllers:@[_vc1, _vc2]];
+
+	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
+	[_vc1 setDefaultOptions:_options];
+
+	[uut popViewControllerAnimated:NO];
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, uut.navigationBar.barTintColor);
+}
+
+
 - (RNNNavigationController *)createNavigationControllerWithOptions:(RNNNavigationOptions *)options {
-	return [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1] options:options presenter:[[RNNNavigationControllerPresenter alloc] init]];
+	return [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1] options:options defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init]];
 }
 
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -1,4 +1,5 @@
 #import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
 #import "RNNRootViewController.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNTestRootViewCreator.h"
@@ -48,8 +49,8 @@
 	layoutInfo.componentId = self.componentId;
 	layoutInfo.name = self.pageName;
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter presenter:presenter options:self.options];
+	id presenter = [OCMockObject partialMockForObject:[[RNNViewControllerPresenter alloc] init]];
+	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter presenter:presenter options:self.options defaultOptions:nil];
 }
 
 -(void)testTopBarBackgroundColor_validColor{
@@ -195,11 +196,11 @@
 	XCTAssertFalse(transparentView);
 }
 
-//-(void)testTopBarLargeTitle_default {
-//	[self.uut viewWillAppear:false];
-//
-//	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode,  UINavigationItemLargeTitleDisplayModeNever);
-//}
+-(void)testTopBarLargeTitle_default {
+	[self.uut viewWillAppear:false];
+
+	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode,  UINavigationItemLargeTitleDisplayModeNever);
+}
 
 -(void)testTopBarLargeTitle_true {
 	self.options.topBar.largeTitle.visible = [[Bool alloc] initWithValue:@(1)];
@@ -538,19 +539,34 @@
 	XCTAssertNotNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
 
-//-(void)testBackgroundImage {
-//	UIImage* backgroundImage = [[UIImage alloc] init];
-//	self.options.backgroundImage = backgroundImage;
-//	[self.uut viewWillAppear:false];
-//
-//	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:backgroundImage]);
-//}
+-(void)testBackgroundImage {
+	Image* backgroundImage = [[Image alloc] initWithValue:[[UIImage alloc] init]];
+	self.options.backgroundImage = backgroundImage;
+	[self.uut viewWillAppear:false];
+
+	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:backgroundImage.get]);
+}
+
+- (void)testMergeOptionsShouldCallPresenterMergeOptions {
+	RNNNavigationOptions* newOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	[[(id)self.uut.presenter expect] mergeOptions:newOptions currentOptions:self.uut.options defaultOptions:self.uut.defaultOptions];
+	[self.uut mergeOptions:newOptions];
+	[(id)self.uut.presenter verify];
+}
+
+- (void)testOverrideOptions {
+	RNNNavigationOptions* newOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	newOptions.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
+	
+	[self.uut overrideOptions:newOptions];
+	XCTAssertEqual([UIColor redColor], self.uut.options.topBar.background.color.get);
+}
 
 #pragma mark BottomTabs
 
 
 - (RNNNavigationController *)createNavigationController {
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[self.uut] options:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[[RNNNavigationControllerPresenter alloc] init]];
+	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[self.uut] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init]];
 	
 	return nav;
 }

lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

@@ -26,7 +26,7 @@
 	self.mockTabBarPresenter = [OCMockObject partialMockForObject:[[RNNTabBarPresenter alloc] init]];
 	self.mockChildViewController = [OCMockObject partialMockForObject:[RNNRootViewController new]];
 	self.mockEventEmmiter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
-	self.mockUut = [OCMockObject partialMockForObject:[[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[[UIViewController alloc] init]] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmmiter]];
+	self.mockUut = [OCMockObject partialMockForObject:[[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[[UIViewController alloc] init]] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmmiter]];
 	OCMStub([self.mockUut selectedViewController]).andReturn(self.mockChildViewController);
 }
 
@@ -38,7 +38,7 @@
 	UIViewController* vc1 = [[UIViewController alloc] init];
 	UIViewController* vc2 = [[UIViewController alloc] init];
 	
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[vc1, vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[vc1, vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init]];
 	XCTAssertTrue(uut.viewControllers.count == 2);
 }
 
@@ -48,7 +48,7 @@
 	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] init];
 	NSArray* childViewControllers = @[[UIViewController new]];
 	
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:nil presenter:presenter];
 	XCTAssertTrue(uut.layoutInfo == layoutInfo);
 	XCTAssertTrue(uut.options == options);
 	XCTAssertTrue(uut.presenter == presenter);
@@ -63,7 +63,7 @@
 
 	NSArray* childViewControllers = @[[UIViewController new]];
 	
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter eventEmitter:eventEmmiter];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options defaultOptions:nil presenter:presenter eventEmitter:eventEmmiter];
 	XCTAssertTrue(uut.layoutInfo == layoutInfo);
 	XCTAssertTrue(uut.options == options);
 	XCTAssertTrue(uut.presenter == presenter);
@@ -72,13 +72,13 @@
 }
 
 - (void)testInitWithLayoutInfo_shouldSetDelegate {
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] presenter:[[RNNViewControllerPresenter alloc] init]];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init]];
 	
 	XCTAssertTrue(uut.delegate == uut);
 }
 
 - (void)testWillMoveToParent_invokePresenterApplyOptionsOnWillMoveToParent {
-	[[self.mockTabBarPresenter expect] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut options]];
+	[[self.mockTabBarPresenter expect] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut resolveOptions]];
 	[self.mockUut willMoveToParentViewController:[UIViewController new]];
 	[self.mockTabBarPresenter verify];
 }
@@ -98,7 +98,7 @@
 - (void)testMergeOptions_shouldInvokePresenterMergeOptions {
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	
-	[(RNNTabBarPresenter *)[self.mockTabBarPresenter expect] mergeOptions:options resolvedOptions:nil];
+	[(RNNTabBarPresenter *)[self.mockTabBarPresenter expect] mergeOptions:options currentOptions:[(RNNTabBarController *)self.mockUut options] defaultOptions:nil];
 	[(RNNTabBarController *)self.mockUut mergeOptions:options];
 	[self.mockTabBarPresenter verify];
 }
@@ -160,9 +160,9 @@
 	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
 	layoutInfo.componentId = @"componentId";
 	
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:nil presenter:nil options:nil];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:nil presenter:nil options:nil defaultOptions:nil];
 	
-	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[UIViewController new], vc] options:nil presenter:[RNNTabBarPresenter new]];
+	RNNTabBarController* uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil childViewControllers:@[[UIViewController new], vc] options:nil defaultOptions:nil presenter:[RNNTabBarPresenter new]];
 	[uut setSelectedIndexByComponentID:@"componentId"];
 	XCTAssertTrue(uut.selectedIndex == 1);
 }