Detach bottomTabPresenter from basePresenter (#5970)

Refactor bottomTabs options applying mechanism. Both bottomTab and bottomTabs presenters were part of the base UIViewController class which was wrong. This commits moves them to the BottomTabsController.

This refactor mostly contains the following

* Detach bottomTabPresenter from basePresenter
* Create tabBarItem appearance on presenter init
* Refactor bottomTabPresenter
* Refactor bottomTabPresenter
* Move appearance creation to bottomTabsController
* Merge child options with direct child controller

lib/ios/BottomTabAppearancePresenter.h

@@ -3,4 +3,6 @@
 API_AVAILABLE(ios(13.0))
 @interface BottomTabAppearancePresenter : BottomTabPresenter
 
+- (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions children:(NSArray<UIViewController *> *)children;
+
 @end

lib/ios/BottomTabAppearancePresenter.m

@@ -3,13 +3,16 @@
 
 @implementation BottomTabAppearancePresenter
 
-- (void)bindViewController:(UIViewController *)boundViewController {
-    [super bindViewController:boundViewController];
-    boundViewController.tabBarItem.standardAppearance = [[UITabBarAppearance alloc] init];
+- (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions children:(NSArray<UIViewController *> *)children {
+    self = [super initWithDefaultOptions:defaultOptions];
+    for (UIViewController* child in children) {
+        child.tabBarItem.standardAppearance = [[UITabBarAppearance alloc] init];
+    }
+    return self;
 }
 
-- (void)updateTabBarItem:(UITabBarItem *)tabItem bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
-    self.boundViewController.tabBarItem = [TabBarItemAppearanceCreator updateTabBarItem:self.boundViewController.tabBarItem bottomTabOptions:bottomTabOptions];
+- (void)createTabBarItem:(UIViewController *)child bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
+    child.tabBarItem = [TabBarItemAppearanceCreator updateTabBarItem:child.tabBarItem bottomTabOptions:bottomTabOptions];
 }
 
 @end

lib/ios/BottomTabPresenter.h

@@ -2,8 +2,12 @@
 
 @interface BottomTabPresenter : RNNBasePresenter
 
-- (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions;
+- (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
 
-- (void)applyDotIndicator:(UIViewController *)child;
+- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options  child:(UIViewController *)child;
+
+- (void)createTabBarItem:(UIViewController *)child bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions;
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions child:(UIViewController *)child;
 
 @end

lib/ios/BottomTabPresenter.m

@@ -1,68 +1,35 @@
 #import "BottomTabPresenter.h"
 #import "RNNTabBarItemCreator.h"
 #import "UIViewController+RNNOptions.h"
-#import "RNNDotIndicatorPresenter.h"
 #import "UIViewController+LayoutProtocol.h"
 
-@interface BottomTabPresenter ()
-@property(nonatomic, strong) RNNDotIndicatorPresenter* dotIndicatorPresenter;
-@end
-
 @implementation BottomTabPresenter
 
-- (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions {
-    self = [super init];
-    self.defaultOptions = defaultOptions;
-    self.dotIndicatorPresenter = [[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:defaultOptions];
-    return self;
-}
-
-- (void)applyOptions:(RNNNavigationOptions *)options {
+- (void)applyOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
     RNNNavigationOptions * withDefault = [options withDefault:self.defaultOptions];
     
-    if (withDefault.bottomTab.badge.hasValue && [self.boundViewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [self.boundViewController setTabBarItemBadge:withDefault.bottomTab.badge.get];
-    }
-    
-    if (withDefault.bottomTab.badgeColor.hasValue && [self.boundViewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [self.boundViewController setTabBarItemBadgeColor:withDefault.bottomTab.badgeColor.get];
-    }
+    [child setTabBarItemBadge:[withDefault.bottomTab.badge getWithDefaultValue:[NSNull null]]];
+    [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor getWithDefaultValue:nil]];
 }
 
-- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
+- (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options  child:(UIViewController *)child {
     RNNNavigationOptions * withDefault = [options withDefault:self.defaultOptions];
     
-    if (withDefault.bottomTab.hasValue) {
-        [self updateTabBarItem:self.boundViewController.tabBarItem bottomTabOptions:withDefault.bottomTab];
-    }
+    [child setTabBarItemBadge:[withDefault.bottomTab.badge getWithDefaultValue:[NSNull null]]];
+    [child setTabBarItemBadgeColor:[withDefault.bottomTab.badgeColor getWithDefaultValue:nil]];
+    [self createTabBarItem:child bottomTabOptions:withDefault.bottomTab];
 }
 
-- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions child:(UIViewController *)child {
     RNNNavigationOptions* withDefault = (RNNNavigationOptions *) [[resolvedOptions withDefault:self.defaultOptions] overrideOptions:options];
     
-    if (options.bottomTab.badge.hasValue) {
-        [self.boundViewController setTabBarItemBadge:options.bottomTab.badge.get];
-    }
-    
-    if (options.bottomTab.badgeColor.hasValue && [self.boundViewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [self.boundViewController setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
-    }
-    
-    if ([options.bottomTab.dotIndicator hasValue] && [self.boundViewController.parentViewController isKindOfClass:[UITabBarController class]]) {
-        [[self dotIndicatorPresenter] apply:self.boundViewController:options.bottomTab.dotIndicator];
-    }
-    
-    if (options.bottomTab.hasValue) {
-        [self updateTabBarItem:self.boundViewController.tabBarItem bottomTabOptions:withDefault.bottomTab];
-    }
-}
-
-- (void)updateTabBarItem:(UITabBarItem *)tabItem bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
-    self.boundViewController.tabBarItem = [RNNTabBarItemCreator updateTabBarItem:self.boundViewController.tabBarItem bottomTabOptions:bottomTabOptions];
+    if (options.bottomTab.badge.hasValue) [child setTabBarItemBadge:options.bottomTab.badge.get];
+    if (options.bottomTab.badgeColor.hasValue) [child setTabBarItemBadgeColor:options.bottomTab.badgeColor.get];
+    if (options.bottomTab.hasValue) [self createTabBarItem:child bottomTabOptions:withDefault.bottomTab];
 }
 
-- (void)applyDotIndicator:(UIViewController *)child {
-    [_dotIndicatorPresenter apply:child:[child resolveOptions].bottomTab.dotIndicator];
+- (void)createTabBarItem:(UIViewController *)child bottomTabOptions:(RNNBottomTabOptions *)bottomTabOptions {
+    child.tabBarItem = [RNNTabBarItemCreator updateTabBarItem:child.tabBarItem bottomTabOptions:bottomTabOptions];
 }
 
 @end

lib/ios/BottomTabPresenterCreator.h

@@ -3,6 +3,6 @@
 
 @interface BottomTabPresenterCreator : NSObject
 
-+ (BottomTabPresenter *)createWithDefaultOptions:(RNNNavigationOptions *)defaultOptions;
++ (BottomTabPresenter *)createWithDefaultOptions:(RNNNavigationOptions *)defaultOptions children:(NSArray<UIViewController *> *)children;
 
 @end

lib/ios/BottomTabPresenterCreator.m

@@ -3,9 +3,9 @@
 
 @implementation BottomTabPresenterCreator
 
-+ (BottomTabPresenter *)createWithDefaultOptions:(RNNNavigationOptions *)defaultOptions {
++ (BottomTabPresenter *)createWithDefaultOptions:(RNNNavigationOptions *)defaultOptions children:(NSArray<UIViewController *> *)children {
 	if (@available(iOS 13.0, *)) {
-		return [[BottomTabAppearancePresenter alloc] initWithDefaultOptions:defaultOptions];
+		return [[BottomTabAppearancePresenter alloc] initWithDefaultOptions:defaultOptions children:children];
 	} else {
 		return [[BottomTabPresenter alloc] initWithDefaultOptions:defaultOptions];
 	}

lib/ios/BottomTabsAppearancePresenter.m

@@ -2,12 +2,6 @@
 
 @implementation BottomTabsAppearancePresenter
 
-- (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
-    [super applyOptionsOnInit:options];
-    UITabBarController *bottomTabs = self.tabBarController;
-    bottomTabs.tabBar.standardAppearance = [UITabBarAppearance new];
-}
-
 - (void)setTabBarBackgroundColor:(UIColor *)backgroundColor {
     UITabBarController *bottomTabs = self.tabBarController;
     for (UIViewController* childViewController in bottomTabs.childViewControllers) {

lib/ios/RNNBasePresenter.h

@@ -27,8 +27,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options;
 
-- (void)applyDotIndicator:(UIViewController *)child;
-
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock;

lib/ios/RNNBasePresenter.m

@@ -5,17 +5,12 @@
 #import "UIViewController+LayoutProtocol.h"
 #import "DotIndicatorOptions.h"
 #import "RCTConvert+Modal.h"
-#import "BottomTabPresenterCreator.h"
 
-@interface RNNBasePresenter ()
-@property(nonatomic, strong) BottomTabPresenter* bottomTabPresenter;
-@end
 @implementation RNNBasePresenter
 
 - (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions {
     self = [super init];
     _defaultOptions = defaultOptions;
-    _bottomTabPresenter = [BottomTabPresenterCreator createWithDefaultOptions:self.defaultOptions];
     return self;
 }
 
@@ -28,7 +23,6 @@
 - (void)bindViewController:(UIViewController *)boundViewController {
     self.boundComponentId = boundViewController.layoutInfo.componentId;
     _boundViewController = boundViewController;
-    _bottomTabPresenter.boundViewController = boundViewController;
 }
 
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {
@@ -61,18 +55,15 @@
 }
 
 - (void)applyOptionsOnWillMoveToParentViewController:(RNNNavigationOptions *)options {
-    [_bottomTabPresenter applyOptionsOnWillMoveToParentViewController:options];
+
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
-    [_bottomTabPresenter applyOptions:options];
+
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-    UIViewController* viewController = self.boundViewController;
     RNNNavigationOptions* withDefault = (RNNNavigationOptions *) [[resolvedOptions withDefault:_defaultOptions] overrideOptions:options];
-    
-    [_bottomTabPresenter mergeOptions:options resolvedOptions:resolvedOptions];
 	
 	if (options.window.backgroundColor.hasValue) {
 		UIApplication.sharedApplication.delegate.window.backgroundColor = withDefault.window.backgroundColor.get;
@@ -90,10 +81,6 @@
 
 }
 
-- (void)applyDotIndicator:(UIViewController *)child {
-    [_bottomTabPresenter applyDotIndicator:child];
-}
-
 - (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions {
     RNNNavigationOptions *withDefault = [resolvedOptions withDefault:[self defaultOptions]];
     NSString* statusBarStyle = [withDefault.statusBar.style getWithDefaultValue:@"default"];

lib/ios/RNNBottomTabsController.h

@@ -3,6 +3,8 @@
 #import "RNNBottomTabsPresenter.h"
 #import "UIViewController+LayoutProtocol.h"
 #import "BottomTabsBaseAttacher.h"
+#import "BottomTabPresenter.h"
+#import "RNNDotIndicatorPresenter.h"
 
 @interface RNNBottomTabsController : UITabBarController <RNNLayoutProtocol, UITabBarControllerDelegate>
 
@@ -11,6 +13,8 @@
                            options:(RNNNavigationOptions *)options
                     defaultOptions:(RNNNavigationOptions *)defaultOptions
                          presenter:(RNNBasePresenter *)presenter
+                bottomTabPresenter:(BottomTabPresenter *)bottomTabPresenter
+                dotIndicatorPresenter:(RNNDotIndicatorPresenter *)dotIndicatorPresenter
                       eventEmitter:(RNNEventEmitter *)eventEmitter
               childViewControllers:(NSArray *)childViewControllers
                 bottomTabsAttacher:(BottomTabsBaseAttacher *)bottomTabsAttacher;

lib/ios/RNNBottomTabsController.m

@@ -1,9 +1,15 @@
 #import "RNNBottomTabsController.h"
 #import "UITabBarController+RNNUtils.h"
 
+@interface RNNBottomTabsController ()
+@property (nonatomic, strong) BottomTabPresenter* bottomTabPresenter;
+@property (nonatomic, strong) RNNDotIndicatorPresenter* dotIndicatorPresenter;
+@end
+
 @implementation RNNBottomTabsController {
 	NSUInteger _currentTabIndex;
     BottomTabsBaseAttacher* _bottomTabsAttacher;
+    
 }
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
@@ -11,14 +17,31 @@
                            options:(RNNNavigationOptions *)options
                     defaultOptions:(RNNNavigationOptions *)defaultOptions
                          presenter:(RNNBasePresenter *)presenter
+                bottomTabPresenter:(BottomTabPresenter *)bottomTabPresenter
+             dotIndicatorPresenter:(RNNDotIndicatorPresenter *)dotIndicatorPresenter
                       eventEmitter:(RNNEventEmitter *)eventEmitter
               childViewControllers:(NSArray *)childViewControllers
                 bottomTabsAttacher:(BottomTabsBaseAttacher *)bottomTabsAttacher {
-    self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:childViewControllers];
     _bottomTabsAttacher = bottomTabsAttacher;
+    _bottomTabPresenter = bottomTabPresenter;
+    _dotIndicatorPresenter = dotIndicatorPresenter;
+    self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:childViewControllers];
+    if (@available(iOS 13.0, *)) {
+        self.tabBar.standardAppearance = [UITabBarAppearance new];
+    }
     return self;
 }
 
+- (void)onChildAddToParent:(UIViewController *)child options:(RNNNavigationOptions *)options {
+    [_bottomTabPresenter applyOptionsOnWillMoveToParentViewController:options child:child];
+}
+
+- (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child {
+    [super mergeChildOptions:options child:child];
+    [_bottomTabPresenter mergeOptions:options resolvedOptions:self.resolveOptions child:[self findViewController:child]];
+    [_dotIndicatorPresenter mergeOptions:options resolvedOptions:self.resolveOptions child:[self findViewController:child]];
+}
+
 - (id<UITabBarControllerDelegate>)delegate {
 	return self;
 }
@@ -36,6 +59,8 @@
               [view addGestureRecognizer: longPressGesture];
           }
     }
+    
+    [_dotIndicatorPresenter bottomTabsDidLayoutSubviews:self];
 }
 
 - (UIViewController *)getCurrentChild {

lib/ios/RNNBottomTabsPresenter.h

@@ -2,8 +2,6 @@
 
 @interface RNNBottomTabsPresenter : RNNBasePresenter
 
-- (void)applyDotIndicator;
-
 - (void)setTabBarBackgroundColor:(UIColor *)backgroundColor;
 
 - (UITabBarController *)tabBarController;

lib/ios/RNNBottomTabsPresenter.m

@@ -88,16 +88,4 @@
     return self.tabBarController.tabBar;
 }
 
-- (void)viewDidLayoutSubviews {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self applyDotIndicator];
-    });
-}
-
-- (void)applyDotIndicator {
-    [self.boundViewController forEachChild:^(UIViewController *child) {
-        [self applyDotIndicator:child];
-    }];
-}
-
 @end

lib/ios/RNNControllerFactory.m

@@ -9,6 +9,7 @@
 #import "BottomTabsBaseAttacher.h"
 #import "BottomTabsAttachModeFactory.h"
 #import "BottomTabsPresenterCreator.h"
+#import "BottomTabPresenterCreator.h"
 
 @implementation RNNControllerFactory {
 	id<RNNComponentViewCreator> _creator;
@@ -150,14 +151,18 @@
     RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
     RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
     RNNBottomTabsPresenter* presenter = [BottomTabsPresenterCreator createWithDefaultOptions:_defaultOptions];
+    NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
+    BottomTabPresenter* bottomTabPresenter = [BottomTabPresenterCreator createWithDefaultOptions:_defaultOptions children:childViewControllers];;
+    RNNDotIndicatorPresenter* dotIndicatorPresenter = [[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:_defaultOptions];
 	BottomTabsBaseAttacher* bottomTabsAttacher = [_bottomTabsAttachModeFactory fromOptions:options];
     
-    NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
     return [[RNNBottomTabsController alloc] initWithLayoutInfo:layoutInfo
                                                        creator:_creator
                                                        options:options
                                                 defaultOptions:_defaultOptions
                                                      presenter:presenter
+                                            bottomTabPresenter:bottomTabPresenter
+                                         dotIndicatorPresenter:dotIndicatorPresenter
                                                   eventEmitter:_eventEmitter
                                           childViewControllers:childViewControllers
                                             bottomTabsAttacher:bottomTabsAttacher

lib/ios/RNNDotIndicatorPresenter.h

@@ -8,4 +8,9 @@
 - (instancetype)initWithDefaultOptions:(RNNNavigationOptions *)defaultOptions;
 
 - (void)apply:(UIViewController *)child :(DotIndicatorOptions *)options;
+
+- (void)bottomTabsDidLayoutSubviews:(UITabBarController *)bottomTabs;
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions child:(UIViewController *)child;
+
 @end

lib/ios/RNNDotIndicatorPresenter.m

@@ -13,20 +13,38 @@
     return self;
 }
 
+- (void)bottomTabsDidLayoutSubviews:(UITabBarController *)bottomTabs {
+    for (UIViewController* child in bottomTabs.childViewControllers) {
+        [self applyDotIndicator:child];
+    }
+}
+
+- (void)applyDotIndicator:(UIViewController *)child {
+    [self apply:child:[child resolveOptions].bottomTab.dotIndicator];
+}
+
+- (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions child:(UIViewController *)child {
+    RNNNavigationOptions* withDefault = (RNNNavigationOptions *) [[resolvedOptions withDefault:self.defaultOptions] overrideOptions:options];
+    
+    if ([options.bottomTab.dotIndicator hasValue]) {
+        [self apply:child:withDefault.bottomTab.dotIndicator];
+    }
+}
+
 - (void)apply:(UIViewController *)child :(DotIndicatorOptions *)options {
     if (![options hasValue]) return;
-
+    
     if ([options.visible isFalse]) {
         if ([child tabBarItem].tag > 0) [self remove:child];
         return;
     }
     if ([self currentIndicatorEquals:child :options]) return;
-
+    
     if ([self hasIndicator:child]) [self remove:child];
-
+    
     UIView *indicator = [self createIndicator:options];
     [child tabBarItem].tag = indicator.tag;
-
+    
     UITabBarController *bottomTabs = [self getTabBarController:child];
     int index = (int) [[bottomTabs childViewControllers] indexOfObject:child];
     [[bottomTabs getTabView:index] addSubview:indicator];
@@ -47,10 +65,10 @@
     UIView *icon = [bottomTabs getTabIcon:index];
     float size = [[options.size getWithDefaultValue:@6] floatValue];
     [NSLayoutConstraint activateConstraints:@[
-            [badge.leftAnchor constraintEqualToAnchor:icon.rightAnchor constant:-size / 2],
-            [badge.topAnchor constraintEqualToAnchor:icon.topAnchor constant:-size / 2],
-            [badge.widthAnchor constraintEqualToConstant:size],
-            [badge.heightAnchor constraintEqualToConstant:size]
+        [badge.leftAnchor constraintEqualToAnchor:icon.rightAnchor constant:-size / 2],
+        [badge.topAnchor constraintEqualToAnchor:icon.topAnchor constant:-size / 2],
+        [badge.widthAnchor constraintEqualToConstant:size],
+        [badge.heightAnchor constraintEqualToConstant:size]
     ]];
 }
 
@@ -80,4 +98,4 @@
     return [viewController isKindOfClass:[UITabBarController class]] ? viewController : [viewController tabBarController];
 }
 
-@end
+@end

lib/ios/UIViewController+LayoutProtocol.h

@@ -12,12 +12,16 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (UIViewController *)presentedComponentViewController;
 
+- (UIViewController *)findViewController:(UIViewController *)child;
+
 - (UIViewController *)topMostViewController;
 
 - (void)mergeOptions:(RNNNavigationOptions *)options;
 
 - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewController *)child;
 
+- (void)onChildAddToParent:(UIViewController *)child options:(RNNNavigationOptions *)options;
+
 - (UINavigationController *)stack;
 
 - (RNNNavigationOptions *)resolveOptions;

lib/ios/UIViewController+LayoutProtocol.m

@@ -17,13 +17,13 @@
 	self.defaultOptions = defaultOptions;
 	self.layoutInfo = layoutInfo;
 	self.creator = creator;
-	self.eventEmitter = eventEmitter;
-	if ([self respondsToSelector:@selector(setViewControllers:)]) {
-		[self performSelector:@selector(setViewControllers:) withObject:childViewControllers];
-	}
-	self.presenter = presenter;
+    self.eventEmitter = eventEmitter;
+    self.presenter = presenter;
     [self.presenter bindViewController:self];
-	[self.presenter applyOptionsOnInit:self.resolveOptions];
+    if ([self respondsToSelector:@selector(setViewControllers:)]) {
+        [self performSelector:@selector(setViewControllers:) withObject:childViewControllers];
+    }
+    [self.presenter applyOptionsOnInit:self.resolveOptions];
 
 	return self;
 }
@@ -117,6 +117,17 @@
         return self;
 }
 
+- (UIViewController *)findViewController:(UIViewController *)child {
+    if (self == child) return child;
+    
+    for (UIViewController* childController in self.childViewControllers) {
+        UIViewController* fromChild = [childController findViewController:child];
+        if (fromChild) return childController;
+    }
+    
+    return nil;
+}
+
 - (CGFloat)getTopBarHeight {
     for(UIViewController * child in [self childViewControllers]) {
         CGFloat childTopBarHeight = [child getTopBarHeight];
@@ -140,6 +151,10 @@
 	[self.parentViewController onChildWillAppear];
 }
 
+- (void)onChildAddToParent:(UIViewController *)child options:(RNNNavigationOptions *)options {
+    [self.parentViewController onChildAddToParent:child options:options];
+}
+
 - (void)componentDidAppear {
     [self.presenter componentDidAppear];
     [self.parentViewController componentDidAppear];
@@ -153,6 +168,7 @@
 - (void)willMoveToParentViewController:(UIViewController *)parent {
 	if (parent) {
 		[self.presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
+        [self onChildAddToParent:self options:self.resolveOptions];
 	}
 }
 

playground/ios/NavigationIOS12Tests/RNNBottomTabsPresenterTest.m

@@ -70,28 +70,6 @@
 	[self.boundViewController verify];
 }
 
-- (void)testViewDidLayoutSubviews_appliesBadgeOnNextRunLoop {
-    id uut = [self uut];
-    [[uut expect] applyDotIndicator];
-    [uut viewDidLayoutSubviews];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
-    [uut verify];
-}
-
-- (void)testApplyDotIndicator_callsAppliesBadgeWithEachChild {
-    id uut = [self uut];
-    id child1 = [UIViewController new];
-    id child2 = [UIViewController new];
-
-    [[uut expect] applyDotIndicator:child1];
-    [[uut expect] applyDotIndicator:child2];
-    [[self boundViewController] addChildViewController:child1];
-    [[self boundViewController] addChildViewController:child2];
-
-    [uut applyDotIndicator];
-    [uut verify];
-}
-
 - (void)testBackgroundColor_validColor {
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	self.options.layout.backgroundColor = [[Color alloc] initWithValue:inputColor];

playground/ios/NavigationIOS12Tests/RNNRootViewControllerTest.m

@@ -8,6 +8,7 @@
 #import "RNNStackController.h"
 #import "RNNBottomTabsController.h"
 #import "RNNUIBarButtonItem.h"
+#import "RNNBottomTabsController+Helpers.h"
 
 
 @interface RNNComponentViewController (EmbedInTabBar)
@@ -166,13 +167,12 @@
 -(void)testTabBadge {
 	NSString* tabBadgeInput = @"5";
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:tabBadgeInput];
-	__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];
 	[controllers addObject:self.uut];
-	[vc setViewControllers:controllers];
-	[self.uut viewWillAppear:false];
+	__unused RNNBottomTabsController* vc = [RNNBottomTabsController createWithChildren:controllers];
+	[self.uut willMoveToParentViewController:vc];
 	XCTAssertTrue([self.uut.tabBarItem.badgeValue isEqualToString:tabBadgeInput]);
 
 }

playground/ios/NavigationTests/BottomTabPresenterTest.m

@@ -0,0 +1,55 @@
+#import <XCTest/XCTest.h>
+#import "RNNBasePresenter.h"
+#import <OCMock/OCMock.h>
+#import "UIViewController+RNNOptions.h"
+#import <ReactNativeNavigation/RNNComponentViewController.h>
+#import <ReactNativeNavigation/BottomTabAppearancePresenter.h>
+#import "RNNBottomTabsController+Helpers.h"
+
+@interface RNNBottomTabPresenterTest : XCTestCase
+
+@property(nonatomic, strong) BottomTabAppearancePresenter *uut;
+@property(nonatomic, strong) RNNNavigationOptions *options;
+@property(nonatomic, strong) RNNBottomTabsController *boundViewController;
+@property(nonatomic, strong) RNNComponentViewController *componentViewController;
+@property(nonatomic, strong) id mockBoundViewController;
+
+@end
+
+@implementation RNNBottomTabPresenterTest
+
+- (void)setUp {
+    [super setUp];
+    self.uut = [[BottomTabAppearancePresenter alloc] initWithDefaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	self.componentViewController = [RNNComponentViewController new];
+    self.boundViewController = [RNNBottomTabsController createWithChildren:@[self.componentViewController]];
+    self.mockBoundViewController = [OCMockObject partialMockForObject:self.boundViewController];
+	[self.uut bindViewController:self.mockBoundViewController];
+    self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
+}
+
+- (void)tearDown {
+    [super tearDown];
+    [self.mockBoundViewController stopMocking];
+    self.boundViewController = nil;
+}
+
+- (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
+    self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
+    [self.uut applyOptions:self.options child:self.componentViewController];
+	XCTAssertEqual(self.componentViewController.tabBarItem.badgeValue, @"badge");
+}
+
+- (void)testMergeOptions_shouldSetTabBarItemColorWithDefaultOptions {
+	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	defaultOptions.bottomTab.selectedIconColor = [Color withColor:UIColor.greenColor];
+	self.uut.defaultOptions = defaultOptions;
+	
+	RNNNavigationOptions* mergeOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	mergeOptions.bottomTab.text = [[Text alloc] initWithValue:@"title"];
+	
+	[self.uut mergeOptions:mergeOptions resolvedOptions:self.options child:self.componentViewController];
+	XCTAssertEqual(self.componentViewController.tabBarItem.title, @"title");
+}
+
+@end

playground/ios/NavigationTests/RNNBasePresenterTest.m

@@ -4,7 +4,7 @@
 #import "UIViewController+RNNOptions.h"
 #import "RNNComponentViewController.h"
 
-@interface RNNBottomTabPresenterTest : XCTestCase
+@interface RNNBasePresenterTest : XCTestCase
 
 @property(nonatomic, strong) RNNBasePresenter *uut;
 @property(nonatomic, strong) RNNNavigationOptions *options;
@@ -13,7 +13,7 @@
 
 @end
 
-@implementation RNNBottomTabPresenterTest
+@implementation RNNBasePresenterTest
 
 - (void)setUp {
     [super setUp];
@@ -36,14 +36,6 @@
     [self.mockBoundViewController verify];
 }
 
-- (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
-    OCMStub([self.mockBoundViewController parentViewController]).andReturn([UITabBarController new]);
-    self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
-    [[self.mockBoundViewController expect] setTabBarItemBadge:self.options.bottomTab.badge.get];
-    [self.uut applyOptions:self.options];
-    [self.mockBoundViewController verify];
-}
-
 - (void)testApplyOptions_setTabBarItemBadgeShouldNotCalledOnUITabBarController {
     [self.uut bindViewController:self.mockBoundViewController];
     self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
@@ -96,17 +88,4 @@
 	XCTAssertTrue(_boundViewController.modalInPresentation);
 }
 
-- (void)testMergeOptions_shouldSetTabBarItemColorWithDefaultOptions {
-	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
-	defaultOptions.bottomTab.selectedIconColor = [Color withColor:UIColor.greenColor];
-	self.uut.defaultOptions = defaultOptions;
-	
-	RNNNavigationOptions* mergeOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
-	mergeOptions.bottomTab.text = [[Text alloc] initWithValue:@"title"];
-    OCMStub([self.mockBoundViewController parentViewController]).andReturn([UITabBarController new]);
-	
-    [self.uut mergeOptions:mergeOptions resolvedOptions:self.options];
-	XCTAssertEqual(self.uut.boundViewController.tabBarItem.title, @"title");
-}
-
 @end

playground/ios/NavigationTests/RNNBottomTabsAppearancePresenterTest.m

@@ -1,13 +1,18 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import "BottomTabsAppearancePresenter.h"
+#import "BottomTabsPresenterCreator.h"
+#import "BottomTabPresenterCreator.h"
 #import "UITabBarController+RNNOptions.h"
 #import "RNNBottomTabsController.h"
 #import "RNNComponentViewController.h"
+#import "RNNBottomTabsPresenter.h"
+#import "RNNDotIndicatorPresenter.h"
 
 @interface RNNBottomTabsAppearancePresenterTest : XCTestCase
 
-@property(nonatomic, strong) BottomTabsAppearancePresenter *uut;
+@property(nonatomic, strong) RNNBottomTabsPresenter *uut;
+@property(nonatomic, strong) NSArray<UIViewController *> *children;
+@property(nonatomic, strong) id dotIndicatorPresenter;
 @property(nonatomic, strong) RNNNavigationOptions *options;
 @property(nonatomic, strong) id boundViewController;
 
@@ -17,8 +22,10 @@
 
 - (void)setUp {
     [super setUp];
-    self.uut = [OCMockObject partialMockForObject:[BottomTabsAppearancePresenter new]];
-    self.boundViewController = [OCMockObject partialMockForObject:[RNNBottomTabsController new]];
+	self.children = @[[[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNComponentPresenter alloc] initWithDefaultOptions:nil] options:nil defaultOptions:nil]];
+	self.dotIndicatorPresenter = [OCMockObject partialMockForObject:[[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:nil]];
+    self.uut = [OCMockObject partialMockForObject:[BottomTabsPresenterCreator createWithDefaultOptions:nil]];
+	self.boundViewController = [OCMockObject partialMockForObject:[[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:nil defaultOptions:nil presenter:self.uut bottomTabPresenter:[BottomTabPresenterCreator createWithDefaultOptions:nil children:self.children] dotIndicatorPresenter:self.dotIndicatorPresenter eventEmitter:nil childViewControllers:self.children bottomTabsAttacher:nil]];
     [self.uut bindViewController:self.boundViewController];
     self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
@@ -71,28 +78,6 @@
 	[self.boundViewController verify];
 }
 
-- (void)testViewDidLayoutSubviews_appliesBadgeOnNextRunLoop {
-    id uut = [self uut];
-    [[uut expect] applyDotIndicator];
-    [uut viewDidLayoutSubviews];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
-    [uut verify];
-}
-
-- (void)testApplyDotIndicator_callsAppliesBadgeWithEachChild {
-    id uut = [self uut];
-    id child1 = [UIViewController new];
-    id child2 = [UIViewController new];
-
-    [[uut expect] applyDotIndicator:child1];
-    [[uut expect] applyDotIndicator:child2];
-    [[self boundViewController] addChildViewController:child1];
-    [[self boundViewController] addChildViewController:child2];
-
-    [uut applyDotIndicator];
-    [uut verify];
-}
-
 - (void)testBackgroundColor_validColor {
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	self.options.layout.backgroundColor = [[Color alloc] initWithValue:inputColor];
@@ -103,12 +88,8 @@
 
 - (void)testTabBarBackgroundColor {
 	UIColor* tabBarBackgroundColor = [UIColor redColor];
-	RNNComponentPresenter* vcPresenter = [[RNNComponentPresenter alloc] initWithDefaultOptions:nil];
-	UIViewController* vc = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:vcPresenter options:nil defaultOptions:nil];
-	
-	[((UITabBarController *)self.boundViewController) setViewControllers:@[vc]];
 	[self.uut setTabBarBackgroundColor:tabBarBackgroundColor];
-	XCTAssertTrue([vc.tabBarItem.standardAppearance.backgroundColor isEqual:tabBarBackgroundColor]);
+	XCTAssertTrue([self.children.lastObject.tabBarItem.standardAppearance.backgroundColor isEqual:tabBarBackgroundColor]);
 }
 
 @end

playground/ios/NavigationTests/RNNBottomTabsController+Helpers.h

@@ -0,0 +1,10 @@
+#import <ReactNativeNavigation/ReactNativeNavigation.h>
+#import "RNNBottomTabsController.h"
+
+@interface RNNBottomTabsController (Helpers)
+
++ (RNNBottomTabsController *)create;
+
++ (RNNBottomTabsController *)createWithChildren:(NSArray *)children;
+
+@end

playground/ios/NavigationTests/RNNBottomTabsController+Helpers.m

@@ -0,0 +1,17 @@
+#import "RNNBottomTabsController+Helpers.h"
+#import "BottomTabsPresenterCreator.h"
+#import "BottomTabPresenterCreator.h"
+
+@implementation RNNBottomTabsController (Helpers)
+
++ (RNNBottomTabsController *)create {
+	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	return [self createWithChildren:nil];
+}
+
++ (RNNBottomTabsController *)createWithChildren:(NSArray *)children {
+	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	return [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:defaultOptions presenter:[BottomTabsPresenterCreator createWithDefaultOptions:defaultOptions] bottomTabPresenter:[BottomTabPresenterCreator createWithDefaultOptions:defaultOptions children:children] dotIndicatorPresenter:[[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:defaultOptions] eventEmitter:nil childViewControllers:children bottomTabsAttacher:nil];
+}
+
+@end

playground/ios/NavigationTests/RNNCommandsHandlerTest.m

@@ -372,7 +372,7 @@
 	options.bottomTabs.tabsAttachMode = [[BottomTabsAttachMode alloc] initWithValue:@"together"];
 
 	BottomTabsBaseAttacher* attacher = [[[BottomTabsAttachModeFactory alloc] initWithDefaultOptions:nil] fromOptions:options];
-	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
+	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] bottomTabPresenter:nil dotIndicatorPresenter:nil eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
 
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(tabBarController);
 	
@@ -390,7 +390,7 @@
 	options.animations.setRoot.waitForRender = [[Bool alloc] initWithBOOL:YES];
 	
 	BottomTabsBaseAttacher* attacher = [[[BottomTabsAttachModeFactory alloc] initWithDefaultOptions:nil] fromOptions:options];
-	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
+	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] bottomTabPresenter:nil dotIndicatorPresenter:nil eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
 
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(tabBarController);
 	
@@ -408,7 +408,7 @@
 	options.animations.setRoot.waitForRender = [[Bool alloc] initWithBOOL:YES];
 
 	BottomTabsBaseAttacher* attacher = [[[BottomTabsAttachModeFactory alloc] initWithDefaultOptions:nil] fromOptions:options];
-	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
+	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] bottomTabPresenter:nil dotIndicatorPresenter:nil eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
 
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(tabBarController);
 

playground/ios/NavigationTests/RNNDotIndicatorPresenterTest.m

@@ -3,23 +3,26 @@
 #import "RNNDotIndicatorPresenter.h"
 #import "DotIndicatorOptions.h"
 #import "RNNBottomTabsController.h"
-#import "RNNComponentViewController.h"
+#import <ReactNativeNavigation/RNNComponentViewController.h>
 #import "RNNTestBase.h"
 #import "UITabBarController+RNNUtils.h"
+#import <ReactNativeNavigation/BottomTabPresenterCreator.h>
+#import "RNNBottomTabsController+Helpers.h"
 
 @interface RNNDotIndicatorPresenterTest : RNNTestBase
 @property(nonatomic, strong) id uut;
 @property(nonatomic, strong) RNNComponentViewController *child;
 @property(nonatomic, strong) id bottomTabs;
+@property(nonatomic, strong) BottomTabPresenter* bottomTabPresenter;
 @end
 
 @implementation RNNDotIndicatorPresenterTest
 - (void)setUp {
     [super setUp];
+	self.child = [self createChild];
+	self.bottomTabPresenter = [BottomTabPresenterCreator createWithDefaultOptions:nil children:@[self.child]];
     self.uut = [OCMockObject partialMockForObject:[RNNDotIndicatorPresenter new]];
-    self.bottomTabs = [OCMockObject partialMockForObject:[RNNBottomTabsController new]];
-    self.child = [self createChild];
-    [self.bottomTabs addChildViewController:self.child];
+    self.bottomTabs = [OCMockObject partialMockForObject:[RNNBottomTabsController createWithChildren:@[self.child]]];
 
     [self setupTopLevelUI:self.bottomTabs];
 }
@@ -128,6 +131,12 @@
     XCTAssertEqual([sizeConstraints[1] constant], 8);
 }
 
+- (void)testApply_onBottomTabsViewDidLayout {
+	[[self.uut expect] apply:self.child :self.child.resolveOptions.bottomTab.dotIndicator];
+	[self.uut bottomTabsDidLayoutSubviews:self.bottomTabs];
+	[self.uut verify];
+}
+
 - (void)applyIndicator {
     [self applyIndicator:[UIColor redColor]];
 }

playground/ios/NavigationTests/RNNRootViewControllerTest.m

@@ -8,7 +8,7 @@
 #import "RNNStackController.h"
 #import "RNNBottomTabsController.h"
 #import "RNNUIBarButtonItem.h"
-
+#import "RNNBottomTabsController+Helpers.h"
 
 @interface RNNComponentViewController (EmbedInTabBar)
 - (void)embedInTabBarController;
@@ -17,7 +17,7 @@
 @implementation RNNComponentViewController (EmbedInTabBar)
 
 - (void)embedInTabBarController {
-	RNNBottomTabsController* tabVC = [[RNNBottomTabsController alloc] init];
+	RNNBottomTabsController* tabVC = [RNNBottomTabsController create];
 	tabVC.viewControllers = @[self];
 	[self viewWillAppear:false];
 }
@@ -179,13 +179,12 @@
 - (void)testTabBadge {
 	NSString* tabBadgeInput = @"5";
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:tabBadgeInput];
-	__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];
 	[controllers addObject:self.uut];
-	[vc setViewControllers:controllers];
-	[self.uut viewWillAppear:false];
+	__unused RNNBottomTabsController* vc = [RNNBottomTabsController createWithChildren:controllers];
+	[self.uut willMoveToParentViewController:vc];
 	XCTAssertTrue([self.uut.tabBarItem.badgeValue isEqualToString:tabBadgeInput]);
 
 }
@@ -371,7 +370,7 @@
 	NSArray* supportedOrientations = @[@"portrait"];
 	self.options.layout.orientation = supportedOrientations;
 	NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-    __unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
+    __unused RNNBottomTabsController* vc = [RNNBottomTabsController createWithChildren:controllers];
 
 	[self.uut viewWillAppear:false];
 
@@ -383,7 +382,7 @@
 	NSArray* supportedOrientations = @[@"portrait", @"landscape"];
 	self.options.layout.orientation = supportedOrientations;
     NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-    __unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
+    __unused RNNBottomTabsController* vc = [RNNBottomTabsController createWithChildren:controllers];
 
 	[self.uut viewWillAppear:false];
 
@@ -395,7 +394,7 @@
 	NSArray* supportedOrientations = @[@"all"];
 	self.options.layout.orientation = supportedOrientations;
 	NSMutableArray* controllers = [[NSMutableArray alloc] initWithArray:@[self.uut]];
-	__unused RNNBottomTabsController* vc = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:[RNNComponentPresenter new] eventEmitter:nil childViewControllers:controllers];
+	__unused RNNBottomTabsController* vc = [RNNBottomTabsController createWithChildren:controllers];
 
 	[self.uut viewWillAppear:false];
 

playground/ios/NavigationTests/RNNTabBarControllerTest.m

@@ -1,9 +1,11 @@
 #import <XCTest/XCTest.h>
-#import "RNNBottomTabsController.h"
-#import "RNNComponentViewController.h"
+#import <ReactNativeNavigation/RNNBottomTabsController.h>
+#import <ReactNativeNavigation/RNNComponentViewController.h>
 #import "RNNStackController.h"
 #import <OCMock/OCMock.h>
 #import "RCTConvert+Modal.h"
+#import <ReactNativeNavigation/BottomTabPresenterCreator.h>
+#import "RNNBottomTabsController+Helpers.h"
 
 @interface RNNTabBarControllerTest : XCTestCase
 
@@ -22,11 +24,11 @@
 
     id tabBarClassMock = OCMClassMock([RNNBottomTabsController class]);
     OCMStub([tabBarClassMock parentViewController]).andReturn([OCMockObject partialMockForObject:[RNNBottomTabsController new]]);
-
+	NSArray* children = @[[[UIViewController alloc] init]];
     self.mockTabBarPresenter = [OCMockObject partialMockForObject:[[RNNBottomTabsPresenter alloc] init]];
     self.mockChildViewController = [OCMockObject partialMockForObject:[RNNComponentViewController new]];
     self.mockEventEmitter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
-	self.originalUut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:self.mockTabBarPresenter eventEmitter:self.mockEventEmitter childViewControllers:@[[[UIViewController alloc] init]]];
+	self.originalUut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:self.mockTabBarPresenter bottomTabPresenter:[BottomTabPresenterCreator createWithDefaultOptions:nil children:children] dotIndicatorPresenter:[[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:nil] eventEmitter:self.mockEventEmitter childViewControllers:children bottomTabsAttacher:nil];
     self.uut = [OCMockObject partialMockForObject:self.originalUut];
     OCMStub([self.uut selectedViewController]).andReturn(self.mockChildViewController);
 }
@@ -171,5 +173,16 @@
     XCTAssertTrue(uut.selectedIndex == 1);
 }
 
+- (void)testOnViewDidLayoutSubviews_ShouldUpdateDotIndicatorForChildren {
+	id dotIndicator = [OCMockObject partialMockForObject:[[RNNDotIndicatorPresenter alloc] initWithDefaultOptions:nil]];
+    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:nil defaultOptions:nil presenter:nil bottomTabPresenter:nil dotIndicatorPresenter:dotIndicator eventEmitter:nil childViewControllers:@[[UIViewController new], vc] bottomTabsAttacher:nil];
+	
+	[[dotIndicator expect] bottomTabsDidLayoutSubviews:uut];
+	[uut viewDidLayoutSubviews];
+	[dotIndicator verify];
+	
+}
+
 
 @end

playground/ios/playground.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		500E9FE72406A52100C61231 /* BottomTabPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 500E9FE62406A4E200C61231 /* BottomTabPresenterTest.m */; };
 		501C86B9239FE9C400E0B631 /* UIImage+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 501C86B8239FE9C400E0B631 /* UIImage+Utils.m */; };
 		5022EDCD2405522000852BA6 /* RNNBottomTabsPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E58D263A2385888C003F36BA /* RNNBottomTabsPresenterTest.m */; };
 		5022EDCE2405524700852BA6 /* RNNBottomTabsAppearancePresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5022EDCB240551EE00852BA6 /* RNNBottomTabsAppearancePresenterTest.m */; };
