From: Adam Dullage <redacted>
Date: Fri, 17 May 2024 11:38:53 +0000 (+0100)
Subject: Prevent tag menu closure also closing search modal
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ada68e0ebef0598e4789620fd102e274a10a0107;p=flatnotes.git

Prevent tag menu closure also closing search modal
---

diff --git a/client/partials/SearchInput.vue b/client/partials/SearchInput.vue
index 4b79d0f..7afac2e 100644
--- a/client/partials/SearchInput.vue
+++ b/client/partials/SearchInput.vue
@@ -91,6 +91,7 @@ function keydownHandler(event) {
       tagChosen(tagMatches.value[tagMenuIndex.value]);
     } else if (event.key === "Escape") {
       tagMenuVisible.value = false;
+      event.stopPropagation();  // Prevent the modal from closing when the tag menu is open.
     }
   }
   // Tag Menu Closed
@@ -112,9 +113,7 @@ function search() {
     });
     emit("search");
   } else {
-    toast.add(
-      getToastOptions("Please enter a search term.", "Error", "error"),
-    );
+    toast.add(getToastOptions("Please enter a search term.", "Error", "error"));
   }
 }
 
diff --git a/client/partials/SearchModal.vue b/client/partials/SearchModal.vue
index 7cbdd84..ce26daa 100644
--- a/client/partials/SearchModal.vue
+++ b/client/partials/SearchModal.vue
@@ -4,7 +4,7 @@
       large
       placeholder="Search by title, content or #tags..."
       @search="toggleHandler"
-      @keyup.esc="toggleHandler"
+      @keydown.esc="toggleHandler"
     />
   </Modal>
 </template>