From bcf8c91c4b3d1eaf048504760b077e28ac535f9a Mon Sep 17 00:00:00 2001
From: Kasper <kasperkh.kh@gmail.com>
Date: Tue, 8 Oct 2024 03:23:00 +0200
Subject: [PATCH] Fix "escape" closing multiple modals

---
 src/components/Modal.svelte | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/Modal.svelte b/src/components/Modal.svelte
index 8642886..db32676 100644
--- a/src/components/Modal.svelte
+++ b/src/components/Modal.svelte
@@ -19,13 +19,11 @@
 	$modal_count += 1
 	onDestroy(() => {
 		$modal_count -= 1
+		dialog_el.close()
 	})
 
 	onMount(() => {
 		dialog_el.showModal()
-		return () => {
-			dialog_el.close()
-		}
 	})
 
 	// Prevent clicks where the mousedown or mouseup happened on a child element. This could've
@@ -53,8 +51,11 @@
 	}}
 	on:keydown
 	on:keydown={(e) => {
-		if (check_shortcut(e, 'Escape') && cancel_on_escape) {
-			on_cancel()
+		if (check_shortcut(e, 'Escape')) {
+			e.preventDefault()
+			if (cancel_on_escape) {
+				on_cancel()
+			}
 		}
 	}}
 	on:keydown|self={(e) => {