Merge child options in stack controller only if child is visible

This needs to be addressed for other ParentControllers as well

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ComponentViewController.java

@@ -50,7 +50,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
     }
 
     @Override
-    protected boolean isViewShown() {
+    public boolean isViewShown() {
         return super.isViewShown() && view.isReady();
     }
 
@@ -63,7 +63,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
 
     @Override
     public void mergeOptions(Options options) {
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, getView()));
+        performOnParentController(parentController -> parentController.mergeChildOptions(options, this, getView()));
         super.mergeOptions(options);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java

@@ -104,7 +104,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
     }
 
     @CallSuper
-    public void mergeChildOptions(Options options, Component child) {
+    public void mergeChildOptions(Options options, ViewController childController, Component child) {
 
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/SideMenuController.java

@@ -70,11 +70,11 @@ public class SideMenuController extends ParentController<DrawerLayout> {
     }
 
     @Override
-    public void mergeChildOptions(Options options, Component child) {
-        super.mergeChildOptions(options, child);
+    public void mergeChildOptions(Options options, ViewController childController, Component child) {
+        super.mergeChildOptions(options, childController, child);
         new SideMenuOptionsPresenter(getView()).present(options.sideMenuRootOptions);
         performOnParentController(parentController ->
-                ((ParentController) parentController).mergeChildOptions(options.copy().clearSideMenuOptions(), child)
+                ((ParentController) parentController).mergeChildOptions(options.copy().clearSideMenuOptions(), childController, child)
         );
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -279,7 +279,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     public abstract void sendOnNavigationButtonPressed(String buttonId);
 
-    protected boolean isViewShown() {
+    public boolean isViewShown() {
         return !isDestroyed &&
                getView().isShown() &&
                view != null &&

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

@@ -90,12 +90,12 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     }
 
     @Override
-    public void mergeChildOptions(Options options, Component child) {
-        super.mergeChildOptions(options, child);
+    public void mergeChildOptions(Options options, ViewController childController, Component child) {
+        super.mergeChildOptions(options, childController, child);
         presenter.mergeChildOptions(options, child);
         tabPresenter.mergeChildOptions(options, child);
         performOnParentController(parentController ->
-                ((ParentController) parentController).mergeChildOptions(options.copy().clearBottomTabsOptions(), child)
+                ((ParentController) parentController).mergeChildOptions(options.copy().clearBottomTabsOptions(), childController, child)
         );
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -91,11 +91,13 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public void mergeChildOptions(Options options, Component child) {
-        super.mergeChildOptions(options, child);
-        presenter.mergeChildOptions(options, resolveCurrentOptions(), child);
-        if (options.fabOptions.hasValue() && child instanceof ReactComponent) {
-            fabOptionsPresenter.mergeOptions(options.fabOptions, (ReactComponent) child, getView());
+    public void mergeChildOptions(Options options, ViewController childController, Component child) {
+        super.mergeChildOptions(options, childController, child);
+        if (childController.isViewShown()) {
+            presenter.mergeChildOptions(options, resolveCurrentOptions(), child);
+            if (options.fabOptions.hasValue() && child instanceof ReactComponent) {
+                fabOptionsPresenter.mergeOptions(options.fabOptions, (ReactComponent) child, getView());
+            }
         }
         performOnParentController(parentController ->
                 ((ParentController) parentController).mergeChildOptions(
@@ -105,6 +107,7 @@ public class StackController extends ParentController<StackLayout> {
                                 .clearFabOptions()
                                 .clearTopTabOptions()
                                 .clearTopTabsOptions(),
+                        childController,
                         child
                 )
         );

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -94,8 +94,8 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
     }
 
     @CallSuper
-    public void mergeChildOptions(Options options, Component child) {
-        super.mergeChildOptions(options, child);
+    public void mergeChildOptions(Options options, ViewController childController, Component child) {
+        super.mergeChildOptions(options, childController, child);
         performOnParentController(parentController -> ((ParentController) parentController).applyChildOptions(options.copy(), child));
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -53,7 +53,7 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
     @Override
     public void mergeOptions(Options options) {
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, getView()));
+        performOnParentController(parentController -> parentController.mergeChildOptions(options, this, getView()));
         super.mergeOptions(options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -52,6 +52,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class StackControllerTest extends BaseTest {
 
@@ -762,8 +763,9 @@ public class StackControllerTest extends BaseTest {
                         .build());
         Options optionsToMerge = new Options();
         Component component = mock(Component.class);
-        uut.mergeChildOptions(optionsToMerge, component);
-        verify(uut, times(1)).mergeChildOptions(optionsToMerge, component);
+        ViewController vc = mock(ViewController.class);
+        uut.mergeChildOptions(optionsToMerge, vc, component);
+        verify(uut, times(1)).mergeChildOptions(optionsToMerge, vc, component);
     }
 
     @Test
@@ -783,10 +785,11 @@ public class StackControllerTest extends BaseTest {
         optionsToMerge.topBar.testId = new Text("topBarID");
         optionsToMerge.bottomTabsOptions.testId = new Text("bottomTabsID");
         Component component = mock(Component.class);
-        uut.mergeChildOptions(optionsToMerge, component);
+        ViewController vc = mock(ViewController.class);
+        uut.mergeChildOptions(optionsToMerge, vc, component);
 
         ArgumentCaptor<Options> captor = ArgumentCaptor.forClass(Options.class);
-        verify(parentController, times(1)).mergeChildOptions(captor.capture(), eq(component));
+        verify(parentController, times(1)).mergeChildOptions(captor.capture(), eq(vc), eq(component));
         assertThat(captor.getValue().topBar.testId.hasValue()).isFalse();
         assertThat(captor.getValue().bottomTabsOptions.testId.get()).isEqualTo(optionsToMerge.bottomTabsOptions.testId.get());
     }
@@ -801,16 +804,26 @@ public class StackControllerTest extends BaseTest {
         options.topBar.testId = new Text("id");
         options.fabOptions.id = new Text("fabId");
         Component component = mock(Component.class);
+        ViewController vc = mock(ViewController.class);
 
         assertThat(options.fabOptions.hasValue()).isTrue();
-        uut.mergeChildOptions(options, component);
+        uut.mergeChildOptions(options, vc, component);
         ArgumentCaptor<Options> captor = ArgumentCaptor.forClass(Options.class);
-        verify(parentController, times(1)).mergeChildOptions(captor.capture(), eq(component));
+        verify(parentController, times(1)).mergeChildOptions(captor.capture(), eq(vc), eq(component));
         assertThat(captor.getValue().animations.push.hasValue()).isFalse();
         assertThat(captor.getValue().topBar.testId.hasValue()).isFalse();
         assertThat(captor.getValue().fabOptions.hasValue()).isFalse();
     }
 
+    @Test
+    public void mergeChildOptions_presenterDoesNotApplyOptionsIfViewIsNotShown() {
+        ViewController vc = mock(ViewController.class);
+        when(vc.isViewShown()).thenReturn(false);
+        Component child = mock(Component.class);
+        uut.mergeChildOptions(new Options(), vc, child);
+        verify(presenter, times(0)).mergeChildOptions(any(), any(), any());
+    }
+
     @Test
     public void destroy() {
         uut.ensureViewIsCreated();