Remove get current leaf, better options resolving (#4700)

* Remove currentLeaf

* Fix resolve options

* Remove irrelevant test

* Remove RNNRootViewController clear background color

* Fix title with subtitle options

lib/ios/RNNBasePresenter.m

 #import "RNNBasePresenter.h"
 #import "UIViewController+RNNOptions.h"
 #import "RNNTabBarItemCreator.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNBasePresenter ()
-@property (nonatomic, strong) RNNReactComponentManager* componentManager;
+@property (nonatomic, strong) RNNReactComponentRegistry* componentRegistry;
 @end
 
 
 @implementation RNNBasePresenter
 
-- (instancetype)initWithComponentManager:(RNNReactComponentManager *)componentManager {
+- (instancetype)initWithcomponentRegistry:(RNNReactComponentRegistry *)componentRegistry {
 	self = [super init];
-	self.componentManager = componentManager;
+	self.componentRegistry = componentRegistry;
 	return self;
 }
 

lib/ios/RNNBridgeManager.m

 #import "RNNBridgeModule.h"
 #import "RNNRootViewCreator.h"
 #import "RNNReactRootViewCreator.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNBridgeManager() <RCTBridgeDelegate>
 
 @property (nonatomic, strong, readwrite) RCTBridge *bridge;
 @property (nonatomic, strong, readwrite) RNNStore *store;
-@property (nonatomic, strong, readwrite) RNNReactComponentManager *componentManager;
+@property (nonatomic, strong, readwrite) RNNReactComponentRegistry *componentRegistry;
 
 @end
 
 	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
 
 	id<RNNRootViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
-	_componentManager = [[RNNReactComponentManager alloc] initWithCreator:rootViewCreator];
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter store:_store componentManager:_componentManager andBridge:bridge];
+	_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter store:_store componentRegistry:_componentRegistry andBridge:bridge];
 	
 	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory eventEmitter:eventEmitter stackManager:[RNNNavigationStackManager new] modalManager:[RNNModalManager new] overlayManager:[RNNOverlayManager new] mainWindow:_mainWindow];
 	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
 
 - (void)onJavaScriptWillLoad {
 	[_store clean];
-	[_componentManager clean];
+	[_componentRegistry clean];
 }
 
 - (void)onJavaScriptLoaded {

lib/ios/RNNCommandsHandler.m

 			});
 		}
 	} else {
-		id animationDelegate = (newVc.resolveOptions.animations.push.hasCustomAnimation || newVc.getCurrentLeaf.isCustomTransitioned) ? newVc : nil;
+		id animationDelegate = (newVc.resolveOptions.animations.push.hasCustomAnimation || newVc.resolveOptions.customTransition.animations) ? newVc : nil;
 		[newVc renderTreeAndWait:([newVc.resolveOptions.animations.push.waitForRender getWithDefaultValue:NO] || animationDelegate) perform:^{
 			[_stackManager push:newVc onTop:fromVC animated:[newVc.resolveOptions.animations.push.enable getWithDefaultValue:YES] animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 	
 	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayout:layout];
 	
-	[newVc renderTreeAndWait:[newVc.getCurrentLeaf.resolveOptions.animations.showModal.waitForRender getWithDefaultValue:NO] perform:^{
+	[newVc renderTreeAndWait:[newVc.resolveOptions.animations.showModal.waitForRender getWithDefaultValue:NO] perform:^{
 		[_modalManager showModal:newVc animated:[newVc.getCurrentChild.resolveOptions.animations.showModal.enable getWithDefaultValue:YES] hasCustomAnimation:newVc.getCurrentChild.resolveOptions.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
 			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 			completion(componentId);
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol>* overlayVC = [_controllerFactory createLayout:layout];
-	[overlayVC renderTreeAndWait:[overlayVC.options.animations.showOverlay.waitForRender getWithDefaultValue:NO] perform:^{
+	[overlayVC renderTreeAndWait:NO perform:^{
 		UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 		overlayWindow.rootViewController = overlayVC;
 		[_overlayManager showOverlayWindow:overlayWindow];

lib/ios/RNNControllerFactory.h

 #import "RNNStore.h"
 #import "RNNEventEmitter.h"
 #import "RNNParentProtocol.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNControllerFactory : NSObject
 
 -(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
 						  eventEmitter:(RNNEventEmitter*)eventEmitter
 								 store:(RNNStore *)store
-					  componentManager:(RNNReactComponentManager *)componentManager
+					  componentRegistry:(RNNReactComponentRegistry *)componentRegistry
 							 andBridge:(RCTBridge*)bridge;
 
 - (UIViewController<RNNParentProtocol> *)createLayout:(NSDictionary*)layout;

lib/ios/RNNControllerFactory.m

 	id<RNNRootViewCreator> _creator;
 	RNNStore *_store;
 	RCTBridge *_bridge;
-	RNNReactComponentManager* _componentManager;
+	RNNReactComponentRegistry* _componentRegistry;
 }
 
 # pragma mark public
 - (instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
 						   eventEmitter:(RNNEventEmitter*)eventEmitter
 								  store:(RNNStore *)store
-					   componentManager:(RNNReactComponentManager *)componentManager
+					   componentRegistry:(RNNReactComponentRegistry *)componentRegistry
 							  andBridge:(RCTBridge *)bridge {
 	
 	self = [super init];
 	_eventEmitter = eventEmitter;
 	_bridge = bridge;
 	_store = store;
-	_componentManager = componentManager;
+	_componentRegistry = componentRegistry;
 	
 	return self;
 }
 - (UIViewController<RNNParentProtocol> *)createComponent:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithComponentManager:_componentManager];
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithcomponentRegistry:_componentRegistry];
 	
 	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
 	
 
 
 - (UIViewController<RNNParentProtocol> *)createStack:(RNNLayoutNode*)node {
-	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] initWithComponentManager:_componentManager];
+	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] initWithcomponentRegistry:_componentRegistry];
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
 	

lib/ios/RNNLayoutProtocol.h

 
 - (UIViewController<RNNLayoutProtocol> *)getCurrentChild;
 
-- (UIViewController<RNNLeafProtocol, RNNLayoutProtocol> *)getCurrentLeaf;
-
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 
 - (RNNNavigationOptions *)resolveOptions;

lib/ios/RNNModalManager.m

 
 -(void)removePendingNextModalIfOnTop:(RNNTransitionCompletionBlock)completion {
 	UIViewController<RNNParentProtocol> *modalToDismiss = [_pendingModalIdsToDismiss lastObject];
-	RNNNavigationOptions* options = modalToDismiss.getCurrentChild.resolveOptions;
+	RNNNavigationOptions* options = modalToDismiss.resolveOptions;
 
 	if(!modalToDismiss) {
 		return;

lib/ios/RNNNavigationButtons.h

 #import <UIKit/UIKit.h>
 #import "RNNButtonOptions.h"
 #import "RNNRootViewCreator.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNNavigationButtons : NSObject
 
--(instancetype)initWithViewController:(UIViewController*)viewController componentManager:(RNNReactComponentManager *)componentManager;
+-(instancetype)initWithViewController:(UIViewController*)viewController componentRegistry:(RNNReactComponentRegistry *)componentRegistry;
 
 -(void)applyLeftButtons:(NSArray*)leftButtons rightButtons:(NSArray*)rightButtons defaultLeftButtonStyle:(RNNButtonOptions *)defaultLeftButtonStyle defaultRightButtonStyle:(RNNButtonOptions *)defaultRightButtonStyle;
 

lib/ios/RNNNavigationButtons.m

 @property (weak, nonatomic) UIViewController<RNNLayoutProtocol>* viewController;
 @property (strong, nonatomic) RNNButtonOptions* defaultLeftButtonStyle;
 @property (strong, nonatomic) RNNButtonOptions* defaultRightButtonStyle;
-@property (strong, nonatomic) RNNReactComponentManager* componentManager;
+@property (strong, nonatomic) RNNReactComponentRegistry* componentRegistry;
 @end
 
 @implementation RNNNavigationButtons
 
--(instancetype)initWithViewController:(UIViewController<RNNLayoutProtocol>*)viewController componentManager:(id)componentManager {
+-(instancetype)initWithViewController:(UIViewController<RNNLayoutProtocol>*)viewController componentRegistry:(id)componentRegistry {
 	self = [super init];
 	
 	self.viewController = viewController;
-	self.componentManager = componentManager;
+	self.componentRegistry = componentRegistry;
 	
 	return self;
 }
 		componentOptions.componentId = [[Text alloc] initWithValue:component[@"componentId"]];
 		componentOptions.name = [[Text alloc] initWithValue:component[@"name"]];
 		
-		RNNReactView *view = [_componentManager createComponentIfNotExists:componentOptions parentComponentId:self.viewController.layoutInfo.componentId reactViewReadyBlock:nil];
+		RNNReactView *view = [_componentRegistry createComponentIfNotExists:componentOptions parentComponentId:self.viewController.layoutInfo.componentId reactViewReadyBlock:nil];
 		barButtonItem = [[RNNUIBarButtonItem alloc] init:buttonId withCustomView:view];
 	} else if (iconImage) {
 		barButtonItem = [[RNNUIBarButtonItem alloc] init:buttonId withIcon:iconImage];

lib/ios/RNNNavigationController.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return ((UIViewController<RNNParentProtocol>*)self.topViewController);
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
 - (UIViewController *)childViewControllerForStatusBarStyle {
 	return self.topViewController;
 }

lib/ios/RNNNavigationControllerPresenter.h

 #import "RNNBasePresenter.h"
 #import "RNNRootViewCreator.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNNavigationControllerPresenter : RNNBasePresenter
 
-- (instancetype)initWithComponentManager:(RNNReactComponentManager *)componentManager;
+- (instancetype)initWithcomponentRegistry:(RNNReactComponentRegistry *)componentRegistry;
 
 - (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options;
 

lib/ios/RNNNavigationControllerPresenter.m

 #import "RNNCustomTitleView.h"
 
 @interface RNNNavigationControllerPresenter() {
-	RNNReactComponentManager* _componentManager;
+	RNNReactComponentRegistry* _componentRegistry;
 	UIView* _customTopBar;
 	UIView* _customTopBarBackground;
 }
 @end
 @implementation RNNNavigationControllerPresenter
 
-- (instancetype)initWithComponentManager:(RNNReactComponentManager *)componentManager {
+- (instancetype)initWithcomponentRegistry:(RNNReactComponentRegistry *)componentRegistry {
 	self = [super init];
-	_componentManager = componentManager;
+	_componentRegistry = componentRegistry;
 	return self;
 }
 
 		readyBlock = nil;
 	}
 	if (options.topBar.component.name.hasValue) {
-		RCTRootView *reactView = [_componentManager createComponentIfNotExists:options.topBar.component parentComponentId:navigationController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
+		RCTRootView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.component parentComponentId:navigationController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
 		
 		_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 		reactView.backgroundColor = UIColor.clearColor;
 		readyBlock = nil;
 	}
 	if (options.topBar.background.component.name.hasValue) {
-		RCTRootView *reactView = [_componentManager createComponentIfNotExists:options.topBar.background.component parentComponentId:navigationController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
+		RCTRootView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.background.component parentComponentId:navigationController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
 		
 		_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
 		[navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
 
 - (void)dealloc {
 	RNNNavigationController* navigationController = self.bindedViewController;
-	[_componentManager removeComponent:navigationController.layoutInfo.componentId];
+	[_componentRegistry removeComponent:navigationController.layoutInfo.componentId];
 }
 
 @end

lib/ios/RNNOptions.h

 
 - (RNNOptions *)overrideOptions:(RNNOptions *)otherOptions;
 - (RNNOptions *)mergeOptions:(RNNOptions *)otherOptions;
+- (RNNOptions *)mergeInOptions:(RNNOptions *)otherOptions;
 
 - (RNNOptions *)withDefault:(RNNOptions *)defaultOptions;
 

lib/ios/RNNOptions.m

 	return [self mergeOptions:otherOptions overrideOptions:NO];
 }
 
+- (RNNOptions *)mergeInOptions:(RNNOptions *)otherOptions {
+	if (!otherOptions) {
+		return self;
+	}
+	
+	return [otherOptions mergeOptions:self overrideOptions:NO];
+}
+
 - (RNNOptions *)withDefault:(RNNOptions *)defaultOptions {
 	RNNOptions* newOptions = [[[self class] alloc] initWithDict:@{}];
 	[newOptions mergeOptions:defaultOptions overrideOptions:YES];

lib/ios/RNNReactComponentManager.h → lib/ios/RNNReactComponentRegistry.h

 #import "RNNStore.h"
 #import "RNNRootViewCreator.h"
 
-@interface RNNReactComponentManager : NSObject
+@interface RNNReactComponentRegistry : NSObject
 
 - (instancetype)initWithCreator:(id<RNNRootViewCreator>)creator;
 

lib/ios/RNNReactComponentManager.m → lib/ios/RNNReactComponentRegistry.m

-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
-@interface RNNReactComponentManager () {
+@interface RNNReactComponentRegistry () {
 	id<RNNRootViewCreator> _creator;
 	NSMutableDictionary* _componentStore;
 }
 
 @end
 
-@implementation RNNReactComponentManager
+@implementation RNNReactComponentRegistry
 
 - (instancetype)initWithCreator:(id<RNNRootViewCreator>)creator {
 	self = [super init];

lib/ios/RNNRootViewController.m

 			}
 		}];
 	}];
-	reactView.backgroundColor = [UIColor clearColor];
+
 	self.view = reactView;
 	
 	if (!wait && readyBlock) {
 	return self;
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return self;
-}
-
 -(void)updateSearchResultsForSearchController:(UISearchController *)searchController {
 	[self.eventEmitter sendOnSearchBarUpdated:self.layoutInfo.componentId
 										 text:searchController.searchBar.text

lib/ios/RNNSideMenuChildVC.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return self.child;
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return self.center;
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
 @end

lib/ios/RNNSplitViewController.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return self.viewControllers[0];
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
-
 @end

lib/ios/RNNTabBarController.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return self.selectedViewController;
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return ((UIViewController<RNNParentProtocol>*)self.selectedViewController).preferredStatusBarStyle;
 }

lib/ios/RNNTopTabsViewController.m

 }
 
 - (RNNNavigationOptions *)resolveOptions {
-	return [(RNNNavigationOptions *)[self.getCurrentChild.resolveOptions.copy mergeOptions:self.options] withDefault:self.defaultOptions];
+	return [(RNNNavigationOptions *)[self.options mergeInOptions:self.getCurrentChild.resolveOptions.copy] withDefault:self.defaultOptions];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
 	return _currentViewController;
 }
 
-- (UIViewController<RNNLeafProtocol> *)getCurrentLeaf {
-	return [[self getCurrentChild] getCurrentLeaf];
-}
-
 @end

lib/ios/RNNTransitionsOptions.h

 @property (nonatomic, strong) RNNScreenTransition* push;
 @property (nonatomic, strong) RNNScreenTransition* pop;
 @property (nonatomic, strong) RNNScreenTransition* showModal;
-@property (nonatomic, strong) RNNScreenTransition* showOverlay;
 @property (nonatomic, strong) RNNScreenTransition* dismissModal;
 @property (nonatomic, strong) RNNScreenTransition* setStackRoot;
 @property (nonatomic, strong) RNNScreenTransition* setRoot;

lib/ios/RNNTransitionsOptions.m

 	self.push = [[RNNScreenTransition alloc] initWithDict:dict[@"push"]];
 	self.pop = [[RNNScreenTransition alloc] initWithDict:dict[@"pop"]];
 	self.showModal = [[RNNScreenTransition alloc] initWithDict:dict[@"showModal"]];
-	self.showOverlay = [[RNNScreenTransition alloc] initWithDict:dict[@"showOverlay"]];
 	self.dismissModal = [[RNNScreenTransition alloc] initWithDict:dict[@"dismissModal"]];
 	self.setStackRoot = [[RNNScreenTransition alloc] initWithDict:dict[@"setStackRoot"]];
 	self.setRoot = [[RNNScreenTransition alloc] initWithDict:dict[@"setRoot"]];

lib/ios/RNNViewControllerPresenter.h

 #import "RNNBasePresenter.h"
 #import "RNNNavigationButtons.h"
-#import "RNNReactComponentManager.h"
+#import "RNNReactComponentRegistry.h"
 
 @interface RNNViewControllerPresenter : RNNBasePresenter
 
-- (instancetype)initWithComponentManager:(RNNReactComponentManager *)componentManager;
+- (instancetype)initWithcomponentRegistry:(RNNReactComponentRegistry *)componentRegistry;
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock;
 

lib/ios/RNNViewControllerPresenter.m

 @interface RNNViewControllerPresenter() {
 	RNNReactView* _customTitleView;
 	RNNTitleViewHelper* _titleViewHelper;
-	RNNReactComponentManager* _componentManager;
+	RNNReactComponentRegistry* _componentRegistry;
 }
 
 @end
 	return self;
 }
 
-- (instancetype)initWithComponentManager:(RNNReactComponentManager *)componentManager {
+- (instancetype)initWithcomponentRegistry:(RNNReactComponentRegistry *)componentRegistry {
 	self = [self init];
-	_componentManager = componentManager;
+	_componentRegistry = componentRegistry;
 	return self;
 }
 
 - (void)bindViewController:(UIViewController *)bindedViewController {
 	self.bindedViewController = bindedViewController;
-	_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:self.bindedViewController componentManager:_componentManager];
+	_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:self.bindedViewController componentRegistry:_componentRegistry];
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
 		rootView.passThroughTouches = !newOptions.overlay.interceptTouchOutside.get;
 	}
 	
-	[self setTitleViewWithSubtitle:newOptions];
+	[self setTitleViewWithSubtitle:(RNNNavigationOptions *)[[currentOptions overrideOptions:newOptions] mergeOptions:defaultOptions]];
 	
 	if (newOptions.topBar.title.component.name.hasValue) {
 		[self setCustomNavigationTitleView:newOptions perform:nil];
 	}
 	
 	if (options.topBar.title.component.name.hasValue) {
-		_customTitleView = (RNNReactView*)[_componentManager createComponentIfNotExists:options.topBar.title.component parentComponentId:viewController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
+		_customTitleView = (RNNReactView*)[_componentRegistry createComponentIfNotExists:options.topBar.title.component parentComponentId:viewController.layoutInfo.componentId reactViewReadyBlock:readyBlock];
 		_customTitleView.backgroundColor = UIColor.clearColor;
 		NSString* alignment = [options.topBar.title.component.alignment getWithDefaultValue:@""];
 		[_customTitleView setAlignment:alignment];

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

 		504AFE751FFFF0540076E904 /* RNNTopTabsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */; };
 		504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */; };
 		504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */; };
-		5050465421F8F4490035497A /* RNNReactComponentManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5050465221F8F4490035497A /* RNNReactComponentManager.h */; };
-		5050465521F8F4490035497A /* RNNReactComponentManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5050465321F8F4490035497A /* RNNReactComponentManager.m */; };
+		5050465421F8F4490035497A /* RNNReactComponentRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5050465221F8F4490035497A /* RNNReactComponentRegistry.h */; };
+		5050465521F8F4490035497A /* RNNReactComponentRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 5050465321F8F4490035497A /* RNNReactComponentRegistry.m */; };
 		5053CE7F2175FB1900D0386B /* RNNDefaultOptionsHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5053CE7D2175FB1900D0386B /* RNNDefaultOptionsHelper.h */; };
 		5053CE802175FB1900D0386B /* RNNDefaultOptionsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5053CE7E2175FB1900D0386B /* RNNDefaultOptionsHelper.m */; };
 		50570B262061473D006A1B5C /* RNNTitleOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50570B242061473D006A1B5C /* RNNTitleOptions.h */; };
 		504AFE631FFE53070076E904 /* RNNOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOptions.m; sourceTree = "<group>"; };
 		504AFE721FFFF0540076E904 /* RNNTopTabsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsOptions.h; sourceTree = "<group>"; };
 		504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopTabsOptions.m; sourceTree = "<group>"; };
-		5050465221F8F4490035497A /* RNNReactComponentManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNReactComponentManager.h; sourceTree = "<group>"; };
-		5050465321F8F4490035497A /* RNNReactComponentManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNReactComponentManager.m; sourceTree = "<group>"; };
+		5050465221F8F4490035497A /* RNNReactComponentRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNReactComponentRegistry.h; sourceTree = "<group>"; };
+		5050465321F8F4490035497A /* RNNReactComponentRegistry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNReactComponentRegistry.m; sourceTree = "<group>"; };
 		5053CE7D2175FB1900D0386B /* RNNDefaultOptionsHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNDefaultOptionsHelper.h; sourceTree = "<group>"; };
 		5053CE7E2175FB1900D0386B /* RNNDefaultOptionsHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNDefaultOptionsHelper.m; sourceTree = "<group>"; };
 		50570B242061473D006A1B5C /* RNNTitleOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTitleOptions.h; sourceTree = "<group>"; };
 				261F0E691E6F028A00989DE2 /* RNNNavigationStackManager.m */,
 				50D031322005149000386B3D /* RNNOverlayManager.h */,
 				50D031332005149000386B3D /* RNNOverlayManager.m */,
-				5050465221F8F4490035497A /* RNNReactComponentManager.h */,
-				5050465321F8F4490035497A /* RNNReactComponentManager.m */,
+				5050465221F8F4490035497A /* RNNReactComponentRegistry.h */,
+				5050465321F8F4490035497A /* RNNReactComponentRegistry.m */,
 			);
 			name = Managers;
 			sourceTree = "<group>";
 				5012242221736883000F5F98 /* NullColor.h in Headers */,
 				50570B262061473D006A1B5C /* RNNTitleOptions.h in Headers */,
 				50395593217485B000B0A663 /* Double.h in Headers */,
-				5050465421F8F4490035497A /* RNNReactComponentManager.h in Headers */,
+				5050465421F8F4490035497A /* RNNReactComponentRegistry.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
 				5049594A216F5FE6006D2B81 /* NullText.h in Headers */,
 				5012242721737278000F5F98 /* NullImage.m in Sources */,
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
 				A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */,
-				5050465521F8F4490035497A /* RNNReactComponentManager.m in Sources */,
+				5050465521F8F4490035497A /* RNNReactComponentRegistry.m in Sources */,
 				263905CB1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.m in Sources */,
 				50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */,
 				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

 	self.store = [OCMockObject partialMockForObject:[[RNNStore alloc] init]];
 	self.eventEmmiter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
 	self.overlayManager = [OCMockObject partialMockForObject:[RNNOverlayManager new]];
-	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter store:self.store componentManager:nil andBridge:nil]];
+	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter store:self.store componentRegistry:nil andBridge:nil]];
 	self.uut = [[RNNCommandsHandler alloc] initWithStore:self.store controllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter stackManager:[RNNNavigationStackManager new] modalManager:[RNNModalManager new] overlayManager:self.overlayManager mainWindow:_mainWindow];
 	self.vc1 = [RNNRootViewController new];
 	self.vc2 = [RNNRootViewController new];

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

 	[super setUp];
 	self.creator = nil;
 	self.store = [RNNStore new];
-	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator eventEmitter:nil store:self.store componentManager:nil andBridge:nil];
+	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator eventEmitter:nil store:self.store componentRegistry:nil andBridge:nil];
 }
 
 - (void)tearDown {

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

 	XCTAssertTrue(self.uut.getCurrentChild == self.uut.topViewController);
 }
 
-- (void)testCurrentLeaf_shouldReturnCurrentChildLeaf {
-	[[_vc2Mock expect] getCurrentLeaf];
-	[self.uut getCurrentLeaf];
-	[_vc2Mock verify];
-}
-
 - (void)testGetLeafViewController_shouldReturnTopViewController {
 	XCTAssertTrue(self.uut.getCurrentChild == self.uut.topViewController);
 }

lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

 	XCTAssertTrue(uut.delegate == uut);
 }
 
-- (void)testWillMoveToParent_invokePresenterApplyOptionsOnWillMoveToParent {
-	[[self.mockTabBarPresenter expect] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut resolveOptions]];
-	[self.mockUut willMoveToParentViewController:[UIViewController new]];
-	[self.mockTabBarPresenter verify];
-}
-
 - (void)testWillMoveToParent_shouldNotInvokePresenterApplyOptionsOnWillMoveToNilParent {
 	[[self.mockTabBarPresenter reject] applyOptionsOnWillMoveToParentViewController:[(RNNTabBarController *)self.mockUut options]];
 	[self.mockUut willMoveToParentViewController:nil];
 	[parentMock verify];
 }
 
-- (void)testGetCurrentLeaf_shouldInvokeSelectedViewControllerGetCurrentLeaf {
-	[[self.mockChildViewController expect] getCurrentLeaf];
-	[self.mockUut getCurrentLeaf];
-	[self.mockChildViewController verify];
-}
-
 - (void)testGetCurrentChild_shouldReturnSelectedViewController {
 	XCTAssertEqual([self.mockUut getCurrentChild], [(RNNTabBarController *)self.mockUut selectedViewController]);
 }