From 5ea1f2e0cf5044df8aeb315c8a24e595467ac150 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sat, 20 Jul 2024 10:35:16 -0700 Subject: [PATCH] fix: ctrl + enter in forms, close #362 --- src/lib/components/lemmy/comment/CommentForm.svelte | 6 +++++- src/lib/components/markdown/MarkdownEditor.svelte | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index 6a8686f1..688f8746 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -17,7 +17,10 @@ export let rows: number = 7 export let placeholder: string | undefined = undefined - const dispatch = createEventDispatcher<{ comment: CommentResponse }>() + const dispatch = createEventDispatcher<{ + comment: CommentResponse + confirm: string + }>() export let value = '' export let actions = true @@ -76,6 +79,7 @@ on:confirm={() => { if (actions) { submit() + dispatch('confirm', value) } }} on:focus diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index 942cd87c..7846f094 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -105,7 +105,11 @@ KeyS: () => wrapSelection('~~', '~~'), KeyH: () => wrapSelection('\n# ', ''), KeyK: () => wrapSelection('[](', ')'), - Enter: () => dispatcher('confirm', value), + Enter: (e: any) => { + dispatcher('confirm', value) + const newEvent = new Event('submit', { cancelable: true }) + e.target.form.dispatchEvent(newEvent) + }, } @@ -295,7 +299,7 @@ overflow-hidden transition-colors" let shortcut = shortcuts[e.code] if (shortcut) { e.preventDefault() - shortcut?.() + shortcut?.(e) } } }}