Add previous controller to screen only when dismissing top modal

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers.modal;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.anim.ModalAnimator;
@@ -43,8 +44,12 @@ public class ModalPresenter {
         listener.onSuccess(toAdd.getId());
     }
 
-    public void dismissModal(ViewController toDismiss, ViewController toAdd, CommandListener listener) {
+    public void dismissTopModal(ViewController toDismiss, @NonNull ViewController toAdd, CommandListener listener) {
         toAdd.attachView(content, 0);
+        dismissModal(toDismiss, listener);
+    }
+
+    public void dismissModal(ViewController toDismiss, CommandListener listener) {
         if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
             animator.dismiss(toDismiss.getView(), new AnimatorListenerAdapter() {
                 @Override

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

@@ -32,9 +32,14 @@ public class ModalStack {
     public void dismissModal(String componentId, ViewController root, CommandListener listener) {
         ViewController toDismiss = findModalByComponentId(componentId);
         if (toDismiss != null) {
-            ViewController toAdd = isTop(toDismiss) ? get(size() - 2) : root;
+            boolean isTop = isTop(toDismiss);
             modals.remove(toDismiss);
-            presenter.dismissModal(toDismiss, toAdd, listener);
+            ViewController toAdd = isEmpty() ? root : isTop ? get(size() - 1) : null;
+            if (isTop) {
+                presenter.dismissTopModal(toDismiss, toAdd, listener);
+            } else {
+                presenter.dismissModal(toDismiss, listener);
+            }
         } else {
             listener.onError("Nothing to dismiss");
         }
@@ -83,7 +88,7 @@ public class ModalStack {
     }
 
     private boolean isTop(ViewController modal) {
-        return size() > 1 && peek().equals(modal);
+        return !isEmpty() && peek().equals(modal);
     }
 
     @Nullable

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers.modal;
 
 import android.app.Activity;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
@@ -13,11 +12,9 @@ import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
-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;
@@ -25,7 +22,6 @@ 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";
@@ -37,18 +33,15 @@ public class ModalPresenterTest extends BaseTest {
     private FrameLayout contentLayout;
     private ModalAnimator animator;
     private ViewController rootController;
-    private ChildControllersRegistry childRegistry;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
-        childRegistry = new ChildControllersRegistry();
+        ChildControllersRegistry childRegistry = new ChildControllersRegistry();
 
-        ViewGroup root = new FrameLayout(activity);
-        rootController = Mockito.mock(ParentController.class);
-        when(this.rootController.getView()).then(invocation -> root);
+        rootController = spy(new SimpleViewController(activity, childRegistry, "root", new Options()));
         contentLayout = new FrameLayout(activity);
-        contentLayout.addView(root);
+        contentLayout.addView(rootController.getView());
         activity.setContentView(contentLayout);
 
         animator = spy(new ModalAnimator(activity));
@@ -114,7 +107,7 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1);
 
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal1, rootController, new CommandListenerAdapter() {
+        uut.dismissTopModal(modal1, rootController, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(modal1, times(1)).onViewDisappear();
@@ -130,28 +123,17 @@ public class ModalPresenterTest extends BaseTest {
         modal2.ensureViewIsCreated();
         FrameLayout spy = spy(new FrameLayout(newActivity()));
         uut.setContentLayout(spy);
-        uut.dismissModal(modal1, modal2, new CommandListenerAdapter());
+        uut.dismissTopModal(modal1, modal2, new CommandListenerAdapter());
         verify(spy, times(1)).addView(modal2.getView(), 0);
     }
 
-    @Test
-    public void dismissModal_onViewBroughtToFront_invokedOnPreviousView() {
-        disableShowModalAnimation(modal1, modal2);
-        disableDismissModalAnimation(modal1, modal2);
-
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.showModal(modal2, rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal2, modal1, new CommandListenerAdapter());
-        verify(modal1, times(1)).onViewBroughtToFront();
-    }
-
     @Test
     public void dismissModal_noAnimation() {
         disableShowModalAnimation(modal1);
         disableDismissModalAnimation(modal1);
 
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.dismissModal(modal1, rootController, new CommandListenerAdapter());
+        uut.dismissTopModal(modal1, rootController, new CommandListenerAdapter());
         verify(modal1, times(1)).onViewDisappear();
         verify(modal1, times(1)).destroy();
         verify(animator, times(0)).dismiss(any(), any());
@@ -164,10 +146,27 @@ public class ModalPresenterTest extends BaseTest {
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
         assertThat(modal1.getView().getParent()).isNull();
-        uut.dismissModal(modal2, modal1, new CommandListenerAdapter());
+        uut.dismissTopModal(modal2, modal1, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
 
+    @Test
+    public void dismissModal_previousControllerIsNotAddedIfDismissedModalIsNotTop() {
+        disableShowModalAnimation(modal1, modal2);
+        disableDismissModalAnimation(modal1, modal2);
+
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, modal1, new CommandListenerAdapter());
+        assertThat(modal1.getView().getParent()).isNull();
+        assertThat(rootController.getView().getParent()).isNull();
+
+        uut.dismissModal(modal1, new CommandListenerAdapter());
+        assertThat(rootController.getView().getParent()).isNull();
+
+        uut.dismissTopModal(modal2, rootController, new CommandListenerAdapter());
+        assertThat(rootController.getView().getParent()).isNotNull();
+    }
+
     @Test
     public void dismissModal_previousViewIsNotDetachedIfOverCurrentContext() {
         modal1.options.modal.presentationStyle = ModalPresentationStyle.OverCurrentContext;

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

@@ -11,11 +11,9 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
-import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import org.junit.Test;
-import org.mockito.Mockito;
 
 import java.util.EmptyStackException;
 
@@ -28,7 +26,6 @@ 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";
@@ -50,11 +47,9 @@ public class ModalStackTest extends BaseTest {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
 
-        ViewGroup root = new FrameLayout(activity);
-        rootController = Mockito.mock(ParentController.class);
-        when(this.rootController.getView()).then(invocation -> root);
+        this.rootController = new SimpleViewController(activity, childRegistry, "root", new Options());
         FrameLayout activityContentView = new FrameLayout(activity);
-        activityContentView.addView(root);
+        activityContentView.addView(rootController.getView());
         activity.setContentView(activityContentView);
 
         animator = spy(new ModalAnimatorMock(activity));
@@ -92,7 +87,7 @@ public class ModalStackTest extends BaseTest {
         CommandListener listener = new CommandListenerAdapter();
         uut.dismissModal(modal1.getId(), rootController, listener);
         assertThat(findModal(modal1.getId())).isNull();
-        verify(presenter, times(1)).dismissModal(modal1, rootController, listener);
+        verify(presenter, times(1)).dismissTopModal(modal1, rootController, listener);
     }
 
     @SuppressWarnings("Convert2Lambda")
@@ -111,6 +106,25 @@ public class ModalStackTest extends BaseTest {
         verifyZeroInteractions(listener);
     }
 
+    @Test
+    public void dismissModal_dismissDeepModal() {
+        disableShowModalAnimation(modal1, modal2, modal3);
+        disableDismissModalAnimation(modal1, modal2, modal3);
+
+        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal2, rootController, new CommandListenerAdapter());
+        uut.showModal(modal3, rootController, new CommandListenerAdapter());
+
+        assertThat(rootController.getView().getParent()).isNull();
+        uut.dismissModal(modal1.getId(), rootController, new CommandListenerAdapter());
+        assertThat(rootController.getView().getParent()).isNull();
+
+        uut.dismissModal(modal3.getId(), rootController, new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), rootController, new CommandListenerAdapter());
+        assertThat(rootController.getView().getParent()).isNotNull();
+        assertThat(rootController.getView().isShown()).isTrue();
+    }
+
     @Test
     public void dismissAllModals() {
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
@@ -145,7 +159,7 @@ public class ModalStackTest extends BaseTest {
         ViewGroup view2 = modal2.getView();
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.dismissAllModals(listener, rootController);
-        verify(presenter, times(1)).dismissModal(modal2, rootController, listener);
+        verify(presenter, times(1)).dismissTopModal(modal2, rootController, listener);
         verify(animator, times(0)).dismiss(eq(view1), any());
         verify(animator, times(1)).dismiss(eq(view2), any());
         assertThat(uut.size()).isEqualTo(0);