Fixes bottomTabs visibility issues - #4071 #4161

lib/ios/RNNRootViewController.m

@@ -263,14 +263,6 @@
 	return self.optionsWithDefault.layout.supportedOrientations;
 }
 
-- (BOOL)hidesBottomBarWhenPushed
-{
-	if (self.optionsWithDefault.bottomTabs.visible.hasValue) {
-		return !self.optionsWithDefault.bottomTabs.visible.get;
-	}
-	return NO;
-}
-
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
 	if (![[vc.optionsWithDefault.topBar.backButton.transition getWithDefaultValue:@""] isEqualToString:@"custom"]){

lib/ios/RNNTabBarPresenter.m

@@ -15,6 +15,7 @@
 	[tabBarController rnn_setTabBarTranslucent:[options.bottomTabs.translucent getWithDefaultValue:YES]];
 	[tabBarController rnn_setTabBarHideShadow:[options.bottomTabs.hideShadow getWithDefaultValue:NO]];
 	[tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:[options.bottomTabs.barStyle getWithDefaultValue:@"default"]]];
+	[tabBarController rnn_setTabBarVisible:[options.bottomTabs.visible getWithDefaultValue:YES]];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
@@ -51,6 +52,10 @@
 	if (options.bottomTabs.hideShadow.hasValue) {
 		[tabBarController rnn_setTabBarHideShadow:options.bottomTabs.hideShadow.get];
 	}
+	
+	if (options.bottomTabs.visible.hasValue) {
+		[tabBarController rnn_setTabBarVisible:options.bottomTabs.visible.get];
+	}
 }
 
 @end

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -509,14 +509,6 @@
 	XCTAssertFalse([self.uut hidesBottomBarWhenPushed]);
 }
 
-
-- (void)testTabBarHidden_true {
-	self.options.bottomTabs.visible = [[Bool alloc] initWithValue:@(0)];
-	[self.uut viewWillAppear:false];
-
-	XCTAssertTrue([self.uut hidesBottomBarWhenPushed]);
-}
-
 - (void)testTabBarHidden_false {
 	self.options.bottomTabs.visible = [[Bool alloc] initWithValue:@(1)];
 	[self.uut viewWillAppear:false];

lib/ios/ReactNativeNavigationTests/RNNTabBarPresenterTest.m

@@ -28,6 +28,7 @@
 	[[self.bindedViewController expect] rnn_setTabBarTranslucent:YES];
 	[[self.bindedViewController expect] rnn_setTabBarHideShadow:NO];
     [[self.bindedViewController expect] rnn_setTabBarStyle:UIBarStyleDefault];
+	[[self.bindedViewController expect] rnn_setTabBarVisible:YES];
 	[self.uut applyOptions:emptyOptions];
 	[self.bindedViewController verify];
 }
@@ -38,6 +39,7 @@
 	initialOptions.bottomTabs.backgroundColor = [[Color alloc] initWithValue:[UIColor redColor]];
 	initialOptions.bottomTabs.translucent = [[Bool alloc] initWithValue:@(0)];
 	initialOptions.bottomTabs.hideShadow = [[Bool alloc] initWithValue:@(1)];
+	initialOptions.bottomTabs.visible = [[Bool alloc] initWithValue:@(0)];
 	initialOptions.bottomTabs.barStyle = [[Text alloc] initWithValue:@"black"];
 	
 	[[self.bindedViewController expect] rnn_setTabBarTestID:@"testID"];
@@ -45,6 +47,7 @@
 	[[self.bindedViewController expect] rnn_setTabBarTranslucent:NO];
 	[[self.bindedViewController expect] rnn_setTabBarHideShadow:YES];
 	[[self.bindedViewController expect] rnn_setTabBarStyle:UIBarStyleBlack];
+	[[self.bindedViewController expect] rnn_setTabBarVisible:NO];
 	
 	[self.uut applyOptions:initialOptions];
 	[self.bindedViewController verify];

lib/ios/UITabBarController+RNNOptions.h

@@ -16,4 +16,6 @@
 
 - (void)rnn_setTabBarHideShadow:(BOOL)hideShadow;
 
+- (void)rnn_setTabBarVisible:(BOOL)visible;
+
 @end

lib/ios/UITabBarController+RNNOptions.m

@@ -31,4 +31,8 @@
 	self.tabBar.clipsToBounds = hideShadow;
 }
 
+- (void)rnn_setTabBarVisible:(BOOL)visible {
+	self.tabBar.hidden = !visible;
+}
+
 @end