Rename all the things (#5455)

Break all the PRs :(

iOS and Android code base used different naming conventions - this commit aims to unify naming conventions. I probably missed a few properties here and there so this will be an ongoing effort.

lib/ios/RNNBasePresenter.h

@@ -26,7 +26,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)applyDotIndicator:(UIViewController *)child;
 
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions;
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock;
 

lib/ios/RNNBasePresenter.m

@@ -85,66 +85,66 @@
     RNNNavigationOptions * withDefault = [options withDefault:_defaultOptions];
 
     if (withDefault.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [viewController rnn_setTabBarItemBadge:withDefault.bottomTab.badge.get];
+        [viewController setTabBarItemBadge:withDefault.bottomTab.badge.get];
     }
 
     if (withDefault.bottomTab.badgeColor.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [viewController rnn_setTabBarItemBadgeColor:withDefault.bottomTab.badgeColor.get];
+        [viewController setTabBarItemBadgeColor:withDefault.bottomTab.badgeColor.get];
     }
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
     UIViewController *viewController = self.boundViewController;
-    if (newOptions.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [viewController rnn_setTabBarItemBadge:newOptions.bottomTab.badge.get];
+    if (options.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
+        [viewController setTabBarItemBadge:options.bottomTab.badge.get];
     }
 
-    if (newOptions.bottomTab.badgeColor.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [viewController rnn_setTabBarItemBadgeColor:newOptions.bottomTab.badgeColor.get];
+    if (options.bottomTab.badgeColor.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
+        [viewController setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
     }
 
-    if ([newOptions.bottomTab.dotIndicator hasValue] && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [[self dotIndicatorPresenter] apply:viewController:newOptions.bottomTab.dotIndicator];
+    if ([options.bottomTab.dotIndicator hasValue] && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
+        [[self dotIndicatorPresenter] apply:viewController:options.bottomTab.dotIndicator];
     }
 
-    if (newOptions.bottomTab.text.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.text.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.icon.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.icon.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.selectedIcon.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.selectedIcon.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.textColor.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.textColor.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.selectedTextColor.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.selectedTextColor.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.iconColor.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.iconColor.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }
 
-    if (newOptions.bottomTab.selectedIconColor.hasValue) {
-        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [currentOptions overrideOptions:newOptions];
+    if (options.bottomTab.selectedIconColor.hasValue) {
+        RNNNavigationOptions *buttonsResolvedOptions = (RNNNavigationOptions *) [resolvedOptions overrideOptions:options];
         UITabBarItem *tabItem = [RNNTabBarItemCreator updateTabBarItem:viewController.tabBarItem bottomTabOptions:buttonsResolvedOptions.bottomTab];
         viewController.tabBarItem = tabItem;
     }

lib/ios/RNNTabBarController.h → lib/ios/RNNBottomTabsController.h

@@ -1,9 +1,9 @@
 #import <UIKit/UIKit.h>
 #import "RNNEventEmitter.h"
-#import "RNNTabBarPresenter.h"
+#import "RNNBottomTabsPresenter.h"
 #import "UIViewController+LayoutProtocol.h"
 
-@interface RNNTabBarController : UITabBarController <RNNLayoutProtocol, UITabBarControllerDelegate>
+@interface RNNBottomTabsController : UITabBarController <RNNLayoutProtocol, UITabBarControllerDelegate>
 
 - (void)setSelectedIndexByComponentID:(NSString *)componentID;
 

lib/ios/RNNTabBarController.m → lib/ios/RNNBottomTabsController.m

@@ -1,6 +1,6 @@
-#import "RNNTabBarController.h"
+#import "RNNBottomTabsController.h"
 
-@implementation RNNTabBarController {
+@implementation RNNBottomTabsController {
 	NSUInteger _currentTabIndex;
 }
 

lib/ios/RNNTabBarPresenter.h → lib/ios/RNNBottomTabsPresenter.h

@@ -1,5 +1,5 @@
 #import "RNNBasePresenter.h"
 
-@interface RNNTabBarPresenter : RNNBasePresenter
+@interface RNNBottomTabsPresenter : RNNBasePresenter
 - (void)applyDotIndicator;
 @end

lib/ios/RNNBottomTabsPresenter.m

@@ -0,0 +1,81 @@
+#import "RNNBottomTabsPresenter.h"
+#import "UITabBarController+RNNOptions.h"
+#import "UIViewController+LayoutProtocol.h"
+#import "UIViewController+Utils.h"
+
+@implementation RNNBottomTabsPresenter
+
+- (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
+    UITabBarController *bottomTabs = self.boundViewController;
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    [bottomTabs setCurrentTabIndex:[withDefault.bottomTabs.currentTabIndex getWithDefaultValue:0]];
+}
+
+- (void)applyOptions:(RNNNavigationOptions *)options {
+    UITabBarController *bottomTabs = self.boundViewController;
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+
+    [bottomTabs setTabBarTestID:[withDefault.bottomTabs.testID getWithDefaultValue:nil]];
+    [bottomTabs setTabBarBackgroundColor:[withDefault.bottomTabs.backgroundColor getWithDefaultValue:nil]];
+    [bottomTabs setTabBarTranslucent:[withDefault.bottomTabs.translucent getWithDefaultValue:NO]];
+    [bottomTabs setTabBarHideShadow:[withDefault.bottomTabs.hideShadow getWithDefaultValue:NO]];
+    [bottomTabs setTabBarStyle:[RCTConvert UIBarStyle:[withDefault.bottomTabs.barStyle getWithDefaultValue:@"default"]]];
+    [bottomTabs setTabBarVisible:[withDefault.bottomTabs.visible getWithDefaultValue:YES] animated:[withDefault.bottomTabs.animate getWithDefaultValue:NO]];
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)currentOptions {
+    [super mergeOptions:options resolvedOptions:currentOptions];
+    UITabBarController *bottomTabs = self.boundViewController;
+
+    if (options.bottomTabs.currentTabIndex.hasValue) {
+        [bottomTabs setCurrentTabIndex:options.bottomTabs.currentTabIndex.get];
+        [options.bottomTabs.currentTabIndex consume];
+    }
+
+    if (options.bottomTabs.currentTabId.hasValue) {
+        [bottomTabs setCurrentTabID:options.bottomTabs.currentTabId.get];
+        [options.bottomTabs.currentTabId consume];
+    }
+
+    if (options.bottomTabs.testID.hasValue) {
+        [bottomTabs setTabBarTestID:options.bottomTabs.testID.get];
+    }
+
+    if (options.bottomTabs.backgroundColor.hasValue) {
+        [bottomTabs setTabBarBackgroundColor:options.bottomTabs.backgroundColor.get];
+    }
+
+    if (options.bottomTabs.barStyle.hasValue) {
+        [bottomTabs setTabBarStyle:[RCTConvert UIBarStyle:options.bottomTabs.barStyle.get]];
+    }
+
+    if (options.bottomTabs.translucent.hasValue) {
+        [bottomTabs setTabBarTranslucent:options.bottomTabs.translucent.get];
+    }
+
+    if (options.bottomTabs.hideShadow.hasValue) {
+        [bottomTabs setTabBarHideShadow:options.bottomTabs.hideShadow.get];
+    }
+
+    if (options.bottomTabs.visible.hasValue) {
+        if (options.bottomTabs.animate.hasValue) {
+            [bottomTabs setTabBarVisible:options.bottomTabs.visible.get animated:[options.bottomTabs.animate getWithDefaultValue:NO]];
+        } else {
+            [bottomTabs setTabBarVisible:options.bottomTabs.visible.get animated:NO];
+        }
+    }
+}
+
+- (void)viewDidLayoutSubviews {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self applyDotIndicator];
+    });
+}
+
+- (void)applyDotIndicator {
+    [self.boundViewController forEachChild:^(UIViewController *child) {
+        [self applyDotIndicator:child];
+    }];
+}
+
+@end

lib/ios/RNNBridgeManager.m

@@ -6,7 +6,7 @@
 #import "RNNEventEmitter.h"
 #import "RNNSplashScreen.h"
 #import "RNNBridgeModule.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNReactComponentRegistry.h"
 
@@ -82,7 +82,7 @@
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
 	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
 
-	id<RNNRootViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
+	id<RNNComponentViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
 	_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
 	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter store:_store componentRegistry:_componentRegistry andBridge:bridge];
 	

lib/ios/RNNCommandsHandler.m

@@ -1,5 +1,5 @@
 #import "RNNCommandsHandler.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNErrorHandler.h"
 #import "RNNDefaultOptionsHelper.h"
 #import "UIViewController+RNNOptions.h"
@@ -85,7 +85,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	UIViewController<RNNLayoutProtocol>* vc = [RNNLayoutManager findComponentForId:componentId];
 	RNNNavigationOptions* newOptions = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
-	if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)] || [vc isKindOfClass:[RNNRootViewController class]]) {
+	if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)] || [vc isKindOfClass:[RNNComponentViewController class]]) {
 		[CATransaction begin];
 		[CATransaction setCompletionBlock:completion];
 		
@@ -116,13 +116,13 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	if ([[newVc.resolveOptions.preview.reactTag getWithDefaultValue:@(0)] floatValue] > 0) {
 		UIViewController* vc = [RNNLayoutManager findComponentForId:componentId];
 		
-		if([vc isKindOfClass:[RNNRootViewController class]]) {
-			RNNRootViewController* rootVc = (RNNRootViewController*)vc;
+		if([vc isKindOfClass:[RNNComponentViewController class]]) {
+			RNNComponentViewController* rootVc = (RNNComponentViewController*)vc;
 			rootVc.previewController = newVc;
 			[newVc renderTreeAndWait:NO perform:nil];
 			
 			rootVc.previewCallback = ^(UIViewController *vcc) {
-				RNNRootViewController* rvc  = (RNNRootViewController*)vcc;
+				RNNComponentViewController* rvc  = (RNNComponentViewController*)vcc;
 				[self->_eventEmitter sendOnPreviewCompleted:componentId previewComponentId:newVc.layoutInfo.componentId];
 				if ([newVc.resolveOptions.preview.commit getWithDefaultValue:NO]) {
 					[CATransaction begin];
@@ -190,7 +190,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)pop:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
-	RNNRootViewController *vc = (RNNRootViewController*)[RNNLayoutManager findComponentForId:componentId];
+	RNNComponentViewController *vc = (RNNComponentViewController*)[RNNLayoutManager findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	
@@ -216,7 +216,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 - (void)popTo:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	RNNRootViewController *vc = (RNNRootViewController*)[RNNLayoutManager findComponentForId:componentId];
+	RNNComponentViewController *vc = (RNNComponentViewController*)[RNNLayoutManager findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	
@@ -228,7 +228,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 - (void)popToRoot:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	RNNRootViewController *vc = (RNNRootViewController*)[RNNLayoutManager findComponentForId:componentId];
+	RNNComponentViewController *vc = (RNNComponentViewController*)[RNNLayoutManager findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	

lib/ios/RNNViewControllerPresenter.h → lib/ios/RNNComponentPresenter.h

@@ -2,7 +2,7 @@
 #import "RNNNavigationButtons.h"
 #import "RNNReactComponentRegistry.h"
 
-@interface RNNViewControllerPresenter : RNNBasePresenter
+@interface RNNComponentPresenter : RNNBasePresenter
 
 - (instancetype)initWithComponentRegistry:(RNNReactComponentRegistry *)componentRegistry:(RNNNavigationOptions *)defaultOptions;
 

lib/ios/RNNViewControllerPresenter.m → lib/ios/RNNComponentPresenter.m

@@ -1,11 +1,11 @@
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 #import "UIViewController+RNNOptions.h"
 #import "UITabBarController+RNNOptions.h"
 #import "RCTConvert+Modal.h"
 #import "RNNTitleViewHelper.h"
 #import "UIViewController+LayoutProtocol.h"
 
-@interface RNNViewControllerPresenter() {
+@interface RNNComponentPresenter() {
 	RNNReactView* _customTitleView;
 	RNNTitleViewHelper* _titleViewHelper;
 	RNNReactComponentRegistry* _componentRegistry;
@@ -13,7 +13,7 @@
 
 @end
 
-@implementation RNNViewControllerPresenter
+@implementation RNNComponentPresenter
 
 - (instancetype)initWithComponentRegistry:(RNNReactComponentRegistry *)componentRegistry:(RNNNavigationOptions *)defaultOptions {
 	self = [self initWithDefaultOptions:defaultOptions];
@@ -30,7 +30,7 @@
 	[super applyOptionsOnWillMoveToParentViewController:options];
 	UIViewController* viewController = self.boundViewController;
 	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	[viewController rnn_setBackButtonIcon:[withDefault.topBar.backButton.icon getWithDefaultValue:nil] withColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil] title:[withDefault.topBar.backButton.showTitle getWithDefaultValue:YES] ? [withDefault.topBar.backButton.title getWithDefaultValue:nil] : @""];
+	[viewController setBackButtonIcon:[withDefault.topBar.backButton.icon getWithDefaultValue:nil] withColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil] title:[withDefault.topBar.backButton.showTitle getWithDefaultValue:YES] ? [withDefault.topBar.backButton.title getWithDefaultValue:nil] : @""];
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
@@ -38,17 +38,17 @@
 	
 	UIViewController* viewController = self.boundViewController;
 	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	[viewController rnn_setBackgroundImage:[withDefault.backgroundImage getWithDefaultValue:nil]];
-	[viewController rnn_setNavigationItemTitle:[withDefault.topBar.title.text getWithDefaultValue:nil]];
-	[viewController rnn_setTopBarPrefersLargeTitle:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
-	[viewController rnn_setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor getWithDefaultValue:nil]];
-	[viewController rnn_setStatusBarBlur:[withDefault.statusBar.blur getWithDefaultValue:NO]];
-	[viewController rnn_setStatusBarStyle:[withDefault.statusBar.style getWithDefaultValue:@"default"] animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
-	[viewController rnn_setBackButtonVisible:[withDefault.topBar.backButton.visible getWithDefaultValue:YES]];
-	[viewController rnn_setInterceptTouchOutside:[withDefault.overlay.interceptTouchOutside getWithDefaultValue:YES]];
+	[viewController setBackgroundImage:[withDefault.backgroundImage getWithDefaultValue:nil]];
+	[viewController setNavigationItemTitle:[withDefault.topBar.title.text getWithDefaultValue:nil]];
+	[viewController setTopBarPrefersLargeTitle:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
+	[viewController setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor getWithDefaultValue:nil]];
+	[viewController setStatusBarBlur:[withDefault.statusBar.blur getWithDefaultValue:NO]];
+	[viewController setStatusBarStyle:[withDefault.statusBar.style getWithDefaultValue:@"default"] animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
+	[viewController setBackButtonVisible:[withDefault.topBar.backButton.visible getWithDefaultValue:YES]];
+	[viewController setInterceptTouchOutside:[withDefault.overlay.interceptTouchOutside getWithDefaultValue:YES]];
 	
 	if (withDefault.layout.backgroundColor.hasValue) {
-		[viewController rnn_setBackgroundColor:withDefault.layout.backgroundColor.get];
+		[viewController setBackgroundColor:withDefault.layout.backgroundColor.get];
 	}
 	
 	if (withDefault.topBar.searchBar.hasValue) {
@@ -56,7 +56,7 @@
 		if (withDefault.topBar.hideNavBarOnFocusSearchBar.hasValue) {
 			hideNavBarOnFocusSearchBar = withDefault.topBar.hideNavBarOnFocusSearchBar.get;
 		}
-		[viewController rnn_setSearchBarWithPlaceholder:[withDefault.topBar.searchBarPlaceholder getWithDefaultValue:@""] hideNavBarOnFocusSearchBar: hideNavBarOnFocusSearchBar];
+		[viewController setSearchBarWithPlaceholder:[withDefault.topBar.searchBarPlaceholder getWithDefaultValue:@""] hideNavBarOnFocusSearchBar:hideNavBarOnFocusSearchBar];
 	}
 	
 	[self setTitleViewWithSubtitle:withDefault];
@@ -67,104 +67,104 @@
 	
 	UIViewController* viewController = self.boundViewController;
 	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[withDefault.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
-	[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[withDefault.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
-	[viewController rnn_setDrawBehindTopBar:[withDefault.topBar.drawBehind getWithDefaultValue:NO]];
-	[viewController rnn_setDrawBehindTabBar:[withDefault.bottomTabs.drawBehind getWithDefaultValue:NO] || ![withDefault.bottomTabs.visible getWithDefaultValue:YES]];
+	[viewController setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[withDefault.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
+	[viewController setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[withDefault.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
+	[viewController setDrawBehindTopBar:[withDefault.topBar.drawBehind getWithDefaultValue:NO]];
+	[viewController setDrawBehindTabBar:[withDefault.bottomTabs.drawBehind getWithDefaultValue:NO] || ![withDefault.bottomTabs.visible getWithDefaultValue:YES]];
 	
 	if ((withDefault.topBar.leftButtons || withDefault.topBar.rightButtons)) {
 		[_navigationButtons applyLeftButtons:withDefault.topBar.leftButtons rightButtons:withDefault.topBar.rightButtons defaultLeftButtonStyle:withDefault.topBar.leftButtonStyle defaultRightButtonStyle:withDefault.topBar.rightButtonStyle];
 	}
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
-	[super mergeOptions:newOptions currentOptions:currentOptions];
-	RNNNavigationOptions * withDefault	= (RNNNavigationOptions *) [[currentOptions overrideOptions:newOptions] withDefault:[self defaultOptions]];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)currentOptions {
+    [super mergeOptions:options resolvedOptions:currentOptions];
+	RNNNavigationOptions * withDefault	= (RNNNavigationOptions *) [[currentOptions overrideOptions:options] withDefault:[self defaultOptions]];
 
 	UIViewController* viewController = self.boundViewController;
 	
-	if (newOptions.backgroundImage.hasValue) {
-		[viewController rnn_setBackgroundImage:newOptions.backgroundImage.get];
+	if (options.backgroundImage.hasValue) {
+		[viewController setBackgroundImage:options.backgroundImage.get];
 	}
 	
-	if (newOptions.modalPresentationStyle.hasValue) {
-		[viewController rnn_setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:newOptions.modalPresentationStyle.get]];
+	if (options.modalPresentationStyle.hasValue) {
+		[viewController setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:options.modalPresentationStyle.get]];
 	}
 	
-	if (newOptions.modalTransitionStyle.hasValue) {
-		[viewController rnn_setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:newOptions.modalTransitionStyle.get]];
+	if (options.modalTransitionStyle.hasValue) {
+		[viewController setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:options.modalTransitionStyle.get]];
 	}
 	
-	if (newOptions.topBar.searchBar.hasValue) {
+	if (options.topBar.searchBar.hasValue) {
 		BOOL hideNavBarOnFocusSearchBar = YES;
-		if (newOptions.topBar.hideNavBarOnFocusSearchBar.hasValue) {
-			hideNavBarOnFocusSearchBar = newOptions.topBar.hideNavBarOnFocusSearchBar.get;
+		if (options.topBar.hideNavBarOnFocusSearchBar.hasValue) {
+			hideNavBarOnFocusSearchBar = options.topBar.hideNavBarOnFocusSearchBar.get;
 		}
-		[viewController rnn_setSearchBarWithPlaceholder:[newOptions.topBar.searchBarPlaceholder getWithDefaultValue:@""] hideNavBarOnFocusSearchBar:hideNavBarOnFocusSearchBar];
+		[viewController setSearchBarWithPlaceholder:[options.topBar.searchBarPlaceholder getWithDefaultValue:@""] hideNavBarOnFocusSearchBar:hideNavBarOnFocusSearchBar];
 	}
 	
-	if (newOptions.topBar.drawBehind.hasValue) {
-		[viewController rnn_setDrawBehindTopBar:newOptions.topBar.drawBehind.get];
+	if (options.topBar.drawBehind.hasValue) {
+		[viewController setDrawBehindTopBar:options.topBar.drawBehind.get];
 	}
 	
-	if (newOptions.topBar.title.text.hasValue) {
-		[viewController rnn_setNavigationItemTitle:newOptions.topBar.title.text.get];
+	if (options.topBar.title.text.hasValue) {
+		[viewController setNavigationItemTitle:options.topBar.title.text.get];
 	}
 	
-	if (newOptions.topBar.largeTitle.visible.hasValue) {
-		[viewController rnn_setTopBarPrefersLargeTitle:newOptions.topBar.largeTitle.visible.get];
+	if (options.topBar.largeTitle.visible.hasValue) {
+		[viewController setTopBarPrefersLargeTitle:options.topBar.largeTitle.visible.get];
 	}
 	
-	if (newOptions.bottomTabs.drawBehind.hasValue) {
-		[viewController rnn_setDrawBehindTabBar:newOptions.bottomTabs.drawBehind.get];
+	if (options.bottomTabs.drawBehind.hasValue) {
+		[viewController setDrawBehindTabBar:options.bottomTabs.drawBehind.get];
 	}
 	
-	if (newOptions.bottomTab.badgeColor.hasValue) {
-		[viewController rnn_setTabBarItemBadgeColor:newOptions.bottomTab.badgeColor.get];
+	if (options.bottomTab.badgeColor.hasValue) {
+		[viewController setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
 	}
 	
-	if (newOptions.layout.backgroundColor.hasValue) {
-		[viewController rnn_setBackgroundColor:newOptions.layout.backgroundColor.get];
+	if (options.layout.backgroundColor.hasValue) {
+		[viewController setBackgroundColor:options.layout.backgroundColor.get];
 	}
 	
-	if (newOptions.bottomTab.visible.hasValue) {
-		[viewController.tabBarController rnn_setCurrentTabIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
+	if (options.bottomTab.visible.hasValue) {
+		[viewController.tabBarController setCurrentTabIndex:[viewController.tabBarController.viewControllers indexOfObject:viewController]];
 	}
 	
-	if (newOptions.statusBar.blur.hasValue) {
-		[viewController rnn_setStatusBarBlur:newOptions.statusBar.blur.get];
+	if (options.statusBar.blur.hasValue) {
+		[viewController setStatusBarBlur:options.statusBar.blur.get];
 	}
 	
-	if (newOptions.statusBar.style.hasValue) {
-		[viewController rnn_setStatusBarStyle:newOptions.statusBar.style.get animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
+	if (options.statusBar.style.hasValue) {
+		[viewController setStatusBarStyle:options.statusBar.style.get animated:[withDefault.statusBar.animate getWithDefaultValue:YES]];
 	}
 	
-	if (newOptions.topBar.backButton.visible.hasValue) {
-		[viewController rnn_setBackButtonVisible:newOptions.topBar.backButton.visible.get];
+	if (options.topBar.backButton.visible.hasValue) {
+		[viewController setBackButtonVisible:options.topBar.backButton.visible.get];
 	}
 	
-	if (newOptions.topBar.leftButtons || newOptions.topBar.rightButtons) {
-		[_navigationButtons applyLeftButtons:newOptions.topBar.leftButtons rightButtons:newOptions.topBar.rightButtons defaultLeftButtonStyle:withDefault.topBar.leftButtonStyle defaultRightButtonStyle:withDefault.topBar.rightButtonStyle];
+	if (options.topBar.leftButtons || options.topBar.rightButtons) {
+		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:withDefault.topBar.leftButtonStyle defaultRightButtonStyle:withDefault.topBar.rightButtonStyle];
 	}
 	
 
-	if (newOptions.overlay.interceptTouchOutside.hasValue) {
+	if (options.overlay.interceptTouchOutside.hasValue) {
 		RCTRootView* rootView = (RCTRootView*)viewController.view;
-		rootView.passThroughTouches = !newOptions.overlay.interceptTouchOutside.get;
+		rootView.passThroughTouches = !options.overlay.interceptTouchOutside.get;
 	}
 
 	[self setTitleViewWithSubtitle:withDefault];
 
-	if (newOptions.topBar.title.component.name.hasValue) {
-		[self setCustomNavigationTitleView:newOptions perform:nil];
+	if (options.topBar.title.component.name.hasValue) {
+		[self setCustomNavigationTitleView:options perform:nil];
 	} else {
 		[_customTitleView removeFromSuperview];
 		_customTitleView = nil;
 	}
 
-	if (newOptions.topBar.backButton.hasValue) {
+	if (options.topBar.backButton.hasValue) {
 		UIViewController *lastViewControllerInStack = viewController.navigationController.viewControllers.count > 1 ? viewController.navigationController.viewControllers[viewController.navigationController.viewControllers.count - 2] : viewController.navigationController.topViewController;
-	    RNNNavigationOptions * resolvedOptions	= (RNNNavigationOptions *) [[currentOptions overrideOptions:newOptions] withDefault:[self defaultOptions]];
+	    RNNNavigationOptions * resolvedOptions	= (RNNNavigationOptions *) [[currentOptions overrideOptions:options] withDefault:[self defaultOptions]];
 		[lastViewControllerInStack applyBackButton:resolvedOptions.topBar.backButton];
 	}
 }

lib/ios/RNNRootViewController.h → lib/ios/RNNComponentViewController.h

@@ -1,20 +1,20 @@
 #import "RNNLayoutNode.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
 #import "RNNNavigationOptions.h"
 #import "RNNAnimator.h"
 #import "RNNUIBarButtonItem.h"
 #import "RNNLayoutInfo.h"
 #import "RNNLayoutProtocol.h"
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 
 typedef void (^PreviewCallback)(UIViewController *vc);
 
-@interface RNNRootViewController : UIViewController	<RNNLayoutProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
+@interface RNNComponentViewController : UIViewController	<RNNLayoutProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
 
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
-@property (nonatomic, strong) RNNViewControllerPresenter* presenter;
+@property (nonatomic, strong) RNNComponentPresenter* presenter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
@@ -23,15 +23,15 @@ typedef void (^PreviewCallback)(UIViewController *vc);
 @property (nonatomic, copy) PreviewCallback previewCallback;
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-				   rootViewCreator:(id<RNNRootViewCreator>)creator
+				   rootViewCreator:(id<RNNComponentViewCreator>)creator
 					  eventEmitter:(RNNEventEmitter*)eventEmitter
-						 presenter:(RNNViewControllerPresenter *)presenter
+						 presenter:(RNNComponentPresenter *)presenter
 						   options:(RNNNavigationOptions *)options
 					defaultOptions:(RNNNavigationOptions *)defaultOptions;
 
 - (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
 									   eventEmitter:(RNNEventEmitter*)eventEmitter
-										  presenter:(RNNViewControllerPresenter *)presenter
+										  presenter:(RNNComponentPresenter *)presenter
 											options:(RNNNavigationOptions *)options
 									 defaultOptions:(RNNNavigationOptions *)defaultOptions;
 

lib/ios/RNNRootViewController.m → lib/ios/RNNComponentViewController.m

@@ -1,12 +1,12 @@
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNAnimationsTransitionDelegate.h"
 #import "UIViewController+LayoutProtocol.h"
 
-@implementation RNNRootViewController
+@implementation RNNComponentViewController
 
 @synthesize previewCallback;
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNRootViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNComponentViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNComponentPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
 	self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:nil];
 	
 	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.resolveOptions.customTransition];
@@ -16,7 +16,7 @@
 	return self;
 }
 
-- (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNViewControllerPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
+- (instancetype)initExternalComponentWithLayoutInfo:(RNNLayoutInfo *)layoutInfo eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNComponentPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
 	self = [self initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:eventEmitter presenter:presenter options:options defaultOptions:defaultOptions];
 	return self;
 }
@@ -31,11 +31,6 @@
 	[_presenter setDefaultOptions:defaultOptions];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options {
-	[_presenter mergeOptions:options currentOptions:self.options];
-	[self.parentViewController mergeChildOptions:options];
-}
-
 - (void)overrideOptions:(RNNNavigationOptions *)options {
 	[self.options overrideOptions:options];
 }
@@ -124,7 +119,7 @@
 }
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
-	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
+	RNNComponentViewController* vc =  (RNNComponentViewController*)viewController;
 	if (![[vc.self.resolveOptions.topBar.backButton.transition getWithDefaultValue:@""] isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}

lib/ios/RNNRootViewCreator.h → lib/ios/RNNComponentViewCreator.h

@@ -3,7 +3,7 @@
 #import "RNNComponentOptions.h"
 #import "RNNReactView.h"
 
-@protocol RNNRootViewCreator
+@protocol RNNComponentViewCreator
 
 - (RNNReactView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId availableSize:(CGSize)availableSize reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
 

lib/ios/RNNControllerFactory.h

@@ -1,7 +1,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNExternalComponentStore.h"
 #import "RNNEventEmitter.h"
 #import "RNNReactComponentRegistry.h"
@@ -9,7 +9,7 @@
 
 @interface RNNControllerFactory : NSObject
 
--(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
+-(instancetype)initWithRootViewCreator:(id <RNNComponentViewCreator>)creator
 						  eventEmitter:(RNNEventEmitter*)eventEmitter
 								 store:(RNNExternalComponentStore *)store
 					  componentRegistry:(RNNReactComponentRegistry *)componentRegistry

lib/ios/RNNControllerFactory.m

@@ -1,13 +1,13 @@
 #import "RNNControllerFactory.h"
 #import "RNNSplitViewController.h"
 #import "RNNSideMenuController.h"
-#import "RNNNavigationController.h"
-#import "RNNTabBarController.h"
+#import "RNNStackController.h"
+#import "RNNBottomTabsController.h"
 #import "RNNTopTabsViewController.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 
 @implementation RNNControllerFactory {
-	id<RNNRootViewCreator> _creator;
+	id<RNNComponentViewCreator> _creator;
 	RNNExternalComponentStore *_store;
 	RCTBridge *_bridge;
 	RNNReactComponentRegistry* _componentRegistry;
@@ -16,7 +16,7 @@
 # pragma mark public
 
 
-- (instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
+- (instancetype)initWithRootViewCreator:(id <RNNComponentViewCreator>)creator
 						   eventEmitter:(RNNEventEmitter*)eventEmitter
 								  store:(RNNExternalComponentStore *)store
 					   componentRegistry:(RNNReactComponentRegistry *)componentRegistry
@@ -103,9 +103,9 @@
 - (UIViewController *)createComponent:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];;
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithComponentRegistry:_componentRegistry:_defaultOptions];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] initWithComponentRegistry:_componentRegistry:_defaultOptions];
 	
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
+	RNNComponentViewController* component = [[RNNComponentViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
 	
 	return component;
 }
@@ -113,24 +113,24 @@
 - (UIViewController *)createExternalComponent:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithDefaultOptions:_defaultOptions];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] initWithDefaultOptions:_defaultOptions];
 	
 	UIViewController* externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
 	
-	RNNRootViewController* component = [[RNNRootViewController alloc] initExternalComponentWithLayoutInfo:layoutInfo eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
+	RNNComponentViewController* component = [[RNNComponentViewController alloc] initExternalComponentWithLayoutInfo:layoutInfo eventEmitter:_eventEmitter presenter:presenter options:options defaultOptions:_defaultOptions];
 	[component bindViewController:externalVC];
 	
 	return component;
 }
 
 - (UIViewController *)createStack:(RNNLayoutNode*)node {
-	RNNNavigationControllerPresenter* presenter = [[RNNNavigationControllerPresenter alloc] initWithComponentRegistry:_componentRegistry :_defaultOptions];
+	RNNStackPresenter* presenter = [[RNNStackPresenter alloc] initWithComponentRegistry:_componentRegistry :_defaultOptions];
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
 	
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
-	RNNNavigationController* stack = [[RNNNavigationController alloc] initWithLayoutInfo:layoutInfo creator:_creator options:options defaultOptions:_defaultOptions presenter:presenter eventEmitter:_eventEmitter childViewControllers:childViewControllers];
+	RNNStackController* stack = [[RNNStackController alloc] initWithLayoutInfo:layoutInfo creator:_creator options:options defaultOptions:_defaultOptions presenter:presenter eventEmitter:_eventEmitter childViewControllers:childViewControllers];
 	
 	return stack;
 }
@@ -138,26 +138,22 @@
 -(UIViewController *)createBottomTabs:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
-	RNNTabBarPresenter* presenter = [[RNNTabBarPresenter alloc] initWithDefaultOptions:_defaultOptions];
-
+	RNNBottomTabsPresenter* presenter = [[RNNBottomTabsPresenter alloc] initWithDefaultOptions:_defaultOptions];
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
-	
-	RNNTabBarController* tabsController = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo
-            creator:_creator
-            options:options
-			defaultOptions:_defaultOptions
-			presenter:presenter
-			eventEmitter:_eventEmitter
-			childViewControllers:childViewControllers
+	return [[RNNBottomTabsController alloc] initWithLayoutInfo:layoutInfo
+																					  creator:_creator
+																					  options:options
+																			   defaultOptions:_defaultOptions
+																					presenter:presenter
+																				 eventEmitter:_eventEmitter
+																		 childViewControllers:childViewControllers
 	];
-	
-	return tabsController;
 }
 
 - (UIViewController *)createTopTabs:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] initWithDefaultOptions :_defaultOptions];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] initWithDefaultOptions :_defaultOptions];
 
 	NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 	
@@ -184,7 +180,7 @@
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
 
-	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo creator:_creator options:options defaultOptions:_defaultOptions presenter:[[RNNViewControllerPresenter alloc] initWithComponentRegistry:_componentRegistry:_defaultOptions] eventEmitter:_eventEmitter childViewController:childVc type:type];
+	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:layoutInfo creator:_creator options:options defaultOptions:_defaultOptions presenter:[[RNNComponentPresenter alloc] initWithComponentRegistry:_componentRegistry:_defaultOptions] eventEmitter:_eventEmitter childViewController:childVc type:type];
 	
 	return sideMenuChild;
 }

lib/ios/RNNInteractivePopAnimator.m

@@ -2,7 +2,7 @@
 #import "RNNAnimator.h"
 #import "RNNAnimatedView.h"
 #import "RNNElementView.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "VICMAImageView.h"
 
 @interface  RNNInteractivePopAnimator()
@@ -68,7 +68,7 @@
 			[UIView animateWithDuration:0.5 delay:0 usingSpringWithDamping:0.8 initialSpringVelocity:0.8 options:UIViewAnimationOptionCurveEaseOut  animations:^{
 				self.imageSnapshot.frame = self.topFrame;
 			} completion:^(BOOL finished) {
-				self.nc.delegate = (RNNRootViewController*)self.vc;
+				self.nc.delegate = (RNNComponentViewController*)self.vc;
 			}];
 		} else {
 			[UIView animateWithDuration:0.3 delay:0 usingSpringWithDamping:0.8 initialSpringVelocity:0.8 options:UIViewAnimationOptionCurveEaseOut  animations:^{

lib/ios/RNNLayoutProtocol.h

@@ -1,6 +1,6 @@
 #import "RNNLayoutInfo.h"
 #import "RNNBasePresenter.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
 
 typedef void (^RNNReactViewReadyCompletionBlock)(void);
@@ -10,7 +10,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 @required
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-						   creator:(id<RNNRootViewCreator>)creator
+						   creator:(id<RNNComponentViewCreator>)creator
 						   options:(RNNNavigationOptions *)options
 					defaultOptions:(RNNNavigationOptions *)defaultOptions
 						 presenter:(RNNBasePresenter *)presenter

lib/ios/RNNModalManager.m

@@ -1,5 +1,5 @@
 #import "RNNModalManager.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNAnimationsTransitionDelegate.h"
 #import "RNNLayoutProtocol.h"
 

lib/ios/RNNNavigationButtons.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNButtonOptions.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNReactComponentRegistry.h"
 
 @interface RNNNavigationButtons : NSObject

lib/ios/RNNNavigationButtons.m

@@ -3,7 +3,7 @@
 #import <React/RCTConvert.h>
 #import "RCTHelpers.h"
 #import "UIImage+tint.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "UIImage+insets.h"
 #import "UIViewController+LayoutProtocol.h"
 

lib/ios/RNNNavigationController.h

@@ -1,12 +0,0 @@
-#import <UIKit/UIKit.h>
-#import "RNNNavigationControllerPresenter.h"
-#import "UINavigationController+RNNOptions.h"
-#import "UIViewController+LayoutProtocol.h"
-
-@interface RNNNavigationController : UINavigationController <RNNLayoutProtocol>
-
-@property (nonatomic, retain) RNNNavigationControllerPresenter* presenter;
-
-- (void)setTopBarBackgroundColor:(UIColor *)backgroundColor;
-
-@end

lib/ios/RNNNavigationControllerPresenter.m

@@ -1,231 +0,0 @@
-#import "RNNNavigationControllerPresenter.h"
-#import "UINavigationController+RNNOptions.h"
-#import "RNNNavigationController.h"
-#import "RNNCustomTitleView.h"
-
-@interface RNNNavigationControllerPresenter() {
-	RNNReactComponentRegistry* _componentRegistry;
-	UIView* _customTopBar;
-	UIView* _customTopBarBackground;
-	RNNReactView* _customTopBarBackgroundReactView;
-}
-
-@end
-@implementation RNNNavigationControllerPresenter
-
-- (instancetype)initWithComponentRegistry:(RNNReactComponentRegistry *)componentRegistry:(RNNNavigationOptions *)defaultOptions {
-	self = [super initWithDefaultOptions:defaultOptions];
-	_componentRegistry = componentRegistry;
-	return self;
-}
-
-- (void)applyOptions:(RNNNavigationOptions *)options {
-	[super applyOptions:options];
-	
-	RNNNavigationController* navigationController = self.boundViewController;
-	RNNNavigationOptions * withDefault = [options withDefault:[self defaultOptions]];
-	
-	self.interactivePopGestureDelegate = [InteractivePopGestureDelegate new];
-	self.interactivePopGestureDelegate.navigationController = navigationController;
-	self.interactivePopGestureDelegate.originalDelegate = navigationController.interactivePopGestureRecognizer.delegate;
-	navigationController.interactivePopGestureRecognizer.delegate = self.interactivePopGestureDelegate;
-	
-	[navigationController rnn_setInteractivePopGestureEnabled:[withDefault.popGesture getWithDefaultValue:YES]];
-	[navigationController rnn_setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
-	[navigationController rnn_setNavigationBarTestID:[withDefault.topBar.testID getWithDefaultValue:nil]];
-	[navigationController rnn_setNavigationBarVisible:[withDefault.topBar.visible getWithDefaultValue:YES] animated:[withDefault.topBar.animate getWithDefaultValue:YES]];
-	[navigationController rnn_hideBarsOnScroll:[withDefault.topBar.hideOnScroll getWithDefaultValue:NO]];
-	[navigationController rnn_setNavigationBarNoBorder:[withDefault.topBar.noBorder getWithDefaultValue:NO]];
-	[navigationController rnn_setBarStyle:[RCTConvert UIBarStyle:[withDefault.topBar.barStyle getWithDefaultValue:@"default"]]];
-	[navigationController rnn_setNavigationBarTranslucent:[withDefault.topBar.background.translucent getWithDefaultValue:NO]];
-	[navigationController rnn_setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
-	[navigationController rnn_setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
-	[navigationController setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
-	[navigationController rnn_setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
-	[navigationController rnn_setNavigationBarLargeTitleFontFamily:[withDefault.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.largeTitle.color getWithDefaultValue:nil]];
-	[navigationController rnn_setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
-	[navigationController rnn_setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
-}
-
-- (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
-	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	if (withDefault.topBar.background.component.name.hasValue) {
-		[self presentBackgroundComponent];
-	}
-}
-
-- (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options {
-	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	RNNNavigationController* navigationController = self.boundViewController;
-	[navigationController setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
-	[navigationController rnn_setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:[UIColor blackColor]]];
-	[navigationController rnn_setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
-}
-
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
-	[super mergeOptions:newOptions currentOptions:currentOptions];
-	
-	RNNNavigationController* navigationController = self.boundViewController;
-	
-	if (newOptions.popGesture.hasValue) {
-		[navigationController rnn_setInteractivePopGestureEnabled:newOptions.popGesture.get];
-	}
-	
-	if (newOptions.rootBackgroundImage.hasValue) {
-		[navigationController rnn_setRootBackgroundImage:newOptions.rootBackgroundImage.get];
-	}
-	
-	if (newOptions.topBar.testID.hasValue) {
-		[navigationController rnn_setNavigationBarTestID:newOptions.topBar.testID.get];
-	}
-	
-	if (newOptions.topBar.visible.hasValue) {
-		[navigationController rnn_setNavigationBarVisible:newOptions.topBar.visible.get animated:[newOptions.topBar.animate getWithDefaultValue:YES]];
-	}
-	
-	if (newOptions.topBar.hideOnScroll.hasValue) {
-		[navigationController rnn_hideBarsOnScroll:[newOptions.topBar.hideOnScroll get]];
-	}
-	
-	if (newOptions.topBar.noBorder.hasValue) {
-		[navigationController rnn_setNavigationBarNoBorder:[newOptions.topBar.noBorder get]];
-	}
-	
-	if (newOptions.topBar.barStyle.hasValue) {
-		[navigationController rnn_setBarStyle:[RCTConvert UIBarStyle:newOptions.topBar.barStyle.get]];
-	}
-	
-	if (newOptions.topBar.background.translucent.hasValue) {
-		[navigationController rnn_setNavigationBarTranslucent:[newOptions.topBar.background.translucent get]];
-	}
-	
-	if (newOptions.topBar.background.clipToBounds.hasValue) {
-		[navigationController rnn_setNavigationBarClipsToBounds:[newOptions.topBar.background.clipToBounds get]];
-	}
-	
-	if (newOptions.topBar.background.blur.hasValue) {
-		[navigationController rnn_setNavigationBarBlur:[newOptions.topBar.background.blur get]];
-	}
-	
-	if (newOptions.topBar.background.color.hasValue) {
-		[navigationController setTopBarBackgroundColor:newOptions.topBar.background.color.get];
-	}
-	
-	if (newOptions.topBar.largeTitle.visible.hasValue) {
-		[navigationController rnn_setNavigationBarLargeTitleVisible:newOptions.topBar.largeTitle.visible.get];
-	}
-	
-	if (newOptions.topBar.backButton.color.hasValue) {
-		[navigationController rnn_setBackButtonColor:newOptions.topBar.backButton.color.get];
-	}
-	
-
-	RNNLargeTitleOptions *largeTitleOptions = newOptions.topBar.largeTitle;
-	if (largeTitleOptions.color.hasValue || largeTitleOptions.fontSize.hasValue || largeTitleOptions.fontFamily.hasValue) {
-		[navigationController rnn_setNavigationBarLargeTitleFontFamily:[newOptions.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[newOptions.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[newOptions.topBar.largeTitle.color getWithDefaultValue:nil]];
-	}
-
-	RNNNavigationOptions * withDefault = (RNNNavigationOptions *) [[newOptions mergeInOptions:currentOptions] withDefault:[self defaultOptions]];
-	[navigationController rnn_setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil]
-												fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil]
-												   color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
-	
-	if (newOptions.topBar.component.name.hasValue) {
-		[self setCustomNavigationBarView:newOptions perform:nil];
-	}
-	
-	if (newOptions.topBar.background.component.name.hasValue) {
-		[self setCustomNavigationComponentBackground:newOptions perform:nil];
-	}
-}
-
-- (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-		dispatch_group_t group = dispatch_group_create();
-		
-		dispatch_group_enter(group);
-		dispatch_async(dispatch_get_main_queue(), ^{
-			[self setCustomNavigationBarView:options perform:^{
-				dispatch_group_leave(group);
-			}];
-		});
-		
-		dispatch_group_enter(group);
-		dispatch_async(dispatch_get_main_queue(), ^{
-			[self setCustomNavigationComponentBackground:options perform:^{
-				dispatch_group_leave(group);
-			}];
-		});
-		
-		dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
-		
-		dispatch_async(dispatch_get_main_queue(), ^{
-			if (readyBlock) {
-				readyBlock();
-			}
-		});
-	});
-}
-
-- (void)setCustomNavigationBarView:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	RNNNavigationController* navigationController = self.boundViewController;
-	if (![options.topBar.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
-		readyBlock();
-		readyBlock = nil;
-	}
-	if (options.topBar.component.name.hasValue) {
-		NSString* currentChildComponentId = [navigationController getCurrentChild].layoutInfo.componentId;
-		RCTRootView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.component parentComponentId:currentChildComponentId reactViewReadyBlock:readyBlock];
-		
-		if (_customTopBar) {
-			[_customTopBar removeFromSuperview];
-		}
-		_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
-		reactView.backgroundColor = UIColor.clearColor;
-		_customTopBar.backgroundColor = UIColor.clearColor;
-		[navigationController.navigationBar addSubview:_customTopBar];
-	} else {
-		[_customTopBar removeFromSuperview];
-		_customTopBar = nil;
-		if (readyBlock) {
-			readyBlock();
-		}
-	}
-}
-
-- (void)setCustomNavigationComponentBackground:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	RNNNavigationController* navigationController = self.boundViewController;
-	if (![options.topBar.background.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
-		readyBlock();
-		readyBlock = nil;
-	}
-	if (options.topBar.background.component.name.hasValue) {
-		NSString* currentChildComponentId = [navigationController getCurrentChild].layoutInfo.componentId;
-		RNNReactView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.background.component parentComponentId:currentChildComponentId reactViewReadyBlock:readyBlock];
-		_customTopBarBackgroundReactView = reactView;
-		
-	} else {
-		[_customTopBarBackground removeFromSuperview];
-		_customTopBarBackground = nil;
-		if (readyBlock) {
-			readyBlock();
-		}
-	}
-}
-
-- (void)presentBackgroundComponent {
-	RNNNavigationController* navigationController = self.boundViewController;
-	if (_customTopBarBackground) {
-		[_customTopBarBackground removeFromSuperview];
-	}
-	RNNCustomTitleView* customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:navigationController.navigationBar.bounds subView:_customTopBarBackgroundReactView alignment:@"fill"];
-	_customTopBarBackground = customTopBarBackground;
-	
-	[navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
-}
-
-- (void)dealloc {
-	[_componentRegistry removeComponent:self.boundComponentId];
-}
-
-@end

lib/ios/RNNNavigationOptions.m

@@ -1,10 +1,10 @@
 #import "RNNNavigationOptions.h"
 #import <React/RCTConvert.h>
-#import "RNNNavigationController.h"
-#import "RNNTabBarController.h"
+#import "RNNStackController.h"
+#import "RNNBottomTabsController.h"
 #import "RNNTopBarOptions.h"
 #import "RNNSideMenuController.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNNavigationButtons.h"
 #import "RNNSplitViewOptions.h"

lib/ios/RNNReactComponentRegistry.h

@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import "RNNReactView.h"
 #import "RNNComponentOptions.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 
 @interface RNNReactComponentRegistry : NSObject
 
-- (instancetype)initWithCreator:(id<RNNRootViewCreator>)creator;
+- (instancetype)initWithCreator:(id<RNNComponentViewCreator>)creator;
 
 - (RNNReactView *)createComponentIfNotExists:(RNNComponentOptions *)component parentComponentId:(NSString *)parentComponentId reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock;
 

lib/ios/RNNReactComponentRegistry.m

@@ -1,7 +1,7 @@
 #import "RNNReactComponentRegistry.h"
 
 @interface RNNReactComponentRegistry () {
-	id<RNNRootViewCreator> _creator;
+	id<RNNComponentViewCreator> _creator;
 	NSMapTable* _componentStore;
 }
 
@@ -9,7 +9,7 @@
 
 @implementation RNNReactComponentRegistry
 
-- (instancetype)initWithCreator:(id<RNNRootViewCreator>)creator {
+- (instancetype)initWithCreator:(id<RNNComponentViewCreator>)creator {
 	self = [super init];
 	_creator = creator;
 	_componentStore = [NSMapTable new];

lib/ios/RNNReactRootViewCreator.h

@@ -1,9 +1,9 @@
 #import <Foundation/Foundation.h>
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 
 #import <React/RCTBridge.h>
 
-@interface RNNReactRootViewCreator : NSObject <RNNRootViewCreator>
+@interface RNNReactRootViewCreator : NSObject <RNNComponentViewCreator>
 
 -(instancetype)initWithBridge:(RCTBridge*)bridge;
 

lib/ios/RNNSideMenuChildVC.h

@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 #import "RNNLayoutProtocol.h"
 
 typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
@@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 
 @interface RNNSideMenuChildVC : UIViewController <RNNLayoutProtocol>
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNRootViewCreator>)creator options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter childViewController:(UIViewController *)childViewController type:(RNNSideMenuChildType)type;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNComponentViewCreator>)creator options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter childViewController:(UIViewController *)childViewController type:(RNNSideMenuChildType)type;
 
 @property (readonly) RNNSideMenuChildType type;
 @property (readonly) UIViewController<RNNLayoutProtocol> *child;

lib/ios/RNNSideMenuChildVC.m

@@ -10,7 +10,7 @@
 @implementation RNNSideMenuChildVC
 
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNRootViewCreator>)creator options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter childViewController:(UIViewController *)childViewController type:(RNNSideMenuChildType)type {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNComponentViewCreator>)creator options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter childViewController:(UIViewController *)childViewController type:(RNNSideMenuChildType)type {
 	self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:nil];
 	self.type = type;
 	self.child = childViewController;

lib/ios/RNNSideMenuController.h

@@ -6,7 +6,7 @@
 
 @interface RNNSideMenuController : MMDrawerController <RNNLayoutProtocol>
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNRootViewCreator>)creator childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter;
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNComponentViewCreator>)creator childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter;
 
 @property (readonly) RNNSideMenuChildVC *center;
 @property (readonly) RNNSideMenuChildVC *left;

lib/ios/RNNSideMenuController.m

@@ -11,7 +11,7 @@
 
 @implementation RNNSideMenuController
 
-- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNRootViewCreator>)creator childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter {
+- (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo creator:(id<RNNComponentViewCreator>)creator childViewControllers:(NSArray *)childViewControllers options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions presenter:(RNNBasePresenter *)presenter eventEmitter:(RNNEventEmitter *)eventEmitter {
 	[self setControllers:childViewControllers];
 	self = [super initWithCenterViewController:self.center leftDrawerViewController:self.left rightDrawerViewController:self.right];
 	

lib/ios/RNNSideMenuPresenter.m

@@ -11,34 +11,34 @@
 - (void)applyOptions:(RNNNavigationOptions *)options {
 	[super applyOptions:options];
 	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	RNNSideMenuController* sideMenuController = self.boundViewController;
+	RNNSideMenuController* sideMenu = self.boundViewController;
 
-	[sideMenuController side:MMDrawerSideLeft enabled:[withDefault.sideMenu.left.enabled getWithDefaultValue:YES]];
-	[sideMenuController side:MMDrawerSideRight enabled:[withDefault.sideMenu.right.enabled getWithDefaultValue:YES]];
+	[sideMenu side:MMDrawerSideLeft enabled:[withDefault.sideMenu.left.enabled getWithDefaultValue:YES]];
+	[sideMenu side:MMDrawerSideRight enabled:[withDefault.sideMenu.right.enabled getWithDefaultValue:YES]];
 	
-	[sideMenuController setShouldStretchLeftDrawer:[withDefault.sideMenu.left.shouldStretchDrawer getWithDefaultValue:YES]];
-	[sideMenuController setShouldStretchRightDrawer:[withDefault.sideMenu.right.shouldStretchDrawer getWithDefaultValue:YES]];
+	[sideMenu setShouldStretchLeftDrawer:[withDefault.sideMenu.left.shouldStretchDrawer getWithDefaultValue:YES]];
+	[sideMenu setShouldStretchRightDrawer:[withDefault.sideMenu.right.shouldStretchDrawer getWithDefaultValue:YES]];
 	
-	[sideMenuController setAnimationVelocityLeft:[withDefault.sideMenu.left.animationVelocity getWithDefaultValue:840.0f]];
-	[sideMenuController setAnimationVelocityRight:[withDefault.sideMenu.right.animationVelocity getWithDefaultValue:840.0f]];
+	[sideMenu setAnimationVelocityLeft:[withDefault.sideMenu.left.animationVelocity getWithDefaultValue:840.0f]];
+	[sideMenu setAnimationVelocityRight:[withDefault.sideMenu.right.animationVelocity getWithDefaultValue:840.0f]];
 	
-	[sideMenuController setAnimationType:[withDefault.sideMenu.animationType getWithDefaultValue:nil]];
+	[sideMenu setAnimationType:[withDefault.sideMenu.animationType getWithDefaultValue:nil]];
 	
 	if (withDefault.sideMenu.left.width.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft width:withDefault.sideMenu.left.width.get];
+		[sideMenu side:MMDrawerSideLeft width:withDefault.sideMenu.left.width.get];
 	}
 	
 	if (withDefault.sideMenu.right.width.hasValue) {
-		[sideMenuController side:MMDrawerSideRight width:withDefault.sideMenu.right.width.get];
+		[sideMenu side:MMDrawerSideRight width:withDefault.sideMenu.right.width.get];
 	}
 	
 	if (withDefault.sideMenu.left.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft visible:withDefault.sideMenu.left.visible.get];
+		[sideMenu side:MMDrawerSideLeft visible:withDefault.sideMenu.left.visible.get];
 		[withDefault.sideMenu.left.visible consume];
 	}
 	
 	if (withDefault.sideMenu.right.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideRight visible:withDefault.sideMenu.right.visible.get];
+		[sideMenu side:MMDrawerSideRight visible:withDefault.sideMenu.right.visible.get];
 		[withDefault.sideMenu.right.visible consume];
 	}
 }
@@ -47,67 +47,66 @@
 	[super applyOptionsOnInit:initialOptions];
 
 	RNNNavigationOptions *withDefault = [initialOptions withDefault:[self defaultOptions]];
-	RNNSideMenuController* sideMenuController = self.boundViewController;
+	RNNSideMenuController* sideMenu = self.boundViewController;
 	if (withDefault.sideMenu.left.width.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft width:withDefault.sideMenu.left.width.get];
+		[sideMenu side:MMDrawerSideLeft width:withDefault.sideMenu.left.width.get];
 	}
 	
 	if (withDefault.sideMenu.right.width.hasValue) {
-		[sideMenuController side:MMDrawerSideRight width:withDefault.sideMenu.right.width.get];
+		[sideMenu side:MMDrawerSideRight width:withDefault.sideMenu.right.width.get];
 	}
 
-		[sideMenuController setOpenDrawerGestureModeMask:[[withDefault.sideMenu.openGestureMode getWithDefaultValue:@(MMOpenDrawerGestureModeAll)] integerValue]];
+		[sideMenu setOpenDrawerGestureModeMask:[[withDefault.sideMenu.openGestureMode getWithDefaultValue:@(MMOpenDrawerGestureModeAll)] integerValue]];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
-	[super mergeOptions:newOptions currentOptions:currentOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)currentOptions {
+    [super mergeOptions:options resolvedOptions:currentOptions];
+	RNNSideMenuController* sideMenu = self.boundViewController;
 	
-	RNNSideMenuController* sideMenuController = self.boundViewController;
-	
-	if (newOptions.sideMenu.left.enabled.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft enabled:newOptions.sideMenu.left.enabled.get];
+	if (options.sideMenu.left.enabled.hasValue) {
+		[sideMenu side:MMDrawerSideLeft enabled:options.sideMenu.left.enabled.get];
 	}
 	
-	if (newOptions.sideMenu.right.enabled.hasValue) {
-		[sideMenuController side:MMDrawerSideRight enabled:newOptions.sideMenu.right.enabled.get];
+	if (options.sideMenu.right.enabled.hasValue) {
+		[sideMenu side:MMDrawerSideRight enabled:options.sideMenu.right.enabled.get];
 	}
 	
-	if (newOptions.sideMenu.left.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft visible:newOptions.sideMenu.left.visible.get];
-		[newOptions.sideMenu.left.visible consume];
+	if (options.sideMenu.left.visible.hasValue) {
+		[sideMenu side:MMDrawerSideLeft visible:options.sideMenu.left.visible.get];
+		[options.sideMenu.left.visible consume];
 	}
 	
-	if (newOptions.sideMenu.right.visible.hasValue) {
-		[sideMenuController side:MMDrawerSideRight visible:newOptions.sideMenu.right.visible.get];
-		[newOptions.sideMenu.right.visible consume];
+	if (options.sideMenu.right.visible.hasValue) {
+		[sideMenu side:MMDrawerSideRight visible:options.sideMenu.right.visible.get];
+		[options.sideMenu.right.visible consume];
 	}
 	
-	if (newOptions.sideMenu.left.width.hasValue) {
-		[sideMenuController side:MMDrawerSideLeft width:newOptions.sideMenu.left.width.get];
+	if (options.sideMenu.left.width.hasValue) {
+		[sideMenu side:MMDrawerSideLeft width:options.sideMenu.left.width.get];
 	}
 	
-	if (newOptions.sideMenu.right.width.hasValue) {
-		[sideMenuController side:MMDrawerSideRight width:newOptions.sideMenu.right.width.get];
+	if (options.sideMenu.right.width.hasValue) {
+		[sideMenu side:MMDrawerSideRight width:options.sideMenu.right.width.get];
 	}
 	
-	if (newOptions.sideMenu.left.shouldStretchDrawer.hasValue) {
-		sideMenuController.shouldStretchLeftDrawer = newOptions.sideMenu.left.shouldStretchDrawer.get;
+	if (options.sideMenu.left.shouldStretchDrawer.hasValue) {
+		sideMenu.shouldStretchLeftDrawer = options.sideMenu.left.shouldStretchDrawer.get;
 	}
 	
-	if (newOptions.sideMenu.right.shouldStretchDrawer.hasValue) {
-		sideMenuController.shouldStretchRightDrawer = newOptions.sideMenu.right.shouldStretchDrawer.get;
+	if (options.sideMenu.right.shouldStretchDrawer.hasValue) {
+		sideMenu.shouldStretchRightDrawer = options.sideMenu.right.shouldStretchDrawer.get;
 	}
 	
-	if (newOptions.sideMenu.left.animationVelocity.hasValue) {
-		sideMenuController.animationVelocityLeft = newOptions.sideMenu.left.animationVelocity.get;
+	if (options.sideMenu.left.animationVelocity.hasValue) {
+		sideMenu.animationVelocityLeft = options.sideMenu.left.animationVelocity.get;
 	}
 	
-	if (newOptions.sideMenu.right.animationVelocity.hasValue) {
-		sideMenuController.animationVelocityRight = newOptions.sideMenu.right.animationVelocity.get;
+	if (options.sideMenu.right.animationVelocity.hasValue) {
+		sideMenu.animationVelocityRight = options.sideMenu.right.animationVelocity.get;
 	}
 	
-	if (newOptions.sideMenu.animationType.hasValue) {
-		[sideMenuController setAnimationType:newOptions.sideMenu.animationType.get];
+	if (options.sideMenu.animationType.hasValue) {
+		[sideMenu setAnimationType:options.sideMenu.animationType.get];
 	}
 }
 

lib/ios/RNNSplitViewControllerPresenter.h

@@ -1,5 +1,5 @@
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 
-@interface RNNSplitViewControllerPresenter : RNNViewControllerPresenter
+@interface RNNSplitViewControllerPresenter : RNNComponentPresenter
 
 @end

lib/ios/RNNSplitViewControllerPresenter.m

@@ -31,22 +31,22 @@
 	[splitViewController rnn_setMaxWidth:initialOptions.splitView.maxWidth];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
-	[super mergeOptions:newOptions currentOptions:currentOptions];
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)currentOptions {
+    [super mergeOptions:options resolvedOptions:currentOptions];
 	
 	UISplitViewController* splitViewController = self.boundViewController;
 
-	if (newOptions.splitView.displayMode) {
-		[splitViewController rnn_setDisplayMode:newOptions.splitView.displayMode];
+	if (options.splitView.displayMode) {
+		[splitViewController rnn_setDisplayMode:options.splitView.displayMode];
 	}
-	if (newOptions.splitView.primaryEdge) {
-		[splitViewController rnn_setPrimaryEdge:newOptions.splitView.primaryEdge];
+	if (options.splitView.primaryEdge) {
+		[splitViewController rnn_setPrimaryEdge:options.splitView.primaryEdge];
 	}
-	if (newOptions.splitView.minWidth) {
-		[splitViewController rnn_setMinWidth:newOptions.splitView.minWidth];
+	if (options.splitView.minWidth) {
+		[splitViewController rnn_setMinWidth:options.splitView.minWidth];
 	}
-	if (newOptions.splitView.maxWidth) {
-		[splitViewController rnn_setMaxWidth:newOptions.splitView.maxWidth];
+	if (options.splitView.maxWidth) {
+		[splitViewController rnn_setMaxWidth:options.splitView.maxWidth];
 	}
 }
 

lib/ios/RNNStackController.h

@@ -0,0 +1,12 @@
+#import <UIKit/UIKit.h>
+#import "RNNStackPresenter.h"
+#import "UINavigationController+RNNOptions.h"
+#import "UIViewController+LayoutProtocol.h"
+
+@interface RNNStackController : UINavigationController <RNNLayoutProtocol>
+
+@property (nonatomic, retain) RNNStackPresenter* presenter;
+
+- (void)setTopBarBackgroundColor:(UIColor *)backgroundColor;
+
+@end

lib/ios/RNNNavigationController.m → lib/ios/RNNStackController.m

@@ -1,9 +1,9 @@
-#import "RNNNavigationController.h"
-#import "RNNRootViewController.h"
+#import "RNNStackController.h"
+#import "RNNComponentViewController.h"
 
 const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
-@implementation RNNNavigationController
+@implementation RNNStackController
 
 -(void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {
 	[super setDefaultOptions:defaultOptions];
@@ -38,8 +38,8 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
 	if (self.viewControllers.count > 1) {
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
-		if ([controller isKindOfClass:[RNNRootViewController class]]) {
-			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
+		if ([controller isKindOfClass:[RNNComponentViewController class]]) {
+			RNNComponentViewController *rnnController = (RNNComponentViewController *)controller;
 			[self.presenter applyOptionsBeforePopping:rnnController.resolveOptions];
 		}
 	}

lib/ios/RNNNavigationControllerPresenter.h → lib/ios/RNNStackPresenter.h

@@ -1,9 +1,9 @@
 #import "RNNBasePresenter.h"
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 #import "RNNReactComponentRegistry.h"
 #import "InteractivePopGestureDelegate.h"
 
-@interface RNNNavigationControllerPresenter : RNNBasePresenter
+@interface RNNStackPresenter : RNNBasePresenter
 
 @property(nonatomic, strong) InteractivePopGestureDelegate *interactivePopGestureDelegate;
 

lib/ios/RNNStackPresenter.m

@@ -0,0 +1,228 @@
+#import "RNNStackPresenter.h"
+#import "UINavigationController+RNNOptions.h"
+#import "RNNStackController.h"
+#import "RNNCustomTitleView.h"
+
+@interface RNNStackPresenter() {
+	RNNReactComponentRegistry* _componentRegistry;
+	UIView* _customTopBar;
+	UIView* _customTopBarBackground;
+	RNNReactView* _customTopBarBackgroundReactView;
+}
+
+@end
+@implementation RNNStackPresenter
+
+- (instancetype)initWithComponentRegistry:(RNNReactComponentRegistry *)componentRegistry:(RNNNavigationOptions *)defaultOptions {
+	self = [super initWithDefaultOptions:defaultOptions];
+	_componentRegistry = componentRegistry;
+	return self;
+}
+
+- (void)applyOptions:(RNNNavigationOptions *)options {
+	[super applyOptions:options];
+	RNNStackController* stack = self.boundViewController;
+	RNNNavigationOptions * withDefault = [options withDefault:[self defaultOptions]];
+	
+	self.interactivePopGestureDelegate = [InteractivePopGestureDelegate new];
+	self.interactivePopGestureDelegate.navigationController = stack;
+	self.interactivePopGestureDelegate.originalDelegate = stack.interactivePopGestureRecognizer.delegate;
+	stack.interactivePopGestureRecognizer.delegate = self.interactivePopGestureDelegate;
+
+	[stack setInteractivePopGestureEnabled:[withDefault.popGesture getWithDefaultValue:YES]];
+	[stack setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
+	[stack setNavigationBarTestId:[withDefault.topBar.testID getWithDefaultValue:nil]];
+	[stack setNavigationBarVisible:[withDefault.topBar.visible getWithDefaultValue:YES] animated:[withDefault.topBar.animate getWithDefaultValue:YES]];
+	[stack hideBarsOnScroll:[withDefault.topBar.hideOnScroll getWithDefaultValue:NO]];
+	[stack setNavigationBarNoBorder:[withDefault.topBar.noBorder getWithDefaultValue:NO]];
+	[stack setBarStyle:[RCTConvert UIBarStyle:[withDefault.topBar.barStyle getWithDefaultValue:@"default"]]];
+	[stack setNavigationBarTranslucent:[withDefault.topBar.background.translucent getWithDefaultValue:NO]];
+	[stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
+	[stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
+	[stack setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
+	[stack setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
+	[stack setNavigationBarLargeTitleFontFamily:[withDefault.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.largeTitle.color getWithDefaultValue:nil]];
+	[stack setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
+	[stack setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
+}
+
+- (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
+	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+	if (withDefault.topBar.background.component.name.hasValue) {
+		[self presentBackgroundComponent];
+	}
+}
+
+- (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options {
+	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+	RNNStackController* navigationController = self.boundViewController;
+	[navigationController setTopBarBackgroundColor:[withDefault.topBar.background.color getWithDefaultValue:nil]];
+	[navigationController setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil] color:[withDefault.topBar.title.color getWithDefaultValue:[UIColor blackColor]]];
+	[navigationController setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+    [super mergeOptions:options resolvedOptions:resolvedOptions];
+	RNNStackController* stack = self.boundViewController;
+
+	if (options.popGesture.hasValue) {
+		[stack setInteractivePopGestureEnabled:options.popGesture.get];
+	}
+	
+	if (options.rootBackgroundImage.hasValue) {
+		[stack setRootBackgroundImage:options.rootBackgroundImage.get];
+	}
+	
+	if (options.topBar.testID.hasValue) {
+		[stack setNavigationBarTestId:options.topBar.testID.get];
+	}
+	
+	if (options.topBar.visible.hasValue) {
+		[stack setNavigationBarVisible:options.topBar.visible.get animated:[options.topBar.animate getWithDefaultValue:YES]];
+	}
+	
+	if (options.topBar.hideOnScroll.hasValue) {
+		[stack hideBarsOnScroll:[options.topBar.hideOnScroll get]];
+	}
+	
+	if (options.topBar.noBorder.hasValue) {
+		[stack setNavigationBarNoBorder:[options.topBar.noBorder get]];
+	}
+	
+	if (options.topBar.barStyle.hasValue) {
+		[stack setBarStyle:[RCTConvert UIBarStyle:options.topBar.barStyle.get]];
+	}
+	
+	if (options.topBar.background.translucent.hasValue) {
+		[stack setNavigationBarTranslucent:[options.topBar.background.translucent get]];
+	}
+	
+	if (options.topBar.background.clipToBounds.hasValue) {
+		[stack setNavigationBarClipsToBounds:[options.topBar.background.clipToBounds get]];
+	}
+	
+	if (options.topBar.background.blur.hasValue) {
+		[stack setNavigationBarBlur:[options.topBar.background.blur get]];
+	}
+	
+	if (options.topBar.background.color.hasValue) {
+		[stack setTopBarBackgroundColor:options.topBar.background.color.get];
+	}
+	
+	if (options.topBar.largeTitle.visible.hasValue) {
+		[stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
+	}
+	
+	if (options.topBar.backButton.color.hasValue) {
+		[stack setBackButtonColor:options.topBar.backButton.color.get];
+	}
+
+	RNNLargeTitleOptions *largeTitleOptions = options.topBar.largeTitle;
+	if (largeTitleOptions.color.hasValue || largeTitleOptions.fontSize.hasValue || largeTitleOptions.fontFamily.hasValue) {
+		[stack setNavigationBarLargeTitleFontFamily:[options.topBar.largeTitle.fontFamily getWithDefaultValue:nil] fontSize:[options.topBar.largeTitle.fontSize getWithDefaultValue:nil] color:[options.topBar.largeTitle.color getWithDefaultValue:nil]];
+	}
+
+	RNNNavigationOptions * withDefault = (RNNNavigationOptions *) [[options mergeInOptions:resolvedOptions] withDefault:[self defaultOptions]];
+	[stack setNavigationBarFontFamily:[withDefault.topBar.title.fontFamily getWithDefaultValue:nil]
+							 fontSize:[withDefault.topBar.title.fontSize getWithDefaultValue:nil]
+								color:[withDefault.topBar.title.color getWithDefaultValue:nil]];
+	
+	if (options.topBar.component.name.hasValue) {
+		[self setCustomNavigationBarView:options perform:nil];
+	}
+	
+	if (options.topBar.background.component.name.hasValue) {
+		[self setCustomNavigationComponentBackground:options perform:nil];
+	}
+}
+
+- (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+		dispatch_group_t group = dispatch_group_create();
+		
+		dispatch_group_enter(group);
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[self setCustomNavigationBarView:options perform:^{
+				dispatch_group_leave(group);
+			}];
+		});
+		
+		dispatch_group_enter(group);
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[self setCustomNavigationComponentBackground:options perform:^{
+				dispatch_group_leave(group);
+			}];
+		});
+		
+		dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+		
+		dispatch_async(dispatch_get_main_queue(), ^{
+			if (readyBlock) {
+				readyBlock();
+			}
+		});
+	});
+}
+
+- (void)setCustomNavigationBarView:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	RNNStackController* stack = self.boundViewController;
+	if (![options.topBar.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
+		readyBlock();
+		readyBlock = nil;
+	}
+	if (options.topBar.component.name.hasValue) {
+		NSString* currentChildComponentId = [stack getCurrentChild].layoutInfo.componentId;
+		RCTRootView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.component parentComponentId:currentChildComponentId reactViewReadyBlock:readyBlock];
+		
+		if (_customTopBar) {
+			[_customTopBar removeFromSuperview];
+		}
+		_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:stack.navigationBar.bounds subView:reactView alignment:@"fill"];
+		reactView.backgroundColor = UIColor.clearColor;
+		_customTopBar.backgroundColor = UIColor.clearColor;
+		[stack.navigationBar addSubview:_customTopBar];
+	} else {
+		[_customTopBar removeFromSuperview];
+		_customTopBar = nil;
+		if (readyBlock) {
+			readyBlock();
+		}
+	}
+}
+
+- (void)setCustomNavigationComponentBackground:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	RNNStackController* stack = self.boundViewController;
+	if (![options.topBar.background.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
+		readyBlock();
+		readyBlock = nil;
+	}
+	if (options.topBar.background.component.name.hasValue) {
+		NSString* currentChildComponentId = [stack getCurrentChild].layoutInfo.componentId;
+		RNNReactView *reactView = [_componentRegistry createComponentIfNotExists:options.topBar.background.component parentComponentId:currentChildComponentId reactViewReadyBlock:readyBlock];
+		_customTopBarBackgroundReactView = reactView;
+		
+	} else {
+		[_customTopBarBackground removeFromSuperview];
+		_customTopBarBackground = nil;
+		if (readyBlock) {
+			readyBlock();
+		}
+	}
+}
+
+- (void)presentBackgroundComponent {
+	RNNStackController* stack = self.boundViewController;
+	if (_customTopBarBackground) {
+		[_customTopBarBackground removeFromSuperview];
+	}
+	RNNCustomTitleView* customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:stack.navigationBar.bounds subView:_customTopBarBackgroundReactView alignment:@"fill"];
+	_customTopBarBackground = customTopBarBackground;
+	
+	[stack.navigationBar insertSubview:_customTopBarBackground atIndex:1];
+}
+
+- (void)dealloc {
+	[_componentRegistry removeComponent:self.boundComponentId];
+}
+
+@end

lib/ios/RNNTabBarPresenter.m

@@ -1,82 +0,0 @@
-#import "RNNTabBarPresenter.h"
-#import "UITabBarController+RNNOptions.h"
-#import "UIViewController+LayoutProtocol.h"
-#import "UIViewController+Utils.h"
-
-@implementation RNNTabBarPresenter
-
-- (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
-    UITabBarController *tabBarController = self.boundViewController;
-    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-    [tabBarController rnn_setCurrentTabIndex:[withDefault.bottomTabs.currentTabIndex getWithDefaultValue:0]];
-}
-
-- (void)applyOptions:(RNNNavigationOptions *)options {
-    UITabBarController *tabBarController = self.boundViewController;
-    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-
-    [tabBarController rnn_setTabBarTestID:[withDefault.bottomTabs.testID getWithDefaultValue:nil]];
-    [tabBarController rnn_setTabBarBackgroundColor:[withDefault.bottomTabs.backgroundColor getWithDefaultValue:nil]];
-    [tabBarController rnn_setTabBarTranslucent:[withDefault.bottomTabs.translucent getWithDefaultValue:NO]];
-    [tabBarController rnn_setTabBarHideShadow:[withDefault.bottomTabs.hideShadow getWithDefaultValue:NO]];
-    [tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:[withDefault.bottomTabs.barStyle getWithDefaultValue:@"default"]]];
-    [tabBarController rnn_setTabBarVisible:[withDefault.bottomTabs.visible getWithDefaultValue:YES] animated:[withDefault.bottomTabs.animate getWithDefaultValue:NO]];
-}
-
-- (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions {
-    [super mergeOptions:newOptions currentOptions:currentOptions];
-
-    UITabBarController *tabBarController = self.boundViewController;
-
-    if (newOptions.bottomTabs.currentTabIndex.hasValue) {
-        [tabBarController rnn_setCurrentTabIndex:newOptions.bottomTabs.currentTabIndex.get];
-        [newOptions.bottomTabs.currentTabIndex consume];
-    }
-
-    if (newOptions.bottomTabs.currentTabId.hasValue) {
-        [tabBarController rnn_setCurrentTabID:newOptions.bottomTabs.currentTabId.get];
-        [newOptions.bottomTabs.currentTabId consume];
-    }
-
-    if (newOptions.bottomTabs.testID.hasValue) {
-        [tabBarController rnn_setTabBarTestID:newOptions.bottomTabs.testID.get];
-    }
-
-    if (newOptions.bottomTabs.backgroundColor.hasValue) {
-        [tabBarController rnn_setTabBarBackgroundColor:newOptions.bottomTabs.backgroundColor.get];
-    }
-
-    if (newOptions.bottomTabs.barStyle.hasValue) {
-        [tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:newOptions.bottomTabs.barStyle.get]];
-    }
-
-    if (newOptions.bottomTabs.translucent.hasValue) {
-        [tabBarController rnn_setTabBarTranslucent:newOptions.bottomTabs.translucent.get];
-    }
-
-    if (newOptions.bottomTabs.hideShadow.hasValue) {
-        [tabBarController rnn_setTabBarHideShadow:newOptions.bottomTabs.hideShadow.get];
-    }
-
-    if (newOptions.bottomTabs.visible.hasValue) {
-        if (newOptions.bottomTabs.animate.hasValue) {
-            [tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get animated:[newOptions.bottomTabs.animate getWithDefaultValue:NO]];
-        } else {
-            [tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get animated:NO];
-        }
-    }
-}
-
-- (void)viewDidLayoutSubviews {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self applyDotIndicator];
-    });
-}
-
-- (void)applyDotIndicator {
-    [self.boundViewController forEachChild:^(UIViewController *child) {
-        [self applyDotIndicator:child];
-    }];
-}
-
-@end

lib/ios/RNNTopTabsViewController.m

@@ -1,7 +1,7 @@
 #import "RNNTopTabsViewController.h"
 #import "RNNSegmentedControl.h"
 #import "ReactNativeNavigation.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "UIViewController+LayoutProtocol.h"
 
 @interface RNNTopTabsViewController () {
@@ -60,7 +60,7 @@
 
 - (void)setViewControllers:(NSArray *)viewControllers {
 	_viewControllers = viewControllers;
-	for (RNNRootViewController* childVc in viewControllers) {
+	for (RNNComponentViewController* childVc in viewControllers) {
 		[childVc.view setFrame:_contentView.bounds];
 //		[childVc.options.topTab applyOn:childVc];
 		[self addChildViewController:childVc];

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -50,10 +50,10 @@
 		4534E72520CB6724009F8185 /* RNNLargeTitleOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4534E72320CB6724009F8185 /* RNNLargeTitleOptions.h */; };
 		4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */; };
 		501214C9217741A000435148 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 501214C8217741A000435148 /* libOCMock.a */; };
-		501223D72173590F000F5F98 /* RNNNavigationControllerPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501223D52173590F000F5F98 /* RNNNavigationControllerPresenter.h */; };
-		501223D82173590F000F5F98 /* RNNNavigationControllerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 501223D62173590F000F5F98 /* RNNNavigationControllerPresenter.m */; };
-		501224062173592D000F5F98 /* RNNTabBarPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501224042173592D000F5F98 /* RNNTabBarPresenter.h */; };
-		501224072173592D000F5F98 /* RNNTabBarPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 501224052173592D000F5F98 /* RNNTabBarPresenter.m */; };
+		501223D72173590F000F5F98 /* RNNStackPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501223D52173590F000F5F98 /* RNNStackPresenter.h */; };
+		501223D82173590F000F5F98 /* RNNStackPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 501223D62173590F000F5F98 /* RNNStackPresenter.m */; };
+		501224062173592D000F5F98 /* RNNBottomTabsPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501224042173592D000F5F98 /* RNNBottomTabsPresenter.h */; };
+		501224072173592D000F5F98 /* RNNBottomTabsPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 501224052173592D000F5F98 /* RNNBottomTabsPresenter.m */; };
 		5012240A21735959000F5F98 /* RNNSideMenuPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012240821735959000F5F98 /* RNNSideMenuPresenter.h */; };
 		5012240B21735959000F5F98 /* RNNSideMenuPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5012240921735959000F5F98 /* RNNSideMenuPresenter.m */; };
 		5012240E21735999000F5F98 /* RNNBasePresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5012240C21735999000F5F98 /* RNNBasePresenter.h */; };
@@ -167,8 +167,8 @@
 		505963F722676A0000EBB63C /* RNNLayoutManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 505963F622676A0000EBB63C /* RNNLayoutManagerTest.m */; };
 		505EDD32214E4BE80071C7DE /* RNNNavigationControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */; };
 		505EDD34214E7B7B0071C7DE /* RNNLeafProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD33214E7A6A0071C7DE /* RNNLeafProtocol.h */; };
-		505EDD3C214FA8000071C7DE /* RNNViewControllerPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */; };
-		505EDD3D214FA8000071C7DE /* RNNViewControllerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */; };
+		505EDD3C214FA8000071C7DE /* RNNComponentPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD3A214FA8000071C7DE /* RNNComponentPresenter.h */; };
+		505EDD3D214FA8000071C7DE /* RNNComponentPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 505EDD3B214FA8000071C7DE /* RNNComponentPresenter.m */; };
 		505EDD4A214FDA800071C7DE /* RCTConvert+Modal.h in Headers */ = {isa = PBXBuildFile; fileRef = 505EDD48214FDA800071C7DE /* RCTConvert+Modal.h */; };
 		5060DE73219DAD7E00D0C052 /* ReactNativeNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */; };
 		5060DE74219DAD8300D0C052 /* RNNBridgeManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 502CB43920CBCA140019B2FE /* RNNBridgeManagerDelegate.h */; };
@@ -203,7 +203,7 @@
 		50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */; };
 		508EBDBD2278746400BEC144 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 508EBDBA2278742700BEC144 /* JavaScriptCore.framework */; };
 		509B2480217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */; };
-		509B258F2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */; };
+		509B258F2178BE7A00C83C23 /* RNNStackPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */; };
 		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
 		50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */; };
 		50AB0B1C2255F8640039DAED /* UIViewController+LayoutProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50AB0B1A2255F8640039DAED /* UIViewController+LayoutProtocol.h */; };
@@ -233,10 +233,10 @@
 		50EB4ED72068EBE000D6ED34 /* RNNBackgroundOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50EB4ED52068EBE000D6ED34 /* RNNBackgroundOptions.h */; };
 		50EB4ED82068EBE000D6ED34 /* RNNBackgroundOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB4ED62068EBE000D6ED34 /* RNNBackgroundOptions.m */; };
 		50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */; };
-		50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFBF1F407A8C001A00BC /* RNNTabBarController.h */; };
-		50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F5DFC01F407A8C001A00BC /* RNNTabBarController.m */; };
-		50F5DFC51F407AA0001A00BC /* RNNNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFC31F407AA0001A00BC /* RNNNavigationController.h */; };
-		50F5DFC61F407AA0001A00BC /* RNNNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F5DFC41F407AA0001A00BC /* RNNNavigationController.m */; };
+		50F5DFC11F407A8C001A00BC /* RNNBottomTabsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFBF1F407A8C001A00BC /* RNNBottomTabsController.h */; };
+		50F5DFC21F407A8C001A00BC /* RNNBottomTabsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F5DFC01F407A8C001A00BC /* RNNBottomTabsController.m */; };
+		50F5DFC51F407AA0001A00BC /* RNNStackController.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F5DFC31F407AA0001A00BC /* RNNStackController.h */; };
+		50F5DFC61F407AA0001A00BC /* RNNStackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 50F5DFC41F407AA0001A00BC /* RNNStackController.m */; };
 		651E1F8A21FD624600DFEA19 /* UISplitViewController+RNNOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 651E1F8921FD624600DFEA19 /* UISplitViewController+RNNOptions.m */; };
 		651E1F8D21FD642100DFEA19 /* RNNSplitViewControllerPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 651E1F8C21FD642100DFEA19 /* RNNSplitViewControllerPresenter.m */; };
 		7365071121E4B16F004E020F /* RCTConvert+UIBarButtonSystemItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 7365070F21E4B16F004E020F /* RCTConvert+UIBarButtonSystemItem.h */; };
