Detach root by default when modal is displayed

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

@@ -172,18 +172,7 @@ public class Navigator extends ParentController {
     }
 
     public void showModal(final ViewController viewController, CommandListener listener) {
-        modalStack.showModal(viewController, new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                contentLayout.removeView(root.getView());
-                listener.onSuccess(childId);
-            }
-
-            @Override
-            public void onError(String message) {
-                listener.onError(message);
-            }
-        });
+        modalStack.showModal(viewController, root, listener);
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers.modal;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.view.ViewGroup;
+import android.view.ViewManager;
 
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
@@ -23,22 +24,22 @@ public class ModalPresenter {
         this.content = contentLayout;
     }
 
-    public void showModal(ViewController toAdd, @Nullable ViewController toRemove, CommandListener listener) {
+    public void showModal(ViewController toAdd, ViewController toRemove, CommandListener listener) {
         content.addView(toAdd.getView());
         if (toAdd.options.animations.showModal.enable.isTrueOrUndefined()) {
             animator.show(toAdd.getView(), toAdd.options.animations.showModal, new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    onShowModalEnd(toRemove, listener, toAdd);
+                    onShowModalEnd(toAdd, toRemove, listener);
                 }
             });
         } else {
-            onShowModalEnd(toRemove, listener, toAdd);
+            onShowModalEnd(toAdd, toRemove, listener);
         }
     }
 
