Fix tabBar visibility (#6276)

Hiding bottom tabs through static options during push transitions broke in 6.7.0.

Closes #6268

Author: yogevbd

e2e/BottomTabs.test.js

@@ -67,4 +67,12 @@ describe('BottomTabs', () => {
     await elementById(TestIDs.POP_BTN).tap();
     await expect(elementById(TestIDs.BOTTOM_TABS)).toBeVisible();
   });
+
+  it('hide Tab Bar on push from second bottomTabs screen', async () => {
+    await elementById(TestIDs.SWITCH_TAB_BY_INDEX_BTN).tap();
+    await elementById(TestIDs.HIDE_TABS_PUSH_BTN).tap();
+    await expect(elementById(TestIDs.BOTTOM_TABS)).toBeNotVisible();
+    await elementById(TestIDs.POP_BTN).tap();
+    await expect(elementById(TestIDs.BOTTOM_TABS)).toBeVisible();
+  });
 });

lib/ios/RNNBasePresenter.m

@@ -120,7 +120,7 @@ - (BOOL)getStatusBarVisibility {
 }
 
 - (BOOL)hidesBottomBarWhenPushed {
-    RNNNavigationOptions *withDefault = [self.boundViewController.topMostViewController.resolveOptions withDefault:self.defaultOptions];
+    RNNNavigationOptions *withDefault = (RNNNavigationOptions *)[[self.boundViewController.topMostViewController.resolveOptions withDefault:self.defaultOptions] mergeOptions:self.boundViewController.options];
     return ![withDefault.bottomTabs.visible getWithDefaultValue:YES];
 }
 

playground/src/screens/SecondBottomTabScreen.js

@@ -9,7 +9,8 @@ const {
   PUSH_BTN,
   PUSHED_BOTTOM_TABS,
   SIDE_MENU_TAB,
-  FLAT_LIST_BTN
+  FLAT_LIST_BTN,
+  HIDE_TABS_PUSH_BTN
 } = require('../testIDs')
 
 class SecondBottomTabScreen extends React.Component {
@@ -37,10 +38,15 @@ class SecondBottomTabScreen extends React.Component {
         <Button label='Push' onPress={this.push} />
         <Button label='Push BottomTabs' testID={PUSH_BTN} onPress={this.pushBottomTabs} />
         <Button label='SideMenu inside BottomTabs' testID={SIDE_MENU_INSIDE_BOTTOM_TABS_BTN} onPress={this.sideMenuInsideBottomTabs} />
+        <Button label='Hide Tabs on Push' testID={HIDE_TABS_PUSH_BTN} onPress={this.hideTabsOnPush} />
       </Root>
     );
   }
 
+  hideTabsOnPush = () => Navigation.push(this, component(Screens.Pushed, {
+    bottomTabs: { visible: false }
+  }));
+
   push = () => Navigation.push(this, Screens.Pushed);
 
   pushBottomTabs = () => Navigation.push(this, {