mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

EmojiPicker: Don't send on enter, just add emoji to draft message

Browse source
This commit is contained in:
Scott Nonnenberg 2023-11-21 11:15:39 -08:00 • committed by GitHub
parent 3c12a0aad0
commit 7a182636d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ts/components/CompositionArea.tsx
View file

@ -543,7 +543,6 @@ export function CompositionArea({
<EmojiButton <EmojiButton
emojiButtonApi={emojiButtonRef} emojiButtonApi={emojiButtonRef}
i18n={i18n} i18n={i18n}
doSend={handleForceSend}
onPickEmoji={insertEmoji} onPickEmoji={insertEmoji}
onClose={() => setComposerFocus(conversationId)} onClose={() => setComposerFocus(conversationId)}
recentEmojis={recentEmojis} recentEmojis={recentEmojis}

4
ts/components/emoji/EmojiButton.tsx
View file

@ -33,7 +33,7 @@ export type OwnProps = Readonly<{
export type Props = OwnProps & export type Props = OwnProps &
Pick< Pick<
EmojiPickerProps, EmojiPickerProps,
'doSend' | 'onPickEmoji' | 'onSetSkinTone' | 'recentEmojis' | 'skinTone' 'onPickEmoji' | 'onSetSkinTone' | 'recentEmojis' | 'skinTone'
>; >;
export type EmojiButtonAPI = Readonly<{ export type EmojiButtonAPI = Readonly<{
@ -46,7 +46,6 @@ export const EmojiButton = React.memo(function EmojiButtonInner({
emoji, emoji,
emojiButtonApi, emojiButtonApi,
i18n, i18n,
doSend,
onClose, onClose,
onOpen, onOpen,
onPickEmoji, onPickEmoji,
@ -178,7 +177,6 @@ export const EmojiButton = React.memo(function EmojiButtonInner({
handleClose(); handleClose();
} }
}} }}
doSend={doSend}
onClose={handleClose} onClose={handleClose}
skinTone={skinTone} skinTone={skinTone}
onSetSkinTone={onSetSkinTone} onSetSkinTone={onSetSkinTone}

10
ts/components/emoji/EmojiPicker.tsx
View file

@ -34,7 +34,6 @@ export type EmojiPickDataType = {
export type OwnProps = { export type OwnProps = {
readonly i18n: LocalizerType; readonly i18n: LocalizerType;
readonly onPickEmoji: (o: EmojiPickDataType) => unknown; readonly onPickEmoji: (o: EmojiPickDataType) => unknown;
readonly doSend?: () => unknown;
readonly skinTone?: number; readonly skinTone?: number;
readonly onSetSkinTone?: (tone: number) => unknown; readonly onSetSkinTone?: (tone: number) => unknown;
readonly recentEmojis?: ReadonlyArray<string>; readonly recentEmojis?: ReadonlyArray<string>;
@ -71,7 +70,6 @@ export const EmojiPicker = React.memo(
( (
{ {
i18n, i18n,
doSend,
onPickEmoji, onPickEmoji,
skinTone = 0, skinTone = 0,
onSetSkinTone, onSetSkinTone,
@ -153,11 +151,7 @@ export const EmojiPicker = React.memo(
const { shortName } = e.currentTarget.dataset; const { shortName } = e.currentTarget.dataset;
if ('key' in e) { if ('key' in e) {
if (e.key === 'Enter') { if (e.key === 'Enter') {
if (doSend) { if (shortName) {
doSend();
e.stopPropagation();
e.preventDefault();
} else if (shortName) {
onPickEmoji({ skinTone: selectedTone, shortName }); onPickEmoji({ skinTone: selectedTone, shortName });
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@ -169,7 +163,7 @@ export const EmojiPicker = React.memo(
onPickEmoji({ skinTone: selectedTone, shortName }); onPickEmoji({ skinTone: selectedTone, shortName });
} }
}, },
[doSend, onPickEmoji, selectedTone] [onPickEmoji, selectedTone]
); );
// Handle key presses, particularly Escape // Handle key presses, particularly Escape