@@ -19,6 +20,8 @@
 		50996C6823AA477400008F89 /* RNNRootViewControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50996C6723AA477400008F89 /* RNNRootViewControllerTest.m */; };
 		50996C6923AA487800008F89 /* RNNTestRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = E58D263D2385888C003F36BA /* RNNTestRootViewCreator.m */; };
 		50BCB27623F1A2B100D6C8E5 /* TopBarAppearancePresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */; };
+		50C9A8D1240EB95F00BD699F /* RNNBottomTabsController+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CF233C240695B10098042D /* RNNBottomTabsController+Helpers.m */; };
+		50CF233D240695B10098042D /* RNNBottomTabsController+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CF233C240695B10098042D /* RNNBottomTabsController+Helpers.m */; };
 		50C9A8D4240FB9D000BD699F /* RNNComponentViewController+Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 50C9A8D3240FB9D000BD699F /* RNNComponentViewController+Utils.m */; };
 		67C681D42B662A53F29C19DA /* Pods_NavigationIOS12Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEE0B5D45FD34FBABC6586CF /* Pods_NavigationIOS12Tests.framework */; };
 		9D204F3DC4FBCD81583BF99F /* Pods_playground.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3340545EAAF11C1F146864 /* Pods_playground.framework */; };
@@ -81,6 +84,7 @@
 		4259AF43A23D928FE78B4A3A /* Pods-NavigationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NavigationTests.debug.xcconfig"; path = "Target Support Files/Pods-NavigationTests/Pods-NavigationTests.debug.xcconfig"; sourceTree = "<group>"; };
 		4A3340545EAAF11C1F146864 /* Pods_playground.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_playground.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4AE37ACF6BFBAB211EE8E7E9 /* Pods-NavigationIOS12Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NavigationIOS12Tests.release.xcconfig"; path = "Target Support Files/Pods-NavigationIOS12Tests/Pods-NavigationIOS12Tests.release.xcconfig"; sourceTree = "<group>"; };
+		500E9FE62406A4E200C61231 /* BottomTabPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BottomTabPresenterTest.m; sourceTree = "<group>"; };
 		501C86B7239FE9C400E0B631 /* UIImage+Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+Utils.h"; sourceTree = "<group>"; };
 		501C86B8239FE9C400E0B631 /* UIImage+Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Utils.m"; sourceTree = "<group>"; };
 		5022EDCB240551EE00852BA6 /* RNNBottomTabsAppearancePresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBottomTabsAppearancePresenterTest.m; sourceTree = "<group>"; };
@@ -93,6 +97,8 @@
 		50996C6123AA46DD00008F89 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50996C6723AA477400008F89 /* RNNRootViewControllerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNRootViewControllerTest.m; sourceTree = "<group>"; };
 		50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TopBarAppearancePresenterTest.m; sourceTree = "<group>"; };
+		50CF233B240695B10098042D /* RNNBottomTabsController+Helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNNBottomTabsController+Helpers.h"; sourceTree = "<group>"; };
+		50CF233C240695B10098042D /* RNNBottomTabsController+Helpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RNNBottomTabsController+Helpers.m"; sourceTree = "<group>"; };
 		50C9A8D2240FB9D000BD699F /* RNNComponentViewController+Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNNComponentViewController+Utils.h"; sourceTree = "<group>"; };
 		50C9A8D3240FB9D000BD699F /* RNNComponentViewController+Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RNNComponentViewController+Utils.m"; sourceTree = "<group>"; };
 		7F8E255E2E08F6ECE7DF6FE3 /* Pods-playground.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-playground.release.xcconfig"; path = "Target Support Files/Pods-playground/Pods-playground.release.xcconfig"; sourceTree = "<group>"; };
@@ -255,6 +261,7 @@
 			children = (
 				E58D26442385888C003F36BA /* Options */,
 				E58D26422385888C003F36BA /* RNNBasePresenterTest.m */,
