Merge branch 'only-close-last-opened-modal-esc-key' into 'develop'

Only close the last opened modal when the esc key is pressed

Closes baserow#3495

See merge request baserow/baserow!3795

Author: bram2w

changelog/entries/unreleased/bug/3495_fix_pressing_esc_in_file_field_modal_over_the_edit_file_moda.json

@@ -0,0 +1,8 @@
+{
+  "type": "bug",
+  "message": "Only close the last opened modal when the esc key is pressed.",
+  "domain": "core",
+  "issue_number": 3495,
+  "bullet_points": [],
+  "created_at": "2025-10-14"
+}

web-frontend/modules/core/components/Modal.vue

@@ -158,11 +158,6 @@ export default {
       default: false,
       required: false,
     },
-    canClose: {
-      type: Boolean,
-      default: true,
-      required: false,
-    },
     collapsibleRightSidebar: {
       type: Boolean,
       default: false,

web-frontend/modules/core/mixins/baseModal.js

@@ -9,8 +9,16 @@ export default {
       // when you release the mouse at different coordinates. Therefore we expect this
       // variable to be set on mousedown to be consistent.
       downElement: null,
+      isModal: true,
     }
   },
+  props: {
+    canClose: {
+      type: Boolean,
+      default: true,
+      required: false,
+    },
+  },
   mounted() {
     this.$bus.$on('close-modals', this.hide)
   },
@@ -68,6 +76,16 @@ export default {
         return
       }
 
+      const hasOpenModalAsChild = this.moveToBody.children.some((child) => {
+        return child.isModal === true && child.open === true
+      })
+      // When the `esc` key is pressed and multiple modals are open, then we don't
+      // want to close them all. Only last opened modal should close. This will make
+      // sure that if there is an open child modal, it will not hide the parent modal.
+      if (hasOpenModalAsChild) {
+        return
+      }
+
       // This is a temporary fix. What happens is the modal is opened by a context menu
       // item and the user closes the modal, the element is first deleted and then the
       // click outside event of the context is fired. It then checks if the click was