ExternalViewController extends ChildController (#5988)

This commit fixes a long lasting tech debt - ExternalViewController now extends ChildController.

Co-authored-by: Yogev Ben David <yogevbd@wix.com>

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -166,7 +166,9 @@ public class LayoutFactory {
     private ViewController createExternalComponent(LayoutNode node) {
         final ExternalComponent externalComponent = ExternalComponent.parse(node.data);
         return new ExternalComponentViewController(activity,
+                childRegistry,
                 node.id,
+                new Presenter(activity, defaultOptions),
                 externalComponent,
                 externalComponentCreators.get(externalComponent.name.get()),
                 reactInstanceManager,

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/externalcomponent/ExternalComponentViewController.java

@@ -7,13 +7,13 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.parse.ExternalComponent;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.ExternalComponentPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.utils.CoordinatorLayoutUtils;
 import com.reactnativenavigation.utils.StatusBarUtils;
-import com.reactnativenavigation.viewcontrollers.NoOpYellowBoxDelegate;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.viewcontrolleroverlay.ViewControllerOverlay;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.views.BehaviourDelegate;
 import com.reactnativenavigation.views.ExternalComponentLayout;
 
@@ -22,20 +22,20 @@ import androidx.fragment.app.FragmentActivity;
 
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
-public class ExternalComponentViewController extends ViewController<ExternalComponentLayout> {
+public class ExternalComponentViewController extends ChildController<ExternalComponentLayout> {
     private final ExternalComponent externalComponent;
     private final ExternalComponentCreator componentCreator;
     private ReactInstanceManager reactInstanceManager;
     private final EventEmitter emitter;
     private final ExternalComponentPresenter presenter;
 
-    public ExternalComponentViewController(Activity activity, String id, ExternalComponent externalComponent, ExternalComponentCreator componentCreator, ReactInstanceManager reactInstanceManager, EventEmitter emitter, ExternalComponentPresenter presenter, Options initialOptions) {
-        super(activity, id, new NoOpYellowBoxDelegate(), initialOptions, new ViewControllerOverlay(activity));
+    public ExternalComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, ExternalComponent externalComponent, ExternalComponentCreator componentCreator, ReactInstanceManager reactInstanceManager, EventEmitter emitter, ExternalComponentPresenter externalComponentPresenter, Options initialOptions) {
+        super(activity, childRegistry, id, presenter, initialOptions);
         this.externalComponent = externalComponent;
         this.componentCreator = componentCreator;
         this.reactInstanceManager = reactInstanceManager;
         this.emitter = emitter;
-        this.presenter = presenter;
+        this.presenter = externalComponentPresenter;
     }
 
     @Override
@@ -53,13 +53,6 @@ public class ExternalComponentViewController extends ViewController<ExternalComp
         emitter.emitOnNavigationButtonPressed(getId(), buttonId);
     }
 
-    @Override
-    public void mergeOptions(Options options) {
-        if (options == Options.EMPTY) return;
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
-        super.mergeOptions(options);
-    }
-
     @Override
     public void onViewAppeared() {
         super.onViewAppeared();

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.parse.ExternalComponent;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.ExternalComponentPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.events.ComponentType;
 import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentViewController;
@@ -33,6 +34,7 @@ public class ExternalComponentViewControllerTest extends BaseTest {
     private ExternalComponent ec;
     private ReactInstanceManager reactInstanceManager;
     private EventEmitter emitter;
+    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
@@ -41,8 +43,11 @@ public class ExternalComponentViewControllerTest extends BaseTest {
         ec = createExternalComponent();
         reactInstanceManager = Mockito.mock(ReactInstanceManager.class);
         emitter = Mockito.mock(EventEmitter.class);
+        childRegistry = new ChildControllersRegistry();
         uut = spy(new ExternalComponentViewController(activity,
+                childRegistry,
                 "fragmentId",
+                new Presenter(activity, Options.EMPTY),
                 ec,
                 componentCreator,
                 reactInstanceManager,
@@ -77,6 +82,14 @@ public class ExternalComponentViewControllerTest extends BaseTest {
         verify(emitter).emitComponentDidDisappear(uut.getId(), ec.name.get(), ComponentType.Component);
     }
 
+    @Test
+    public void registersInChildRegister() {
+        uut.onViewAppeared();
+        assertThat(childRegistry.size()).isOne();
+        uut.onViewDisappear();
+        assertThat(childRegistry.size()).isZero();
+    }
+
     private ExternalComponent createExternalComponent() {
         ExternalComponent component = new ExternalComponent();
         component.name = new Text("fragmentComponent");