Detached options from presenters, design improvments for LayoutProtocol (#4049)

* Detached options from presenters, design improvments for LayoutProtocol

* fixes topBar.background.clipToBounds

* Fixes e2e

* Fixes unit tests

* Homogeneous constructors for parent and child view controllers

* Handle parent options merging with children in optionsResolver

* Fix topBar.background.clipToBounds

* Removed unnecessary options merging

* Fixes shared element transition

* Fixed sideMenu inside bottomTabs

e2e/ComplexLayout.test.js

@@ -20,7 +20,7 @@ describe('complex layout', () => {
     await expect(elementByLabel('External component in deep stack')).toBeVisible();
   });
 
-  test(':android: merge options correctly in SideMenu inside BottomTabs layout', async () => {
+  test('merge options correctly in SideMenu inside BottomTabs layout', async () => {
     await elementById(testIDs.COMPLEX_LAYOUT_BUTTON).tap();
     await elementById(testIDs.SIDE_MENU_LAYOUT_INSIDE_BOTTOM_TAB).tap();
     await elementById(testIDs.SECOND_TAB_BAR_BUTTON).tap();

lib/ios/RNNBackgroundOptions.m

@@ -76,6 +76,12 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 			self.originalTopBarImages = nil;
 		}
 	}
+
+	if (self.clipToBounds) {
+		navigationController.navigationBar.clipsToBounds = [self.clipToBounds boolValue];
+	} else {
+		navigationController.navigationBar.clipsToBounds = NO;
+	}
 }
 
 - (void)storeOriginalTopBarImages:(UINavigationController *)navigationController {

lib/ios/RNNBasePresenter.h

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

lib/ios/RNNBasePresenter.m

@@ -2,31 +2,12 @@
 
 @implementation RNNBasePresenter
 
-- (instancetype)initWithOptions:(RNNNavigationOptions *)options {
-	self = [super init];
-	if (self) {
-		self.options = options;
-	}
-	return self;
-}
-
-- (void)presentOn:(UIViewController *)viewController {
-	[self.options applyOn:viewController];
-}
-
-- (void)present:(RNNNavigationOptions *)options on:(UIViewController *)viewController {
+- (void)present:(RNNNavigationOptions *)options onViewControllerWillAppear:(UIViewController *)viewController {
 	[options applyOn:viewController];
 }
 
-- (RNNNavigationOptions *)presentWithChildOptions:(RNNNavigationOptions *)childOptions on:(UIViewController *)viewController {
-	RNNNavigationOptions* options = [self.options combineWithOptions:childOptions];
-	[self present:options on:viewController];
-	
-	return options;
-}
-
-- (void)overrideOptions:(RNNNavigationOptions *)options {
-	[_options mergeOptions:options overrideOptions:YES];
+- (void)present:(RNNNavigationOptions *)options onViewControllerDidLoad:(UIViewController *)viewController {
+	[options applyOn:viewController];
 }
 
 @end

lib/ios/RNNCommandsHandler.m

@@ -73,9 +73,13 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:completion];
 	
-	[vc.presenter overrideOptions:options];
-	[vc.presenter presentOn:vc];
-	
+	while (vc != nil) {
+		if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
+			[vc mergeOptions:options];
+		}
+		vc = (UIViewController<RNNLayoutProtocol>*)vc.parentViewController;
+	}
+
 	[CATransaction commit];
 }
 
@@ -90,7 +94,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNRootViewController *newVc = (RNNRootViewController *)[_controllerFactory createLayoutAndSaveToStore:layout];
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	
-	if ([newVc.presenter.options.preview.reactTag floatValue] > 0) {
+	if ([newVc.options.preview.reactTag floatValue] > 0) {
 		UIViewController* vc = [_store findComponentForId:componentId];
 		
 		if([vc isKindOfClass:[RNNRootViewController class]]) {
@@ -100,7 +104,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
       rootVc.previewCallback = ^(UIViewController *vcc) {
 				RNNRootViewController* rvc  = (RNNRootViewController*)vcc;
 				[self->_eventEmitter sendOnPreviewCompleted:componentId previewComponentId:newVc.layoutInfo.componentId];
-				if ([newVc.presenter.options.preview.commit floatValue] > 0) {
+				if ([newVc.options.preview.commit floatValue] > 0) {
 					[CATransaction begin];
 					[CATransaction setCompletionBlock:^{
 						[self->_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
@@ -113,27 +117,27 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			
 			CGSize size = CGSizeMake(rootVc.view.frame.size.width, rootVc.view.frame.size.height);
 			
-			if (newVc.presenter.options.preview.width) {
-				size.width = [newVc.presenter.options.preview.width floatValue];
+			if (newVc.options.preview.width) {
+				size.width = [newVc.options.preview.width floatValue];
 			}
 			
-			if (newVc.presenter.options.preview.height) {
-				size.height = [newVc.presenter.options.preview.height floatValue];
+			if (newVc.options.preview.height) {
+				size.height = [newVc.options.preview.height floatValue];
 			}
 			
-			if (newVc.presenter.options.preview.width || newVc.presenter.options.preview.height) {
+			if (newVc.options.preview.width || newVc.options.preview.height) {
 				newVc.preferredContentSize = size;
 			}
       
 			RCTExecuteOnMainQueue(^{
-				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.presenter.options.preview.reactTag];
+				UIView *view = [[ReactNativeNavigation getBridge].uiManager viewForReactTag:newVc.options.preview.reactTag];
 				[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
 			});
 		}
 	} else {
-		id animationDelegate = (newVc.presenter.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
-		[newVc waitForReactViewRender:(newVc.presenter.options.animations.push.waitForRender || animationDelegate) perform:^{
-			[_stackManager push:newVc onTop:fromVC animated:newVc.presenter.options.animations.push.enable animationDelegate:animationDelegate completion:^{
+		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
+		[newVc waitForReactViewRender:(newVc.options.animations.push.waitForRender || animationDelegate) perform:^{
+			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 				completion();
 			} rejection:rejection];
@@ -145,7 +149,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
-	RNNNavigationOptions* options = [newVC getLeafViewController].presenter.options;
+	RNNNavigationOptions* options = [newVC getLeafViewController].options;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
 	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:options.animations.setStackRoot.enable completion:^{
@@ -158,12 +162,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.presenter.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
 	UINavigationController *nvc = vc.navigationController;
 	
 	if ([nvc topViewController] == vc) {
-		if (vc.presenter.options.animations.pop) {
+		if (vc.options.animations.pop) {
 			nvc.delegate = vc;
 		} else {
 			nvc.delegate = nil;
@@ -171,10 +175,10 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	} else {
 		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
 		[vcs removeObject:vc];
-		[nvc setViewControllers:vcs animated:vc.presenter.options.animations.pop.enable];
+		[nvc setViewControllers:vcs animated:vc.options.animations.pop.enable];
 	}
 	
-	[_stackManager pop:vc animated:vc.presenter.options.animations.pop.enable completion:^{
+	[_stackManager pop:vc animated:vc.options.animations.pop.enable completion:^{
 		[_store removeComponent:componentId];
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
 		completion();
@@ -186,9 +190,9 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)popTo:(NSString*)componentId mergeOptions:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.presenter.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
-	[_stackManager popTo:vc animated:vc.presenter.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popTo:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
 		[self removePopedViewControllers:poppedViewControllers];
 		completion();
@@ -198,7 +202,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)popToRoot:(NSString*)componentId mergeOptions:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	[vc.presenter.options mergeWith:options];
+	[vc.options mergeWith:options];
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
@@ -206,7 +210,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_stackManager popToRoot:vc animated:vc.presenter.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
+	[_stackManager popToRoot:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[self removePopedViewControllers:poppedViewControllers];
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		
@@ -220,8 +224,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	
-	[newVc.getLeafViewController waitForReactViewRender:newVc.getLeafViewController.presenter.options.animations.showModal.waitForRender perform:^{
-		[_modalManager showModal:newVc animated:newVc.getLeafViewController.presenter.options.animations.showModal.enable hasCustomAnimation:newVc.getLeafViewController.presenter.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
+	[newVc.getLeafViewController waitForReactViewRender:newVc.getLeafViewController.options.animations.showModal.waitForRender perform:^{
+		[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable hasCustomAnimation:newVc.getLeafViewController.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
 			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 			completion(componentId);
 		}];
@@ -236,7 +240,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
 	}];
 	UIViewController<RNNParentProtocol> *modalToDismiss = (UIViewController<RNNParentProtocol>*)[_store findComponentForId:componentId];
-	[modalToDismiss.getLeafViewController.presenter.options mergeWith:options];
+	[modalToDismiss.getLeafViewController.options mergeWith:options];
 	
 	[self removePopedViewControllers:modalToDismiss.navigationController.viewControllers];
 	

lib/ios/RNNControllerFactory.m

@@ -100,134 +100,118 @@
 
 - (UIViewController<RNNParentProtocol> *)createComponent:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
-	
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:options];
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:NO presenter:presenter];
-
-	if (!component.isCustomViewController) {
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options];
+	
+	if (!component.isExternalViewController) {
 		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
 		[_bridge.uiManager setAvailableSize:availableSize forRootView:component.view];
 	}
+	
 	return (UIViewController<RNNParentProtocol> *)component;
 }
 
 - (UIViewController<RNNParentProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
 
 	UIViewController* externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:options];
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:YES presenter:presenter];
-	
-	[component addChildViewController:externalVC];
-	[component.view addSubview:externalVC.view];
-	[externalVC didMoveToParentViewController:component];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initExternalComponentWithLayoutInfo:layoutInfo eventEmitter:_eventEmitter presenter:presenter options:options];
+	[component bindViewController:externalVC];
 	
 	return (UIViewController<RNNParentProtocol> *)component;
 }
 
 
 - (UIViewController<RNNParentProtocol> *)createStack:(RNNLayoutNode*)node {
-	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
+	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] init];
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-
-	vc.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:options];
-	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
 	
-	NSMutableArray* controllers = [NSMutableArray new];
-	for (NSDictionary* child in node.children) {
-		[controllers addObject:[self fromTree:child]];
-	}
+	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	[vc setViewControllers:controllers];
+	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
 	
-	return vc;
+	return stack;
 }
 
 -(UIViewController<RNNParentProtocol> *)createTabs:(RNNLayoutNode*)node {
-	RNNTabBarController* vc = [[RNNTabBarController alloc] initWithEventEmitter:_eventEmitter];
-	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-	vc.presenter = [[RNNTabBarPresenter alloc] initWithOptions:options];
+	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] init];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
+
+	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	NSMutableArray* controllers = [NSMutableArray new];
-	for (NSDictionary *child in node.children) {
-		UIViewController<RNNParentProtocol>* childVc = [self fromTree:child];
-		[controllers addObject:childVc];
-	}
-	[vc setViewControllers:controllers];
+	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter eventEmitter:_eventEmitter];
 	
-	return vc;
+	return tabsController;
 }
 
 - (UIViewController<RNNParentProtocol> *)createTopTabs:(RNNLayoutNode*)node {
-	RNNTopTabsViewController* vc = [[RNNTopTabsViewController alloc] init];
-	vc.layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
-	
-	NSMutableArray* controllers = [NSMutableArray new];
-	for (NSDictionary *child in node.children) {
-		RNNRootViewController* childVc = (RNNRootViewController*)[self fromTree:child];
-		[controllers addObject:childVc];
-		[_bridge.uiManager setAvailableSize:vc.contentView.bounds.size forRootView:childVc.view];
-	}
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	RNNBasePresenter* presenter = [[RNNBasePresenter alloc] init];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
+
+	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	[vc setViewControllers:controllers];
+	RNNTopTabsViewController* topTabsController = [[RNNTopTabsViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
 	
-	return vc;
+	return topTabsController;
 }
 
 - (UIViewController<RNNParentProtocol> *)createSideMenu:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-	RNNBasePresenter* presenter = [[RNNBasePresenter alloc] initWithOptions:options];
-	
-	NSMutableArray* childrenVCs = [NSMutableArray new];
+	RNNBasePresenter* presenter = [[RNNBasePresenter alloc] init];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
+
+	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	for (NSDictionary *child in node.children) {
-		UIViewController *vc = [self fromTree:child];
-		[childrenVCs addObject:vc];
-	}
-	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs presenter:presenter];
-	sideMenu.layoutInfo = layoutInfo;
+	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
 	
 	return sideMenu;
 }
 
 
 - (UIViewController<RNNParentProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
-	UIViewController<RNNParentProtocol>* child = [self fromTree:node.children[0]];
+	UIViewController<RNNParentProtocol>* childVc = [self fromTree:node.children[0]];
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
-	sideMenuChild.presenter = [[RNNBasePresenter alloc] initWithOptions:options];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
+
+	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo childViewControllers:@[childVc] options:options optionsResolver:optionsResolver presenter:[[RNNBasePresenter alloc] init] type:type];
 	
 	return sideMenuChild;
 }
 
 - (UIViewController<RNNParentProtocol> *)createSplitView:(RNNLayoutNode*)node {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	RNNBasePresenter* presenter = [[RNNBasePresenter alloc] init];
+	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
 
-	NSString* componentId = node.nodeId;
-	
-	RNNSplitViewOptions* options = [[RNNSplitViewOptions alloc] initWithDict:_optionsManager.defaultOptionsDict];
-	[options mergeWith:node.data[@"options"]];
-
-	RNNSplitViewController* svc = [[RNNSplitViewController alloc] initWithOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter];
-
-	// We need two children of the node for successful Master / Detail
-	NSDictionary *master = node.children[0];
-	NSDictionary *detail = node.children[1];
+	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 
-	// Create view controllers
-	RNNRootViewController* masterVc = (RNNRootViewController*)[self fromTree:master];
-	RNNRootViewController* detailVc = (RNNRootViewController*)[self fromTree:detail];
+	RNNSplitViewController* splitViewController = [[RNNSplitViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
 
-	// Set the controllers and delegate to masterVC
-	svc.viewControllers = [NSArray arrayWithObjects:masterVc, detailVc, nil];
-	svc.delegate = masterVc;
+	return splitViewController;
+}
 
-	return svc;
+- (NSArray<UIViewController *> *)extractChildrenViewControllersFromNode:(RNNLayoutNode *)node {
+	NSMutableArray* childrenArray = [NSMutableArray new];
+	for (NSDictionary* child in node.children) {
+		UIViewController* childVc = [self fromTree:child];
+		[childrenArray addObject:childVc];
+	}
+	
+	return childrenArray;
 }
 
 @end

lib/ios/RNNLayoutProtocol.h

@@ -7,5 +7,8 @@
 
 @property (nonatomic, retain) RNNBasePresenter* presenter;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+
+- (void)mergeOptions:(RNNNavigationOptions *)options;
 
 @end

lib/ios/RNNLeafProtocol.h

@@ -4,8 +4,10 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 @protocol RNNLeafProtocol <RNNLayoutProtocol>
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+
 - (UIViewController<RNNLeafProtocol> *)getLeafViewController;
 
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+- (void)bindViewController:(UIViewController *)viewController;
 
 @end

lib/ios/RNNModalManager.m

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

lib/ios/RNNNavigationController.h

@@ -1,10 +1,13 @@
 #import <UIKit/UIKit.h>
 #import "RNNParentProtocol.h"
 #import "RNNNavigationControllerPresenter.h"
+#import "RNNParentOptionsResolver.h"
 
 @interface RNNNavigationController : UINavigationController <RNNParentProtocol>
 
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNNavigationControllerPresenter* presenter;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
 @end

lib/ios/RNNNavigationController.m

@@ -5,6 +5,19 @@
 
 @implementation RNNNavigationController
 
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNNavigationControllerPresenter *)presenter {
+	self = [super init];
+
+	self.presenter = presenter;
+	self.options = options;
+	self.optionsResolver = optionsResolver;
+	self.layoutInfo = layoutInfo;
+	
+	[self setViewControllers:childViewControllers];
+	
+	return self;
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
@@ -26,7 +39,7 @@
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[rnnController.presenter presentOn:rnnController];
+			[rnnController.presenter present:rnnController.options onViewControllerDidLoad:rnnController];
 		}
 	}
 	
@@ -34,11 +47,11 @@
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.presenter.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.presenter.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)getLeafViewController {
@@ -49,24 +62,19 @@
 	return self.topViewController;
 }
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
-	}
+- (void)viewDidLoad {
+	[super viewDidLoad];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	[_optionsResolver resolve:self with:self.childViewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
 }
 
+
 @end

lib/ios/RNNNavigationControllerPresenter.m

@@ -2,8 +2,9 @@
 
 @implementation RNNNavigationControllerPresenter
 
-- (void)present:(RNNOptions *)options on:(UINavigationController *)navigationController {
+- (void)present:(RNNNavigationOptions *)options onViewControllerDidLoad:(UINavigationController *)navigationController {
 	[options applyOnNavigationController:navigationController];
+
 }
 
 @end

lib/ios/RNNNavigationOptions.h

@@ -38,6 +38,4 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) NSString* modalPresentationStyle;
 @property (nonatomic, strong) NSString* modalTransitionStyle;
 
-- (RNNNavigationOptions *)combineWithOptions:(RNNOptions *)options;
-
 @end

lib/ios/RNNNavigationOptions.m

@@ -10,14 +10,6 @@
 
 @implementation RNNNavigationOptions
 
-- (RNNNavigationOptions *)combineWithOptions:(RNNOptions *)options {
-	RNNNavigationOptions *navigationOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
-	[navigationOptions mergeOptions:self overrideOptions:YES];
-	[navigationOptions mergeOptions:options overrideOptions:YES];
-	
-	return navigationOptions;
-}
-
 - (void)applyOn:(UIViewController *)viewController {
 	[self.topBar applyOn:viewController];
 	[self.bottomTabs applyOn:viewController];

lib/ios/RNNParentOptionsResolver.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "RNNLayoutProtocol.h"
+
+@interface RNNParentOptionsResolver : NSObject
+
+- (void)resolve:(UIViewController<RNNLayoutProtocol> *)parent with:(NSArray<UIViewController<RNNLayoutProtocol> *> *)children;
+
+@end

lib/ios/RNNParentOptionsResolver.m

@@ -0,0 +1,9 @@
+#import "RNNParentOptionsResolver.h"
+
+@implementation RNNParentOptionsResolver
+
+- (void)resolve:(UIViewController<RNNLayoutProtocol> *)parent with:(NSArray<UIViewController<RNNLayoutProtocol> *> *)children {
+	
+}
+
+@end

lib/ios/RNNParentProtocol.h

@@ -1,12 +1,15 @@
 #import "RNNLayoutProtocol.h"
 #import "RNNLeafProtocol.h"
+#import "RNNParentOptionsResolver.h"
 
 @protocol RNNParentProtocol <RNNLayoutProtocol, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
 @required
 
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
+
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter;
+
 - (UIViewController<RNNLeafProtocol> *)getLeafViewController;
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)options;
-- (void)performOnChildLoad:(RNNNavigationOptions *)options;
 
 @end

lib/ios/RNNRootViewController.h

@@ -12,23 +12,30 @@
 
 typedef void (^PreviewCallback)(UIViewController *vc);
 
-@interface RNNRootViewController : UIViewController	<RNNLeafProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate, RNNPresenterDelegate>
+@interface RNNRootViewController : UIViewController	<RNNLeafProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
 
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, strong) RNNViewControllerPresenter* presenter;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+
 @property (nonatomic) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) RNNAnimator* animator;
 @property (nonatomic, strong) UIViewController* previewController;
 @property (nonatomic, copy) PreviewCallback previewCallback;
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-			 rootViewCreator:(id<RNNRootViewCreator>)creator
-				eventEmitter:(RNNEventEmitter*)eventEmitter
-		 isExternalComponent:(BOOL)isExternalComponent
-				   presenter:(RNNViewControllerPresenter *)presenter;
+				   rootViewCreator:(id<RNNRootViewCreator>)creator
+					  eventEmitter:(RNNEventEmitter*)eventEmitter
+						 presenter:(RNNViewControllerPresenter *)presenter
+						   options:(RNNNavigationOptions *)options;
+
+- (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
+									   eventEmitter:(RNNEventEmitter*)eventEmitter
+										  presenter:(RNNViewControllerPresenter *)presenter
+											options:(RNNNavigationOptions *)options;
 
-- (BOOL)isCustomViewController;
+- (BOOL)isExternalViewController;
 - (BOOL)isCustomTransitioned;
 
 -(void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem;

lib/ios/RNNRootViewController.m

@@ -13,7 +13,6 @@
 	BOOL _isBeingPresented;
 }
 
-@property (nonatomic) BOOL isExternalComponent;
 @property (nonatomic, copy) RNNReactViewReadyCompletionBlock reactViewReadyBlock;
 
 @end
@@ -22,22 +21,17 @@
 
 @synthesize previewCallback;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-				   rootViewCreator:(id<RNNRootViewCreator>)creator
-					  eventEmitter:(RNNEventEmitter*)eventEmitter
-			   isExternalComponent:(BOOL)isExternalComponent
-						 presenter:(RNNViewControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options {
 	self = [super init];
 	self.eventEmitter = eventEmitter;
 	self.creator = creator;
-	self.isExternalComponent = isExternalComponent;
 	self.layoutInfo = layoutInfo;
 	self.presenter = presenter;
-	self.presenter.delegate = self;
+	self.options = options;
 	
-	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.presenter.options.customTransition];
+	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.options.customTransition];
 	
-	if (!self.isExternalComponent) {
+	if (self.creator) {
 		self.view = [creator createRootView:self.layoutInfo.name rootViewId:self.layoutInfo.componentId];
 		[[NSNotificationCenter defaultCenter] addObserver:self
 												 selector:@selector(reactViewReady)
@@ -54,13 +48,22 @@
 	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];
+	return self;
+}
+
+- (void)bindViewController:(UIViewController *)viewController {
+	[self addChildViewController:viewController];
+	[self.view addSubview:viewController.view];
+	[viewController didMoveToParentViewController:self];
+}
+
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	_isBeingPresented = YES;
-	[_presenter presentOn:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:_presenter.options];
-	}
+	[_presenter present:self.options onViewControllerWillAppear:self];
+	[self initReactCustomViews];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
@@ -79,10 +82,13 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_presenter presentOn:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
-	}
+	[_presenter present:self.options onViewControllerDidLoad:self];
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.options mergeOptions:options overrideOptions:YES];
+	[self.presenter present:self.options onViewControllerWillAppear:self];
+	[self initReactCustomViews];
 }
 
 - (void)reactViewReady {
@@ -96,7 +102,7 @@
 
 
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	if (wait && !_isExternalComponent) {
+	if (wait && !self.isExternalViewController) {
 		[self onReactViewReady:readyBlock];
 	} else {
 		readyBlock();
@@ -108,7 +114,7 @@
 }
 
 - (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock {
-	if (self.isCustomViewController) {
+	if (self.isExternalViewController) {
 		readyBlock();
 	} else {
 		self.reactViewReadyBlock = readyBlock;
@@ -125,7 +131,7 @@
 	[self.eventEmitter sendOnSearchBarCancelPressed:self.layoutInfo.componentId];
 }
 
-- (void)optionsUpdated {
+- (void)initReactCustomViews {
 	[self setCustomNavigationTitleView];
 	[self setCustomNavigationBarView];
 	[self setCustomNavigationComponentBackground];
@@ -133,11 +139,11 @@
 
 - (void)setCustomNavigationTitleView {
 	if (!_customTitleView && _isBeingPresented) {
-		if (self.presenter.options.topBar.title.component.name) {
-			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.title.component];
+		if (self.options.topBar.title.component.name) {
+			_customTitleView = (RNNReactView*)[_creator createRootViewFromComponentOptions:self.options.topBar.title.component];
 			_customTitleView.backgroundColor = UIColor.clearColor;
-			[_customTitleView setAlignment:self.presenter.options.topBar.title.component.alignment];
-			BOOL isCenter = [self.presenter.options.topBar.title.component.alignment isEqualToString:@"center"];
+			[_customTitleView setAlignment:self.options.topBar.title.component.alignment];
+			BOOL isCenter = [self.options.topBar.title.component.alignment isEqualToString:@"center"];
 			__weak RNNReactView *weakTitleView = _customTitleView;
 			CGRect frame = self.navigationController.navigationBar.bounds;
 			[_customTitleView setFrame:frame];
@@ -161,8 +167,8 @@
 
 - (void)setCustomNavigationBarView {
 	if (!_customTopBar) {
-		if (self.presenter.options.topBar.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.component];
+		if (self.options.topBar.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.component];
 			
 			_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			reactView.backgroundColor = UIColor.clearColor;
@@ -181,20 +187,14 @@
 
 - (void)setCustomNavigationComponentBackground {
 	if (!_customTopBarBackground) {
-		if (self.presenter.options.topBar.background.component.name) {
-			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.presenter.options.topBar.background.component];
+		if (self.options.topBar.background.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.background.component];
 			
 			_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 			[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
 		} else if (self.navigationController.navigationBar.subviews.count && [[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
 		}
-		
-		if (self.presenter.options.topBar.background.clipToBounds) {
-			self.navigationController.navigationBar.clipsToBounds = YES;
-		} else {
-			self.navigationController.navigationBar.clipsToBounds = NO;
-		}
 	} if (_customTopBarBackground && _customTopBarBackground.superview == nil) {
 		if (self.navigationController.navigationBar.subviews.count && [[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
 			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
@@ -205,17 +205,17 @@
 }
 
 -(BOOL)isCustomTransitioned {
-	return self.presenter.options.customTransition.animations != nil;
+	return self.options.customTransition.animations != nil;
 }
 
-- (BOOL)isCustomViewController {
-	return self.isExternalComponent;
+- (BOOL)isExternalViewController {
+	return !self.creator;
 }
 
 - (BOOL)prefersStatusBarHidden {
-	if (self.presenter.options.statusBar.visible) {
-		return ![self.presenter.options.statusBar.visible boolValue];
-	} else if ([self.presenter.options.statusBar.hideWithTopBar boolValue]) {
+	if (self.options.statusBar.visible) {
+		return ![self.options.statusBar.visible boolValue];
+	} else if ([self.options.statusBar.hideWithTopBar boolValue]) {
 		return self.navigationController.isNavigationBarHidden;
 	}
 	
@@ -223,7 +223,7 @@
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	if (self.presenter.options.statusBar.style && [self.presenter.options.statusBar.style isEqualToString:@"light"]) {
+	if (self.options.statusBar.style && [self.options.statusBar.style isEqualToString:@"light"]) {
 		return UIStatusBarStyleLightContent;
 	} else {
 		return UIStatusBarStyleDefault;
@@ -231,20 +231,20 @@
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	return self.presenter.options.layout.supportedOrientations;
+	return self.options.layout.supportedOrientations;
 }
 
 - (BOOL)hidesBottomBarWhenPushed
 {
-	if (self.presenter.options.bottomTabs && self.presenter.options.bottomTabs.visible) {
-		return ![self.presenter.options.bottomTabs.visible boolValue];
+	if (self.options.bottomTabs && self.options.bottomTabs.visible) {
+		return ![self.options.bottomTabs.visible boolValue];
 	}
 	return NO;
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
-	if (![vc.presenter.options.topBar.backButton.transition isEqualToString:@"custom"]){
+	if (![vc.options.topBar.backButton.transition isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}
 }
@@ -253,26 +253,25 @@
 								  animationControllerForOperation:(UINavigationControllerOperation)operation
 											   fromViewController:(UIViewController*)fromVC
 												 toViewController:(UIViewController*)toVC {
-	{
-		if (self.animator) {
-			return self.animator;
-		} else if (operation == UINavigationControllerOperationPush && self.presenter.options.animations.push.hasCustomAnimation) {
-			return [[RNNPushAnimation alloc] initWithScreenTransition:self.presenter.options.animations.push];
-		} else if (operation == UINavigationControllerOperationPop && self.presenter.options.animations.pop.hasCustomAnimation) {
-			return [[RNNPushAnimation alloc] initWithScreenTransition:self.presenter.options.animations.pop];
-		} else {
-			return nil;
-		}
+	if (self.animator) {
+		return self.animator;
+	} else if (operation == UINavigationControllerOperationPush && self.options.animations.push.hasCustomAnimation) {
+		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.push];
+	} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop.hasCustomAnimation) {
+		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.pop];
+	} else {
+		return nil;
 	}
+	
 	return nil;
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.presenter.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.presenter.options.animations.dismissModal isDismiss:YES];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location{
@@ -307,7 +306,7 @@
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems {
 	NSMutableArray *actions = [[NSMutableArray alloc] init];
-	for (NSDictionary *previewAction in self.presenter.options.preview.actions) {
+	for (NSDictionary *previewAction in self.options.preview.actions) {
 		UIPreviewAction *action = [self convertAction:previewAction];
 		NSDictionary *actionActions = previewAction[@"actions"];
 		if (actionActions.count > 0) {

lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.m

@@ -21,7 +21,6 @@
 
 #import "MMDrawerController.h"
 #import "UIViewController+MMDrawerController.h"
-#import "RNNNavigationOptions.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -480,24 +479,6 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
     }
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:childOptions];
-	}
-}
-
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:childOptions];
-	}
-}
-
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:nil];
-	}
-}
-
 -(void)setCenterViewController:(UIViewController *)newCenterViewController withCloseAnimation:(BOOL)animated completion:(void(^)(BOOL finished))completion{
     
     if(self.openSide == MMDrawerSideNone){

lib/ios/RNNSideMenuChildVC.h

@@ -1,11 +1,3 @@
-//
-//  RNNSideMenuChildVC.h
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
 #import <UIKit/UIKit.h>
 #import "RNNParentProtocol.h"
 
@@ -23,7 +15,9 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
--(instancetype) initWithChild:(UIViewController<RNNParentProtocol>*)child type:(RNNSideMenuChildType)type;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -1,58 +1,56 @@
-//
-//  RNNSideMenuChildVC.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
 #import "RNNSideMenuChildVC.h"
 
 @interface RNNSideMenuChildVC ()
 
 @property (readwrite) RNNSideMenuChildType type;
-@property (readwrite) UIViewController<RNNParentProtocol> *child;
+@property (nonatomic, retain) UIViewController<RNNParentProtocol> *child;
 
 @end
 
 @implementation RNNSideMenuChildVC
 
--(instancetype) initWithChild:(UIViewController<RNNParentProtocol>*)child type:(RNNSideMenuChildType)type {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter type:(RNNSideMenuChildType)type {
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	
+	self.type = type;
+
+	return self;
+}
+
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
 	
+	self.presenter = presenter;
+	self.options = options;
+	self.layoutInfo = layoutInfo;
+	self.optionsResolver = optionsResolver;
+	
+	[self bindChildViewControllers:childViewControllers];
+	
+	return self;
+}
+
+- (void)bindChildViewControllers:(NSArray<UIViewController<RNNParentProtocol> *> *)viewControllers {
+	UIViewController<RNNParentProtocol>* child = viewControllers[0];
+	
 	self.child = child;
 	[self addChildViewController:self.child];
 	[self.child.view setFrame:self.view.bounds];
 	[self.view addSubview:self.child.view];
 	[self.view bringSubviewToFront:self.child.view];
-
-	self.type = type;
-	
-	return self;
 }
 
 - (UIViewController *)getLeafViewController {
 	return [self.child getLeafViewController];
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
-}
-
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	[_optionsResolver resolve:self with:self.childViewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
-	}
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

lib/ios/RNNSideMenuController.h

@@ -20,8 +20,8 @@
 
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
-
--(instancetype)initWithControllers:(NSArray*)controllers presenter:(RNNBasePresenter *)presenter;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
 -(void)showSideMenu:(MMDrawerSide)side animated:(BOOL)animated;
 -(void)hideSideMenu:(MMDrawerSide)side animated:(BOOL)animated;

lib/ios/RNNSideMenuController.m

@@ -21,24 +21,31 @@
 
 @implementation RNNSideMenuController
 
--(instancetype)initWithControllers:(NSArray*)controllers presenter:(RNNBasePresenter *)presenter
-{
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
+	
 	self.presenter = presenter;
+	self.options = options;
+	self.layoutInfo = layoutInfo;
+	self.optionsResolver = optionsResolver;
+	
+	[self bindChildViewControllers:childViewControllers];
 	
-	[self setControllers:controllers];
+	return self;
+}
+
+- (void)bindChildViewControllers:(NSArray<UIViewController<RNNLayoutProtocol> *> *)viewControllers {
+	[self setControllers:viewControllers];
 	
 	self.sideMenu = [[MMDrawerController alloc] initWithCenterViewController:self.center leftDrawerViewController:self.left rightDrawerViewController:self.right];
 	
 	self.sideMenu.openDrawerGestureModeMask = MMOpenDrawerGestureModeAll;
 	self.sideMenu.closeDrawerGestureModeMask = MMCloseDrawerGestureModeAll;
-
+	
 	[self addChildViewController:self.sideMenu];
 	[self.sideMenu.view setFrame:self.view.bounds];
 	[self.view addSubview:self.sideMenu.view];
 	[self.view bringSubviewToFront:self.sideMenu.view];
-	
-	return self;
 }
 
 -(void)showSideMenu:(MMDrawerSide)side animated:(BOOL)animated {
@@ -94,25 +101,13 @@
 	return [self.center getLeafViewController];
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
-}
-
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-		if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
-}
-
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
-	}
+	[_optionsResolver resolve:self with:self.childViewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
+}
 
 @end

lib/ios/RNNSideMenuSideOptions.m

@@ -5,8 +5,8 @@
 @implementation RNNSideMenuSideOptions
 
 - (void)applyOnSide:(MMDrawerSide)side viewController:(UIViewController *)viewController {
-	RNNSideMenuController* sideMenuController = (RNNSideMenuController*)UIApplication.sharedApplication.delegate.window.rootViewController;
-	if (sideMenuController && [sideMenuController isKindOfClass:[RNNSideMenuController class]]) {
+	RNNSideMenuController* sideMenuController = [self getParentSideMenuControllerFromChild:viewController];
+	if (sideMenuController) {
 		if (self.enabled) {
 			switch (side) {
 				case MMDrawerSideRight:
@@ -62,6 +62,19 @@
 	[self resetOptions];
 }
 
+- (RNNSideMenuController *)getParentSideMenuControllerFromChild:(UIViewController *)childViewController {
+	UIViewController* vc = childViewController;
+	while (vc) {
+		if ([vc isKindOfClass:[RNNSideMenuController class]]) {
+			return (RNNSideMenuController *)vc;
+		}
+		
+		vc = vc.parentViewController;
+	}
+	
+	return nil;
+}
+
 - (void)resetOptions {
 	self.visible = nil;
 	self.enabled = nil;

lib/ios/RNNSplitViewController.h

@@ -10,18 +10,11 @@
 #import "RNNTopTabsViewController.h"
 #import "RNNParentProtocol.h"
 
-@interface RNNSplitViewController : UISplitViewController	<RNNParentProtocol>
+@interface RNNSplitViewController : UISplitViewController <RNNParentProtocol>
 
-@property (nonatomic, strong) RNNSplitViewOptions* options;
-@property (nonatomic, strong) RNNEventEmitter *eventEmitter;
-@property (nonatomic, strong) NSString* componentId;
+@property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
-@property (nonatomic) id<RNNRootViewCreator> creator;
-
--(instancetype)initWithOptions:(RNNSplitViewOptions*)options
-			withComponentId:(NSString*)componentId
-			rootViewCreator:(id<RNNRootViewCreator>)creator
-				  eventEmitter:(RNNEventEmitter*)eventEmitter;
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
 @end

lib/ios/RNNSplitViewController.m

@@ -2,21 +2,27 @@
 
 @implementation RNNSplitViewController
 
--(instancetype)initWithOptions:(RNNSplitViewOptions*)options
-			withComponentId:(NSString*)componentId
-			rootViewCreator:(id<RNNRootViewCreator>)creator
-			   eventEmitter:(RNNEventEmitter*)eventEmitter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
-	self.componentId = componentId;
+	
+	self.presenter = presenter;
 	self.options = options;
-	self.eventEmitter = eventEmitter;
-	self.creator = creator;
-
+	self.layoutInfo = layoutInfo;
+	self.optionsResolver = optionsResolver;
+	
 	self.navigationController.delegate = self;
-
+	
+	[self bindChildViewControllers:childViewControllers];
+	
 	return self;
 }
 
+- (void)bindChildViewControllers:(NSArray<UIViewController<RNNLayoutProtocol> *> *)viewControllers {
+	[self setViewControllers:viewControllers];
+	UIViewController<UISplitViewControllerDelegate>* masterViewController = viewControllers[0];
+	self.delegate = masterViewController;
+}
+
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.options applyOn:self];
@@ -26,18 +32,13 @@
 	return self;
 }
 
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	[_optionsResolver resolve:self with:self.viewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
 }
 
 @end

lib/ios/RNNTabBarController.h

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

lib/ios/RNNTabBarController.m

@@ -8,25 +8,41 @@
 	RNNEventEmitter *_eventEmitter;
 }
 
-- (instancetype)initWithEventEmitter:(id)eventEmitter {
-	self = [super init];
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
+			  childViewControllers:(NSArray *)childViewControllers
+						   options:(RNNNavigationOptions *)options
+				   optionsResolver:(RNNParentOptionsResolver *)optionsResolver
+						 presenter:(RNNBasePresenter *)presenter
+					  eventEmitter:(RNNEventEmitter *)eventEmitter {
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	
 	_eventEmitter = eventEmitter;
-	self.delegate = self;
+	
 	return self;
 }
 
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
+			  childViewControllers:(NSArray *)childViewControllers
+						   options:(RNNNavigationOptions *)options
+				   optionsResolver:(RNNParentOptionsResolver *)optionsResolver
+						 presenter:(RNNBasePresenter *)presenter {
+	self = [super init];
+	
+	self.presenter = presenter;
+	self.options = options;
+	self.layoutInfo = layoutInfo;
+	self.optionsResolver = optionsResolver;
+	
+	[self setViewControllers:childViewControllers];
+	
+	return self;
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
+- (instancetype)initWithEventEmitter:(id)eventEmitter {
+	self = [super init];
+	_eventEmitter = eventEmitter;
+	self.delegate = self;
+	return self;
 }
 
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
@@ -56,8 +72,13 @@
 	return ((UIViewController<RNNParentProtocol>*)self.selectedViewController).preferredStatusBarStyle;
 }
 
-- (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControllers {
-	[super setViewControllers:viewControllers];
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	[_optionsResolver resolve:self with:self.viewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
 }
 
 #pragma mark UITabBarControllerDelegate

lib/ios/RNNTabBarPresenter.m

@@ -2,12 +2,8 @@
 
 @implementation RNNTabBarPresenter
 
-- (void)presentOn:(UITabBarController *)tabBarController {
-	[self.options applyOnTabBarController:tabBarController];
-}
-
-- (void)present:(RNNNavigationOptions *)options on:(UITabBarController *)tabBarController {
-	[self.options applyOnTabBarController:tabBarController];
+- (void)present:(RNNNavigationOptions *)options onViewControllerDidLoad:(UITabBarController *)tabBarController {
+	[options applyOnTabBarController:tabBarController];
 }
 
 @end

lib/ios/RNNTopTabsViewController.h

@@ -6,8 +6,11 @@
 @interface RNNTopTabsViewController : UIViewController <RNNParentProtocol>
 
 @property (nonatomic, retain) UIView* contentView;
+
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
+@property (nonatomic, strong) RNNNavigationOptions* options;
+@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
 - (void)setViewControllers:(NSArray*)viewControllers;
 - (void)viewController:(UIViewController*)vc changedTitle:(NSString*)title;

lib/ios/RNNTopTabsViewController.m

@@ -13,6 +13,19 @@
 
 @implementation RNNTopTabsViewController
 
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
+	self = [self init];
+	
+	self.presenter = presenter;
+	self.options = options;
+	self.layoutInfo = layoutInfo;
+	self.optionsResolver = optionsResolver;
+	
+	[self setViewControllers:childViewControllers];
+	
+	return self;
+}
+
 - (instancetype)init {
 	self = [super init];
 	
@@ -57,7 +70,7 @@
 	_viewControllers = viewControllers;
 	for (RNNRootViewController* childVc in viewControllers) {
 		[childVc.view setFrame:_contentView.bounds];
-		[childVc.presenter.options.topTab applyOn:childVc];
+		[childVc.options.topTab applyOn:childVc];
 	}
 	
 	[self setSelectedViewControllerIndex:0];
@@ -72,24 +85,19 @@
     [super viewDidLoad];
 }
 
-#pragma mark RNNParentProtocol
-
-- (UIViewController *)getLeafViewController {
-	return _currentViewController;
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	[_optionsResolver resolve:self with:_viewControllers];
+	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
-	}
+- (void)mergeOptions:(RNNNavigationOptions *)options {
+	[self.presenter present:options onViewControllerWillAppear:self];
 }
 
-- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
-	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
-	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
-	}
+#pragma mark RNNParentProtocol
+
+- (UIViewController *)getLeafViewController {
+	return _currentViewController;
 }
 
 @end

lib/ios/RNNViewControllerPresenter.h

@@ -3,6 +3,4 @@
 
 @interface RNNViewControllerPresenter : RNNBasePresenter
 
-- (void)presentOn:(UIViewController *)viewController;
-
 @end

lib/ios/RNNViewControllerPresenter.m

@@ -2,12 +2,8 @@
 
 @implementation RNNViewControllerPresenter
 
-- (void)presentOn:(UIViewController *)viewController {
-	[self.options applyOn:viewController];
-	
-	if ([self.delegate respondsToSelector:@selector(optionsUpdated)]) {
-		[self.delegate optionsUpdated];
-	}
+- (void)present:(RNNNavigationOptions *)options onViewControllerDidLoad:(UIViewController *)viewController {
+	[options applyOn:viewController];
 }
 
 @end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -115,6 +115,8 @@
 		50644A2120E11A720026709C /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 50644A1F20E11A720026709C /* Constants.m */; };
 		506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */; };
 		506A2B1520973DFD00F43A95 /* RNNErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */; };
+		506F62E22163912E00AD0D0A /* RNNParentOptionsResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 506F62E02163912E00AD0D0A /* RNNParentOptionsResolver.h */; };
+		506F62E32163912E00AD0D0A /* RNNParentOptionsResolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 506F62E12163912E00AD0D0A /* RNNParentOptionsResolver.m */; };
 		50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50706E6B20CE7CA5003345C3 /* UIImage+tint.h */; };
 		50706E6E20CE7CA5003345C3 /* UIImage+tint.m in Sources */ = {isa = PBXBuildFile; fileRef = 50706E6C20CE7CA5003345C3 /* UIImage+tint.m */; };
 		50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50762D06205E96C200E3D18A /* RNNModalAnimation.h */; };
@@ -358,6 +360,8 @@
 		50644A1F20E11A720026709C /* Constants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
 		506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNErrorHandler.h; sourceTree = "<group>"; };
 		506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNErrorHandler.m; sourceTree = "<group>"; };
+		506F62E02163912E00AD0D0A /* RNNParentOptionsResolver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNParentOptionsResolver.h; sourceTree = "<group>"; };
+		506F62E12163912E00AD0D0A /* RNNParentOptionsResolver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNParentOptionsResolver.m; sourceTree = "<group>"; };
 		50706E6B20CE7CA5003345C3 /* UIImage+tint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+tint.h"; sourceTree = "<group>"; };
 		50706E6C20CE7CA5003345C3 /* UIImage+tint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+tint.m"; sourceTree = "<group>"; };
 		50762D06205E96C200E3D18A /* RNNModalAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalAnimation.h; sourceTree = "<group>"; };
@@ -702,6 +706,8 @@
 				50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */,
 				501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */,
 				501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */,
+				506F62E02163912E00AD0D0A /* RNNParentOptionsResolver.h */,
+				506F62E12163912E00AD0D0A /* RNNParentOptionsResolver.m */,
 				50220F46212ABDFD004C2B0A /* RNNReactRootView.h */,
 				50220F47212ABDFD004C2B0A /* RNNReactRootView.m */,
 				501E0215213E7EA3003365C5 /* RNNReactView.h */,
@@ -912,6 +918,7 @@
 				50415CBA20553B8E00BB682E /* RNNScreenTransition.h in Headers */,
 				263905C21E4C6F440023D7D3 /* SidebarAnimation.h in Headers */,
 				E8E518361F83B94A000467AC /* RNNViewLocation.h in Headers */,
+				506F62E22163912E00AD0D0A /* RNNParentOptionsResolver.h in Headers */,
 				505EDD34214E7B7B0071C7DE /* RNNLeafProtocol.h in Headers */,
 				263905B51E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.h in Headers */,
 				50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */,
@@ -1181,6 +1188,7 @@
 				50F5DFC61F407AA0001A00BC /* RNNNavigationController.m in Sources */,
 				21B85E5D1F44480200B314B5 /* RNNNavigationButtons.m in Sources */,
 				E8E518371F83B94A000467AC /* RNNViewLocation.m in Sources */,
+				506F62E32163912E00AD0D0A /* RNNParentOptionsResolver.m in Sources */,
 				E3458D3E20BD9CE40023149B /* RNNPreviewOptions.m in Sources */,
 				263905C91E4C6F440023D7D3 /* SidebarFlipboardAnimation.m in Sources */,
 			);

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -97,12 +97,14 @@
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = @"the title";
 	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
+	RNNTestRootViewCreator* creator = [[RNNTestRootViewCreator alloc] init];
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:initialOptions];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil isExternalComponent:NO presenter:presenter];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:creator eventEmitter:nil presenter:presenter options:initialOptions];
 	
 	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
-	nav.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:initialOptions];
+	nav.presenter = [[RNNNavigationControllerPresenter alloc] init];
+	nav.options = initialOptions;
 	
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
@@ -123,8 +125,8 @@
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = @"the title";
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:initialOptions];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil isExternalComponent:NO presenter:presenter];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:presenter options:initialOptions];
 	
 	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -12,17 +12,18 @@
 	RNNRootViewController* _vc1;
 	RNNRootViewController* _vc2;
 	UIViewController* _vc3;
-	RNNViewControllerPresenter* _presenter;
 }
 
 - (void)setUp {
     [super setUp];
 	
-	_presenter = [[RNNViewControllerPresenter alloc] initWithOptions:[[RNNNavigationOptions alloc] initWithDict:@{}]];
-	self.uut = [[RNNNavigationController alloc] init];
-	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil isExternalComponent:NO presenter:_presenter];
-	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil isExternalComponent:NO presenter:_presenter];
+	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:nil];
+	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:nil];
 	_vc3 = [UIViewController new];
+	
+	self.uut = [[RNNNavigationController alloc] initWithRootViewController:_vc1];
+	self.uut.options = [[RNNNavigationOptions alloc] initWithDict:@{}];
+	self.uut.presenter = [[RNNNavigationControllerPresenter alloc] init];;
 }
 
 - (void)testChildViewControllerForStatusBarStyle_shouldReturnTopViewController {
@@ -34,10 +35,48 @@
 }
 
 - (void)testPreferredStatusBarStyle_shouldReturnLeafPreferredStatusBarStyle {
-	[self.uut setViewControllers:@[_vc1]];
-	self.uut.getLeafViewController.presenter.options.statusBar.style = @"light";
+	self.uut.getLeafViewController.options.statusBar.style = @"light";
 	XCTAssertTrue(self.uut.preferredStatusBarStyle == self.uut.getLeafViewController.preferredStatusBarStyle);
 }
 
+- (void)testPopGestureEnabled_false {
+	NSNumber* popGestureEnabled = @(0);
+	self.uut.options.popGesture = popGestureEnabled;
+	
+	[self.uut viewDidLoad];
+
+	XCTAssertFalse(self.uut.interactivePopGestureRecognizer.enabled);
+}
+
+- (void)testPopGestureEnabled_true {
+	NSNumber* popGestureEnabled = @(1);
+	self.uut.options.popGesture = popGestureEnabled;
+	
+	[self.uut viewDidLoad];
+	
+	XCTAssertTrue(self.uut.interactivePopGestureRecognizer.enabled);
+}
+
+- (void)testRootBackgroundImage {
+	UIImage* rootBackgroundImage = [[UIImage alloc] init];
+	self.uut.options.rootBackgroundImage = rootBackgroundImage;
+	[self.uut viewDidLoad];
+	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:rootBackgroundImage]);
+}
+
+- (void)testTopBarBackgroundClipToBounds_true {
+	self.uut.options.topBar.background.clipToBounds = @(1);
+	[self.uut viewDidLoad];
+
+	XCTAssertTrue(self.uut.navigationBar.clipsToBounds);
+}
+
+- (void)testTopBarBackgroundClipToBounds_false {
+	self.uut.options.topBar.background.clipToBounds = @(0);
+	[self.uut viewDidLoad];
+
+	XCTAssertFalse(self.uut.navigationController.navigationBar.clipsToBounds);
+}
+
 
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -48,8 +48,8 @@
 	layoutInfo.componentId = self.componentId;
 	layoutInfo.name = self.pageName;
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithOptions:self.options];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO presenter:presenter];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter presenter:presenter options:self.options];
 }
 
 -(void)testTopBarBackgroundColor_validColor{
@@ -70,7 +70,6 @@
 }
 
 - (void)testStatusBarHidden_default {
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -78,7 +77,6 @@
 
 - (void)testStatusBarVisible_false {
 	self.options.statusBar.visible = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut prefersStatusBarHidden]);
@@ -86,7 +84,6 @@
 
 - (void)testStatusBarVisible_true {
 	self.options.statusBar.visible = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -95,7 +92,6 @@
 - (void)testStatusBarHideWithTopBar_false {
 	self.options.statusBar.hideWithTopBar = @(0);
 	self.options.topBar.visible = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut prefersStatusBarHidden]);
@@ -105,6 +101,7 @@
 	self.options.statusBar.hideWithTopBar = @(1);
 	self.options.topBar.visible = @(0);
 	__unused RNNNavigationController* nav = [self createNavigationController];
+
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut prefersStatusBarHidden]);
@@ -113,15 +110,12 @@
 -(void)testTitle_string{
 	NSString* title =@"some title";
 	self.options.topBar.title.text = title;
-	__unused RNNNavigationController* nav = [self createNavigationController];
 
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue([self.uut.navigationItem.title isEqual:title]);
 }
 
 -(void)testTitle_default{
-	__unused RNNNavigationController* nav = [self createNavigationController];
-
 	[self.uut viewWillAppear:false];
 	XCTAssertNil(self.uut.navigationItem.title);
 }
@@ -143,23 +137,6 @@
 	XCTAssertTrue([self.uut.view.backgroundColor isEqual:expectedColor]);
 }
 
--(void)testPopGestureEnabled_true{
-	NSNumber* popGestureEnabled = @(1);
-	self.options.popGesture = popGestureEnabled;
-	__unused RNNNavigationController* nav = [self createNavigationController];
-	[self.uut viewWillAppear:false];
-	XCTAssertTrue(self.uut.navigationController.interactivePopGestureRecognizer.enabled);
-}
-
--(void)testPopGestureEnabled_false{
-	NSNumber* popGestureEnabled = @(0);
-	self.options.popGesture = popGestureEnabled;
-	__unused RNNNavigationController* nav = [self createNavigationController];
-	
-	[self.uut viewWillAppear:false];
-	XCTAssertFalse(self.uut.navigationController.interactivePopGestureRecognizer.enabled);
-}
-
 -(void)testTopBarTextFontFamily_validFont{
 	NSString* inputFont = @"HelveticaNeue";
 	__unused RNNNavigationController* nav = [self createNavigationController];
@@ -219,21 +196,18 @@
 }
 
 -(void)testTopBarLargeTitle_default {
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode,  UINavigationItemLargeTitleDisplayModeNever);
 }
 -(void)testTopBarLargeTitle_true {
 	self.options.topBar.largeTitle.visible = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode, UINavigationItemLargeTitleDisplayModeAlways);
 }
 -(void)testTopBarLargeTitle_false {
 	self.options.topBar.largeTitle.visible  = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	
 	XCTAssertEqual(self.uut.navigationItem.largeTitleDisplayMode, UINavigationItemLargeTitleDisplayModeNever);
@@ -246,6 +220,7 @@
 	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
+
 	XCTAssertTrue([self.uut.navigationController.navigationBar.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
@@ -482,6 +457,7 @@
 
 	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"text": @"test", @"enabled": @false, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
 	__unused RNNNavigationController* nav = [self createNavigationController];
+
 	[self.uut viewWillAppear:false];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.leftBarButtonItems objectAtIndex:0];
@@ -513,7 +489,6 @@
 -(void)testStatusBarBlurOn {
 	NSNumber* statusBarBlurInput = @(1);
 	self.options.statusBar.blur = statusBarBlurInput;
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil([self.uut.view viewWithTag:BLUR_STATUS_TAG]);
 }
@@ -521,13 +496,11 @@
 -(void)testStatusBarBlurOff {
 	NSNumber* statusBarBlurInput = @(0);
 	self.options.statusBar.blur = statusBarBlurInput;
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.view viewWithTag:BLUR_STATUS_TAG]);
 }
 
 - (void)testTabBarHidden_default {
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut hidesBottomBarWhenPushed]);
@@ -536,7 +509,6 @@
 
 - (void)testTabBarHidden_true {
 	self.options.bottomTabs.visible = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([self.uut hidesBottomBarWhenPushed]);
@@ -544,7 +516,6 @@
 
 - (void)testTabBarHidden_false {
 	self.options.bottomTabs.visible = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse([self.uut hidesBottomBarWhenPushed]);
@@ -575,23 +546,13 @@
 -(void)testBackgroundImage {
 	UIImage* backgroundImage = [[UIImage alloc] init];
 	self.options.backgroundImage = backgroundImage;
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:backgroundImage]);
 }
 
