Merge pull request #4121 from traPtitech/feat/close_file_modal_on_esc

モーダルを開いてるときにescキーを押したら閉じられるように
traPtitech · Jan 6, 2024 · ca5871a · ca5871a
2 parents 7133947 + 018ef2b
commit ca5871a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/UI/FilterInput.vue b/src/components/UI/FilterInput.vue
@@ -16,7 +16,7 @@
       :data-disable-ime="$boolAttr(disableIme)"
       :enterkeyhint="enterkeyhint"
       @input="onInput"
-      @keydown.esc="reset"
+      @keydown.esc.stop="reset"
       @keydown.enter="emit('enter')"
     />
   </div>

diff --git a/src/store/ui/modal.ts b/src/store/ui/modal.ts
@@ -148,6 +148,12 @@ const useModalStorePinia = defineStore('ui/modal', () => {
     }
   }
 
+  window.addEventListener('keydown', e => {
+    if (e.key === 'Escape' && shouldShowModal.value) {
+      popModal()
+    }
+  })
+
   return {
     isOnInitialModalRoute,
     isClearingModal,