Fix dismissing modals with sideMenu (wix#7369)

Dismissing a modal that has a `sideMenu` layout exposed a bug we have where we look for the component in the top ViewController presented children, with `sideMenu` it's not enough because its children are not components. Instead, We should recursively look for that component in all of the top viewController children tree. Closes wix#7367
ds-fancode · Nov 24, 2021 · 709ddb8 · 709ddb8
1 parent 5cc967b
commit 709ddb8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/e2e/Modals.test.js b/e2e/Modals.test.js
@@ -203,4 +203,13 @@ describe('modal', () => {
 
     await expect(elementByLabel('Toggle declared modal')).toBeVisible();
   });
+
+  it.e2e('dismiss modal with side menu', async () => {
+    await elementById(TestIDs.MODAL_COMMANDS_BTN).tap();
+    await elementById(TestIDs.SHOW_SIDE_MENU_MODAL).tap();
+    await expect(elementByLabel('StatusBar Options')).toBeVisible();
+    await elementById(TestIDs.DISMISS_MODAL_TOPBAR_BTN).tap();
+    await expect(elementByLabel('StatusBar Options')).not.toBeVisible();
+    await expect(elementByLabel('Modal Commands')).toBeVisible();
+  });
 });
diff --git a/lib/ios/RNNModalManager.m b/lib/ios/RNNModalManager.m
@@ -177,8 +177,7 @@ - (void)removePendingNextModalIfOnTop:(RNNTransitionCompletionBlock)completion
             _dismissModalTransitionDelegate;
     }
 
-    if ((modalToDismiss == topPresentedVC ||
-         [[topPresentedVC childViewControllers] containsObject:modalToDismiss])) {
+    if ((modalToDismiss == topPresentedVC || [topPresentedVC findViewController:modalToDismiss])) {
         [self dismissSearchController:modalToDismiss];
         [modalToDismiss
             dismissViewControllerAnimated:animated

diff --git a/playground/src/screens/ModalCommandsScreen.tsx b/playground/src/screens/ModalCommandsScreen.tsx
@@ -12,6 +12,7 @@ const {
   SHOW_MODAL_PROMISE_RESULT,
   MODAL_DISMISSED_LISTENER_RESULT,
   DISMISS_MODAL_PROMISE_RESULT,
+  SHOW_SIDE_MENU_MODAL,
 } = testIDs;
 
 interface State {
@@ -51,6 +52,11 @@ export default class ModalScreen extends NavigationComponent<NavigationComponent
           {this.state?.dismissModalPromiseResult || ''}
         </Text>
         <Button label="Show Modal" testID={MODAL_BTN} onPress={this.showModal} />
+        <Button
+          label="Show Side Menu Modal"
+          testID={SHOW_SIDE_MENU_MODAL}
+          onPress={this.showSideMenuModal}
+        />
       </Root>
     );
   }
@@ -85,4 +91,6 @@ export default class ModalScreen extends NavigationComponent<NavigationComponent
         });
       });
   };
+
+  showSideMenuModal = () => Navigation.showModal(Screens.StatusBar);
 }
diff --git a/playground/src/screens/ModalScreen.tsx b/playground/src/screens/ModalScreen.tsx
@@ -197,6 +197,7 @@ export default class ModalScreen extends NavigationComponent<Props, State> {
       overlay: { interceptTouchOutside: false },
     });
   };
+
   toggleModal = () => this.setState({ modalVisible: !this.state.modalVisible });
 
   showModalWithTransition = () => {

diff --git a/playground/src/testIDs.ts b/playground/src/testIDs.ts
@@ -28,6 +28,7 @@ const testIDs = {
   DISMISS_MODAL_BTN: 'DISMISS_MODAL_BUTTON',
   DISMISS_REACT_MODAL_BTN: 'DISMISS_REACT_MODAL_BUTTON',
   DISMISS_MODAL_TOPBAR_BTN: 'DISMISS_MODAL_TOPBAR_BTN',
+  SHOW_SIDE_MENU_MODAL: 'SHOW_SIDE_MENU_MODAL',
   CHANGE_LEFT_RIGHT_COLORS: 'CHANGE_LEFT_RIGHT_COLORS',
   MODAL_SCREEN_HEADER: 'MODAL_SCREEN_HEADER',
   ALERT_BUTTON: 'ALERT_BUTTON',