danog/telegram-tt
1
0
Fork 0
mirror of https://github.com/danog/telegram-tt.git synced 2024-12-03 18:17:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sticker Tooltip: Clean input; Emoji Tooltip: Save to recent (#1305)

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-07-21 17:44:44 +03:00
parent bedd7727cd
commit bf6c6ef035
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/middle/composer/Composer.tsx
View File

@ -538,7 +538,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
resetComposer, stopRecordingVoice, showDialog, slowMode, isAdmin, sendMessage, forwardMessages, lang, resetComposer, stopRecordingVoice, showDialog, slowMode, isAdmin, sendMessage, forwardMessages, lang,
]); ]);
const handleStickerSelect = useCallback((sticker: ApiSticker) => { const handleStickerSelect = useCallback((sticker: ApiSticker, shouldPreserveInput = false) => {
sticker = { sticker = {
...sticker, ...sticker,
isPreloadedGlobally: true, isPreloadedGlobally: true,
@ -549,7 +549,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
openCalendar(); openCalendar();
} else { } else {
sendMessage({ sticker }); sendMessage({ sticker });
requestAnimationFrame(() => { resetComposer(true); }); requestAnimationFrame(() => { resetComposer(shouldPreserveInput); });
} }
}, [shouldSchedule, openCalendar, sendMessage, resetComposer]); }, [shouldSchedule, openCalendar, sendMessage, resetComposer]);

7
src/components/middle/composer/EmojiTooltip.tsx
View File

@ -105,6 +105,11 @@ const EmojiTooltip: FC<OwnProps> = ({
} }
}, [addRecentEmoji, emojis, onEmojiSelect, selectedIndex]); }, [addRecentEmoji, emojis, onEmojiSelect, selectedIndex]);
const handleClick = useCallback((native: string, id: string) => {
onEmojiSelect(native);
addRecentEmoji({ emoji: id });
}, [addRecentEmoji, onEmojiSelect]);
useEffect(() => (isOpen ? captureKeyboardListeners({ useEffect(() => (isOpen ? captureKeyboardListeners({
onEsc: onClose, onEsc: onClose,
onLeft: (e: KeyboardEvent) => handleArrowKey(-1, e), onLeft: (e: KeyboardEvent) => handleArrowKey(-1, e),
@ -138,7 +143,7 @@ const EmojiTooltip: FC<OwnProps> = ({
key={emoji.id} key={emoji.id}
emoji={emoji} emoji={emoji}
focus={selectedIndex === index} focus={selectedIndex === index}
onClick={onEmojiSelect} onClick={handleClick}
/> />
)) ))
) : shouldRender ? ( ) : shouldRender ? (

8
src/components/middle/composer/SymbolMenu.tsx
View File

@ -32,7 +32,7 @@ export type OwnProps = {
onLoad: () => void; onLoad: () => void;
onClose: () => void; onClose: () => void;
onEmojiSelect: (emoji: string) => void; onEmojiSelect: (emoji: string) => void;
onStickerSelect: (sticker: ApiSticker) => void; onStickerSelect: (sticker: ApiSticker, shouldPreserveInput?: boolean) => void;
onGifSelect: (gif: ApiVideo) => void; onGifSelect: (gif: ApiVideo) => void;
onRemoveSymbol: () => void; onRemoveSymbol: () => void;
onSearchOpen: (type: 'stickers' | 'gifs') => void; onSearchOpen: (type: 'stickers' | 'gifs') => void;
@ -114,6 +114,10 @@ const SymbolMenu: FC<OwnProps & StateProps> = ({
onSearchOpen(type); onSearchOpen(type);
}, [onClose, onSearchOpen]); }, [onClose, onSearchOpen]);
const handleStickerSelect = useCallback((sticker: ApiSticker) => {
onStickerSelect(sticker, true);
}, [onStickerSelect]);
const lang = useLang(); const lang = useLang();
const { canSendStickers, canSendGifs } = allowedAttachmentOptions; const { canSendStickers, canSendGifs } = allowedAttachmentOptions;
@ -133,7 +137,7 @@ const SymbolMenu: FC<OwnProps & StateProps> = ({
className="picker-tab" className="picker-tab"
loadAndPlay={canSendStickers ? isOpen && (isActive || isFrom) : false} loadAndPlay={canSendStickers ? isOpen && (isActive || isFrom) : false}
canSendStickers={canSendStickers} canSendStickers={canSendStickers}
onStickerSelect={onStickerSelect} onStickerSelect={handleStickerSelect}
/> />
); );
case SymbolMenuTabs.GIFs: case SymbolMenuTabs.GIFs: