Apply BottomTabs visibility only if child is visible (#5835)

When calling mergeOptions to update BottomTabs visibility, apply the visibility only if the child is visible.

lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsPresenter.java

@@ -35,14 +35,14 @@ public class BottomTabsPresenter {
         this.defaultOptions = defaultOptions;
     }
 
-    public void bindView(BottomTabs bottomTabs, TabSelector tabSelector) {
+    public void bindView(BottomTabs bottomTabs, TabSelector tabSelector, BottomTabsAnimator animator) {
         this.bottomTabs = bottomTabs;
         this.tabSelector = tabSelector;
-        animator = new BottomTabsAnimator(bottomTabs);
+        this.animator = animator;
     }
 
-    public void mergeOptions(Options options) {
-        mergeBottomTabsOptions(options);
+    public void mergeOptions(Options options, ViewController view) {
+        mergeBottomTabsOptions(options, view);
     }
 
     public void applyOptions(Options options) {
@@ -58,12 +58,12 @@ public class BottomTabsPresenter {
     }
 
     public void mergeChildOptions(Options options, ViewController child) {
-        mergeBottomTabsOptions(options);
+        mergeBottomTabsOptions(options, child);
         int tabIndex = bottomTabFinder.findByControllerId(child.getId());
         if (tabIndex >= 0) mergeDrawBehind(tabIndex);
     }
 
-    private void mergeBottomTabsOptions(Options options) {
+    private void mergeBottomTabsOptions(Options options, ViewController view) {
         BottomTabsOptions bottomTabsOptions = options.bottomTabsOptions;
         AnimationsOptions animations = options.animations;
 
@@ -86,18 +86,20 @@ public class BottomTabsPresenter {
             int tabIndex = bottomTabFinder.findByControllerId(bottomTabsOptions.currentTabId.get());
             if (tabIndex >= 0) tabSelector.selectTab(tabIndex);
         }
-        if (bottomTabsOptions.visible.isTrue()) {
-            if (bottomTabsOptions.animate.isTrueOrUndefined()) {
-                animator.show(animations);
-            } else {
-                bottomTabs.restoreBottomNavigation(false);
+        if (view.isViewShown()) {
+            if (bottomTabsOptions.visible.isTrue()) {
+                if (bottomTabsOptions.animate.isTrueOrUndefined()) {
+                    animator.show(animations);
+                } else {
+                    bottomTabs.restoreBottomNavigation(false);
+                }
             }
-        }
-        if (bottomTabsOptions.visible.isFalse()) {
-            if (bottomTabsOptions.animate.isTrueOrUndefined()) {
-                animator.hide(animations);
-            } else {
-                bottomTabs.hideBottomNavigation(false);
+            if (bottomTabsOptions.visible.isFalse()) {
+                if (bottomTabsOptions.animate.isTrueOrUndefined()) {
+                    animator.hide(animations);
+                } else {
+                    bottomTabs.hideBottomNavigation(false);
+                }
             }
         }
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
+import com.reactnativenavigation.anim.BottomTabsAnimator;
 import com.reactnativenavigation.parse.BottomTabOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
@@ -68,7 +69,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
 
         bottomTabs = createBottomTabs();
         tabsAttacher.init(root, resolveCurrentOptions());
-        presenter.bindView(bottomTabs, this);
+        presenter.bindView(bottomTabs, this, new BottomTabsAnimator(bottomTabs));
         tabPresenter.bindView(bottomTabs);
         bottomTabs.setOnTabSelectedListener(this);
         CoordinatorLayout.LayoutParams lp = new CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
@@ -98,7 +99,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
 
     @Override
     public void mergeOptions(Options options) {
-        presenter.mergeOptions(options);
+        presenter.mergeOptions(options, this);
         tabPresenter.mergeOptions(options);
         super.mergeOptions(options);
         this.options.bottomTabsOptions.clearOneTimeOptions();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsPresenterTest.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.anim.BottomTabsAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
@@ -17,7 +18,10 @@ import org.mockito.Mockito;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
@@ -25,6 +29,7 @@ public class BottomTabsPresenterTest extends BaseTest {
     private List<ViewController> tabs;
     private BottomTabsPresenter uut;
     private BottomTabs bottomTabs;
+    private BottomTabsAnimator animator;
 
     @Override
     public void beforeEach() {
@@ -35,7 +40,8 @@ public class BottomTabsPresenterTest extends BaseTest {
         tabs = Arrays.asList(child1, child2);
         uut = new BottomTabsPresenter(tabs, new Options());
         bottomTabs = Mockito.mock(BottomTabs.class);
-        uut.bindView(bottomTabs, Mockito.mock(TabSelector.class));
+        animator = spy(new BottomTabsAnimator(bottomTabs));
+        uut.bindView(bottomTabs, Mockito.mock(TabSelector.class), animator);
     }
 
     @Test
@@ -50,4 +56,19 @@ public class BottomTabsPresenterTest extends BaseTest {
         verify(bottomTabs).setBackgroundColor(options.bottomTabsOptions.backgroundColor.get());
         verifyNoMoreInteractions(bottomTabs);
     }
+
+    @Test
+    public void mergeChildOptions_visibilityIsAppliedOnlyIsChildIsShown() {
+        assertThat(tabs.get(0).isViewShown()).isFalse();
+        assertThat(bottomTabs.isHidden()).isFalse();
+
+        Options options = new Options();
+        options.bottomTabsOptions.visible = new Bool(false);
+        uut.mergeChildOptions(options, tabs.get(0));
+        verify(animator, times(0)).hide(any());
+
+        Mockito.when(tabs.get(0).isViewShown()).thenAnswer(ignored -> true);
+        uut.mergeChildOptions(options, tabs.get(0));
+        verify(animator).hide(any());
+    }
 }