From e3f7f0efdad7320117ebd109b2c2630e2b7fecc8 Mon Sep 17 00:00:00 2001 From: Ian Philips Date: Wed, 13 Jul 2022 08:44:27 -0600 Subject: [PATCH] Revert "Disable enter to submit on mobile group chat" This reverts commit b3f4c2f0098c923673b5bbe10e0ba08a56821833. --- web/components/feed/feed-comments.tsx | 14 +++++--------- web/components/groups/group-chat.tsx | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/web/components/feed/feed-comments.tsx b/web/components/feed/feed-comments.tsx index 198e9c36..c327d8af 100644 --- a/web/components/feed/feed-comments.tsx +++ b/web/components/feed/feed-comments.tsx @@ -31,7 +31,6 @@ import { track } from 'web/lib/service/analytics' import { useEvent } from 'web/hooks/use-event' import { Tipper } from '../tipper' import { CommentTipMap, CommentTips } from 'web/hooks/use-tip-txns' -import useMediaQuery from 'react-query/types/devtools/useMediaQuery' export function FeedCommentThread(props: { contract: Contract @@ -473,7 +472,7 @@ export function CommentInputTextArea(props: { isSubmitting: boolean setRef?: (ref: HTMLTextAreaElement) => void presetId?: string - enterToSubmitOnDesktop?: boolean + enterToSubmit?: boolean }) { const { isReply, @@ -485,9 +484,9 @@ export function CommentInputTextArea(props: { presetId, isSubmitting, replyToUsername, - enterToSubmitOnDesktop, + enterToSubmit, } = props - const isMobile = innerWidth < 768 + const memoizedSetComment = useEvent(setComment) useEffect(() => { if (!replyToUsername || !user || replyToUsername === user.username) return @@ -508,7 +507,7 @@ export function CommentInputTextArea(props: { placeholder={ isReply ? 'Write a reply... ' - : enterToSubmitOnDesktop + : enterToSubmit ? 'Send a message' : 'Write a comment...' } @@ -517,10 +516,7 @@ export function CommentInputTextArea(props: { disabled={isSubmitting} onKeyDown={(e) => { if ( - (enterToSubmitOnDesktop && - e.key === 'Enter' && - !e.shiftKey && - !isMobile) || + (enterToSubmit && e.key === 'Enter' && !e.shiftKey) || (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) ) { e.preventDefault() diff --git a/web/components/groups/group-chat.tsx b/web/components/groups/group-chat.tsx index 2cf2d73d..c98f1af1 100644 --- a/web/components/groups/group-chat.tsx +++ b/web/components/groups/group-chat.tsx @@ -165,7 +165,7 @@ export function GroupChat(props: { replyToUsername={replyToUsername} submitComment={submitMessage} isSubmitting={isSubmitting} - enterToSubmitOnDesktop={true} + enterToSubmit={true} setRef={setInputRef} />