Fixed options merging issues, removed optionsResolver (#4100)

lib/ios/RNNCommandsHandler.m

@@ -67,14 +67,15 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController* vc = [_store findComponentForId:componentId];
+	UIViewController<RNNLayoutProtocol>* vc = (UIViewController<RNNLayoutProtocol>*)[_store findComponentForId:componentId];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	
-	while (vc != nil) {
-		if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
-			[(UIViewController<RNNLayoutProtocol>*)vc mergeOptions:options];
-		}
-		vc = vc.parentViewController;
+	if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)] || [vc isKindOfClass:[RNNRootViewController class]]) {
+		[CATransaction begin];
+		[CATransaction setCompletionBlock:completion];
+		
+		[vc.getLeafViewController mergeAndPresentOptions:options];
+		
+		[CATransaction commit];
 	}
 }
 

lib/ios/RNNControllerFactory.m

@@ -131,11 +131,10 @@
 	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] init];
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
 	
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 	
 	return stack;
 }
@@ -144,11 +143,10 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
 	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] init];
-	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter eventEmitter:_eventEmitter];
+	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter eventEmitter:_eventEmitter];
 	
 	return tabsController;
 }
@@ -157,11 +155,10 @@
 	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];
 	
-	RNNTopTabsViewController* topTabsController = [[RNNTopTabsViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	RNNTopTabsViewController* topTabsController = [[RNNTopTabsViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 	
 	return topTabsController;
 }
@@ -170,11 +167,10 @@
 	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];
 	
-	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 	
 	return sideMenu;
 }
@@ -184,9 +180,8 @@
 	UIViewController<RNNParentProtocol>* childVc = [self fromTree:node.children[0]];
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
-	RNNParentOptionsResolver* optionsResolver = [[RNNParentOptionsResolver alloc] init];
 
-	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo childViewControllers:@[childVc] options:options optionsResolver:optionsResolver presenter:[[RNNBasePresenter alloc] init] type:type];
+	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo childViewControllers:@[childVc] options:options presenter:[[RNNBasePresenter alloc] init] type:type];
 	
 	return sideMenuChild;
 }
@@ -195,11 +190,10 @@
 	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];
 
-	RNNSplitViewController* splitViewController = [[RNNSplitViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options optionsResolver:optionsResolver presenter:presenter];
+	RNNSplitViewController* splitViewController = [[RNNSplitViewController alloc] initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 
 	return splitViewController;
 }

lib/ios/RNNLayoutProtocol.h

@@ -1,5 +1,6 @@
 #import "RNNLayoutInfo.h"
 #import "RNNBasePresenter.h"
+#import "RNNLeafProtocol.h"
 
 @protocol RNNLayoutProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
@@ -9,6 +10,6 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, strong) RNNNavigationOptions* options;
 
-- (void)mergeOptions:(RNNNavigationOptions *)options;
+- (UIViewController<RNNLeafProtocol, RNNLayoutProtocol> *)getLeafViewController;
 
 @end

lib/ios/RNNLeafProtocol.h

@@ -1,13 +1,12 @@
-#import "RNNLayoutProtocol.h"
 
 typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
-@protocol RNNLeafProtocol <RNNLayoutProtocol>
+@protocol RNNLeafProtocol <NSObject>
 
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
 
-- (UIViewController<RNNLeafProtocol> *)getLeafViewController;
-
 - (void)bindViewController:(UIViewController *)viewController;
 
+- (void)mergeAndPresentOptions:(RNNNavigationOptions *)newOptions;
+
 @end

lib/ios/RNNNavigationController.h

@@ -1,13 +1,11 @@
 #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,12 +5,11 @@
 
 @implementation RNNNavigationController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNNavigationControllerPresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNNavigationControllerPresenter *)presenter {
 	self = [super init];
 
 	self.presenter = presenter;
 	self.options = options;
-	self.optionsResolver = optionsResolver;
 	self.layoutInfo = layoutInfo;
 	
 	[self setViewControllers:childViewControllers];
@@ -62,20 +61,9 @@
 	return self.topViewController;
 }
 
-- (void)viewDidLoad {
-	[super viewDidLoad];
-	[_presenter present:self.options onViewControllerDidLoad:self];
-}
-
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:self.childViewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
-
 
 @end

lib/ios/RNNNavigationOptions.m

@@ -19,7 +19,11 @@
 	[self.overlay applyOn:viewController];
 	[self.statusBar applyOn:viewController];
 	[self.layout applyOn:viewController];
-	[self applyOtherOptions:self on:viewController];
+	
+	[self applyOtherOptionsOn:viewController];
+	
+	[self applyOnNavigationController:viewController.navigationController];
+	[self applyOnTabBarController:viewController.tabBarController];
 }
 
 - (void)applyOnNavigationController:(UINavigationController *)navigationController {
@@ -27,19 +31,19 @@
 	[self.statusBar applyOn:navigationController];
 	[self.layout applyOn:navigationController];
 	[self.bottomTab applyOn:navigationController];
-	[self applyOtherOptions:self onNavigationController:navigationController];
+	[self applyOtherOptionsOnNavigationController:navigationController];
 }
 
 - (void)applyOnTabBarController:(UITabBarController *)tabBarController {
 	[self.bottomTabs applyOnTabBarController:tabBarController];
 }
 
