fixed bottomTabs options with no stack

lib/ios/RNNBackButtonOptions.h

@@ -2,7 +2,7 @@
 
 @interface RNNBackButtonOptions : RNNOptions
 
-@property (nonatomic, strong) NSDictionary* image;
+@property (nonatomic, strong) NSDictionary* icon;
 @property (nonatomic, strong) NSNumber* visible;
 @property (nonatomic, strong) NSString* title;
 @property (nonatomic, strong) NSString* transition;

lib/ios/RNNBackButtonOptions.m

@@ -3,8 +3,8 @@
 @implementation RNNBackButtonOptions
 
 - (void)applyOn:(UIViewController *)viewController {
-	if (self.image) {
-		UIImage *image = self.image ? [RCTConvert UIImage:self.image] : nil;
+	if (self.icon) {
+		UIImage *image = self.icon ? [RCTConvert UIImage:self.icon] : nil;
 		[viewController.navigationController.navigationBar setBackIndicatorImage:image];
 		[viewController.navigationController.navigationBar setBackIndicatorTransitionMaskImage:image];
 	}

lib/ios/RNNControllerFactory.m

@@ -145,8 +145,8 @@
 
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
-		UIViewController* childVc = (UIViewController*)[self fromTree:child];
-		RNNRootViewController* rootView = (RNNRootViewController *)childVc.childViewControllers.firstObject;
+		UIViewController<RNNRootViewProtocol>* childVc = [self fromTree:child];
+		RNNRootViewController* rootView = (RNNRootViewController *)[childVc getLeafViewController];
 		[rootView applyTabBarItem];
 		
 		[controllers addObject:childVc];

lib/ios/RNNNavigationController.m

@@ -8,32 +8,28 @@
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
 
-- (UIViewController<RNNRootViewProtocol>*)getTopViewController {
-	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
-}
-
 - (UINavigationController *)navigationController {
 	return self;
 }
 
 - (BOOL)isCustomViewController {
-	return [self.getTopViewController isCustomViewController];
+	return [self.getLeafViewController isCustomViewController];
 }
 
 - (void)mergeOptions:(RNNOptions *)options {
-	[self.getTopViewController mergeOptions:options];
+	[self.getLeafViewController mergeOptions:options];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	return self.getTopViewController.preferredStatusBarStyle;
+	return self.getLeafViewController.preferredStatusBarStyle;
 }
 
 - (UIModalPresentationStyle)modalPresentationStyle {
-	return self.getTopViewController.modalPresentationStyle;
+	return self.getLeafViewController.modalPresentationStyle;
 }
 
 - (void)applyModalOptions {
-	[self.getTopViewController applyModalOptions];
+	[self.getLeafViewController applyModalOptions];
 }
 
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
@@ -41,7 +37,7 @@
 }
 
 - (NSString *)componentId {
-	return _componentId ? _componentId : self.getTopViewController.componentId;
+	return _componentId ? _componentId : self.getLeafViewController.componentId;
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
@@ -53,11 +49,15 @@
 }
 
 - (RNNNavigationOptions *)options {
-	return self.getTopViewController.options;
+	return self.getLeafViewController.options;
+}
+
+- (UIViewController *)getLeafViewController {
+	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
 }
 
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[self.getTopViewController waitForReactViewRender:wait perform:readyBlock];
+	[self.getLeafViewController waitForReactViewRender:wait perform:readyBlock];
 }
 
 - (UIViewController *)childViewControllerForStatusBarStyle {

lib/ios/RNNRootViewController.m

@@ -99,6 +99,10 @@
 	}
 }
 
+- (UIViewController *)getLeafViewController {
+	return self;
+}
+
 - (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock {
 	if (self.isCustomViewController) {
 		readyBlock();

lib/ios/RNNRootViewProtocol.h

@@ -15,6 +15,7 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 @required
 - (NSString *)componentId;
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+- (UIViewController<RNNRootViewProtocol> *)getLeafViewController;
 
 @end
 

lib/ios/RNNSideMenuChildVC.m

@@ -39,6 +39,10 @@
 	[self.child waitForReactViewRender:wait perform:readyBlock];
 }
 
+- (UIViewController *)getLeafViewController {
+	return self.child;
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.m

@@ -89,6 +89,10 @@
 	}
 }
 
+- (UIViewController *)getLeafViewController {
+	return self.center;
+}
+
 - (void)mergeOptions:(RNNOptions *)options {
 	[self.center mergeOptions:options];
 }

lib/ios/RNNSplitViewController.m

@@ -33,6 +33,10 @@
 - (void)optionsUpdated {
 }
 
+- (UIViewController *)getLeafViewController {
+	return self;
+}
+
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
 	readyBlock();
 }

lib/ios/RNNTabBarController.m

@@ -53,6 +53,10 @@
 	return [((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) options];
 }
 
+- (UIViewController *)getLeafViewController {
+	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController);
+}
+
 - (NSString *)componentId {
 	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).componentId;
 }

lib/ios/RNNTopTabsViewController.m

@@ -76,8 +76,14 @@
 	return _currentViewController.componentId;
 }
 
+#pragma mark RNNRootViewProtocol
+
 - (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
 	[_currentViewController waitForReactViewRender:wait perform:readyBlock];
 }
 
+- (UIViewController *)getLeafViewController {
+	return _currentViewController;
+}
+
 @end