Fix dismissModal root issue

Add root only if a modal was actually dismissed

e2e/Modals.test.js

@@ -32,7 +32,7 @@ describe('modal', () => {
     await expect(elementById(testIDs.WELCOME_SCREEN_HEADER)).toBeVisible();
   });
 
-  xit('dismiss unknown screen id', async () => {
+  it('dismiss unknown screen id', async () => {
     await elementById(testIDs.SHOW_MODAL_BUTTON).tap();
     await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
     await elementById(testIDs.DISMISS_UNKNOWN_MODAL_BUTTON).tap();

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

@@ -72,7 +72,7 @@ public class Navigator extends ParentController {
 
     @Override
     public void destroy() {
-        modalStack.dismissAllModals(new CommandListenerAdapter());
+        modalStack.dismissAllModals(new CommandListenerAdapter(), () -> {});
         super.destroy();
     }
 
@@ -124,7 +124,11 @@ public class Navigator extends ParentController {
         if (from != null) {
             from.performOnParentStack(stack -> ((StackController) stack).push(viewController, listener));
         } else {
-            listener.onError("Could not push component: " + viewController.getId() + ". Stack with id " + fromId + " was not found.");
+            listener.onError("Could not push component: " +
+                             viewController.getId() +
+                             ". Stack with id " +
+                             fromId +
+                             " was not found.");
         }
     }
 
@@ -183,13 +187,18 @@ public class Navigator extends ParentController {
     }
 
     public void dismissModal(final String componentId, CommandListener listener) {
-        if (modalStack.size() == 1) contentLayout.addView(root.getView());
-        modalStack.dismissModal(componentId, listener);
+        modalStack.dismissModal(componentId,
+                () -> {
+                    if (modalStack.size() == 1) contentLayout.addView(root.getView());
+                },
+                listener
+        );
     }
 
     public void dismissAllModals(CommandListener listener) {
-        if (!modalStack.isEmpty()) contentLayout.addView(root.getView(), 0);
-        modalStack.dismissAllModals(listener);
+        modalStack.dismissAllModals(listener, () -> {
+            if (!modalStack.isEmpty()) contentLayout.addView(root.getView(), 0);
+        });
     }
 
     public void showOverlay(ViewController overlay) {

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

@@ -29,9 +29,10 @@ public class ModalStack {
         presenter.showModal(viewController, toRemove, listener);
     }
 
-    public void dismissModal(String componentId, CommandListener listener) {
+    public void dismissModal(String componentId, Runnable onModalWilDismiss, CommandListener listener) {
         ViewController toDismiss = findModalByComponentId(componentId);
         if (toDismiss != null) {
+            onModalWilDismiss.run();
             ViewController toAdd = isTop(toDismiss) ? get(size() - 2) : null;
             modals.remove(toDismiss);
             presenter.dismissModal(toDismiss, toAdd, listener);
@@ -40,7 +41,7 @@ public class ModalStack {
         }
     }
 
-    public void dismissAllModals(CommandListener listener) {
+    public void dismissAllModals(CommandListener listener, Runnable onModalWilDismiss) {
         if (modals.isEmpty()) {
             listener.onError("Nothing to dismiss");
             return;
@@ -48,7 +49,7 @@ public class ModalStack {
 
         while (!modals.isEmpty()) {
             if (modals.size() == 1) {
-                dismissModal(modals.get(0).getId(), listener);
+                dismissModal(modals.get(0).getId(), onModalWilDismiss, listener);
             } else {
                 modals.get(0).destroy();
                 modals.remove(0);
@@ -61,8 +62,7 @@ public class ModalStack {
         if (peek().handleBack(listener)) {
             return true;
         }
-        onModalWillDismiss.run();
-        dismissModal(peek().getId(), listener);
+        dismissModal(peek().getId(), onModalWillDismiss, listener);
         return true;
     }
 

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

@@ -72,19 +72,35 @@ public class ModalStackTest2 extends BaseTest {
         assertThat(findModal(MODAL_ID_1)).isNotNull();
     }
 
+    @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissModal() {
         uut.showModal(modal1, new CommandListenerAdapter());
         CommandListener listener = new CommandListenerAdapter();
-        uut.dismissModal(modal1.getId(), listener);
+        Runnable onModalWillDismiss = spy(new Runnable() {
+            @Override
+            public void run() {
+                assertThat(modal1.getView().getParent()).isNotNull();
+            }
+        });
+        uut.dismissModal(modal1.getId(), onModalWillDismiss, listener);
         assertThat(findModal(modal1.getId())).isNull();
+        verify(onModalWillDismiss, times(1)).run();
         verify(presenter, times(1)).dismissModal(modal1, null, listener);
     }
 
+    @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissModal_rejectIfModalNotFound() {
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.dismissModal(MODAL_ID_1, listener);
+        Runnable onModalWillDismiss = spy(new Runnable() {
+            @Override
+            public void run() {
+
+            }
+        });
+        uut.dismissModal(MODAL_ID_1, onModalWillDismiss, listener);
+        verify(onModalWillDismiss, times(0)).run();
         verify(listener, times(1)).onError(anyString());
         verifyZeroInteractions(listener);
     }
@@ -101,7 +117,7 @@ public class ModalStackTest2 extends BaseTest {
                 assertThat(uut.isEmpty()).isTrue();
             }
         });
-        uut.dismissAllModals(listener);
+        uut.dismissAllModals(listener, () -> {});
         verify(listener, times(1)).onSuccess(anyString());
         verifyZeroInteractions(listener);
     }
@@ -109,10 +125,11 @@ public class ModalStackTest2 extends BaseTest {
     @Test
     public void dismissAllModals_rejectIfEmpty() {
         CommandListener spy = spy(new CommandListenerAdapter());
-        uut.dismissAllModals(spy);
+        uut.dismissAllModals(spy, () -> {});
         verify(spy, times(1)).onError(any());
     }
 
+    @SuppressWarnings("Convert2Lambda")
     @Test
     public void dismissAllModals_onlyTopModalIsAnimated() {
         uut.showModal(modal1, new CommandListenerAdapter());
@@ -121,8 +138,14 @@ public class ModalStackTest2 extends BaseTest {
         ViewGroup view1 = modal1.getView();
         ViewGroup view2 = modal2.getView();
         CommandListener listener = spy(new CommandListenerAdapter());
-        uut.dismissAllModals(listener);
+        Runnable onModalWillDismiss = spy(new Runnable() {
+            @Override
+            public void run() {
 
+            }
+        });
+        uut.dismissAllModals(listener, onModalWillDismiss);
+        verify(onModalWillDismiss, times(1)).run();
         verify(presenter, times(1)).dismissModal(modal2, null, listener);
         verify(animator, times(0)).dismiss(eq(view1), any());
         verify(animator, times(1)).dismiss(eq(view2), any());
@@ -134,7 +157,7 @@ public class ModalStackTest2 extends BaseTest {
         uut.showModal(modal1, new CommandListenerAdapter());
         uut.showModal(modal2, new CommandListenerAdapter());
 
-        uut.dismissAllModals(new CommandListenerAdapter());
+        uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
 
         verify(modal1, times(1)).destroy();
         verify(modal1, times(1)).onViewDisappear();
@@ -146,7 +169,7 @@ public class ModalStackTest2 extends BaseTest {
         assertThat(uut.isEmpty()).isTrue();
         uut.showModal(modal1, new CommandListenerAdapter());
         assertThat(uut.isEmpty()).isFalse();
-        uut.dismissAllModals(new CommandListenerAdapter());
+        uut.dismissAllModals(new CommandListenerAdapter(), () -> {});
         assertThat(uut.isEmpty()).isTrue();
     }
 
@@ -168,7 +191,7 @@ public class ModalStackTest2 extends BaseTest {
 
         uut.showModal(modal1, new CommandListenerAdapter());
         uut.showModal(modal2, new CommandListenerAdapter());
-        uut.dismissModal(modal2.getId(), new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
         verify(modal1, times(2)).onViewAppeared();
     }
 
@@ -181,7 +204,7 @@ public class ModalStackTest2 extends BaseTest {
         uut.showModal(modal2, new CommandListenerAdapter());
         uut.showModal(modal3, new CommandListenerAdapter());
 
-        uut.dismissModal(modal2.getId(), new CommandListenerAdapter());
+        uut.dismissModal(modal2.getId(), () -> {}, new CommandListenerAdapter());
         assertThat(uut.size()).isEqualTo(2);
         verify(modal2, times(1)).onViewDisappear();
         verify(modal2, times(1)).destroy();