Merge Stack child options only for current child of stack

Currently child options are applied only for visible children. During push animations, both children are visible.
If mergeOptions is called on the disappearing child during push animation, wrong options will be applied.

This commit changes the conditional so that child options are merged to stack if the child is also the current child.

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

@@ -392,6 +392,7 @@ public class StackPresenter {
         if (options.subtitle.fontFamily != null) topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
 
         if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color.get());
+        if (options.background.component.hasValue()) topBar.setBackgroundComponent(options.background.component);
 
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 

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

@@ -104,7 +104,7 @@ public class StackController extends ParentController<StackLayout> {
     @Override
     public void mergeChildOptions(Options options, ViewController childController, Component child) {
         super.mergeChildOptions(options, childController, child);
-        if (childController.isViewShown()) {
+        if (childController.isViewShown() && peek() == childController) {
             presenter.mergeChildOptions(options, resolveCurrentOptions(), child);
             if (options.fabOptions.hasValue() && child instanceof ReactComponent) {
                 fabOptionsPresenter.mergeOptions(options.fabOptions, (ReactComponent) child, getView());

lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

@@ -92,7 +92,9 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
         if (getLayoutParams() instanceof RelativeLayout.LayoutParams) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
             layoutParams.topMargin = ViewUtils.getHeight(topBar);
-            setLayoutParams(layoutParams);
+            try {
+                setLayoutParams(layoutParams);
+            } catch (IllegalStateException ignored) { }
         }
     }
 

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

@@ -14,10 +14,7 @@ import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
-import com.reactnativenavigation.mocks.TypefaceLoaderMock;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.SubtitleOptions;
-import com.reactnativenavigation.parse.TopBarBackgroundOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
@@ -33,7 +30,6 @@ import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
 import com.reactnativenavigation.views.topbar.TopBar;
 
-import org.json.JSONObject;
 import org.junit.Test;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -46,7 +42,7 @@ import static org.mockito.Mockito.verify;
 
 public class OptionsApplyingTest extends BaseTest {
     private Activity activity;
-    private StackController stackController;
+    private StackController stack;
     private ComponentViewController uut;
     private IReactView view;
     private Options initialNavigationOptions;
@@ -79,13 +75,14 @@ public class OptionsApplyingTest extends BaseTest {
                 return topBar;
             }
         };
-        stackController = TestUtils.newStackController(activity)
+        stack = TestUtils.newStackController(activity)
                 .setTopBarController(topBarController)
                 .build();
-        stackController.ensureViewIsCreated();
-        stackController.getView().layout(0, 0, 1000, 1000);
-        stackController.getTopBar().layout(0, 0, 1000, 100);
-        uut.setParentController(stackController);
+        stack.ensureViewIsCreated();
+        stack.getView().layout(0, 0, 1000, 1000);
+        stack.getTopBar().layout(0, 0, 1000, 100);
+        activity.setContentView(stack.getView());
+        disablePushAnimation(uut);
     }
 
     @SuppressWarnings("ConstantConditions")
@@ -120,7 +117,6 @@ public class OptionsApplyingTest extends BaseTest {
 
     @Test
     public void mergeNavigationOptionsUpdatesCurrentOptions() {
-        uut.ensureViewIsCreated();
         assertThat(uut.options.topBar.title.text.get("")).isEmpty();
         Options options = new Options();
         options.topBar.title.text = new Text("new title");
@@ -130,44 +126,32 @@ public class OptionsApplyingTest extends BaseTest {
 
     @Test
     public void reappliesOptionsOnMerge() {
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-        assertThat(stackController.getTopBar().getTitle()).isEmpty();
+        assertThat(stack.getTopBar().getTitle()).isEmpty();
+        stack.push(uut, new CommandListenerAdapter());
 
         Options opts = new Options();
         opts.topBar.title.text = new Text("the new title");
         uut.mergeOptions(opts);
 
-        assertThat(stackController.getTopBar().getTitle()).isEqualTo("the new title");
+        assertThat(stack.getTopBar().getTitle()).isEqualTo("the new title");
     }
 
     @Test
     public void appliesTopBackBackgroundColor() {
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-
-        Options opts = new Options();
-        opts.topBar.background.color = new Colour(Color.RED);
-        uut.mergeOptions(opts);
-
-        assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isEqualTo(Color.RED);
+        uut.options.topBar.background.color = new Colour(Color.RED);
+        stack.push(uut, new CommandListenerAdapter());
+        assertThat(((ColorDrawable) stack.getTopBar().getBackground()).getColor()).isEqualTo(Color.RED);
     }
 
     @Test
     public void appliesTopBarTextColor() {
         assertThat(uut.initialOptions).isSameAs(initialNavigationOptions);
-        stackController.push(uut, new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                Options opts = new Options();
-                opts.topBar.title.text = new Text("the title");
-                opts.topBar.title.color = new Colour(Color.RED);
-                uut.mergeOptions(opts);
+        uut.options.topBar.title.text = new Text("the title");
+        uut.options.topBar.title.color = new Colour(Color.RED);
+        stack.push(uut, new CommandListenerAdapter());
 
-                assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
-                assertThat(stackController.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
-            }
-        });
+        assertThat(stack.getTopBar().getTitleTextView()).isNotEqualTo(null);
+        assertThat(stack.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
     }
 
     @SuppressWarnings("MagicNumber")
@@ -175,32 +159,29 @@ public class OptionsApplyingTest extends BaseTest {
     public void appliesTopBarTextSize() {
         assertThat(uut.initialOptions).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBar.title.text = new Text("the title");
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
 
-        Options opts = new Options();
-        opts.topBar.title.text = new Text("the title");
-        opts.topBar.title.fontSize = new Fraction(18);
-        uut.mergeOptions(opts);
+        uut.options.topBar.title.text = new Text("the title");
+        uut.options.topBar.title.fontSize = new Fraction(18);
+        stack.push(uut, new CommandListenerAdapter());
 
-        assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);
-        assertThat(stackController.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
+        assertThat(stack.getTopBar().getTitleTextView()).isNotEqualTo(null);
+        assertThat(stack.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
     }
 
     @Test
     public void appliesTopBarVisible() {
+        stack.push(uut, new CommandListenerAdapter());
+
         assertThat(uut.initialOptions).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBar.title.text = new Text("the title");
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-        assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
+        assertThat(stack.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
 
         Options opts = new Options();
         opts.topBar.visible = new Bool(false);
         opts.topBar.animate = new Bool(false);
         uut.mergeOptions(opts);
 
-        assertThat(stackController.getTopBar().getVisibility()).isEqualTo(View.GONE);
+        assertThat(stack.getTopBar().getVisibility()).isEqualTo(View.GONE);
     }
 
     @Test
@@ -208,8 +189,8 @@ public class OptionsApplyingTest extends BaseTest {
         uut.options.topBar.title.text = new Text("the title");
         uut.options.topBar.drawBehind = new Bool(false);
         uut.ensureViewIsCreated();
-        stackController.ensureViewIsCreated();
-        stackController.push(uut, new CommandListenerAdapter() {
+        stack.ensureViewIsCreated();
+        stack.push(uut, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 uut.onViewAppeared();
@@ -221,33 +202,23 @@ public class OptionsApplyingTest extends BaseTest {
                 uut.mergeOptions(opts);
 
                 uutLayoutParams = (RelativeLayout.LayoutParams) (uut.getComponent().asView()).getLayoutParams();
-                assertThat(uutLayoutParams.getRule(BELOW)).isNotEqualTo(stackController.getTopBar().getId());
+                assertThat(uutLayoutParams.getRule(BELOW)).isNotEqualTo(stack.getTopBar().getId());
             }
         });
     }
 
     @Test
-    public void appliesTopBarComponent() throws Exception {
-        disablePushAnimation(uut);
-        JSONObject json = new JSONObject();
-        json.put("component", new JSONObject().put("name","someComponent").put("componentId", "id"));
-        uut.options.topBar.background = TopBarBackgroundOptions.parse(json);
-        uut.ensureViewIsCreated();
-        stackController.push(uut, new CommandListenerAdapter());
-        uut.onViewAppeared();
-
+    public void appliesTopBarComponent() {
+        uut.options.topBar.background.component.name = new Text("someComponent");
+        uut.options.topBar.background.component.componentId = new Text("id");
+        stack.push(uut, new CommandListenerAdapter());
         verify(topBar, times(1)).setBackgroundComponent(any());
     }
 
     @Test
-    public void appliesSubtitle() throws Exception {
-        JSONObject json = new JSONObject();
-        json.put("text", "sub");
-        uut.options.topBar.subtitle = SubtitleOptions.parse(new TypefaceLoaderMock(), json);
-        uut.ensureViewIsCreated();
-        stackController.push(uut, new CommandListenerAdapter());
-        uut.onViewAppeared();
-
-        assertThat(stackController.getTopBar().getTitleBar().getSubtitle()).isEqualTo("sub");
+    public void appliesSubtitle() {
+        uut.options.topBar.subtitle.text = new Text("sub");
+        stack.push(uut, new CommandListenerAdapter());
+        assertThat(stack.getTopBar().getTitleBar().getSubtitle()).isEqualTo("sub");
     }
 }

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

@@ -916,6 +916,15 @@ public class StackControllerTest extends BaseTest {
         verify(presenter, times(0)).mergeChildOptions(any(), any(), any());
     }
 
+    @Test
+    public void mergeChildOptions_presenterMergesOptionsOnlyForCurrentChild() {
+        ViewController vc = mock(ViewController.class);
+        when(vc.isViewShown()).thenReturn(true);
+        Component child = mock(Component.class);
+        uut.mergeChildOptions(new Options(), vc, child);
+        verify(presenter, times(0)).mergeChildOptions(any(), any(), any());
+    }
+
     @Test
     public void resolvedOptionsAreAppliedWhenStackIsAttachedToParentAndNotVisible() {
         FrameLayout parent = new FrameLayout(activity);