From 9bd7fe5905055a96bcfe879947c59ed4d4252877 Mon Sep 17 00:00:00 2001 From: Austin Chen Date: Wed, 31 Aug 2022 21:44:13 -0700 Subject: [PATCH] Submit comments on ctrl/cmd-enter --- web/components/feed/feed-comments.tsx | 12 ++++++------ web/components/groups/group-chat.tsx | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/components/feed/feed-comments.tsx b/web/components/feed/feed-comments.tsx index 1aebb27b..196d90e1 100644 --- a/web/components/feed/feed-comments.tsx +++ b/web/components/feed/feed-comments.tsx @@ -384,6 +384,7 @@ export function CommentInput(props: { user={user} submitComment={submitComment} isSubmitting={isSubmitting} + submitOn={'mod-enter'} presetId={id} /> @@ -398,7 +399,8 @@ export function CommentInputTextArea(props: { upload: Parameters[0]['upload'] submitComment: (id?: string) => void isSubmitting: boolean - submitOnEnter?: boolean + // mod-enter = ctrl-enter or cmd-enter + submitOn?: 'enter' | 'mod-enter' presetId?: string }) { const { @@ -408,11 +410,9 @@ export function CommentInputTextArea(props: { submitComment, presetId, isSubmitting, - submitOnEnter, + submitOn, replyToUser, } = props - const isMobile = (useWindowSize().width ?? 0) < 768 // TODO: base off input device (keybord vs touch) - useEffect(() => { editor?.setEditable(!isSubmitting) }, [isSubmitting, editor]) @@ -431,10 +431,10 @@ export function CommentInputTextArea(props: { editorProps: { handleKeyDown: (view, event) => { if ( - submitOnEnter && + submitOn && event.key === 'Enter' && !event.shiftKey && - (!isMobile || event.ctrlKey || event.metaKey) && + (submitOn === 'enter' || event.ctrlKey || event.metaKey) && // mention list is closed !(view.state as any).mention$.active ) { diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx index 9a60c9c7..0b5991e5 100644 --- a/web/components/groups/group-chat.tsx +++ b/web/components/groups/group-chat.tsx @@ -175,7 +175,7 @@ export function GroupChat(props: { replyToUser={replyToUser} submitComment={submitMessage} isSubmitting={isSubmitting} - submitOnEnter + submitOn={'enter'} />