From 84dfaa63635ecda9cbfbfbcfa002754d61f93306 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Tue, 21 Nov 2023 13:00:09 -0800
Subject: [PATCH] EmojiPicker: Don't send on enter, just add emoji to draft
 message

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 ts/components/CompositionArea.tsx   |  1 -
 ts/components/emoji/EmojiButton.tsx |  4 +---
 ts/components/emoji/EmojiPicker.tsx | 10 ++--------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ts/components/CompositionArea.tsx b/ts/components/CompositionArea.tsx
index 4737a488682..71f128cd992 100644
--- a/ts/components/CompositionArea.tsx
+++ b/ts/components/CompositionArea.tsx
@@ -543,7 +543,6 @@ export function CompositionArea({
         <EmojiButton
           emojiButtonApi={emojiButtonRef}
           i18n={i18n}
-          doSend={handleForceSend}
           onPickEmoji={insertEmoji}
           onClose={() => setComposerFocus(conversationId)}
           recentEmojis={recentEmojis}
diff --git a/ts/components/emoji/EmojiButton.tsx b/ts/components/emoji/EmojiButton.tsx
index 7b36e74a29d..5407316c885 100644
--- a/ts/components/emoji/EmojiButton.tsx
+++ b/ts/components/emoji/EmojiButton.tsx
@@ -33,7 +33,7 @@ export type OwnProps = Readonly<{
 export type Props = OwnProps &
   Pick<
     EmojiPickerProps,
-    'doSend' | 'onPickEmoji' | 'onSetSkinTone' | 'recentEmojis' | 'skinTone'
+    'onPickEmoji' | 'onSetSkinTone' | 'recentEmojis' | 'skinTone'
   >;
 
 export type EmojiButtonAPI = Readonly<{
@@ -46,7 +46,6 @@ export const EmojiButton = React.memo(function EmojiButtonInner({
   emoji,
   emojiButtonApi,
   i18n,
-  doSend,
   onClose,
   onOpen,
   onPickEmoji,
@@ -178,7 +177,6 @@ export const EmojiButton = React.memo(function EmojiButtonInner({
                     handleClose();
                   }
                 }}
-                doSend={doSend}
                 onClose={handleClose}
                 skinTone={skinTone}
                 onSetSkinTone={onSetSkinTone}
diff --git a/ts/components/emoji/EmojiPicker.tsx b/ts/components/emoji/EmojiPicker.tsx
index e34db6a700e..d198d7a00ef 100644
--- a/ts/components/emoji/EmojiPicker.tsx
+++ b/ts/components/emoji/EmojiPicker.tsx
@@ -34,7 +34,6 @@ export type EmojiPickDataType = {
 export type OwnProps = {
   readonly i18n: LocalizerType;
   readonly onPickEmoji: (o: EmojiPickDataType) => unknown;
-  readonly doSend?: () => unknown;
   readonly skinTone?: number;
   readonly onSetSkinTone?: (tone: number) => unknown;
   readonly recentEmojis?: ReadonlyArray<string>;
@@ -71,7 +70,6 @@ export const EmojiPicker = React.memo(
     (
       {
         i18n,
-        doSend,
         onPickEmoji,
         skinTone = 0,
         onSetSkinTone,
@@ -153,11 +151,7 @@ export const EmojiPicker = React.memo(
           const { shortName } = e.currentTarget.dataset;
           if ('key' in e) {
             if (e.key === 'Enter') {
-              if (doSend) {
-                doSend();
-                e.stopPropagation();
-                e.preventDefault();
-              } else if (shortName) {
+              if (shortName) {
                 onPickEmoji({ skinTone: selectedTone, shortName });
                 e.stopPropagation();
                 e.preventDefault();
@@ -169,7 +163,7 @@ export const EmojiPicker = React.memo(
             onPickEmoji({ skinTone: selectedTone, shortName });
           }
         },
-        [doSend, onPickEmoji, selectedTone]
+        [onPickEmoji, selectedTone]
       );
 
       // Handle key presses, particularly Escape