-    private void onShowModalEnd(@Nullable ViewController toRemove, CommandListener listener, ViewController toAdd) {
-        if (toRemove != null) content.removeView(toRemove.getView());
+    private void onShowModalEnd(ViewController toAdd, ViewController toRemove, CommandListener listener) {
+        ((ViewManager) toRemove.getView().getParent()).removeView(toRemove.getView());
         listener.onSuccess(toAdd.getId());
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -23,8 +23,8 @@ public class ModalStack {
         presenter.setContentLayout(contentLayout);
     }
 
-    public void showModal(ViewController viewController, CommandListener listener) {
-        ViewController toRemove = isEmpty() ? null : peek();
+    public void showModal(ViewController viewController, ViewController root, CommandListener listener) {
+        ViewController toRemove = isEmpty() ? root : peek();
         modals.add(viewController);
         presenter.showModal(viewController, toRemove, listener);
     }

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

@@ -426,6 +426,7 @@ public class NavigatorTest extends BaseTest {
 
         uut.dismissModal(child1.getId(), new CommandListenerAdapter());
         assertThat(parentController.getView().getParent()).isNotNull();
+        verify(parentController, times(2)).onViewAppeared();
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers.modal;
 
 import android.app.Activity;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
@@ -9,9 +10,11 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -19,6 +22,7 @@ import static org.mockito.ArgumentMatchers.eq;
 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 ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -29,14 +33,21 @@ public class ModalPresenterTest extends BaseTest {
     private ModalPresenter uut;
     private FrameLayout contentLayout;
     private ModalAnimator animator;
+    private ViewController rootController;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
-        animator = spy(new ModalAnimator(activity));
-        uut = new ModalPresenter(animator);
+
+        ViewGroup root = new FrameLayout(activity);
+        rootController = Mockito.mock(ParentController.class);
+        when(this.rootController.getView()).then(invocation -> root);
         contentLayout = new FrameLayout(activity);
+        contentLayout.addView(root);
         activity.setContentView(contentLayout);
+
+        animator = spy(new ModalAnimator(activity));
+        uut = new ModalPresenter(animator);
         uut.setContentLayout(contentLayout);
         modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
@@ -52,7 +63,7 @@ public class ModalPresenterTest extends BaseTest {
                 verify(modal1, times(1)).onViewAppeared();
             }
         });
-        uut.showModal(modal1, null, listener);
+        uut.showModal(modal1, rootController, listener);
         verify(animator, times(0)).show(
                 eq(modal1.getView()),
                 eq(modal1.options.animations.showModal),
@@ -97,8 +108,8 @@ public class ModalPresenterTest extends BaseTest {
     public void dismissModal_animatesByDefault() {
         disableShowModalAnimation(modal1);
 
-        uut.showModal(modal1, null, new CommandListenerAdapter());
-        uut.dismissModal(modal1, null, new CommandListenerAdapter() {
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.dismissModal(modal1, rootController, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(modal1, times(1)).onViewDisappear();
@@ -122,8 +133,8 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1);
         disableDismissModalAnimation(modal1);
 
-        uut.showModal(modal1, null, new CommandListenerAdapter());
-        uut.dismissModal(modal1, null, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.dismissModal(modal1, rootController, new CommandListenerAdapter());
         verify(modal1, times(1)).onViewDisappear();
         verify(modal1, times(1)).destroy();
         verify(animator, times(0)).dismiss(any(), any());
@@ -133,7 +144,7 @@ public class ModalPresenterTest extends BaseTest {
     public void dismissModal_previousModalIsAddedBackToHierarchy() {
         disableShowModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, null, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
         assertThat(modal1.getView().getParent()).isNull();
         uut.dismissModal(modal2, modal1, new CommandListenerAdapter());

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -10,9 +10,11 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
+import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import java.util.EmptyStackException;
 
@@ -25,6 +27,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 public class ModalStackTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -38,16 +41,23 @@ public class ModalStackTest extends BaseTest {
     private Activity activity;
     private ModalPresenter presenter;
     private ModalAnimator animator;
+    private ViewController rootController;
 
     @Override
     public void beforeEach() {
         activity = newActivity();
+
         ViewGroup root = new FrameLayout(activity);
-        activity.setContentView(root);
+        rootController = Mockito.mock(ParentController.class);
+        when(this.rootController.getView()).then(invocation -> root);
+        FrameLayout activityContentView = new FrameLayout(activity);
+        activityContentView.addView(root);
+        activity.setContentView(activityContentView);
+
         animator = spy(new ModalAnimatorMock(activity));
         presenter = spy(new ModalPresenter(animator));
         uut = new ModalStack(presenter);
-        uut.setContentLayout(root);
+        uut.setContentLayout(activityContentView);
         modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));
         modal3 = spy(new SimpleViewController(activity, MODAL_ID_3, new Options()));
@@ -57,7 +67,7 @@ public class ModalStackTest extends BaseTest {
     public void modalRefIsSaved() {
         disableShowModalAnimation(modal1);
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.showModal(modal1, listener);
+        uut.showModal(modal1, rootController, listener);
         verify(listener, times(1)).onSuccess(modal1.getId());
         assertThat(findModal(MODAL_ID_1)).isNotNull();
     }
@@ -65,17 +75,17 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void showModal() {
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.showModal(modal1, listener);
+        uut.showModal(modal1, rootController, listener);
         verify(listener, times(1)).onSuccess(modal1.getId());
         assertThat(uut.size()).isOne();
-        verify(presenter, times(1)).showModal(modal1, null, listener);
+        verify(presenter, times(1)).showModal(modal1, rootController, listener);
         assertThat(findModal(MODAL_ID_1)).isNotNull();
     }
 
     @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissModal() {
-        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
         CommandListener listener = new CommandListenerAdapter();
         Runnable onModalWillDismiss = spy(new Runnable() {
             @Override
@@ -107,8 +117,8 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void dismissAllModals() {
-        uut.showModal(modal1, new CommandListenerAdapter());
-        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
         CommandListener listener = spy(new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -132,8 +142,8 @@ public class ModalStackTest extends BaseTest {
     @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissAllModals_onlyTopModalIsAnimated() {
-        uut.showModal(modal1, new CommandListenerAdapter());
-        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
 
         ViewGroup view1 = modal1.getView();
         ViewGroup view2 = modal2.getView();
@@ -154,8 +164,8 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void dismissAllModals_bottomModalsAreDestroyed() {
-        uut.showModal(modal1, new CommandListenerAdapter());
-        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
 
         uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
 
@@ -167,7 +177,7 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void isEmpty() {
         assertThat(uut.isEmpty()).isTrue();
-        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isFalse();
         uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
         assertThat(uut.isEmpty()).isTrue();
@@ -177,7 +187,7 @@ public class ModalStackTest extends BaseTest {
     public void peek() {
         assertThat(uut.isEmpty()).isTrue();
         assertThatThrownBy(() -> uut.peek()).isInstanceOf(EmptyStackException.class);
-        uut.showModal(modal1, new CommandListenerAdapter() {
+        uut.showModal(modal1, rootController, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 assertThat(uut.peek()).isEqualTo(modal1);
@@ -189,8 +199,8 @@ public class ModalStackTest extends BaseTest {
     public void onDismiss_onViewAppearedInvokedOnPreviousModal() {
         disableShowModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, new CommandListenerAdapter());
-        uut.showModal(modal2, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
         uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
@@ -200,9 +210,9 @@ public class ModalStackTest extends BaseTest {
         disableShowModalAnimation(modal1, modal2, modal3);
         disableDismissModalAnimation(modal1, modal2, modal3);
 
-        uut.showModal(modal1, new CommandListenerAdapter());
-        uut.showModal(modal2, new CommandListenerAdapter());
-        uut.showModal(modal3, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        uut.showModal(modal3, rootController, new CommandListenerAdapter());
 
         uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(2);
@@ -220,7 +230,7 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void handleBack_dismissModal() {
         disableDismissModalAnimation(modal1);
-        uut.showModal(modal1, new CommandListenerAdapter());
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
         assertThat(uut.handleBack(new CommandListenerAdapter(), () -> {})).isTrue();
         verify(modal1, times(1)).onViewDisappear();
 
@@ -234,7 +244,10 @@ public class ModalStackTest extends BaseTest {
                 return true;
             }
         });
-        uut.showModal(backHandlingModal, new CommandListenerAdapter());
+        uut.showModal(backHandlingModal, rootController, new CommandListenerAdapter());
+
+        rootController.getView().getViewTreeObserver().dispatchOnGlobalLayout();
+
         assertThat(uut.handleBack(new CommandListenerAdapter(), any())).isTrue();
         verify(backHandlingModal, times(1)).handleBack(any());
         verify(backHandlingModal, times(0)).onViewDisappear();