@@ -270,8 +270,8 @@
 		7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500771E254908001B9E1B /* RNNSplashScreen.m */; };
 		7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */; };
 		7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */; };
-		7BEF0D181E437684003E96B0 /* RNNRootViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D161E437684003E96B0 /* RNNRootViewController.h */; };
-		7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D171E437684003E96B0 /* RNNRootViewController.m */; };
+		7BEF0D181E437684003E96B0 /* RNNComponentViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D161E437684003E96B0 /* RNNComponentViewController.h */; };
+		7BEF0D191E437684003E96B0 /* RNNComponentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D171E437684003E96B0 /* RNNComponentViewController.m */; };
 		7BEF0D1C1E43771B003E96B0 /* RNNLayoutNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */; };
 		7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */; };
 		A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */; };
@@ -372,7 +372,7 @@
 		263905D51E4C94970023D7D3 /* RNNSideMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuController.m; sourceTree = "<group>"; };
 		263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuChildVC.h; sourceTree = "<group>"; };
 		263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuChildVC.m; sourceTree = "<group>"; };
-		26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNRootViewCreator.h; sourceTree = "<group>"; };
+		26916C941E4B9CCC00D13680 /* RNNComponentViewCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentViewCreator.h; sourceTree = "<group>"; };
 		26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNReactRootViewCreator.h; sourceTree = "<group>"; };
 		26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootViewCreator.m; sourceTree = "<group>"; };
 		2DCD9193200014A900EDC75D /* RNNBridgeManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBridgeManager.h; sourceTree = "<group>"; };
@@ -398,10 +398,10 @@
 		4534E72320CB6724009F8185 /* RNNLargeTitleOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNLargeTitleOptions.h; sourceTree = "<group>"; };
 		4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLargeTitleOptions.m; sourceTree = "<group>"; };
 		501214C8217741A000435148 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
-		501223D52173590F000F5F98 /* RNNNavigationControllerPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationControllerPresenter.h; sourceTree = "<group>"; };
-		501223D62173590F000F5F98 /* RNNNavigationControllerPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerPresenter.m; sourceTree = "<group>"; };
-		501224042173592D000F5F98 /* RNNTabBarPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarPresenter.h; sourceTree = "<group>"; };
-		501224052173592D000F5F98 /* RNNTabBarPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarPresenter.m; sourceTree = "<group>"; };
+		501223D52173590F000F5F98 /* RNNStackPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNStackPresenter.h; sourceTree = "<group>"; };
+		501223D62173590F000F5F98 /* RNNStackPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNStackPresenter.m; sourceTree = "<group>"; };
+		501224042173592D000F5F98 /* RNNBottomTabsPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabsPresenter.h; sourceTree = "<group>"; };
+		501224052173592D000F5F98 /* RNNBottomTabsPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabsPresenter.m; sourceTree = "<group>"; };
 		5012240821735959000F5F98 /* RNNSideMenuPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuPresenter.h; sourceTree = "<group>"; };
 		5012240921735959000F5F98 /* RNNSideMenuPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuPresenter.m; sourceTree = "<group>"; };
 		5012240C21735999000F5F98 /* RNNBasePresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBasePresenter.h; sourceTree = "<group>"; };
@@ -515,8 +515,8 @@
 		505963F622676A0000EBB63C /* RNNLayoutManagerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutManagerTest.m; sourceTree = "<group>"; };
 		505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerTest.m; sourceTree = "<group>"; };
 		505EDD33214E7A6A0071C7DE /* RNNLeafProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLeafProtocol.h; sourceTree = "<group>"; };
-		505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNViewControllerPresenter.h; sourceTree = "<group>"; };
-		505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNViewControllerPresenter.m; sourceTree = "<group>"; };
+		505EDD3A214FA8000071C7DE /* RNNComponentPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentPresenter.h; sourceTree = "<group>"; };
+		505EDD3B214FA8000071C7DE /* RNNComponentPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentPresenter.m; sourceTree = "<group>"; };
 		505EDD47214FC4A60071C7DE /* RNNLayoutProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNLayoutProtocol.h; sourceTree = "<group>"; };
 		505EDD48214FDA800071C7DE /* RCTConvert+Modal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Modal.h"; sourceTree = "<group>"; };
 		506317A8220B547400B26FC3 /* UIImage+insets.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+insets.h"; sourceTree = "<group>"; };
@@ -550,7 +550,7 @@
 		50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNOverlayWindow.h; sourceTree = "<group>"; };
 		508EBDBA2278742700BEC144 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+RNNOptionsTest.m"; sourceTree = "<group>"; };
-		509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationControllerPresenterTest.m; sourceTree = "<group>"; };
+		509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNStackPresenterTest.m; sourceTree = "<group>"; };
 		50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayOptions.h; sourceTree = "<group>"; };
 		50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayOptions.m; sourceTree = "<group>"; };
 		50AB0B1A2255F8640039DAED /* UIViewController+LayoutProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIViewController+LayoutProtocol.h"; sourceTree = "<group>"; };
@@ -580,10 +580,10 @@
 		50EB4ED62068EBE000D6ED34 /* RNNBackgroundOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBackgroundOptions.m; sourceTree = "<group>"; };
 		50EB933F1FE14A3E00BD8EEE /* RNNBottomTabOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabOptions.h; sourceTree = "<group>"; };
 		50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabOptions.m; sourceTree = "<group>"; };
-		50F5DFBF1F407A8C001A00BC /* RNNTabBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarController.h; sourceTree = "<group>"; };
-		50F5DFC01F407A8C001A00BC /* RNNTabBarController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarController.m; sourceTree = "<group>"; };
-		50F5DFC31F407AA0001A00BC /* RNNNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationController.h; sourceTree = "<group>"; };
-		50F5DFC41F407AA0001A00BC /* RNNNavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationController.m; sourceTree = "<group>"; };
+		50F5DFBF1F407A8C001A00BC /* RNNBottomTabsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabsController.h; sourceTree = "<group>"; };
+		50F5DFC01F407A8C001A00BC /* RNNBottomTabsController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabsController.m; sourceTree = "<group>"; };
+		50F5DFC31F407AA0001A00BC /* RNNStackController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNStackController.h; sourceTree = "<group>"; };
+		50F5DFC41F407AA0001A00BC /* RNNStackController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNStackController.m; sourceTree = "<group>"; };
 		651E1F8821FD611600DFEA19 /* UISplitViewController+RNNOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UISplitViewController+RNNOptions.h"; sourceTree = "<group>"; };
 		651E1F8921FD624600DFEA19 /* UISplitViewController+RNNOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UISplitViewController+RNNOptions.m"; sourceTree = "<group>"; };
 		651E1F8B21FD63F400DFEA19 /* RNNSplitViewControllerPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSplitViewControllerPresenter.h; sourceTree = "<group>"; };
@@ -623,8 +623,8 @@
 		7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNBridgeModule.m; sourceTree = "<group>"; };
 		7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNControllerFactory.h; sourceTree = "<group>"; };
 		7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactory.m; sourceTree = "<group>"; };
-		7BEF0D161E437684003E96B0 /* RNNRootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewController.h; sourceTree = "<group>"; };
-		7BEF0D171E437684003E96B0 /* RNNRootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNRootViewController.m; sourceTree = "<group>"; };
+		7BEF0D161E437684003E96B0 /* RNNComponentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNComponentViewController.h; sourceTree = "<group>"; };
+		7BEF0D171E437684003E96B0 /* RNNComponentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNComponentViewController.m; sourceTree = "<group>"; };
 		7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNLayoutNode.h; sourceTree = "<group>"; };
 		7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutNode.m; sourceTree = "<group>"; };
 		A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopBarOptions.m; sourceTree = "<group>"; };
@@ -662,7 +662,7 @@
 		E8A430101F9CB87B00B61A20 /* RNNAnimatedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNAnimatedView.m; sourceTree = "<group>"; };
 		E8A5CD501F464F0400E89D0D /* RNNAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNAnimator.h; sourceTree = "<group>"; };
 		E8A5CD511F464F0400E89D0D /* RNNAnimator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNAnimator.m; sourceTree = "<group>"; };
-		E8A5CD581F48CCC300E89D0D /* RNNNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNNavigationController.h; sourceTree = "<group>"; };
+		E8A5CD581F48CCC300E89D0D /* RNNStackController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNStackController.h; sourceTree = "<group>"; };
 		E8A5CD601F49114F00E89D0D /* RNNElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNElement.h; sourceTree = "<group>"; };
 		E8A5CD611F49114F00E89D0D /* RNNElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNElement.m; sourceTree = "<group>"; };
 		E8AEDB3A1F55A1C2000F5A6A /* RNNElementView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNElementView.h; sourceTree = "<group>"; };
@@ -777,10 +777,10 @@
 		5012242C2173E0A4000F5F98 /* Parent ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
-				50F5DFBF1F407A8C001A00BC /* RNNTabBarController.h */,
-				50F5DFC01F407A8C001A00BC /* RNNTabBarController.m */,
-				50F5DFC31F407AA0001A00BC /* RNNNavigationController.h */,
-				50F5DFC41F407AA0001A00BC /* RNNNavigationController.m */,
+				50F5DFBF1F407A8C001A00BC /* RNNBottomTabsController.h */,
+				50F5DFC01F407A8C001A00BC /* RNNBottomTabsController.m */,
+				50F5DFC31F407AA0001A00BC /* RNNStackController.h */,
+				50F5DFC41F407AA0001A00BC /* RNNStackController.m */,
 				263905D41E4C94970023D7D3 /* RNNSideMenuController.h */,
 				263905D51E4C94970023D7D3 /* RNNSideMenuController.m */,
 				263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */,
