Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

feat: support modal close on escape kaydown

Smaug67391a6b38f80234
diff --git a/frontend/app/components/ModalManager.vue b/frontend/app/components/ModalManager.vue
index dbaf37a0..48367ca6 100644
--- a/frontend/app/components/ModalManager.vue
+++ b/frontend/app/components/ModalManager.vue
@@ -12,7 +12,7 @@
v-bind="modal.options.props"
class="modal"
:class="modal.options.size"
- @close="(r?:string) => modalManager.close(modal, r)"
+ @close="(r?: string) => modalManager.close(modal, r)"
/>
</div>
</div>
@@ -23,6 +23,15 @@
const modalManager = useModal();
const modals = modalManager.modals;
+
+const handleKeydown = (e: KeyboardEvent) => {
+ if (e.key === 'Escape' && modals.value.length > 0) {
+ modalManager.closeLast('cancel');
+ }
+};
+
+onMounted(() => document.addEventListener('keydown', handleKeydown));
+onUnmounted(() => document.removeEventListener('keydown', handleKeydown));
</script>
<style scoped lang="scss">
diff --git a/frontend/app/composables/useModal.ts b/frontend/app/composables/useModal.ts
index 42e54a39..a3215bff 100644
--- a/frontend/app/composables/useModal.ts
+++ b/frontend/app/composables/useModal.ts
@@ -23,8 +23,14 @@ function close(modal: Modal, reason?: string) {
}
}
+function closeLast(reason?: string) {
+ if (modals.value.length === 0) return;
+ const lastModal = modals.value[modals.value.length - 1]!;
+ close(lastModal, reason);
+}
+
export function useModal() {
- return { add, close, modals };
+ return { add, close, closeLast, modals };
}
interface ModalOptions {
@@ -35,5 +41,8 @@ interface ModalOptions {
}
export class Modal {
- constructor(public component: object, public options: ModalOptions = { size: 'medium' }) {}
+ constructor(
+ public component: object,
+ public options: ModalOptions = { size: 'medium' },
+ ) {}
}