--(void)testRootBackgroundImage {
-	UIImage* rootBackgroundImage = [[UIImage alloc] init];
-	self.options.rootBackgroundImage = rootBackgroundImage;
-	__unused RNNNavigationController* nav = [self createNavigationController];
-	[self.uut viewWillAppear:false];
-	XCTAssertTrue([[(UIImageView*)self.uut.navigationController.view.subviews[0] image] isEqual:rootBackgroundImage]);
-}
-
 -(void)testTopBarDrawUnder_true {
 	self.options.topBar.drawBehind = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
@@ -599,7 +560,6 @@
 
 -(void)testTopBarDrawUnder_false {
 	self.options.topBar.drawBehind = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeTop);
@@ -607,7 +567,6 @@
 
 -(void)testBottomTabsDrawUnder_true {
 	self.options.bottomTabs.drawBehind = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertTrue(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
@@ -615,7 +574,6 @@
 
 -(void)testBottomTabsDrawUnder_false {
 	self.options.bottomTabs.drawBehind = @(0);
-	__unused RNNNavigationController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 
 	XCTAssertFalse(self.uut.edgesForExtendedLayout & UIRectEdgeBottom);
@@ -714,31 +672,17 @@
 	XCTAssertTrue([attributes[@"NSFont"] isEqual:expectedFont]);
 }
 
-- (void)testTopBarBackgroundClipToBounds_true {
-	self.options.topBar.background.clipToBounds = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertTrue(self.uut.navigationController.navigationBar.clipsToBounds);
-}
-
-- (void)testTopBarBackgroundClipToBounds_false {
-	__unused RNNNavigationController* nav = [self createNavigationController];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertFalse(self.uut.navigationController.navigationBar.clipsToBounds);
-}
-
 - (void)testWillMoveToParent_shouldPassOptionsToParent {
 	__unused RNNNavigationController* nav = [self createNavigationController];
-	self.uut.presenter.options.topBar.visible = @(0);
+	self.uut.options.topBar.visible = @(0);
 	[self.uut willMoveToParentViewController:nav];
 	XCTAssertTrue(nav.navigationBarHidden);
 }
 
 - (RNNNavigationController *)createNavigationController {
 	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:self.uut];
-	nav.presenter = [[RNNNavigationControllerPresenter alloc] initWithOptions:[[RNNNavigationOptions alloc] initWithDict:@{}]];
+	nav.options = [[RNNNavigationOptions alloc] initWithDict:@{}];
+	nav.presenter = [[RNNNavigationControllerPresenter alloc] init];
 	
 	return nav;
 }