@@ -947,12 +947,12 @@
 			children = (
 				5012240C21735999000F5F98 /* RNNBasePresenter.h */,
 				5012240D21735999000F5F98 /* RNNBasePresenter.m */,
-				505EDD3A214FA8000071C7DE /* RNNViewControllerPresenter.h */,
-				505EDD3B214FA8000071C7DE /* RNNViewControllerPresenter.m */,
-				501223D52173590F000F5F98 /* RNNNavigationControllerPresenter.h */,
-				501223D62173590F000F5F98 /* RNNNavigationControllerPresenter.m */,
-				501224042173592D000F5F98 /* RNNTabBarPresenter.h */,
-				501224052173592D000F5F98 /* RNNTabBarPresenter.m */,
+				505EDD3A214FA8000071C7DE /* RNNComponentPresenter.h */,
+				505EDD3B214FA8000071C7DE /* RNNComponentPresenter.m */,
+				501223D52173590F000F5F98 /* RNNStackPresenter.h */,
+				501223D62173590F000F5F98 /* RNNStackPresenter.m */,
+				501224042173592D000F5F98 /* RNNBottomTabsPresenter.h */,
+				501224052173592D000F5F98 /* RNNBottomTabsPresenter.m */,
 				5012240821735959000F5F98 /* RNNSideMenuPresenter.h */,
 				5012240921735959000F5F98 /* RNNSideMenuPresenter.m */,
 				651E1F8B21FD63F400DFEA19 /* RNNSplitViewControllerPresenter.h */,
@@ -1006,15 +1006,15 @@
 				501E0215213E7EA3003365C5 /* RNNReactView.h */,
 				501E0216213E7EA3003365C5 /* RNNReactView.m */,
 				50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */,
-				26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */,
+				26916C941E4B9CCC00D13680 /* RNNComponentViewCreator.h */,
 				26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */,
 				26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */,
 				7BA500761E254908001B9E1B /* RNNSplashScreen.h */,
 				7BA500771E254908001B9E1B /* RNNSplashScreen.m */,
 				7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */,
 				7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */,
-				7BEF0D161E437684003E96B0 /* RNNRootViewController.h */,
-				7BEF0D171E437684003E96B0 /* RNNRootViewController.m */,
+				7BEF0D161E437684003E96B0 /* RNNComponentViewController.h */,
+				7BEF0D171E437684003E96B0 /* RNNComponentViewController.m */,
 				7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */,
 				7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */,
 				21B85E5E1F44482A00B314B5 /* RNNNavigationButtons.h */,
@@ -1042,7 +1042,7 @@
 				505EDD31214E4BE80071C7DE /* RNNNavigationControllerTest.m */,
 				506F630C216A599300AD0D0A /* RNNTabBarControllerTest.m */,
 				506F630E216A5AD700AD0D0A /* RNNViewControllerPresenterTest.m */,
-				509B258E2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m */,
+				509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */,
 				502F0E172179C39900367CC3 /* RNNTabBarPresenterTest.m */,
 				50CE8502217C6C9B00084EBF /* RNNSideMenuPresenterTest.m */,
 				5085DD2C21DCF75A0032E64B /* RNNSideMenuControllerTest.m */,
@@ -1171,7 +1171,7 @@
 		E8367B791F77BA1F00675C05 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				E8A5CD581F48CCC300E89D0D /* RNNNavigationController.h */,
+				E8A5CD581F48CCC300E89D0D /* RNNStackController.h */,
 				30987F787A14D232AB091E7E /* UIView+Utils.m */,
 				30987D981545DCBBCCAB34F0 /* UIViewController+Utils.m */,
 				30987F749DCD552D95979721 /* UITabBarController+RNNUtils.m */,
@@ -1251,7 +1251,7 @@
 				5012241621736667000F5F98 /* Color.h in Headers */,
 				7365071121E4B16F004E020F /* RCTConvert+UIBarButtonSystemItem.h in Headers */,
 				5064495D20DC62B90026709C /* RNNSideMenuSideOptions.h in Headers */,
-				50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */,
+				50F5DFC11F407A8C001A00BC /* RNNBottomTabsController.h in Headers */,
 				50395587217480C900B0A663 /* IntNumber.h in Headers */,
 				5012242A217372B3000F5F98 /* ImageParser.h in Headers */,
 				50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */,
@@ -1270,9 +1270,9 @@
 				263905B51E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.h in Headers */,
 				50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */,
 				507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */,
-				501223D72173590F000F5F98 /* RNNNavigationControllerPresenter.h in Headers */,
+				501223D72173590F000F5F98 /* RNNStackPresenter.h in Headers */,
 				50495946216F5FB5006D2B81 /* TextParser.h in Headers */,
-				505EDD3C214FA8000071C7DE /* RNNViewControllerPresenter.h in Headers */,
+				505EDD3C214FA8000071C7DE /* RNNComponentPresenter.h in Headers */,
 				502CB46E20CD1DDA0019B2FE /* RNNBackButtonOptions.h in Headers */,
 				50495939216E5750006D2B81 /* Bool.h in Headers */,
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
@@ -1285,10 +1285,10 @@
 				5012241E217366D4000F5F98 /* ColorParser.h in Headers */,
 				E8367B801F7A8A4700675C05 /* VICMAImageView.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
-				50F5DFC51F407AA0001A00BC /* RNNNavigationController.h in Headers */,
+				50F5DFC51F407AA0001A00BC /* RNNStackController.h in Headers */,
 				5047E4F42267568800908DD3 /* RNNExternalComponentStore.h in Headers */,
 				21B85E5F1F44482A00B314B5 /* RNNNavigationButtons.h in Headers */,
-				7BEF0D181E437684003E96B0 /* RNNRootViewController.h in Headers */,
+				7BEF0D181E437684003E96B0 /* RNNComponentViewController.h in Headers */,
 				7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */,
 				E8DA24401F97459B00CD552B /* RNNElementFinder.h in Headers */,
 				50AB0B1C2255F8640039DAED /* UIViewController+LayoutProtocol.h in Headers */,
@@ -1350,7 +1350,7 @@
 				5038A3B1216DF41B009280BC /* UIViewController+RNNOptions.h in Headers */,
 				505EDD4A214FDA800071C7DE /* RCTConvert+Modal.h in Headers */,
 				5049595A216F6B46006D2B81 /* NullDictionary.h in Headers */,
-				501224062173592D000F5F98 /* RNNTabBarPresenter.h in Headers */,
+				501224062173592D000F5F98 /* RNNBottomTabsPresenter.h in Headers */,
 				50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */,
 				309874B40D202C9718F15CBD /* UIView+Utils.h in Headers */,
 				309877B0B5AAA7788F56F3D9 /* UIViewController+Utils.h in Headers */,
@@ -1475,7 +1475,7 @@
 				506F630D216A599300AD0D0A /* RNNTabBarControllerTest.m in Sources */,
 				7B49FECB1E95098500DEB3EA /* RNNControllerFactoryTest.m in Sources */,
 				50206A6D21AFE75400B7BB1A /* RNNSideMenuParserTest.m in Sources */,
-				509B258F2178BE7A00C83C23 /* RNNNavigationControllerPresenterTest.m in Sources */,
+				509B258F2178BE7A00C83C23 /* RNNStackPresenterTest.m in Sources */,
 				7B49FECD1E95098500DEB3EA /* RNNModalManagerTest.m in Sources */,
 				5085DD2D21DCF75A0032E64B /* RNNSideMenuControllerTest.m in Sources */,
 				E83BAD791F27416B00A9F3DD /* RNNRootViewControllerTest.m in Sources */,
@@ -1506,7 +1506,7 @@
 				50451D0E2042F70900695F00 /* RNNTransition.m in Sources */,
 				5048862E20BE976D000908DE /* RNNLayoutOptions.m in Sources */,
 				501CD320214A5B6900A6E225 /* RNNLayoutInfo.m in Sources */,
-				7BEF0D191E437684003E96B0 /* RNNRootViewController.m in Sources */,
+				7BEF0D191E437684003E96B0 /* RNNComponentViewController.m in Sources */,
 				50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */,
 				E8A5CD531F464F0400E89D0D /* RNNAnimator.m in Sources */,
 				50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */,
@@ -1535,7 +1535,7 @@
 				5038A3BA216DFCFD009280BC /* UITabBarController+RNNOptions.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				50644A2120E11A720026709C /* Constants.m in Sources */,
-				501223D82173590F000F5F98 /* RNNNavigationControllerPresenter.m in Sources */,
+				501223D82173590F000F5F98 /* RNNStackPresenter.m in Sources */,
 				E8AEDB3D1F55A1C2000F5A6A /* RNNElementView.m in Sources */,
 				E83BAD6B1F27363A00A9F3DD /* RNNNavigationOptions.m in Sources */,
 				5049594F216F6277006D2B81 /* NumberParser.m in Sources */,
@@ -1559,7 +1559,7 @@
 				504AFE651FFE53070076E904 /* RNNOptions.m in Sources */,
 				5053CE802175FB1900D0386B /* RNNDefaultOptionsHelper.m in Sources */,
 				50495947216F5FB5006D2B81 /* TextParser.m in Sources */,
-				50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */,
+				50F5DFC21F407A8C001A00BC /* RNNBottomTabsController.m in Sources */,
 				50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */,
 				5038A3CF216E35E0009280BC /* Dictionary.m in Sources */,
 				C2A57A1D21E815F80066711C /* InteractivePopGestureDelegate.m in Sources */,
@@ -1575,7 +1575,7 @@
 				E5F6C3AD22DB4D0F0093C2CE /* UITabBarController+RNNUtils.m in Sources */,
 				214545251F4DC125006E8DA1 /* RNNUIBarButtonItem.m in Sources */,
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,
-				505EDD3D214FA8000071C7DE /* RNNViewControllerPresenter.m in Sources */,
+				505EDD3D214FA8000071C7DE /* RNNComponentPresenter.m in Sources */,
 				E33AC20820B5C4F90090DB8A /* RNNSplitViewOptions.m in Sources */,
 				E33AC20020B5BA0B0090DB8A /* RNNSplitViewController.m in Sources */,
 				5038A3C2216E1E66009280BC /* RNNFontAttributesCreator.m in Sources */,
@@ -1587,7 +1587,7 @@
 				5039558C2174829400B0A663 /* IntNumberParser.m in Sources */,
 				507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */,
 				50706E6E20CE7CA5003345C3 /* UIImage+tint.m in Sources */,
-				501224072173592D000F5F98 /* RNNTabBarPresenter.m in Sources */,
+				501224072173592D000F5F98 /* RNNBottomTabsPresenter.m in Sources */,
 				50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */,
 				5039559C2174867000B0A663 /* DoubleParser.m in Sources */,
 				E5F6C3A822DB4D0F0093C2CE /* UIView+Utils.m in Sources */,
@@ -1617,7 +1617,7 @@
 				E8E518331F83B3E0000467AC /* RNNUtils.m in Sources */,
 				50451D062042DAEB00695F00 /* RNNPushAnimation.m in Sources */,
 				5049593A216E5750006D2B81 /* Bool.m in Sources */,
-				50F5DFC61F407AA0001A00BC /* RNNNavigationController.m in Sources */,
+				50F5DFC61F407AA0001A00BC /* RNNStackController.m in Sources */,
 				21B85E5D1F44480200B314B5 /* RNNNavigationButtons.m in Sources */,
 				E8E518371F83B94A000467AC /* RNNViewLocation.m in Sources */,
 				E3458D3E20BD9CE40023149B /* RNNPreviewOptions.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNBasePresenterTest.m

@@ -2,13 +2,13 @@
 #import "RNNBasePresenter.h"
 #import <OCMock/OCMock.h>
 #import "UIViewController+RNNOptions.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 
 @interface RNNBottomTabPresenterTest : XCTestCase
 
 @property(nonatomic, strong) RNNBasePresenter *uut;
 @property(nonatomic, strong) RNNNavigationOptions *options;
-@property(nonatomic, strong) RNNRootViewController *boundViewController;
+@property(nonatomic, strong) RNNComponentViewController *boundViewController;
 @property(nonatomic, strong) id mockBoundViewController;
 
 @end
@@ -18,7 +18,7 @@
 - (void)setUp {
     [super setUp];
     self.uut = [[RNNBasePresenter alloc] init];
-    self.boundViewController = [RNNRootViewController new];
+    self.boundViewController = [RNNComponentViewController new];
     self.mockBoundViewController = [OCMockObject partialMockForObject:self.boundViewController];
     [self.uut bindViewController:self.mockBoundViewController];
     self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
@@ -31,7 +31,7 @@
 }
 
 - (void)testApplyOptions_shouldSetTabBarItemBadgeOnlyWhenParentIsUITabBarController {
-    [[self.mockBoundViewController reject] rnn_setTabBarItemBadge:[OCMArg any]];
+    [[self.mockBoundViewController reject] setTabBarItemBadge:[OCMArg any]];
     [self.uut applyOptions:self.options];
     [self.mockBoundViewController verify];
 }
@@ -39,7 +39,7 @@
 - (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
     OCMStub([self.mockBoundViewController parentViewController]).andReturn([UITabBarController new]);
     self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
-    [[self.mockBoundViewController expect] rnn_setTabBarItemBadge:self.options.bottomTab.badge.get];
+    [[self.mockBoundViewController expect] setTabBarItemBadge:self.options.bottomTab.badge.get];
     [self.uut applyOptions:self.options];
     [self.mockBoundViewController verify];
 }
@@ -47,7 +47,7 @@
 - (void)testApplyOptions_setTabBarItemBadgeShouldNotCalledOnUITabBarController {
     [self.uut bindViewController:self.mockBoundViewController];
     self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
-    [[self.mockBoundViewController reject] rnn_setTabBarItemBadge:[[RNNBottomTabOptions alloc] initWithDict:@{@"badge": @"badge"}]];
+    [[self.mockBoundViewController reject] setTabBarItemBadge:[[RNNBottomTabOptions alloc] initWithDict:@{@"badge": @"badge"}]];
     [self.uut applyOptions:self.options];
     [self.mockBoundViewController verify];
 }
@@ -55,7 +55,7 @@
 - (void)testApplyOptions_setTabBarItemBadgeShouldWhenNoValue {
     [self.uut bindViewController:self.mockBoundViewController];
     self.options.bottomTab.badge = nil;
-    [[self.mockBoundViewController reject] rnn_setTabBarItemBadge:[OCMArg any]];
+    [[self.mockBoundViewController reject] setTabBarItemBadge:[OCMArg any]];
     [self.uut applyOptions:self.options];
     [self.mockBoundViewController verify];
 }

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -3,8 +3,8 @@
 #import "RNNCommandsHandler.h"
 #import "RNNNavigationOptions.h"
 #import "RNNTestRootViewCreator.h"
-#import "RNNRootViewController.h"
-#import "RNNNavigationController.h"
+#import "RNNComponentViewController.h"
+#import "RNNStackController.h"
 #import "RNNErrorHandler.h"
 #import <OCMock/OCMock.h>
 #import "RNNLayoutManager.h"
@@ -23,7 +23,7 @@
 
 @end
 
-@interface MockUINavigationController : RNNNavigationController
+@interface MockUINavigationController : RNNStackController
 @property (nonatomic, strong) NSArray* willReturnVCs;
 @end
 
@@ -43,9 +43,9 @@
 
 @property (nonatomic, strong) RNNCommandsHandler* uut;
 @property (nonatomic, strong) id modalManager;
-@property (nonatomic, strong) RNNRootViewController* vc1;
-@property (nonatomic, strong) RNNRootViewController* vc2;
-@property (nonatomic, strong) RNNRootViewController* vc3;
+@property (nonatomic, strong) RNNComponentViewController* vc1;
+@property (nonatomic, strong) RNNComponentViewController* vc2;
+@property (nonatomic, strong) RNNComponentViewController* vc3;
 @property (nonatomic, strong) MockUINavigationController* nvc;
 @property (nonatomic, strong) id mainWindow;
 @property (nonatomic, strong) id sharedApplication;
@@ -65,9 +65,9 @@
 	self.modalManager = [OCMockObject partialMockForObject:[RNNModalManager new]];
 	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter store:nil componentRegistry:nil andBridge:nil]];
 	self.uut = [[RNNCommandsHandler alloc] initWithControllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter stackManager:[RNNNavigationStackManager new] modalManager:self.modalManager overlayManager:self.overlayManager mainWindow:_mainWindow];
-	self.vc1 = [RNNRootViewController new];
-	self.vc2 = [RNNRootViewController new];
-	self.vc3 = [RNNRootViewController new];
+	self.vc1 = [RNNComponentViewController new];
+	self.vc2 = [RNNComponentViewController new];
+	self.vc3 = [RNNComponentViewController new];
 	_nvc = [[MockUINavigationController alloc] init];
 	[_nvc setViewControllers:@[self.vc1, self.vc2, self.vc3]];
 	OCMStub([self.sharedApplication keyWindow]).andReturn(self.mainWindow);
@@ -121,10 +121,10 @@
 	RNNLayoutInfo* layoutInfo = [RNNLayoutInfo new];
 	RNNTestRootViewCreator* creator = [[RNNTestRootViewCreator alloc] init];
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:creator eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
+	RNNComponentViewController* vc = [[RNNComponentViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:creator eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
 	
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:creator options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init] eventEmitter:nil childViewControllers:@[vc]];
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:creator options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNStackPresenter alloc] init] eventEmitter:nil childViewControllers:@[vc]];
 	
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
@@ -144,10 +144,10 @@
 	RNNNavigationOptions* initialOptions = [[RNNNavigationOptions alloc] initWithDict:@{}];
 	initialOptions.topBar.title.text = [[Text alloc] initWithValue:@"the title"];
 	
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	RNNRootViewController* vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
+	RNNComponentViewController* vc = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:presenter options:initialOptions defaultOptions:nil];
 	
-	__unused RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
+	__unused RNNStackController* nav = [[RNNStackController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);
 	
@@ -182,7 +182,7 @@
 
 - (void)testShowOverlay_withCreatedLayout {
 	[self.uut setReadyToReceiveCommands:true];
-	UIViewController* layoutVC = [RNNRootViewController new];
+	UIViewController* layoutVC = [RNNComponentViewController new];
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(layoutVC);
 	
 	[[self.overlayManager expect] showOverlayWindow:[OCMArg any]];

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

@@ -1,17 +1,17 @@
 
 #import <XCTest/XCTest.h>
 #import "RNNControllerFactory.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNSideMenuController.h"
 #import "RNNSideMenuChildVC.h"
-#import "RNNNavigationController.h"
-#import "RNNTabBarController.h"
+#import "RNNStackController.h"
+#import "RNNBottomTabsController.h"
 #import "RNNTopTabsViewController.h"
 #import "RNNSplitViewController.h"
 
 @interface RNNControllerFactoryTest : XCTestCase
 
-@property (nonatomic, strong) id<RNNRootViewCreator> creator;
+@property (nonatomic, strong) id<RNNComponentViewCreator> creator;
 @property (nonatomic, strong) RNNControllerFactory *factory;
 @property (nonatomic, strong) RNNExternalComponentStore *store;
 
@@ -40,7 +40,7 @@
 							 @"data": @{},
 							 @"children": @[]};
 	id ans = [self.factory createLayout:layout];
-	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([ans isMemberOfClass:[RNNComponentViewController class]]);
 }
 
 - (void)testCreateLayout_ExternalComponentLayout {
@@ -53,7 +53,7 @@
 							  @"data": @{@"name": @"externalComponent"},
 							  @"children": @[]};
 	id ans = [self.factory createLayout:layout];
-	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([ans isMemberOfClass:[RNNComponentViewController class]]);
 }
 
 - (void)testCreateLayout_ComponentStackLayout {
@@ -62,7 +62,7 @@
 							 @"data": @{},
 							 @"children": @[]};
 	id ans = [self.factory createLayout:layout];
-	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
+	XCTAssertTrue([ans isMemberOfClass:[RNNStackController class]]);
 }
 
 - (void)testCreateLayout_SplitViewLayout {
@@ -91,11 +91,11 @@
 									   @"type": @"Component",
 									   @"data": @{},
 									   @"children": @[]}]};
-	RNNNavigationController* ans = (RNNNavigationController*) [self.factory createLayout:layout];
+	RNNStackController* ans = (RNNStackController*) [self.factory createLayout:layout];
 	
-	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
+	XCTAssertTrue([ans isMemberOfClass:[RNNStackController class]]);
 	XCTAssertTrue(ans.childViewControllers.count == 1);
-	XCTAssertTrue([ans.childViewControllers[0] isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([ans.childViewControllers[0] isMemberOfClass:[RNNComponentViewController class]]);
 }
 
 - (void)testCreateLayout_BottomTabsLayout {
@@ -112,15 +112,15 @@
 												 @"type": @"Component",
 												 @"data": @{},
 												 @"children": @[]}]}]};
-	RNNTabBarController* tabBar = (RNNTabBarController*) [self.factory createLayout:layout];
+	RNNBottomTabsController* tabBar = (RNNBottomTabsController*) [self.factory createLayout:layout];
 	
-	XCTAssertTrue([tabBar isMemberOfClass:[RNNTabBarController class]]);
+	XCTAssertTrue([tabBar isMemberOfClass:[RNNBottomTabsController class]]);
 	XCTAssertTrue(tabBar.childViewControllers.count == 1);
-	XCTAssertTrue([tabBar.childViewControllers[0] isMemberOfClass:[RNNNavigationController class]]);
+	XCTAssertTrue([tabBar.childViewControllers[0] isMemberOfClass:[RNNStackController class]]);
 	
 	UINavigationController *navController = tabBar.childViewControllers[0];
 	XCTAssertTrue(navController.childViewControllers.count == 1);
-	XCTAssertTrue([navController.childViewControllers[0] isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([navController.childViewControllers[0] isMemberOfClass:[RNNComponentViewController class]]);
 }
 
 - (void)testCreateLayout_TopTabsLayout {
@@ -177,15 +177,15 @@
 	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuChildVC class]]);
 	RNNSideMenuChildVC *center = (RNNSideMenuChildVC*)ans.center;
 	XCTAssertTrue(center.type == RNNSideMenuChildTypeCenter);
-	XCTAssertTrue([center.child isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([center.child isMemberOfClass:[RNNComponentViewController class]]);
 	
 	RNNSideMenuChildVC *left = (RNNSideMenuChildVC*)ans.left;
 	XCTAssertTrue(left.type == RNNSideMenuChildTypeLeft);
-	XCTAssertTrue([left.child isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([left.child isMemberOfClass:[RNNComponentViewController class]]);
 	
 	RNNSideMenuChildVC *right = (RNNSideMenuChildVC*)ans.right;
 	XCTAssertTrue(right.type == RNNSideMenuChildTypeRight);
-	XCTAssertTrue([right.child isMemberOfClass:[RNNRootViewController class]]);
+	XCTAssertTrue([right.child isMemberOfClass:[RNNComponentViewController class]]);
 }
 
 @end

lib/ios/ReactNativeNavigationTests/RNNDotIndicatorPresenterTest.m

@@ -2,14 +2,14 @@
 #import <OCMock/OCMock.h>
 #import "RNNDotIndicatorPresenter.h"
 #import "DotIndicatorOptions.h"
-#import "RNNTabBarController.h"
-#import "RNNRootViewController.h"
+#import "RNNBottomTabsController.h"
+#import "RNNComponentViewController.h"
 #import "RNNTestBase.h"
 #import "UITabBarController+RNNUtils.h"
 
 @interface RNNDotIndicatorPresenterTest : RNNTestBase
 @property(nonatomic, strong) id uut;
-@property(nonatomic, strong) RNNRootViewController *child;
+@property(nonatomic, strong) RNNComponentViewController *child;
 @property(nonatomic, strong) id bottomTabs;
 @end
 
@@ -17,7 +17,7 @@
 - (void)setUp {
     [super setUp];
     self.uut = [OCMockObject partialMockForObject:[RNNDotIndicatorPresenter new]];
-    self.bottomTabs = [OCMockObject partialMockForObject:[RNNTabBarController new]];
+    self.bottomTabs = [OCMockObject partialMockForObject:[RNNBottomTabsController new]];
     self.child = [self createChild];
     [self.bottomTabs addChildViewController:self.child];
 
@@ -139,13 +139,13 @@
     [[self uut] apply:self.child :options];
 }
 
-- (RNNRootViewController *)createChild {
+- (RNNComponentViewController *)createChild {
     RNNNavigationOptions *options = [RNNNavigationOptions new];
     options.bottomTab = [RNNBottomTabOptions new];
     id img = [OCMockObject partialMockForObject:[UIImage new]];
 
     options.bottomTab.icon = [[Image alloc] initWithValue:img];
-    return [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNViewControllerPresenter new] options:options defaultOptions:nil];
+    return [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNComponentPresenter new] options:options defaultOptions:nil];
 }
 
 - (BOOL)tabHasIndicator {

lib/ios/ReactNativeNavigationTests/RNNModalManagerTest.m

@@ -1,6 +1,6 @@
 #import <XCTest/XCTest.h>
 #import "RNNModalManager.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 
 @interface MockViewController : UIViewController
 
@@ -30,17 +30,17 @@
 @end
 
 @implementation RNNModalManagerTest {
-	RNNRootViewController* _vc1;
-	RNNRootViewController* _vc2;
-	RNNRootViewController* _vc3;
+	RNNComponentViewController* _vc1;
+	RNNComponentViewController* _vc2;
+	RNNComponentViewController* _vc3;
 	MockModalManager* _modalManager;
 }
 
 - (void)setUp {
 	[super setUp];
-	_vc1 = [RNNRootViewController new];
-	_vc2 = [RNNRootViewController new];
-	_vc3 = [RNNRootViewController new];
+	_vc1 = [RNNComponentViewController new];
+	_vc2 = [RNNComponentViewController new];
+	_vc3 = [RNNComponentViewController new];
 	_modalManager = [[MockModalManager alloc] init];
 	_modalManager.topPresentedVC = [MockViewController new];
 }

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -1,19 +1,19 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "RNNNavigationController.h"
-#import "RNNRootViewController.h"
+#import "RNNStackController.h"
+#import "RNNComponentViewController.h"
 #import "RNNTestRootViewCreator.h"
 
 @interface RNNNavigationControllerTest : XCTestCase
 
-@property (nonatomic, strong) RNNNavigationController *uut;
+@property (nonatomic, strong) RNNStackController *uut;
 
 @end
 
 @implementation RNNNavigationControllerTest {
-	RNNRootViewController* _vc1;
+	RNNComponentViewController* _vc1;
 	id _vc2Mock;
-	RNNRootViewController* _vc2;
+	RNNComponentViewController* _vc2;
 	UIViewController* _vc3;
 	RNNNavigationOptions* _options;
 	RNNTestRootViewCreator* _creator;
@@ -22,12 +22,12 @@
 - (void)setUp {
     [super setUp];
 	_creator = [[RNNTestRootViewCreator alloc] init];
-	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNViewControllerPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions]  defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
-	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc1 = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNComponentPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc2 = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNComponentPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc2Mock = [OCMockObject partialMockForObject:_vc2];
 	_vc3 = [UIViewController new];
 	_options = [OCMockObject partialMockForObject:[[RNNNavigationOptions alloc] initEmptyOptions]];
-	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:_options defaultOptions:nil presenter:[OCMockObject partialMockForObject:[[RNNNavigationControllerPresenter alloc] init]] eventEmitter:nil childViewControllers:@[_vc1, _vc2]];
+	self.uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:_options defaultOptions:nil presenter:[OCMockObject partialMockForObject:[[RNNStackPresenter alloc] init]] eventEmitter:nil childViewControllers:@[_vc1, _vc2]];
 }
 
 - (void)testInitWithLayoutInfo_shouldBindPresenter {
@@ -35,7 +35,7 @@
 }
 
 - (void)testInitWithLayoutInfo_shouldSetMultipleViewControllers {
-	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init] eventEmitter:nil childViewControllers:@[_vc1, _vc2]];
+	self.uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNComponentPresenter alloc] init] eventEmitter:nil childViewControllers:@[_vc1, _vc2]];
 	XCTAssertTrue(self.uut.viewControllers.count == 2);
 }
 
@@ -113,7 +113,7 @@
 }
 
 - (void)testPopViewControllerReturnLastChildViewController {
-	RNNNavigationController* uut = [RNNNavigationController new];
+	RNNStackController* uut = [RNNStackController new];
 	[uut setViewControllers:@[_vc1, _vc2]];
 	XCTAssertEqual([uut popViewControllerAnimated:NO], _vc2);
 }
@@ -135,7 +135,7 @@
 }
 
 - (void)testPopViewControllerShouldInvokeApplyOptionsBeforePoppingForDestinationViewController {
-	RNNNavigationController* uut = [RNNNavigationController new];
+	RNNStackController* uut = [RNNStackController new];
 	[uut setViewControllers:@[_vc1, _vc2]];
 	
 	[[(id)uut.presenter expect] applyOptionsBeforePopping:[OCMArg any]];
@@ -190,8 +190,8 @@
 	XCTAssertNil(self.uut.navigationBar.barTintColor);
 }
 
-- (RNNNavigationController *)createNavigationControllerWithOptions:(RNNNavigationOptions *)options {
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:options defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init] eventEmitter:nil childViewControllers:@[_vc1]];
+- (RNNStackController *)createNavigationControllerWithOptions:(RNNNavigationOptions *)options {
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:options defaultOptions:nil presenter:[[RNNStackPresenter alloc] init] eventEmitter:nil childViewControllers:@[_vc1]];
 	return nav;
 }
 

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

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

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -1,23 +1,23 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNTestRootViewCreator.h"
 #import <React/RCTConvert.h>
 #import "RNNNavigationOptions.h"
-#import "RNNNavigationController.h"
-#import "RNNTabBarController.h"
+#import "RNNStackController.h"
+#import "RNNBottomTabsController.h"
 #import "RNNUIBarButtonItem.h"
 
 
-@interface RNNRootViewController (EmbedInTabBar)
+@interface RNNComponentViewController (EmbedInTabBar)
 - (void)embedInTabBarController;
 @end
 
-@implementation RNNRootViewController (EmbedInTabBar)
+@implementation RNNComponentViewController (EmbedInTabBar)
 
 - (void)embedInTabBarController {
-	RNNTabBarController* tabVC = [[RNNTabBarController alloc] init];
+	RNNBottomTabsController* tabVC = [[RNNBottomTabsController alloc] init];
 	tabVC.viewControllers = @[self];
 	[self viewWillAppear:false];
 }
@@ -26,13 +26,13 @@
 
 @interface RNNRootViewControllerTest : XCTestCase
 
-@property (nonatomic, strong) id<RNNRootViewCreator> creator;
+@property (nonatomic, strong) id<RNNComponentViewCreator> creator;
 @property (nonatomic, strong) NSString* pageName;
 @property (nonatomic, strong) NSString* componentId;
 @property (nonatomic, strong) id emitter;
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNLayoutInfo* layoutInfo;
-@property (nonatomic, strong) RNNRootViewController* uut;
+@property (nonatomic, strong) RNNComponentViewController* uut;
 @end
 
 @implementation RNNRootViewControllerTest
@@ -49,14 +49,14 @@
 	layoutInfo.componentId = self.componentId;
 	layoutInfo.name = self.pageName;
 	
-	id presenter = [OCMockObject partialMockForObject:[[RNNViewControllerPresenter alloc] init]];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter presenter:presenter options:self.options defaultOptions:nil];
+	id presenter = [OCMockObject partialMockForObject:[[RNNComponentPresenter alloc] init]];
+	self.uut = [[RNNComponentViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:self.creator eventEmitter:self.emitter presenter:presenter options:self.options defaultOptions:nil];
 }
 
 -(void)testTopBarBackgroundColor_validColor{
 	NSNumber* inputColor = @(0xFFFF0000);
 	self.options.topBar.background.color = [[Color alloc] initWithValue:[RCTConvert UIColor:inputColor]];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
@@ -101,7 +101,7 @@
 - (void)testStatusBarHideWithTopBar_true {
 	self.options.statusBar.hideWithTopBar = [[Bool alloc] initWithValue:@(1)];
 	self.options.topBar.visible = [[Bool alloc] initWithValue:@(0)];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 
 	[self.uut viewWillAppear:false];
 
@@ -124,7 +124,7 @@
 -(void)testTopBarTextColor_validColor{
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	self.options.topBar.title.color = [[Color alloc] initWithValue:inputColor];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
@@ -140,7 +140,7 @@
 
 -(void)testTopBarTextFontFamily_validFont{
 	NSString* inputFont = @"HelveticaNeue";
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	self.options.topBar.title.fontFamily = [[Text alloc] initWithValue:inputFont];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:17];
@@ -149,7 +149,7 @@
 
 -(void)testTopBarHideOnScroll_true {
 	NSNumber* hideOnScrollInput = @(1);
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	self.options.topBar.hideOnScroll = [[Bool alloc] initWithValue:hideOnScrollInput];;
 	[self.uut viewWillAppear:false];
 	XCTAssertTrue(self.uut.navigationController.hidesBarsOnSwipe);
@@ -158,7 +158,7 @@
 -(void)testTopBarTranslucent {
 	NSNumber* topBarTranslucentInput = @(0);
 	self.options.topBar.background.translucent = [[Bool alloc] initWithValue:topBarTranslucentInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertFalse(self.uut.navigationController.navigationBar.translucent);
 }
@@ -166,7 +166,7 @@
 -(void)testTabBadge {
 	NSString* tabBadgeInput = @"5";
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:tabBadgeInput];
-	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
+	__unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];
 	UITabBarItem* item = [[UITabBarItem alloc] initWithTitle:@"A Tab" image:nil tag:1];
 	[self.uut setTabBarItem:item];
@@ -180,7 +180,7 @@
 -(void)testTopBarTransparent_BOOL_True {
 	UIColor* transparentColor = [RCTConvert UIColor:@(0x00000000)];
 	self.options.topBar.background.color = [[Color alloc] initWithValue:transparentColor];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIView* transparentView = [self.uut.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
 	XCTAssertTrue(transparentView);
@@ -189,7 +189,7 @@
 
 -(void)testTopBarTransparent_BOOL_false {
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	self.options.topBar.background.color = [[Color alloc] initWithValue:inputColor];
 	[self.uut viewWillAppear:false];
 	UIView* transparentView = [self.uut.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
@@ -220,7 +220,7 @@
 -(void)testTopBarLargeTitleFontSize_withoutTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	self.options.topBar.largeTitle.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 
@@ -232,7 +232,7 @@
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	self.options.topBar.largeTitle.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
 	self.options.topBar.largeTitle.color = [[Color alloc] initWithValue:inputColor];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -248,7 +248,7 @@
 	self.options.topBar.largeTitle.color = [[Color alloc] initWithValue:inputColor];
 	self.options.topBar.largeTitle.fontFamily = [[Text alloc] initWithValue:inputFont];
 	
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
@@ -261,7 +261,7 @@
 	NSString* inputFont = @"HelveticaNeue";
 	self.options.topBar.largeTitle.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
 	self.options.topBar.largeTitle.fontFamily = [[Text alloc] initWithValue:inputFont];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -271,7 +271,7 @@
 -(void)testTopBarTextFontSize_withoutTextFontFamily_withoutTextColor {
 	NSNumber* topBarTextFontSizeInput = @(15);
 	self.options.topBar.title.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -282,7 +282,7 @@
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	self.options.topBar.title.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
 	self.options.topBar.title.color = [[Color alloc] initWithValue:inputColor];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont systemFontOfSize:15];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
@@ -297,7 +297,7 @@
 	self.options.topBar.title.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
 	self.options.topBar.title.color = [[Color alloc] initWithValue:inputColor];
 	self.options.topBar.title.fontFamily = [[Text alloc] initWithValue:inputFont];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
@@ -310,7 +310,7 @@
 	NSString* inputFont = @"HelveticaNeue";
 	self.options.topBar.title.fontSize = [[Number alloc] initWithValue:topBarTextFontSizeInput];
 	self.options.topBar.title.fontFamily = [[Text alloc] initWithValue:inputFont];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
 	XCTAssertTrue([self.uut.navigationController.navigationBar.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
@@ -319,7 +319,7 @@
 // TODO: Currently not passing
 -(void)testTopBarTextFontFamily_invalidFont{
 	NSString* inputFont = @"HelveticaNeueeeee";
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	self.options.topBar.title.fontFamily = [[Text alloc] initWithValue:inputFont];
 	//	XCTAssertThrows([self.uut viewWillAppear:false]);
 }
@@ -327,7 +327,7 @@
 -(void)testOrientation_portrait {
 	NSArray* supportedOrientations = @[@"portrait"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskPortrait;
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -336,7 +336,7 @@
 -(void)testOrientation_portraitString {
 	NSString* supportedOrientation = @"portrait";
 	self.options.layout.orientation = supportedOrientation;
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait);
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -345,7 +345,7 @@
 -(void)testOrientation_portraitAndLandscape {
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscape);
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -354,7 +354,7 @@
 -(void)testOrientation_all {
 	NSArray* supportedOrientations = @[@"all"];
 	self.options.layout.orientation = supportedOrientations;
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = UIInterfaceOrientationMaskAll;
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -363,7 +363,7 @@
 -(void)testOrientation_default {
 	NSString* supportedOrientations = @"default";
 	self.options.layout.orientation = supportedOrientations;
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIInterfaceOrientationMask expectedOrientation = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
 	XCTAssertTrue(self.uut.navigationController.supportedInterfaceOrientations == expectedOrientation);
@@ -374,7 +374,7 @@
 	NSArray* supportedOrientations = @[@"portrait"];
 	self.options.layout.orientation = supportedOrientations;
 	NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-    __unused RNNTabBarController* vc = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNViewControllerPresenter new] eventEmitter:nil childViewControllers:controllers];
+    __unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
 
 	[self.uut viewWillAppear:false];
 
@@ -386,7 +386,7 @@
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
 	self.options.layout.orientation = supportedOrientations;
     NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-    __unused RNNTabBarController* vc = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNViewControllerPresenter new] eventEmitter:nil childViewControllers:controllers];
+    __unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
 
 	[self.uut viewWillAppear:false];
 
@@ -398,7 +398,7 @@
 	NSArray* supportedOrientations = @[@"all"];
 	self.options.layout.orientation = supportedOrientations;
 	NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNViewControllerPresenter new] eventEmitter:nil childViewControllers:controllers];
+	__unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
 
 	[self.uut viewWillAppear:false];
 
@@ -408,8 +408,8 @@
 
 -(void)testRightButtonsWithTitle_withoutStyle {
 	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"text": @"test"}];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNViewControllerPresenter new] options:self.options defaultOptions:nil];
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
+	self.uut = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNComponentPresenter new] options:self.options defaultOptions:nil];
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*) nav.topViewController.navigationItem.rightBarButtonItems[0];
 	NSString* expectedButtonId = @"testId";
@@ -423,8 +423,8 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 
 	self.options.topBar.rightButtons = @[@{@"id": @"testId", @"text": @"test", @"enabled": @false, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNViewControllerPresenter new] options:self.options defaultOptions:nil];
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
+	self.uut = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNComponentPresenter new] options:self.options defaultOptions:nil];
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.rightBarButtonItems objectAtIndex:0];
 	NSString* expectedButtonId = @"testId";
@@ -438,8 +438,8 @@
 
 -(void)testLeftButtonsWithTitle_withoutStyle {
 	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"text": @"test"}];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNViewControllerPresenter new] options:self.options defaultOptions:nil];
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
+	self.uut = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNComponentPresenter new] options:self.options defaultOptions:nil];
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
 	
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.leftBarButtonItems objectAtIndex:0];
 	NSString* expectedButtonId = @"testId";
@@ -453,8 +453,8 @@
 	NSNumber* inputColor = @(0xFFFF0000);
 
 	self.options.topBar.leftButtons = @[@{@"id": @"testId", @"text": @"test", @"enabled": @false, @"buttonColor": inputColor, @"buttonFontSize": @22, @"buttonFontWeight": @"800"}];
-	self.uut = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNViewControllerPresenter new] options:self.options defaultOptions:nil];
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
+	self.uut = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[RNNComponentPresenter new] options:self.options defaultOptions:nil];
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:_creator options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:@[self.uut]];
 
 	RNNUIBarButtonItem* button = (RNNUIBarButtonItem*)[nav.topViewController.navigationItem.leftBarButtonItems objectAtIndex:0];
 	NSString* expectedButtonId = @"testId";
@@ -469,7 +469,7 @@
 -(void)testTopBarNoBorderOn {
 	NSNumber* topBarNoBorderInput = @(1);
 	self.options.topBar.noBorder = [[Bool alloc] initWithValue:topBarNoBorderInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil(self.uut.navigationController.navigationBar.shadowImage);
 }
@@ -477,7 +477,7 @@
 -(void)testTopBarNoBorderOff {
 	NSNumber* topBarNoBorderInput = @(0);
 	self.options.topBar.noBorder = [[Bool alloc] initWithValue:topBarNoBorderInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil(self.uut.navigationController.navigationBar.shadowImage);
 }
@@ -510,7 +510,7 @@
 }
 
 -(void)testTopBarBlur_default {
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -518,7 +518,7 @@
 -(void)testTopBarBlur_false {
 	NSNumber* topBarBlurInput = @(0);
 	self.options.topBar.background.blur = [[Bool alloc] initWithValue:topBarBlurInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -526,7 +526,7 @@
 -(void)testTopBarBlur_true {
 	NSNumber* topBarBlurInput = @(1);
 	self.options.topBar.background.blur = [[Bool alloc] initWithValue:topBarBlurInput];
-	__unused RNNNavigationController* nav = [self createNavigationController];
+	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	XCTAssertNotNil([self.uut.navigationController.navigationBar viewWithTag:BLUR_TOPBAR_TAG]);
 }
@@ -541,7 +541,7 @@
 
 - (void)testMergeOptionsShouldCallPresenterMergeOptions {
 	RNNNavigationOptions* newOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
-	[[(id)self.uut.presenter expect] mergeOptions:newOptions currentOptions:self.uut.options];
+    [[(id) self.uut.presenter expect] mergeOptions:newOptions resolvedOptions:self.uut.options];
 	[self.uut mergeOptions:newOptions];
 	[(id)self.uut.presenter verify];
 }
@@ -557,8 +557,8 @@
 #pragma mark BottomTabs
 
 
-- (RNNNavigationController *)createNavigationController {
-	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init] eventEmitter:nil childViewControllers:@[self.uut]];
+- (RNNStackController *)createNavigationController {
+	RNNStackController* nav = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[[RNNStackPresenter alloc] init] eventEmitter:nil childViewControllers:@[self.uut]];
 	
 	return nav;
 }

lib/ios/ReactNativeNavigationTests/RNNSideMenuControllerTest.m

@@ -1,6 +1,6 @@
 #import <XCTest/XCTest.h>
 #import "RNNSideMenuController.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 
 @interface RNNSideMenuControllerTest : XCTestCase
 @property (nonatomic, strong) RNNSideMenuController *uut;
@@ -13,9 +13,9 @@
 
 - (void)setUp {
     [super setUp];
-	_leftVC = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNRootViewController new] type:RNNSideMenuChildTypeLeft];
-	_rightVC = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNRootViewController new] type:RNNSideMenuChildTypeRight];
-	_centerVC =[[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNRootViewController new] type:RNNSideMenuChildTypeCenter];
+	_leftVC = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNComponentViewController new] type:RNNSideMenuChildTypeLeft];
+	_rightVC = [[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNComponentViewController new] type:RNNSideMenuChildTypeRight];
+	_centerVC =[[RNNSideMenuChildVC alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewController:[RNNComponentViewController new] type:RNNSideMenuChildTypeCenter];
 	self.uut = [[RNNSideMenuController alloc] initWithLayoutInfo:nil creator:nil childViewControllers:@[_leftVC, _centerVC, _rightVC] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:nil eventEmitter:nil];
 }
 

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerPresenterTest.m → lib/ios/ReactNativeNavigationTests/RNNStackPresenterTest.m

@@ -1,46 +1,46 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "RNNNavigationControllerPresenter.h"
+#import "RNNStackPresenter.h"
 #import "UINavigationController+RNNOptions.h"
-#import "RNNNavigationController.h"
+#import "RNNStackController.h"
 
-@interface RNNNavigationControllerPresenterTest : XCTestCase
+@interface RNNStackPresenterTest : XCTestCase
 
-@property (nonatomic, strong) RNNNavigationControllerPresenter *uut;
+@property (nonatomic, strong) RNNStackPresenter *uut;
 @property (nonatomic, strong) RNNNavigationOptions *options;
-@property (nonatomic, strong) id bindedViewController;
+@property (nonatomic, strong) id boundViewController;
 
 @end
 
-@implementation RNNNavigationControllerPresenterTest
+@implementation RNNStackPresenterTest
 
 - (void)setUp {
 	[super setUp];
-	self.uut = [[RNNNavigationControllerPresenter alloc] init];
-	self.bindedViewController = [OCMockObject partialMockForObject:[RNNNavigationController new]];
-	[self.uut bindViewController:self.bindedViewController];
+	self.uut = [[RNNStackPresenter alloc] init];
+	self.boundViewController = [OCMockObject partialMockForObject:[RNNStackController new]];
+	[self.uut bindViewController:self.boundViewController];
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
 - (void)testApplyOptions_shouldSetBackButtonColor_withDefaultValues {
-	[[_bindedViewController expect] rnn_setBackButtonColor:nil];
+	[[_boundViewController expect] setBackButtonColor:nil];
 	[self.uut applyOptions:self.options];
-	[_bindedViewController verify];
+	[_boundViewController verify];
 }
 
 - (void)testApplyOptions_shouldSetBackButtonColor_withColor {
 	self.options.topBar.backButton.color = [[Color alloc] initWithValue:[UIColor redColor]];
-	[[_bindedViewController expect] rnn_setBackButtonColor:[UIColor redColor]];
+	[[_boundViewController expect] setBackButtonColor:[UIColor redColor]];
 	[self.uut applyOptions:self.options];
-	[_bindedViewController verify];
+	[_boundViewController verify];
 }
 
 - (void)testApplyOptionsBeforePoppingShouldSetTopBarBackgroundForPoppingViewController {
 	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
 	
-	[[_bindedViewController expect] setTopBarBackgroundColor:_options.topBar.background.color.get];
+	[[_boundViewController expect] setTopBarBackgroundColor:_options.topBar.background.color.get];
 	[self.uut applyOptionsBeforePopping:self.options];
-	[_bindedViewController verify];
+	[_boundViewController verify];
 }
 
 - (void)testApplyOptionsBeforePoppingShouldSetLargeTitleForPoppingViewController {

lib/ios/ReactNativeNavigationTests/RNNTabBarControllerTest.m

@@ -1,12 +1,12 @@
 #import <XCTest/XCTest.h>
-#import "RNNTabBarController.h"
-#import "RNNRootViewController.h"
-#import "RNNNavigationController.h"
+#import "RNNBottomTabsController.h"
+#import "RNNComponentViewController.h"
+#import "RNNStackController.h"
 #import <OCMock/OCMock.h>
 
 @interface RNNTabBarControllerTest : XCTestCase
 
-@property(nonatomic, strong) RNNTabBarController * uut;
+@property(nonatomic, strong) RNNBottomTabsController * uut;
 @property(nonatomic, strong) id mockChildViewController;
 @property(nonatomic, strong) id mockEventEmitter;
 @property(nonatomic, strong) id mockTabBarPresenter;
@@ -18,13 +18,13 @@
 - (void)setUp {
     [super setUp];
 
-    id tabBarClassMock = OCMClassMock([RNNTabBarController class]);
-    OCMStub([tabBarClassMock parentViewController]).andReturn([OCMockObject partialMockForObject:[RNNTabBarController new]]);
+    id tabBarClassMock = OCMClassMock([RNNBottomTabsController class]);
+    OCMStub([tabBarClassMock parentViewController]).andReturn([OCMockObject partialMockForObject:[RNNBottomTabsController new]]);
 
-    self.mockTabBarPresenter = [OCMockObject partialMockForObject:[[RNNTabBarPresenter alloc] init]];
-    self.mockChildViewController = [OCMockObject partialMockForObject:[RNNRootViewController new]];
+    self.mockTabBarPresenter = [OCMockObject partialMockForObject:[[RNNBottomTabsPresenter alloc] init]];
+    self.mockChildViewController = [OCMockObject partialMockForObject:[RNNComponentViewController new]];
     self.mockEventEmitter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
-    self.uut = [OCMockObject partialMockForObject:[[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmitter childViewControllers:@[[[UIViewController alloc] init]]]];
+    self.uut = [OCMockObject partialMockForObject:[[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmitter childViewControllers:@[[[UIViewController alloc] init]]]];
     OCMStub([self.uut selectedViewController]).andReturn(self.mockChildViewController);
 }
 
@@ -36,17 +36,17 @@
     UIViewController *vc1 = [[UIViewController alloc] init];
     UIViewController *vc2 = [[UIViewController alloc] init];
 
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init] eventEmitter:nil childViewControllers:@[vc1, vc2]];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNComponentPresenter alloc] init] eventEmitter:nil childViewControllers:@[vc1, vc2]];
     XCTAssertTrue(uut.viewControllers.count == 2);
 }
 
 - (void)testInitWithLayoutInfo_shouldInitializeDependencies {
     RNNLayoutInfo *layoutInfo = [RNNLayoutInfo new];
     RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-    RNNTabBarPresenter *presenter = [[RNNTabBarPresenter alloc] init];
+    RNNBottomTabsPresenter *presenter = [[RNNBottomTabsPresenter alloc] init];
     NSArray *childViewControllers = @[[UIViewController new]];
 
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo creator:nil options:options defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:childViewControllers];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:layoutInfo creator:nil options:options defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:childViewControllers];
     XCTAssertTrue(uut.layoutInfo == layoutInfo);
     XCTAssertTrue(uut.options == options);
     XCTAssertTrue(uut.presenter == presenter);
@@ -56,12 +56,12 @@
 - (void)testInitWithEventEmmiter_shouldInitializeDependencies {
     RNNLayoutInfo *layoutInfo = [RNNLayoutInfo new];
     RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:@{}];
-    RNNTabBarPresenter *presenter = [[RNNTabBarPresenter alloc] init];
+    RNNBottomTabsPresenter *presenter = [[RNNBottomTabsPresenter alloc] init];
     RNNEventEmitter *eventEmmiter = [RNNEventEmitter new];
 
     NSArray *childViewControllers = @[[UIViewController new]];
 
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:layoutInfo creator:nil options:options defaultOptions:nil presenter:presenter eventEmitter:eventEmmiter childViewControllers:childViewControllers];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:layoutInfo creator:nil options:options defaultOptions:nil presenter:presenter eventEmitter:eventEmmiter childViewControllers:childViewControllers];
     XCTAssertTrue(uut.layoutInfo == layoutInfo);
     XCTAssertTrue(uut.options == options);
     XCTAssertTrue(uut.presenter == presenter);
@@ -70,7 +70,7 @@
 }
 
 - (void)testInitWithLayoutInfo_shouldSetDelegate {
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNBasePresenter alloc] init] eventEmitter:nil childViewControllers:nil];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNBasePresenter alloc] init] eventEmitter:nil childViewControllers:nil];
 
     XCTAssertTrue(uut.delegate == uut);
 }
@@ -90,23 +90,23 @@
 - (void)testMergeOptions_shouldInvokePresenterMergeOptions {
     RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:@{}];
 
-    [(RNNTabBarPresenter *) [self.mockTabBarPresenter expect] mergeOptions:options currentOptions:[self.uut options]];
+    [(RNNBottomTabsPresenter *) [self.mockTabBarPresenter expect] mergeOptions:options resolvedOptions:[self.uut options]];
     [self.uut mergeOptions:options];
     [self.mockTabBarPresenter verify];
 }
 
 - (void)testMergeOptions_shouldInvokeParentMergeOptions {
-    id parentMock = [OCMockObject partialMockForObject:[RNNRootViewController new]];
+    id parentMock = [OCMockObject partialMockForObject:[RNNComponentViewController new]];
     RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:@{}];
 
     OCMStub([self.uut parentViewController]).andReturn(parentMock);
-    [((RNNRootViewController *) [parentMock expect]) mergeChildOptions:options];
+    [((RNNComponentViewController *) [parentMock expect]) mergeChildOptions:options];
     [self.uut mergeOptions:options];
     [parentMock verify];
 }
 
 - (void)testOnChildAppear_shouldInvokeParentOnChildAppear {
-    id parentMock = [OCMockObject partialMockForObject:[RNNNavigationController new]];
+    id parentMock = [OCMockObject partialMockForObject:[RNNStackController new]];
 
     OCMStub([self.uut parentViewController]).andReturn(parentMock);
 
@@ -122,7 +122,7 @@
 }
 
 - (void)testGetCurrentChild_shouldReturnSelectedViewController {
-    XCTAssertEqual([self.uut getCurrentChild], [(RNNTabBarController *) self.uut selectedViewController]);
+    XCTAssertEqual([self.uut getCurrentChild], [(RNNBottomTabsController *) self.uut selectedViewController]);
 }
 
 - (void)testPreferredStatusBarStyle_shouldInvokeSelectedViewControllerPreferredStatusBarStyle {
@@ -144,9 +144,9 @@
     RNNLayoutInfo *layoutInfo = [RNNLayoutInfo new];
     layoutInfo.componentId = @"componentId";
 
-    RNNRootViewController *vc = [[RNNRootViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:nil presenter:nil options:nil defaultOptions:nil];
+    RNNComponentViewController *vc = [[RNNComponentViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:nil eventEmitter:nil presenter:nil options:nil defaultOptions:nil];
 
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:[RNNTabBarPresenter new] eventEmitter:nil childViewControllers:@[[UIViewController new], vc]];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:[RNNBottomTabsPresenter new] eventEmitter:nil childViewControllers:@[[UIViewController new], vc]];
     [uut setSelectedIndexByComponentID:@"componentId"];
     XCTAssertTrue(uut.selectedIndex == 1);
 }
@@ -155,8 +155,8 @@
     RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initEmptyOptions];
     options.bottomTabs.currentTabIndex = [[IntNumber alloc] initWithValue:@(1)];
 
-    RNNRootViewController *vc = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:nil options:nil defaultOptions:nil];
-    RNNTabBarController *uut = [[RNNTabBarController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:nil presenter:[RNNTabBarPresenter new] eventEmitter:nil childViewControllers:@[[UIViewController new], vc]];
+    RNNComponentViewController *vc = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:nil options:nil defaultOptions:nil];
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:nil presenter:[RNNBottomTabsPresenter new] eventEmitter:nil childViewControllers:@[[UIViewController new], vc]];
 
     XCTAssertTrue(uut.selectedIndex == 1);
 }

lib/ios/ReactNativeNavigationTests/RNNTabBarPresenterTest.m

@@ -1,12 +1,12 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "RNNTabBarPresenter.h"
+#import "RNNBottomTabsPresenter.h"
 #import "UITabBarController+RNNOptions.h"
-#import "RNNTabBarController.h"
+#import "RNNBottomTabsController.h"
 
 @interface RNNTabBarPresenterTest : XCTestCase
 
-@property(nonatomic, strong) RNNTabBarPresenter *uut;
+@property(nonatomic, strong) RNNBottomTabsPresenter *uut;
 @property(nonatomic, strong) RNNNavigationOptions *options;
 @property(nonatomic, strong) id boundViewController;
 
@@ -16,20 +16,20 @@
 
 - (void)setUp {
     [super setUp];
-    self.uut = [OCMockObject partialMockForObject:[RNNTabBarPresenter new]];
-    self.boundViewController = [OCMockObject partialMockForObject:[RNNTabBarController new]];
+    self.uut = [OCMockObject partialMockForObject:[RNNBottomTabsPresenter new]];
+    self.boundViewController = [OCMockObject partialMockForObject:[RNNBottomTabsController new]];
     [self.uut bindViewController:self.boundViewController];
     self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
 - (void)testApplyOptions_shouldSetDefaultEmptyOptions {
     RNNNavigationOptions *emptyOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
-    [[self.boundViewController expect] rnn_setTabBarTestID:nil];
-    [[self.boundViewController expect] rnn_setTabBarBackgroundColor:nil];
-    [[self.boundViewController expect] rnn_setTabBarTranslucent:NO];
-    [[self.boundViewController expect] rnn_setTabBarHideShadow:NO];
-    [[self.boundViewController expect] rnn_setTabBarStyle:UIBarStyleDefault];
-    [[self.boundViewController expect] rnn_setTabBarVisible:YES animated:NO];
+    [[self.boundViewController expect] setTabBarTestID:nil];
+    [[self.boundViewController expect] setTabBarBackgroundColor:nil];
+    [[self.boundViewController expect] setTabBarTranslucent:NO];
+    [[self.boundViewController expect] setTabBarHideShadow:NO];
+    [[self.boundViewController expect] setTabBarStyle:UIBarStyleDefault];
+    [[self.boundViewController expect] setTabBarVisible:YES animated:NO];
     [self.uut applyOptions:emptyOptions];
     [self.boundViewController verify];
 }
@@ -43,12 +43,12 @@
     initialOptions.bottomTabs.visible = [[Bool alloc] initWithValue:@(0)];
     initialOptions.bottomTabs.barStyle = [[Text alloc] initWithValue:@"black"];
 
-    [[self.boundViewController expect] rnn_setTabBarTestID:@"testID"];
-    [[self.boundViewController expect] rnn_setTabBarBackgroundColor:[UIColor redColor]];
-    [[self.boundViewController expect] rnn_setTabBarTranslucent:NO];
-    [[self.boundViewController expect] rnn_setTabBarHideShadow:YES];
-    [[self.boundViewController expect] rnn_setTabBarStyle:UIBarStyleBlack];
-    [[self.boundViewController expect] rnn_setTabBarVisible:NO animated:NO];
+    [[self.boundViewController expect] setTabBarTestID:@"testID"];
+    [[self.boundViewController expect] setTabBarBackgroundColor:[UIColor redColor]];
+    [[self.boundViewController expect] setTabBarTranslucent:NO];
+    [[self.boundViewController expect] setTabBarHideShadow:YES];
+    [[self.boundViewController expect] setTabBarStyle:UIBarStyleBlack];
+    [[self.boundViewController expect] setTabBarVisible:NO animated:NO];
 
     [self.uut applyOptions:initialOptions];
     [self.boundViewController verify];

lib/ios/ReactNativeNavigationTests/RNNTestRootViewCreator.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import "RNNRootViewCreator.h"
+#import "RNNComponentViewCreator.h"
 
-@interface RNNTestRootViewCreator : NSObject <RNNRootViewCreator>
+@interface RNNTestRootViewCreator : NSObject <RNNComponentViewCreator>
 
 @end

lib/ios/ReactNativeNavigationTests/RNNViewControllerPresenterTest.m

@@ -1,14 +1,14 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 #import "UIViewController+RNNOptions.h"
-#import "RNNRootViewController.h"
+#import "RNNComponentViewController.h"
 
 @interface RNNViewControllerPresenterTest : XCTestCase
 
-@property (nonatomic, strong) RNNViewControllerPresenter *uut;
+@property (nonatomic, strong) RNNComponentPresenter *uut;
 @property (nonatomic, strong) RNNNavigationOptions *options;
-@property (nonatomic, strong) UIViewController *bindedViewController;
+@property (nonatomic, strong) UIViewController *boundViewController;
 @property (nonatomic, strong) RNNReactComponentRegistry *componentRegistry;
 
 @end
@@ -18,123 +18,123 @@
 - (void)setUp {
     [super setUp];
 	self.componentRegistry = [OCMockObject partialMockForObject:[RNNReactComponentRegistry new]];
-	self.uut = [[RNNViewControllerPresenter alloc] initWithComponentRegistry:self.componentRegistry:[[RNNNavigationOptions alloc] initEmptyOptions]];
-	self.bindedViewController = [OCMockObject partialMockForObject:[RNNRootViewController new]];
-	[self.uut bindViewController:self.bindedViewController];
+	self.uut = [[RNNComponentPresenter alloc] initWithComponentRegistry:self.componentRegistry:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	self.boundViewController = [OCMockObject partialMockForObject:[RNNComponentViewController new]];
+	[self.uut bindViewController:self.boundViewController];
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
 - (void)testApplyOptions_backgroundImageDefaultNilShouldNotAddSubview {
 	[self.uut applyOptions:self.options];
-	XCTAssertTrue((self.bindedViewController.view.subviews.count) == 0);
+	XCTAssertTrue((self.boundViewController.view.subviews.count) == 0);
 }
 
 - (void)testApplyOptions_topBarPrefersLargeTitleDefaultFalse {
 	[self.uut applyOptions:self.options];
 	
-	XCTAssertTrue(self.bindedViewController.navigationItem.largeTitleDisplayMode == UINavigationItemLargeTitleDisplayModeNever);
+	XCTAssertTrue(self.boundViewController.navigationItem.largeTitleDisplayMode == UINavigationItemLargeTitleDisplayModeNever);
 }
 
 - (void)testApplyOptions_layoutBackgroundColorDefaultWhiteColor {
 	[self.uut applyOptions:self.options];
-	XCTAssertNil(self.bindedViewController.view.backgroundColor);
+	XCTAssertNil(self.boundViewController.view.backgroundColor);
 }
 
 - (void)testApplyOptions_statusBarBlurDefaultFalse {
 	[self.uut applyOptions:self.options];
-	XCTAssertNil([self.bindedViewController.view viewWithTag:BLUR_STATUS_TAG]);
+	XCTAssertNil([self.boundViewController.view viewWithTag:BLUR_STATUS_TAG]);
 }
 
 - (void)testApplyOptions_statusBarStyleDefaultStyle {
 	[self.uut applyOptions:self.options];
-	XCTAssertTrue([self.bindedViewController preferredStatusBarStyle] == UIStatusBarStyleDefault);
+	XCTAssertTrue([self.boundViewController preferredStatusBarStyle] == UIStatusBarStyleDefault);
 }
 
 - (void)testApplyOptions_backButtonVisibleDefaultTrue {
 	[self.uut applyOptions:self.options];
-	XCTAssertFalse(self.bindedViewController.navigationItem.hidesBackButton);
+	XCTAssertFalse(self.boundViewController.navigationItem.hidesBackButton);
 }
 
 - (void)testApplyOptions_drawBehindTabBarTrueWhenVisibleFalse {
 	self.options.bottomTabs.visible = [[Bool alloc] initWithValue:@(0)];
-	[[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:YES];
+	[[(id) self.boundViewController expect] setDrawBehindTabBar:YES];
 	[self.uut applyOptionsOnInit:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptions_setOverlayTouchOutsideIfHasValue {
     self.options.overlay.interceptTouchOutside = [[Bool alloc] initWithBOOL:YES];
-    [[(id)self.bindedViewController expect] rnn_setInterceptTouchOutside:YES];
+    [(UIViewController *) [(id) self.boundViewController expect] setInterceptTouchOutside:YES];
     [self.uut applyOptions:self.options];
-    [(id)self.bindedViewController verify];
+    [(id)self.boundViewController verify];
 }
 
 - (void)testBindViewControllerShouldCreateNavigationButtonsCreator {
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
-	[presenter bindViewController:self.bindedViewController];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
+	[presenter bindViewController:self.boundViewController];
 	XCTAssertNotNil(presenter.navigationButtons);
 }
 
-- (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithDefault {
-	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationFullScreen];
+- (void)testApplyOptionsOnInit_shouldSetModalPresentationStyleWithDefault {
+    [(UIViewController *) [(id) self.boundViewController expect] setModalPresentationStyle:UIModalPresentationFullScreen];
 	[self.uut applyOptionsOnInit:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptionsOnInit_shouldSetModalTransitionStyleWithDefault {
-	[[(id)self.bindedViewController expect] rnn_setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
+	[(UIViewController *) [(id) self.boundViewController expect] setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
 	[self.uut applyOptionsOnInit:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
-- (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithValue {
+- (void)testApplyOptionsOnInit_shouldSetModalPresentationStyleWithValue {
 	self.options.modalPresentationStyle = [[Text alloc] initWithValue:@"overCurrentContext"];
-	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationOverCurrentContext];
+    [(UIViewController *) [(id) self.boundViewController expect] setModalPresentationStyle:UIModalPresentationOverCurrentContext];
 	[self.uut applyOptionsOnInit:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptionsOnInit_shouldSetModalTransitionStyleWithValue {
 	self.options.modalTransitionStyle = [[Text alloc] initWithValue:@"crossDissolve"];
-	[[(id)self.bindedViewController expect] rnn_setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
+	[(UIViewController *) [(id) self.boundViewController expect] setModalTransitionStyle:UIModalTransitionStyleCrossDissolve];
 	[self.uut applyOptionsOnInit:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 -(void)testApplyOptionsOnInit_TopBarDrawUnder_true {
     self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(1)];
-    
-    [[(id)self.bindedViewController expect] rnn_setDrawBehindTopBar:YES];
+
+	[[(id) self.boundViewController expect] setDrawBehindTopBar:YES];
     [self.uut applyOptionsOnInit:self.options];
-    [(id)self.bindedViewController verify];
+    [(id)self.boundViewController verify];
 }
 
 -(void)testApplyOptionsOnInit_TopBarDrawUnder_false {
     self.options.topBar.drawBehind = [[Bool alloc] initWithValue:@(0)];
-    
-    [[(id)self.bindedViewController expect] rnn_setDrawBehindTopBar:NO];
+
+	[[(id) self.boundViewController expect] setDrawBehindTopBar:NO];
     [self.uut applyOptionsOnInit:self.options];
-    [(id)self.bindedViewController verify];
+    [(id)self.boundViewController verify];
 }
 
 -(void)testApplyOptionsOnInit_BottomTabsDrawUnder_true {
     self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(1)];
-    
-    [[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:YES];
+
+	[[(id) self.boundViewController expect] setDrawBehindTabBar:YES];
     [self.uut applyOptionsOnInit:self.options];
-    [(id)self.bindedViewController verify];
+    [(id)self.boundViewController verify];
 }
 
 -(void)testApplyOptionsOnInit_BottomTabsDrawUnder_false {
     self.options.bottomTabs.drawBehind = [[Bool alloc] initWithValue:@(0)];
-    
-    [[(id)self.bindedViewController expect] rnn_setDrawBehindTabBar:NO];
+
+	[[(id) self.boundViewController expect] setDrawBehindTabBar:NO];
     [self.uut applyOptionsOnInit:self.options];
-    [(id)self.bindedViewController verify];
+    [(id)self.boundViewController verify];
 }
 
 - (void)testReactViewShouldBeReleasedOnDealloc {
-	RNNRootViewController* bindViewController = [RNNRootViewController new];
+	RNNComponentViewController* bindViewController = [RNNComponentViewController new];
 	bindViewController.layoutInfo = [self createLayoutInfoWithComponentId:@"componentId"];
 	[self.uut bindViewController:bindViewController];
 	
@@ -146,7 +146,7 @@
 }
 
 - (void)testBindViewControllerShouldSetBindedComponentId {
-	RNNRootViewController* bindViewController = [RNNRootViewController new];
+	RNNComponentViewController* bindViewController = [RNNComponentViewController new];
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] init];
 	layoutInfo.componentId = @"componentId";
 	bindViewController.layoutInfo = layoutInfo;
@@ -156,7 +156,7 @@
 }
 
 - (void)testRenderComponentsCreateReactViewWithBindedComponentId {
-	RNNRootViewController* bindedViewController = [RNNRootViewController new];
+	RNNComponentViewController* bindedViewController = [RNNComponentViewController new];
 	RNNLayoutInfo* layoutInfo = [self createLayoutInfoWithComponentId:@"componentId"];
 	bindedViewController.layoutInfo = layoutInfo;
 	
@@ -175,32 +175,32 @@
 - (void)testApplyOptionsOnWillMoveToParent_shouldSetBackButtonOnBindedViewController_withTitle {
 	Text* title = [[Text alloc] initWithValue:@"Title"];
 	self.options.topBar.backButton.title = title;
-	[[(id)self.bindedViewController expect] rnn_setBackButtonIcon:nil withColor:nil title:title.get];
+	[[(id) self.boundViewController expect] setBackButtonIcon:nil withColor:nil title:title.get];
 	[self.uut applyOptionsOnWillMoveToParentViewController:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptionsOnWillMoveToParent_shouldSetBackButtonOnBindedViewController_withHideTitle {
 	Text* title = [[Text alloc] initWithValue:@"Title"];
 	self.options.topBar.backButton.title = title;
 	self.options.topBar.backButton.showTitle = [[Bool alloc] initWithValue:@(0)];
-	[[(id)self.bindedViewController expect] rnn_setBackButtonIcon:nil withColor:nil title:@""];
+	[[(id) self.boundViewController expect] setBackButtonIcon:nil withColor:nil title:@""];
 	[self.uut applyOptionsOnWillMoveToParentViewController:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptionsOnWillMoveToParent_shouldSetBackButtonOnBindedViewController_withIcon {
 	Image* image = [[Image alloc] initWithValue:[UIImage new]];
 	self.options.topBar.backButton.icon = image;
-	[[(id)self.bindedViewController expect] rnn_setBackButtonIcon:image.get withColor:nil title:nil];
+	[[(id) self.boundViewController expect] setBackButtonIcon:image.get withColor:nil title:nil];
 	[self.uut applyOptionsOnWillMoveToParentViewController:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 - (void)testApplyOptionsOnWillMoveToParent_shouldSetBackButtonOnBindedViewController_withDefaultValues {
-	[[(id)self.bindedViewController expect] rnn_setBackButtonIcon:nil withColor:nil title:nil];
+	[[(id) self.boundViewController expect] setBackButtonIcon:nil withColor:nil title:nil];
 	[self.uut applyOptionsOnWillMoveToParentViewController:self.options];
-	[(id)self.bindedViewController verify];
+	[(id)self.boundViewController verify];
 }
 
 

lib/ios/ReactNativeNavigationTests/UITabBarController+RNNOptionsTest.m

@@ -16,12 +16,12 @@
 }
 
 - (void)test_tabBarTranslucent_true {
-	[self.uut rnn_setTabBarTranslucent:YES];
+	[self.uut setTabBarTranslucent:YES];
 	XCTAssertTrue(self.uut.tabBar.translucent);
 }
 
 - (void)test_tabBarTranslucent_false {
-	[self.uut rnn_setTabBarTranslucent:NO];
+	[self.uut setTabBarTranslucent:NO];
 	XCTAssertFalse(self.uut.tabBar.translucent);
 }
 
@@ -30,19 +30,19 @@
 }
 
 - (void)test_tabBarHideShadow_true {
-	[self.uut rnn_setTabBarHideShadow:YES];
+	[self.uut setTabBarHideShadow:YES];
 	XCTAssertTrue(self.uut.tabBar.clipsToBounds);
 }
 
 - (void)test_tabBarHideShadow_false {
-	[self.uut rnn_setTabBarHideShadow:NO];
+	[self.uut setTabBarHideShadow:NO];
 	XCTAssertFalse(self.uut.tabBar.clipsToBounds);
 }
 
 - (void)test_tabBarBackgroundColor {
 	UIColor* tabBarBackgroundColor = [UIColor redColor];
 
-	[self.uut rnn_setTabBarBackgroundColor:tabBarBackgroundColor];
+	[self.uut setTabBarBackgroundColor:tabBarBackgroundColor];
 	XCTAssertTrue([self.uut.tabBar.barTintColor isEqual:tabBarBackgroundColor]);
 }
 

lib/ios/ReactNativeNavigationTests/UIViewController+LayoutProtocolTest.m

@@ -2,10 +2,10 @@
 #import <OCMock/OCMock.h>
 #import "UIViewController+LayoutProtocol.h"
 #import "UIViewController+RNNOptions.h"
-#import "RNNViewControllerPresenter.h"
+#import "RNNComponentPresenter.h"
 #import "RCTConvert+Modal.h"
-#import "RNNTabBarController.h"
-#import "RNNNavigationController.h"
+#import "RNNBottomTabsController.h"
+#import "RNNStackController.h"
 
 @interface UIViewController_LayoutProtocolTest : XCTestCase
 
@@ -23,7 +23,7 @@
 }
 
 - (void)testInitWithLayoutApplyDefaultOptions {
-    RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+    RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
     RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initEmptyOptions];
     RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
     defaultOptions.modalPresentationStyle = [[Text alloc] initWithValue:@"fullScreen"];
@@ -46,8 +46,8 @@
 	UIViewController* uut = [UIViewController new];
 	[[UINavigationController alloc] initWithRootViewController:uut];
 	UIColor* color = [UIColor blackColor];
-	
-	[uut rnn_setBackButtonIcon:nil withColor:color title:nil];
+
+    [uut setBackButtonIcon:nil withColor:color title:nil];
 	XCTAssertEqual(color, uut.navigationItem.backBarButtonItem.tintColor);
 }
 
@@ -55,8 +55,8 @@
 	UIViewController* uut = [UIViewController new];
     UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
     NSString* title = @"Title";
-	
-	[uut rnn_setBackButtonIcon:nil withColor:nil title:title];
+
+    [uut setBackButtonIcon:nil withColor:nil title:title];
 	XCTAssertEqual(title, uut.navigationItem.backBarButtonItem.title);
 }
 
@@ -64,8 +64,8 @@
 	UIViewController* uut = [UIViewController new];
     UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:uut];
     UIImage* icon = [UIImage new];
-	
-	[uut rnn_setBackButtonIcon:icon withColor:nil title:nil];
+
+    [uut setBackButtonIcon:icon withColor:nil title:nil];
 	XCTAssertEqual(icon, uut.navigationItem.backBarButtonItem.image);
 }
 
@@ -75,13 +75,13 @@
 	UINavigationController* nav = [[UINavigationController alloc] init];
 	[nav setViewControllers:@[uut, viewController2]];
 	NSString* title = @"Title";
-	
-	[uut rnn_setBackButtonIcon:nil withColor:nil title:title];
+
+    [uut setBackButtonIcon:nil withColor:nil title:title];
 	XCTAssertEqual(title, uut.navigationItem.backBarButtonItem.title);
 }
 
 - (void)testResolveOptions {
-	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
 
 	RNNNavigationOptions* childOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
 	RNNNavigationOptions* parentOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
@@ -92,7 +92,7 @@
 		defaultOptions.bottomTab.selectedIconColor = [[Color alloc] initWithValue:UIColor.blueColor];
 
 	UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:childOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:nil];
-    RNNNavigationController* parent = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:parentOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:@[child]];
+    RNNStackController* parent = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:parentOptions defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:@[child]];
 
     XCTAssertEqual([parent getCurrentChild], child);
 	XCTAssertEqual([[parent resolveOptions].bottomTab.text get], @"text");
@@ -100,11 +100,11 @@
 }
 
 - (void)testMergeOptions_invokedOnParentViewController {
-    id parent = [OCMockObject partialMockForObject:[RNNNavigationController new]];
+    id parent = [OCMockObject partialMockForObject:[RNNStackController new]];
     RNNNavigationOptions * toMerge = [[RNNNavigationOptions alloc] initEmptyOptions];
     [(UIViewController *) [parent expect] mergeChildOptions:toMerge];
 
-    RNNNavigationController* uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:nil];
+    RNNStackController* uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:nil eventEmitter:nil childViewControllers:nil];
     [parent addChildViewController:uut];
 
     [uut mergeOptions:toMerge];
@@ -112,13 +112,13 @@
 }
 
 - (void)testMergeOptions_presenterIsInvokedWithResolvedOptions {
-    id parent = [OCMockObject partialMockForObject:[RNNNavigationController new]];
-    id presenter = [OCMockObject partialMockForObject:[RNNNavigationControllerPresenter new]];
+    id parent = [OCMockObject partialMockForObject:[RNNStackController new]];
+    id presenter = [OCMockObject partialMockForObject:[RNNStackPresenter new]];
     RNNNavigationOptions * toMerge = [[RNNNavigationOptions alloc] initEmptyOptions];
     toMerge.topBar.title.color = [[Color alloc] initWithValue:[UIColor redColor]];
 
-    [[presenter expect] mergeOptions:toMerge currentOptions:[OCMArg checkWithBlock:^(id value) {
-        RNNNavigationOptions * options = (RNNNavigationOptions *) value;
+    [[presenter expect] mergeOptions:toMerge resolvedOptions:[OCMArg checkWithBlock:^(id value) {
+        RNNNavigationOptions *options = (RNNNavigationOptions *) value;
         XCTAssertEqual([options.topBar.title.text get], @"Initial title");
         XCTAssertEqual([options.bottomTab.text get], @"Child tab text");
         return YES;
@@ -129,7 +129,7 @@
     UIViewController* child = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:childOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:nil];
     RNNNavigationOptions * initialOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
     initialOptions.topBar.title.text = [[Text alloc] initWithValue:@"Initial title"];
-    RNNNavigationController* uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil creator:nil options:initialOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:@[child]];
+    RNNStackController* uut = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:initialOptions defaultOptions:nil presenter:presenter eventEmitter:nil childViewControllers:@[child]];
     [parent addChildViewController:uut];
 
 	[uut mergeOptions:toMerge];

lib/ios/ReactNativeNavigationTests/UIViewController+RNNOptionsTest.m

@@ -17,74 +17,74 @@
 }
 
 - (void)test_setTabBarItemBadge_shouldSetValidValue {
-    [self.uut rnn_setTabBarItemBadge:@"badge"];
+    [self.uut setTabBarItemBadge:@"badge"];
     XCTAssertEqual([self.uut tabBarItem].badgeValue, @"badge");
 }
 
 - (void)test_setTabBarItemBadge_shouldResetWhenValueIsEmptyString {
-    [self.uut rnn_setTabBarItemBadge:@"badge"];
+    [self.uut setTabBarItemBadge:@"badge"];
 
-    [self.uut rnn_setTabBarItemBadge:@""];
+    [self.uut setTabBarItemBadge:@""];
     XCTAssertEqual([self.uut tabBarItem].badgeValue, nil);
 }
 
 - (void)test_setTabBarItemBadge_shouldResetWhenValueIsNullObject {
-    [self.uut rnn_setTabBarItemBadge:@"badge"];
-    [self.uut rnn_setTabBarItemBadge:(id) [NSNull new]];
+    [self.uut setTabBarItemBadge:@"badge"];
+    [self.uut setTabBarItemBadge:(id) [NSNull new]];
     XCTAssertEqual([self.uut tabBarItem].badgeValue, nil);
 }
 
 - (void)testSetDrawBehindTopBarTrue_shouldSetExtendedLayoutTrue {
     [[self.uut expect] setExtendedLayoutIncludesOpaqueBars:YES];
-    [self.uut rnn_setDrawBehindTopBar:YES];
+    [self.uut setDrawBehindTopBar:YES];
     [self.uut verify];
 }
 
 - (void)testSetDrawBehindTabBarTrue_shouldSetExtendedLayoutTrue {
     [[self.uut expect] setExtendedLayoutIncludesOpaqueBars:YES];
-    [self.uut rnn_setDrawBehindTabBar:YES];
+    [self.uut setDrawBehindTabBar:YES];
     [self.uut verify];
 }
 
 - (void)testSetDrawBehindTopBarFalse_shouldNotCallExtendedLayout {
     [[self.uut reject] setExtendedLayoutIncludesOpaqueBars:NO];
-    [self.uut rnn_setDrawBehindTopBar:NO];
+    [self.uut setDrawBehindTopBar:NO];
     [self.uut verify];
 }
 
 - (void)testSetDrawBehindTabBarFalse_shouldNotCallExtendedLayout {
     [[self.uut reject] setExtendedLayoutIncludesOpaqueBars:NO];
-    [self.uut rnn_setDrawBehindTabBar:NO];
+    [self.uut setDrawBehindTabBar:NO];
     [self.uut verify];
 }
 
 - (void)testSetDrawBehindTopBarFalse_shouldSetCorrectEdgesForExtendedLayout {
-    [self.uut rnn_setDrawBehindTopBar:NO];
+    [self.uut setDrawBehindTopBar:NO];
     UIRectEdge expectedRectEdge = UIRectEdgeLeft | UIRectEdgeBottom | UIRectEdgeRight;
     XCTAssertEqual([self.uut edgesForExtendedLayout], expectedRectEdge);
 }
 
 - (void)testSetDrawBehindTapBarFalse_shouldSetCorrectEdgesForExtendedLayout {
-    [self.uut rnn_setDrawBehindTabBar:NO];
+    [self.uut setDrawBehindTabBar:NO];
     UIRectEdge expectedRectEdge = UIRectEdgeTop | UIRectEdgeLeft | UIRectEdgeRight;
     XCTAssertEqual([self.uut edgesForExtendedLayout], expectedRectEdge);
 }
 
 - (void)testSetBackgroundImageShouldNotAddViewIfImageNil {
     NSUInteger subviewsCount = [[[self.uut view] subviews] count];
-    [self.uut rnn_setBackgroundImage:nil];
+    [self.uut setBackgroundImage:nil];
     XCTAssertEqual([[[self.uut view] subviews] count], subviewsCount);
 }
 
 - (void)testSetBackgroundImageShouldAddUIImageViewSubview {
     NSUInteger subviewsCount = [[[self.uut view] subviews] count];
-    [self.uut rnn_setBackgroundImage:[UIImage new]];
+    [self.uut setBackgroundImage:[UIImage new]];
     XCTAssertEqual([[[self.uut view] subviews] count], subviewsCount + 1);
 }
 
 - (void)testSetBackgroundImageShouldAddUIImageViewSubviewWithImage {
     UIImage *image = [UIImage new];
-    [self.uut rnn_setBackgroundImage:image];
+    [self.uut setBackgroundImage:image];
     UIImageView *imageView = [[[self.uut view] subviews] firstObject];
     XCTAssertEqual(imageView.image, image);
 }

lib/ios/UINavigationController+RNNOptions.h

@@ -2,32 +2,32 @@
 
 @interface UINavigationController (RNNOptions)
 
-- (void)rnn_setInteractivePopGestureEnabled:(BOOL)enabled;
+- (void)setInteractivePopGestureEnabled:(BOOL)enabled;
 
-- (void)rnn_setRootBackgroundImage:(UIImage *)backgroundImage;
+- (void)setRootBackgroundImage:(UIImage *)backgroundImage;
 
-- (void)rnn_setNavigationBarTestID:(NSString *)testID;
+- (void)setNavigationBarTestId:(NSString *)testID;
 
-- (void)rnn_setNavigationBarVisible:(BOOL)visible animated:(BOOL)animated;
+- (void)setNavigationBarVisible:(BOOL)visible animated:(BOOL)animated;
 
-- (void)rnn_hideBarsOnScroll:(BOOL)hideOnScroll;
+- (void)hideBarsOnScroll:(BOOL)hideOnScroll;
 
-- (void)rnn_setNavigationBarNoBorder:(BOOL)noBorder;
+- (void)setNavigationBarNoBorder:(BOOL)noBorder;
 
-- (void)rnn_setBarStyle:(UIBarStyle)barStyle;
+- (void)setBarStyle:(UIBarStyle)barStyle;
 
-- (void)rnn_setNavigationBarFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color;
+- (void)setNavigationBarFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color;
 
-- (void)rnn_setNavigationBarTranslucent:(BOOL)translucent;
+- (void)setNavigationBarTranslucent:(BOOL)translucent;
 
-- (void)rnn_setNavigationBarBlur:(BOOL)blur;
+- (void)setNavigationBarBlur:(BOOL)blur;
 
-- (void)rnn_setNavigationBarClipsToBounds:(BOOL)clipsToBounds;
+- (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds;
 
-- (void)rnn_setNavigationBarLargeTitleVisible:(BOOL)visible;
+- (void)setNavigationBarLargeTitleVisible:(BOOL)visible;
 
-- (void)rnn_setNavigationBarLargeTitleFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color;
+- (void)setNavigationBarLargeTitleFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color;
 
-- (void)rnn_setBackButtonColor:(UIColor *)color;
+- (void)setBackButtonColor:(UIColor *)color;
 
 @end

lib/ios/UINavigationController+RNNOptions.m

@@ -5,11 +5,11 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 
 @implementation UINavigationController (RNNOptions)
 
-- (void)rnn_setInteractivePopGestureEnabled:(BOOL)enabled {
+- (void)setInteractivePopGestureEnabled:(BOOL)enabled {
 	self.interactivePopGestureRecognizer.enabled = enabled;
 }
 
-- (void)rnn_setRootBackgroundImage:(UIImage *)backgroundImage {
+- (void)setRootBackgroundImage:(UIImage *)backgroundImage {
 	UIImageView* backgroundImageView = (self.view.subviews.count > 0) ? self.view.subviews[0] : nil;
 	if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
 		backgroundImageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
@@ -21,19 +21,19 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	[backgroundImageView setContentMode:UIViewContentModeScaleAspectFill];
 }
 
-- (void)rnn_setNavigationBarTestID:(NSString *)testID {
+- (void)setNavigationBarTestId:(NSString *)testID {
 	self.navigationBar.accessibilityIdentifier = testID;
 }
 
-- (void)rnn_setNavigationBarVisible:(BOOL)visible animated:(BOOL)animated {
+- (void)setNavigationBarVisible:(BOOL)visible animated:(BOOL)animated {
 	[self setNavigationBarHidden:!visible animated:animated];
 }
 
-- (void)rnn_hideBarsOnScroll:(BOOL)hideOnScroll {
+- (void)hideBarsOnScroll:(BOOL)hideOnScroll {
 	self.hidesBarsOnSwipe = hideOnScroll;
 }
 
-- (void)rnn_setNavigationBarNoBorder:(BOOL)noBorder {
+- (void)setNavigationBarNoBorder:(BOOL)noBorder {
 	if (noBorder) {
 		[self.navigationBar setShadowImage:[[UIImage alloc] init]];
 	} else {
@@ -41,11 +41,11 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	}
 }
 
-- (void)rnn_setBarStyle:(UIBarStyle)barStyle {
+- (void)setBarStyle:(UIBarStyle)barStyle {
 	self.navigationBar.barStyle = barStyle;
 }
 
-- (void)rnn_setNavigationBarFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color {
+- (void)setNavigationBarFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color {
 	NSDictionary* fontAttributes = [RNNFontAttributesCreator createFontAttributesWithFontFamily:fontFamily fontSize:fontSize color:color];
 	
 	if (fontAttributes.allKeys.count > 0) {
@@ -53,7 +53,7 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	}
 }
 
-- (void)rnn_setNavigationBarLargeTitleVisible:(BOOL)visible {
+- (void)setNavigationBarLargeTitleVisible:(BOOL)visible {
 	if (@available(iOS 11.0, *)) {
 		if (visible){
 			self.navigationBar.prefersLargeTitles = YES;
@@ -63,18 +63,18 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	}
 }
 
-- (void)rnn_setNavigationBarLargeTitleFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color {
+- (void)setNavigationBarLargeTitleFontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize color:(UIColor *)color {
 	if (@available(iOS 11.0, *)) {
 		NSDictionary* fontAttributes = [RNNFontAttributesCreator createFontAttributesWithFontFamily:fontFamily fontSize:fontSize color:color];
 		self.navigationBar.largeTitleTextAttributes = fontAttributes;
 	}
 }
 
-- (void)rnn_setNavigationBarTranslucent:(BOOL)translucent {
+- (void)setNavigationBarTranslucent:(BOOL)translucent {
 	self.navigationBar.translucent = translucent;
 }
 
-- (void)rnn_setNavigationBarBlur:(BOOL)blur {
+- (void)setNavigationBarBlur:(BOOL)blur {
 	if (blur && ![self.navigationBar viewWithTag:BLUR_TOPBAR_TAG]) {
 		[self.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
 		self.navigationBar.shadowImage = [UIImage new];
@@ -95,11 +95,11 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	}
 }
 
-- (void)rnn_setBackButtonColor:(UIColor *)color {
+- (void)setBackButtonColor:(UIColor *)color {
 	self.navigationBar.tintColor = color;
 }
 
-- (void)rnn_setNavigationBarClipsToBounds:(BOOL)clipsToBounds {
+- (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds {
 	self.navigationBar.clipsToBounds = clipsToBounds;
 }
 

lib/ios/UITabBarController+RNNOptions.h

@@ -2,20 +2,20 @@
 
 @interface UITabBarController (RNNOptions)
 
-- (void)rnn_setCurrentTabIndex:(NSUInteger)currentTabIndex;
+- (void)setCurrentTabIndex:(NSUInteger)currentTabIndex;
 
-- (void)rnn_setCurrentTabID:(NSString *)tabID;
+- (void)setCurrentTabID:(NSString *)tabID;
 
-- (void)rnn_setTabBarTestID:(NSString *)testID;
+- (void)setTabBarTestID:(NSString *)testID;
 
-- (void)rnn_setTabBarBackgroundColor:(UIColor *)backgroundColor;
+- (void)setTabBarBackgroundColor:(UIColor *)backgroundColor;
 
-- (void)rnn_setTabBarStyle:(UIBarStyle)barStyle;
+- (void)setTabBarStyle:(UIBarStyle)barStyle;
 
-- (void)rnn_setTabBarTranslucent:(BOOL)translucent;
+- (void)setTabBarTranslucent:(BOOL)translucent;
 
-- (void)rnn_setTabBarHideShadow:(BOOL)hideShadow;
+- (void)setTabBarHideShadow:(BOOL)hideShadow;
 
-- (void)rnn_setTabBarVisible:(BOOL)visible animated:(BOOL)animated;
+- (void)setTabBarVisible:(BOOL)visible animated:(BOOL)animated;
 
 @end

lib/ios/UITabBarController+RNNOptions.m

@@ -1,37 +1,37 @@
 #import "UITabBarController+RNNOptions.h"
-#import "RNNTabBarController.h"
+#import "RNNBottomTabsController.h"
 
 @implementation UITabBarController (RNNOptions)
 
-- (void)rnn_setCurrentTabIndex:(NSUInteger)currentTabIndex {
+- (void)setCurrentTabIndex:(NSUInteger)currentTabIndex {
 	[self setSelectedIndex:currentTabIndex];
 }
 
-- (void)rnn_setCurrentTabID:(NSString *)currentTabId {
-	[(RNNTabBarController*)self setSelectedIndexByComponentID:currentTabId];
+- (void)setCurrentTabID:(NSString *)currentTabId {
+	[(RNNBottomTabsController*)self setSelectedIndexByComponentID:currentTabId];
 }
 
-- (void)rnn_setTabBarTestID:(NSString *)testID {
+- (void)setTabBarTestID:(NSString *)testID {
 	self.tabBar.accessibilityIdentifier = testID;
 }
 
-- (void)rnn_setTabBarBackgroundColor:(UIColor *)backgroundColor {
+- (void)setTabBarBackgroundColor:(UIColor *)backgroundColor {
 	self.tabBar.barTintColor = backgroundColor;
 }
 
-- (void)rnn_setTabBarStyle:(UIBarStyle)barStyle {
+- (void)setTabBarStyle:(UIBarStyle)barStyle {
 	self.tabBar.barStyle = barStyle;
 }
 
-- (void)rnn_setTabBarTranslucent:(BOOL)translucent {
+- (void)setTabBarTranslucent:(BOOL)translucent {
 	self.tabBar.translucent = translucent;
 }
 
-- (void)rnn_setTabBarHideShadow:(BOOL)hideShadow {
+- (void)setTabBarHideShadow:(BOOL)hideShadow {
 	self.tabBar.clipsToBounds = hideShadow;
 }
 
-- (void)rnn_setTabBarVisible:(BOOL)visible animated:(BOOL)animated {
+- (void)setTabBarVisible:(BOOL)visible animated:(BOOL)animated {
     const CGRect tabBarFrame = self.tabBar.frame;
 	const CGRect tabBarVisibleFrame = CGRectMake(tabBarFrame.origin.x,
 												 self.view.frame.size.height - tabBarFrame.size.height,
@@ -74,7 +74,7 @@
 	}
 }
 
-- (void)rnn_forEachTab:(void (^)(UIView *, UIViewController * tabViewController, int tabIndex))performOnTab {
+- (void)forEachTab:(void (^)(UIView *, UIViewController * tabViewController, int tabIndex))performOnTab {
     int tabIndex = 0;
     for (UIView * tab in self.tabBar.subviews) {
         if ([NSStringFromClass([tab class]) isEqualToString:@"UITabBarButton"]) {

lib/ios/UIViewController+LayoutProtocol.h

@@ -25,6 +25,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 @property (nonatomic, strong) RNNEventEmitter* eventEmitter;
-@property (nonatomic) id<RNNRootViewCreator> creator;
+@property (nonatomic) id<RNNComponentViewCreator> creator;
 
 @end

lib/ios/UIViewController+LayoutProtocol.m

@@ -5,7 +5,7 @@
 @implementation UIViewController (LayoutProtocol)
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
-						   creator:(id<RNNRootViewCreator>)creator
+						   creator:(id<RNNComponentViewCreator>)creator
 						   options:(RNNNavigationOptions *)options
 					defaultOptions:(RNNNavigationOptions *)defaultOptions
 						 presenter:(RNNBasePresenter *)presenter
@@ -30,12 +30,12 @@
 
 - (void)mergeOptions:(RNNNavigationOptions *)options {
     [self.options overrideOptions:options];
-	[self.presenter mergeOptions:options currentOptions:self.resolveOptions];
+    [self.presenter mergeOptions:options resolvedOptions:self.resolveOptions];
     [self.parentViewController mergeChildOptions:options];
 }
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options {
-	[self.presenter mergeOptions:options currentOptions:self.resolveOptions];
+    [self.presenter mergeOptions:options resolvedOptions:self.resolveOptions];
 	[self.parentViewController mergeChildOptions:options];
 }
 
@@ -136,11 +136,11 @@
 	objc_setAssociatedObject(self, @selector(eventEmitter), eventEmitter, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
-- (id<RNNRootViewCreator>)creator {
+- (id<RNNComponentViewCreator>)creator {
 	return objc_getAssociatedObject(self, @selector(creator));
 }
 
-- (void)setCreator:(id<RNNRootViewCreator>)creator {
+- (void)setCreator:(id<RNNComponentViewCreator>)creator {
 	objc_setAssociatedObject(self, @selector(creator), creator, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 

lib/ios/UIViewController+RNNOptions.h

@@ -6,39 +6,35 @@
 
 @interface UIViewController (RNNOptions)
 
-- (void)rnn_setBackgroundImage:(UIImage *)backgroundImage;
+- (void)setBackgroundImage:(UIImage *)backgroundImage;
 
-- (void)rnn_setModalPresentationStyle:(UIModalPresentationStyle)modalPresentationStyle;
+- (void)setSearchBarWithPlaceholder:(NSString *)placeholder hideNavBarOnFocusSearchBar:(BOOL)hideNavBarOnFocusSearchBar;
 
-- (void)rnn_setModalTransitionStyle:(UIModalTransitionStyle)modalTransitionStyle;
+- (void)setSearchBarHiddenWhenScrolling:(BOOL)searchBarHidden;
 
-- (void)rnn_setSearchBarWithPlaceholder:(NSString *)placeholder hideNavBarOnFocusSearchBar:(BOOL)hideNavBarOnFocusSearchBar;
+- (void)setDrawBehindTopBar:(BOOL)drawBehind;
 
-- (void)rnn_setSearchBarHiddenWhenScrolling:(BOOL)searchBarHidden;
+- (void)setDrawBehindTabBar:(BOOL)drawBehindTabBar;
 
-- (void)rnn_setDrawBehindTopBar:(BOOL)drawBehind;
+- (void)setTabBarItemBadgeColor:(UIColor *)badgeColor;
 
-- (void)rnn_setDrawBehindTabBar:(BOOL)drawBehindTabBar;
+- (void)setTabBarItemBadge:(NSString *)badge;
 
-- (void)rnn_setTabBarItemBadgeColor:(UIColor *)badgeColor;
+- (void)setTopBarPrefersLargeTitle:(BOOL)prefersLargeTitle;
 
-- (void)rnn_setTabBarItemBadge:(NSString *)badge;
+- (void)setNavigationItemTitle:(NSString *)title;
 
-- (void)rnn_setTopBarPrefersLargeTitle:(BOOL)prefersLargeTitle;
+- (void)setStatusBarStyle:(NSString *)style animated:(BOOL)animated;
 
-- (void)rnn_setNavigationItemTitle:(NSString *)title;
+- (void)setStatusBarBlur:(BOOL)blur;
 
-- (void)rnn_setStatusBarStyle:(NSString *)style animated:(BOOL)animated;
+- (void)setBackButtonVisible:(BOOL)visible;
 
-- (void)rnn_setStatusBarBlur:(BOOL)blur;
+- (void)setBackgroundColor:(UIColor *)backgroundColor;
 
-- (void)rnn_setBackButtonVisible:(BOOL)visible;
+- (void)setInterceptTouchOutside:(BOOL)interceptTouchOutside;
 
-- (void)rnn_setBackgroundColor:(UIColor *)backgroundColor;
-
-- (void)rnn_setInterceptTouchOutside:(BOOL)interceptTouchOutside;
-
-- (void)rnn_setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSString *)title;
+- (void)setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSString *)title;
 
 - (void)applyBackButton:(RNNBackButtonOptions *)backButton;
 

lib/ios/UIViewController+RNNOptions.m

@@ -10,7 +10,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 
 @implementation UIViewController (RNNOptions)
 
-- (void)rnn_setBackgroundImage:(UIImage *)backgroundImage {
+- (void)setBackgroundImage:(UIImage *)backgroundImage {
 	if (backgroundImage) {
 		UIImageView* backgroundImageView = (self.view.subviews.count > 0) ? self.view.subviews[0] : nil;
 		if (![backgroundImageView isKindOfClass:[UIImageView class]]) {
@@ -24,16 +24,8 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setModalPresentationStyle:(UIModalPresentationStyle)modalPresentationStyle {
-	self.modalPresentationStyle = modalPresentationStyle;
-}
-
-- (void)rnn_setModalTransitionStyle:(UIModalTransitionStyle)modalTransitionStyle {
-	self.modalTransitionStyle = modalTransitionStyle;
-}
-
-- (void)rnn_setSearchBarWithPlaceholder:(NSString *)placeholder
-						hideNavBarOnFocusSearchBar:(BOOL)hideNavBarOnFocusSearchBar {
+- (void)setSearchBarWithPlaceholder:(NSString *)placeholder
+		 hideNavBarOnFocusSearchBar:(BOOL)hideNavBarOnFocusSearchBar {
 	if (@available(iOS 11.0, *)) {
 		if (!self.navigationItem.searchController) {
 			UISearchController *search = [[UISearchController alloc]initWithSearchResultsController:nil];
@@ -55,17 +47,17 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setSearchBarHiddenWhenScrolling:(BOOL)searchBarHidden {
+- (void)setSearchBarHiddenWhenScrolling:(BOOL)searchBarHidden {
 	if (@available(iOS 11.0, *)) {
 		self.navigationItem.hidesSearchBarWhenScrolling = searchBarHidden;
 	}
 }
 
-- (void)rnn_setNavigationItemTitle:(NSString *)title {
+- (void)setNavigationItemTitle:(NSString *)title {
 	self.navigationItem.title = title;
 }
 
-- (void)rnn_setDrawBehindTopBar:(BOOL)drawBehind {
+- (void)setDrawBehindTopBar:(BOOL)drawBehind {
 	if (drawBehind) {
 		[self setExtendedLayoutIncludesOpaqueBars:YES];
 		self.edgesForExtendedLayout |= UIRectEdgeTop;
@@ -74,7 +66,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setDrawBehindTabBar:(BOOL)drawBehindTabBar {
+- (void)setDrawBehindTabBar:(BOOL)drawBehindTabBar {
 	if (drawBehindTabBar) {
 		[self setExtendedLayoutIncludesOpaqueBars:YES];
 		self.edgesForExtendedLayout |= UIRectEdgeBottom;
@@ -83,7 +75,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setTabBarItemBadge:(NSString *)badge {
+- (void)setTabBarItemBadge:(NSString *)badge {
     UITabBarItem *tabBarItem = self.tabBarItem;
 
     if ([badge isKindOfClass:[NSNull class]] || [badge isEqualToString:@""]) {
@@ -95,13 +87,13 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
     }
 }
 
-- (void)rnn_setTabBarItemBadgeColor:(UIColor *)badgeColor {
+- (void)setTabBarItemBadgeColor:(UIColor *)badgeColor {
 	if (@available(iOS 10.0, *)) {
 		self.tabBarItem.badgeColor = badgeColor;
 	}
 }
 
-- (void)rnn_setStatusBarStyle:(NSString *)style animated:(BOOL)animated {
+- (void)setStatusBarStyle:(NSString *)style animated:(BOOL)animated {
 	if (animated) {
 		[UIView animateWithDuration:[self statusBarAnimationDuration:animated] animations:^{
 			[self setNeedsStatusBarAppearanceUpdate];
@@ -111,7 +103,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setTopBarPrefersLargeTitle:(BOOL)prefersLargeTitle {
+- (void)setTopBarPrefersLargeTitle:(BOOL)prefersLargeTitle {
 	if (@available(iOS 11.0, *)) {
 		if (prefersLargeTitle) {
 			self.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeAlways;
@@ -122,7 +114,7 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 }
 
 
-- (void)rnn_setStatusBarBlur:(BOOL)blur {
+- (void)setStatusBarBlur:(BOOL)blur {
 	UIView* curBlurView = [self.view viewWithTag:BLUR_STATUS_TAG];
 	if (blur) {
 		if (!curBlurView) {
@@ -138,11 +130,11 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	}
 }
 
-- (void)rnn_setBackgroundColor:(UIColor *)backgroundColor {
+- (void)setBackgroundColor:(UIColor *)backgroundColor {
 	self.view.backgroundColor = backgroundColor;
 }
 
-- (void)rnn_setBackButtonVisible:(BOOL)visible {
+- (void)setBackButtonVisible:(BOOL)visible {
 	self.navigationItem.hidesBackButton = !visible;
 }
 
@@ -161,14 +153,14 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	return NO;
 }
 
-- (void)rnn_setInterceptTouchOutside:(BOOL)interceptTouchOutside {
+- (void)setInterceptTouchOutside:(BOOL)interceptTouchOutside {
 	if ([self.view isKindOfClass:[RCTRootView class]]) {
 		RCTRootView* rootView = (RCTRootView*)self.view;
 		rootView.passThroughTouches = !interceptTouchOutside;
 	}
 }
 
-- (void)rnn_setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSString *)title {
+- (void)setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSString *)title {
 	UIBarButtonItem *backItem = [[UIBarButtonItem alloc] init];
 	if (icon) {
 		backItem.image = color