+				500E9FE62406A4E200C61231 /* BottomTabPresenterTest.m */,
 				50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */,
 				E58D26412385888C003F36BA /* RNNCommandsHandlerTest.m */,
 				E58D26352385888B003F36BA /* RNNComponentPresenterTest.m */,
@@ -282,6 +289,8 @@
 				E58D263B2385888C003F36BA /* UITabBarController+RNNOptionsTest.m */,
 				E58D26252385888B003F36BA /* UIViewController+LayoutProtocolTest.m */,
 				E58D263E2385888C003F36BA /* UIViewController+RNNOptionsTest.m */,
+				50CF233B240695B10098042D /* RNNBottomTabsController+Helpers.h */,
+				50CF233C240695B10098042D /* RNNBottomTabsController+Helpers.m */,
 				50647FE223E3196800B92025 /* RNNExternalViewControllerTests.m */,
 				E58D262E2385888B003F36BA /* utils */,
 				E58D261F238587F4003F36BA /* Info.plist */,
@@ -740,6 +749,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5022EDCD2405522000852BA6 /* RNNBottomTabsPresenterTest.m in Sources */,
+				50C9A8D1240EB95F00BD699F /* RNNBottomTabsController+Helpers.m in Sources */,
 				50996C6923AA487800008F89 /* RNNTestRootViewCreator.m in Sources */,
 				50996C6823AA477400008F89 /* RNNRootViewControllerTest.m in Sources */,
 			);
@@ -773,7 +783,9 @@
 				E58D26502385888C003F36BA /* RNNNavigationOptionsTest.m in Sources */,
 				E58D264E2385888C003F36BA /* RNNTestBase.m in Sources */,
 				5022EDCE2405524700852BA6 /* RNNBottomTabsAppearancePresenterTest.m in Sources */,
+				500E9FE72406A52100C61231 /* BottomTabPresenterTest.m in Sources */,
 				E58D26612385888C003F36BA /* RNNTestNoColor.m in Sources */,
+				50CF233D240695B10098042D /* RNNBottomTabsController+Helpers.m in Sources */,
 				E58D265D2385888C003F36BA /* RNNControllerFactoryTest.m in Sources */,
 				E58D265C2385888C003F36BA /* RNNStackControllerTest.m in Sources */,
 				E58D26482385888C003F36BA /* RNNDotIndicatorPresenterTest.m in Sources */,