Fix escape handling in Safari

probablykasper · Jan 10, 2024 · 51b262f · 51b262f
1 parent 82d07ad
commit 51b262f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Next
+- Fix escape handling in Safari
+
 ## 1.3.0 - 2024 Jan 10
 - Add `class` property
 - Fix escape shortcut handling

diff --git a/src/lib/Modal.svelte b/src/lib/Modal.svelte
@@ -65,13 +65,20 @@
 	}}
 	on:keydown
 	on:keydown={(e) => {
+		// Escape handling required for Chromium
 		if (e.key === 'Escape') {
 			e.preventDefault()
 			if (!noEscapeHandling) {
 				onCancel()
 			}
 		}
 	}}
+	on:cancel={(e) => {
+		// Escape handling required for Safari
+		e.preventDefault()
+		if (noEscapeHandling) return
+		onCancel()
+	}}
 	on:keydown|self={(e) => {
 		if (form && e.key === 'Enter' && !e.metaKey) {
 			form()