Fixed bug where mergeOptions would incorrectly call applyOptions

* Use resolved options when applying options in ChildController
* mergeOptions only if view is visible

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -23,9 +23,9 @@ import com.reactnativenavigation.utils.Now;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.utils.UiUtils;
-import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
+import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 
 import java.util.Map;
 
@@ -61,7 +61,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@ReactMethod
 	public void setRoot(String commandId, ReadableMap rawLayoutTree, Promise promise) {
-		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree).optJSONObject("root"));
+        final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree).optJSONObject("root"));
 		handle(() -> {
             navigator().setEventEmitter(eventEmitter);
             final ViewController viewController = newLayoutFactory().create(layoutTree);
@@ -81,7 +81,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@ReactMethod
 	public void push(String commandId, String onComponentId, ReadableMap rawLayoutTree, Promise promise) {
-		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
+        final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 		handle(() -> {
             final ViewController viewController = newLayoutFactory().create(layoutTree);
             navigator().push(onComponentId, viewController, new NativeCommandListener(commandId, promise, eventEmitter, now));

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

@@ -48,16 +48,17 @@ public abstract class ChildController<T extends ViewGroup> extends ViewControlle
     @Override
     public void applyOptions(Options options) {
         super.applyOptions(options);
-        presenter.applyOptions(getView(), options);
+        Options resolvedOptions = resolveCurrentOptions();
+        presenter.applyOptions(getView(), resolvedOptions);
         if (isRoot()) {
-            presenter.applyRootOptions(getView(), options);
+            presenter.applyRootOptions(getView(), resolvedOptions);
         }
     }
 
     @Override
     public void mergeOptions(Options options) {
         if (options == Options.EMPTY) return;
-        presenter.mergeOptions(getView(), options);
+        if (isViewShown()) presenter.mergeOptions(getView(), options);
         super.mergeOptions(options);
     }
 

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

@@ -108,7 +108,6 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     public void mergeOptions(Options options) {
         this.initialOptions = this.initialOptions.mergeWith(options);
         this.options = this.options.mergeWith(options);
-        if (view != null) applyOptions(this.options);
         this.options.clearOneTimeOptions();
         initialOptions.clearOneTimeOptions();
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java

@@ -21,12 +21,18 @@ public class ChildControllerTest extends BaseTest {
     private ChildController uut;
     private ChildControllersRegistry childRegistry;
     private OptionsPresenter presenter;
+    private Options resolvedOptions = new Options();
 
     @Override
     public void beforeEach() {
         childRegistry = spy(new ChildControllersRegistry());
         presenter = Mockito.mock(OptionsPresenter.class);
-        uut = new SimpleViewController(newActivity(), childRegistry, "childId", presenter, new Options());
+        uut = new SimpleViewController(newActivity(), childRegistry, "childId", presenter, new Options()) {
+            @Override
+            public Options resolveCurrentOptions() {
+                return resolvedOptions;
+            }
+        };
     }
 
     @Test
@@ -45,10 +51,9 @@ public class ChildControllerTest extends BaseTest {
 
     @Test
     public void applyOptions_applyRootOptionsIfRoot() {
-        addToParent(newActivity(), uut);
-        Options options = new Options();
-        uut.applyOptions(options);
-        verify(presenter, times(1)).applyRootOptions(uut.getView(), options);
+        newActivity().setContentView(uut.getView());
+        verify(presenter).applyOptions(uut.getView(), resolvedOptions);
+        verify(presenter).applyRootOptions(uut.getView(), resolvedOptions);
     }
 
     @Test
@@ -61,6 +66,8 @@ public class ChildControllerTest extends BaseTest {
 
     @Test
     public void mergeOptions() {
+        newActivity().setContentView(uut.getView());
+
         Options options = new Options();
         uut.mergeOptions(options);
         verify(presenter).mergeOptions(uut.getView(), options);