Always merge options with parent controller (#5606)

Until now, mergeOptions would merge with parent controller only if mergeOptions was called with
a componentId. This commit fixes the issue and makes options merge correctly even when called with a layoutId.

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

 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import androidx.annotation.CallSuper;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.views.Component;
 
+import androidx.annotation.CallSuper;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T>  {
     private final Presenter presenter;
     private final ChildControllersRegistry childRegistry;
     public void mergeOptions(Options options) {
         if (options == Options.EMPTY) return;
         if (isViewShown()) presenter.mergeOptions(getView(), options);
+        performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
         super.mergeOptions(options);
     }
 

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

         if (options == Options.EMPTY) return;
         presenter.mergeOptions(getView(), options);
         super.mergeOptions(options);
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
     }
 
     @Override

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

 
 import android.app.Activity;
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 
 import com.facebook.react.ReactInstanceManager;
 
 import org.mockito.Mockito;
 
+import androidx.annotation.NonNull;
+
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public class SimpleViewController extends ChildController<SimpleViewController.SimpleView> {
         return "SimpleViewController " + getId();
     }
 
-    @Override
-    public void mergeOptions(Options options) {
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
-        super.mergeOptions(options);
-    }
-
     @Override
     public int getTopInset() {
         int statusBarInset = resolveCurrentOptions().statusBar.drawBehind.isTrue() ? 0 : 63;

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

 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ParentController;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 
 public class ChildControllerTest extends BaseTest {
 
+    private ParentController parent;
     private ChildController uut;
     private ChildControllersRegistry childRegistry;
     private Presenter presenter;
                 return resolvedOptions;
             }
         };
+        parent = Mockito.mock(ParentController.class);
+        uut.setParentController(parent);
     }
 
     @Test
         verify(presenter, times(0)).mergeOptions(any(), any());
     }
 
+    @Test
+    public void mergeOptions_mergeWithParentViewController() {
+        Options options = new Options();
+        uut.mergeOptions(options);
+        verify(uut.getParentController()).mergeChildOptions(options, uut);
+    }
+
     @Test
     public void destroy() {
         uut.destroy();

playground/android/build.gradle

             url "$rootDir/../../node_modules/react-native/android"
         }
         maven { url "$rootDir/../../node_modules/detox/Detox-android" }
-        maven { url 'https://jitpack.io' }
+        maven { url 'https://www.jitpack.io' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
         maven { url "$rootDir/../../node_modules/jsc-android/dist" }
     }

playground/src/screens/FirstBottomTabScreen.js

     }
   });
 
-  switchTabByComponentId = () => Navigation.mergeOptions(this, {
+  switchTabByComponentId = () => Navigation.mergeOptions('SecondTab', {
     bottomTabs: {
       currentTabId: 'SecondTab'
     }