-- (void)applyOtherOptions:(RNNNavigationOptions *)options onNavigationController:(UINavigationController*)navigationController {
-	if (options.popGesture) {
-		navigationController.interactivePopGestureRecognizer.enabled = [options.popGesture boolValue];
+- (void)applyOtherOptionsOnNavigationController:(UINavigationController*)navigationController {
+	if (self.popGesture) {
+		navigationController.interactivePopGestureRecognizer.enabled = [self.popGesture boolValue];
 	}
 	
-	if (options.rootBackgroundImage) {
+	if (self.rootBackgroundImage) {
 		UIImageView* backgroundImageView = (navigationController.view.subviews.count > 0) ? navigationController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
 			backgroundImageView = [[UIImageView alloc] initWithFrame:navigationController.view.bounds];
@@ -47,13 +51,13 @@
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = [options.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)options.rootBackgroundImage : [RCTConvert UIImage:options.rootBackgroundImage];
+		backgroundImageView.image = [self.rootBackgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.rootBackgroundImage : [RCTConvert UIImage:self.rootBackgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
 }
 
-- (void)applyOtherOptions:(RNNNavigationOptions *)options on:(UIViewController*)viewController {
-	if (options.backgroundImage) {
+- (void)applyOtherOptionsOn:(UIViewController*)viewController {
+	if (self.backgroundImage) {
 		UIImageView* backgroundImageView = (viewController.view.subviews.count > 0) ? viewController.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
 			backgroundImageView = [[UIImageView alloc] initWithFrame:viewController.view.bounds];
@@ -61,16 +65,16 @@
 		}
 		
 		backgroundImageView.layer.masksToBounds = YES;
-		backgroundImageView.image = [options.backgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)options.backgroundImage : [RCTConvert UIImage:options.backgroundImage];
+		backgroundImageView.image = [self.backgroundImage isKindOfClass:[UIImage class]] ? (UIImage*)self.backgroundImage : [RCTConvert UIImage:self.backgroundImage];
 		[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 	}
 
-	if (options.modalPresentationStyle) {
-		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:options.modalPresentationStyle];
+	if (self.modalPresentationStyle) {
+		viewController.modalPresentationStyle = [RCTConvert UIModalPresentationStyle:self.modalPresentationStyle];
 		[viewController.view setBackgroundColor:[UIColor clearColor]];
 	}
-	if (options.modalTransitionStyle) {
-		viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:options.modalTransitionStyle];
+	if (self.modalTransitionStyle) {
+		viewController.modalTransitionStyle = [RCTConvert UIModalTransitionStyle:self.modalTransitionStyle];
 	}
 }
 

lib/ios/RNNParentOptionsResolver.h

@@ -1,8 +0,0 @@
-#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

@@ -1,13 +0,0 @@
-#import "RNNParentOptionsResolver.h"
-
-@implementation RNNParentOptionsResolver
-
-- (void)resolve:(UIViewController<RNNLayoutProtocol> *)parent with:(NSArray<UIViewController<RNNLayoutProtocol> *> *)children {
-	for (UIViewController<RNNLayoutProtocol>* child in parent.childViewControllers) {
-		if ([parent conformsToProtocol:@protocol(RNNLayoutProtocol)] && [child conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
-			[parent.options mergeOptions:child.options overrideOptions:YES];
-		}
-	}
-}
-
-@end

lib/ios/RNNParentProtocol.h

@@ -1,15 +1,10 @@
 #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;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter;
 
 @end

lib/ios/RNNRootViewController.h

@@ -8,11 +8,12 @@
 #import "RNNUIBarButtonItem.h"
 #import "RNNLayoutInfo.h"
 #import "RNNLeafProtocol.h"
+#import "RNNLayoutProtocol.h"
 #import "RNNViewControllerPresenter.h"
 
 typedef void (^PreviewCallback)(UIViewController *vc);
 
-@interface RNNRootViewController : UIViewController	<RNNLeafProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
+@interface RNNRootViewController : UIViewController	<RNNLeafProtocol, RNNLayoutProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
 
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;

lib/ios/RNNRootViewController.m

@@ -85,9 +85,10 @@
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
+- (void)mergeAndPresentOptions:(RNNNavigationOptions *)newOptions {
+	[self.options mergeOptions:newOptions overrideOptions:YES];
+	[_presenter present:self.options onViewControllerWillAppear:self];
+	
 	[self initReactCustomViews];
 }
 

lib/ios/RNNSideMenuChildVC.h

@@ -16,8 +16,7 @@ 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)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter type:(RNNSideMenuChildType)type;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter type:(RNNSideMenuChildType)type;
 
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -9,21 +9,20 @@
 
 @implementation RNNSideMenuChildVC
 
-- (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];
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter type:(RNNSideMenuChildType)type {
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 	
 	self.type = type;
 
 	return self;
 }
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
 	
 	self.presenter = presenter;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
-	self.optionsResolver = optionsResolver;
 	
 	[self bindChildViewControllers:childViewControllers];
 	
@@ -45,15 +44,9 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:self.childViewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.h

@@ -21,7 +21,6 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) 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,13 +21,12 @@
 
 @implementation RNNSideMenuController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
 	
 	self.presenter = presenter;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
-	self.optionsResolver = optionsResolver;
 	
 	[self bindChildViewControllers:childViewControllers];
 	
@@ -106,13 +105,7 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:self.childViewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
-
 @end

lib/ios/RNNSplitViewController.h

@@ -15,6 +15,5 @@
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
-@property (nonatomic, strong) RNNParentOptionsResolver* optionsResolver;
 
 @end

lib/ios/RNNSplitViewController.m

@@ -2,13 +2,12 @@
 
 @implementation RNNSplitViewController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter {
 	self = [super init];
 	
 	self.presenter = presenter;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
-	self.optionsResolver = optionsResolver;
 	
 	self.navigationController.delegate = self;
 	
@@ -33,13 +32,8 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:self.viewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
 
 @end

lib/ios/RNNTabBarController.h

@@ -5,13 +5,12 @@
 
 @interface RNNTabBarController : UITabBarController <RNNParentProtocol, UITabBarControllerDelegate>
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options 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

@@ -11,10 +11,9 @@
 - (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];
+	self = [self initWithLayoutInfo:layoutInfo childViewControllers:childViewControllers options:options presenter:presenter];
 	
 	_eventEmitter = eventEmitter;
 	
@@ -24,14 +23,12 @@
 - (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];
 	
@@ -73,15 +70,9 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:self.viewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
-
 #pragma mark UITabBarControllerDelegate
 
 - (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {

lib/ios/RNNTopTabsViewController.h

@@ -10,7 +10,6 @@
 @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,13 +13,12 @@
 
 @implementation RNNTopTabsViewController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options optionsResolver:(RNNParentOptionsResolver *)optionsResolver presenter:(RNNBasePresenter *)presenter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options presenter:(RNNBasePresenter *)presenter {
 	self = [self init];
 	
 	self.presenter = presenter;
 	self.options = options;
 	self.layoutInfo = layoutInfo;
-	self.optionsResolver = optionsResolver;
 	
 	[self setViewControllers:childViewControllers];
 	
@@ -86,14 +85,9 @@
 }
 
 - (void)willMoveToParentViewController:(UIViewController *)parent {
-	[_optionsResolver resolve:self with:_viewControllers];
 	[_presenter present:self.options onViewControllerDidLoad:self];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[self.options mergeOptions:options overrideOptions:YES];
-	[self.presenter present:self.options onViewControllerWillAppear:self];
-}
 
 #pragma mark RNNParentProtocol
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -115,8 +115,6 @@
 		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 */; };
@@ -360,8 +358,6 @@
 		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>"; };
@@ -706,8 +702,6 @@
 				50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */,
 				501CD31D214A5B6900A6E225 /* RNNLayoutInfo.h */,
 				501CD31E214A5B6900A6E225 /* RNNLayoutInfo.m */,
-				506F62E02163912E00AD0D0A /* RNNParentOptionsResolver.h */,
-				506F62E12163912E00AD0D0A /* RNNParentOptionsResolver.m */,
 				50220F46212ABDFD004C2B0A /* RNNReactRootView.h */,
 				50220F47212ABDFD004C2B0A /* RNNReactRootView.m */,
 				501E0215213E7EA3003365C5 /* RNNReactView.h */,
@@ -918,7 +912,6 @@
 				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 */,
@@ -1188,7 +1181,6 @@
 				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/RNNNavigationControllerTest.m

@@ -43,7 +43,7 @@
 	NSNumber* popGestureEnabled = @(0);
 	self.uut.options.popGesture = popGestureEnabled;
 	
-	[self.uut viewDidLoad];
+	[self.uut willMoveToParentViewController:nil];
 
 	XCTAssertFalse(self.uut.interactivePopGestureRecognizer.enabled);
 }
@@ -60,13 +60,13 @@
 - (void)testRootBackgroundImage {
 	UIImage* rootBackgroundImage = [[UIImage alloc] init];
 	self.uut.options.rootBackgroundImage = rootBackgroundImage;
-	[self.uut viewDidLoad];
+	[self.uut willMoveToParentViewController:nil];
 	XCTAssertTrue([[(UIImageView*)self.uut.view.subviews[0] image] isEqual:rootBackgroundImage]);
 }
 
 - (void)testTopBarBackgroundClipToBounds_true {
 	self.uut.options.topBar.background.clipToBounds = @(1);
-	[self.uut viewDidLoad];
+	[self.uut willMoveToParentViewController:nil];
 
 	XCTAssertTrue(self.uut.navigationBar.clipsToBounds);
 }