diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx index 8fdae748a..5e8883b89 100644 --- a/src/components/middle/composer/Composer.tsx +++ b/src/components/middle/composer/Composer.tsx @@ -148,6 +148,7 @@ type OwnProps = { type StateProps = { + isOnActiveTab: boolean; editingMessage?: ApiMessage; chat?: ApiChat; draft?: ApiDraft; @@ -222,6 +223,7 @@ const SENDING_ANIMATION_DURATION = 350; const APPENDIX = ''; const Composer: FC = ({ + isOnActiveTab, dropAreaState, shouldSchedule, canScheduleUntilOnline, @@ -429,7 +431,7 @@ const Composer: FC = ({ filteredCustomEmojis, insertEmoji, } = useEmojiTooltip( - Boolean(isReady && isForCurrentMessageList && shouldSuggestStickers && !hasAttachments), + Boolean(isReady && isOnActiveTab && isForCurrentMessageList && shouldSuggestStickers && !hasAttachments), getHtml, setHtml, undefined, @@ -443,7 +445,7 @@ const Composer: FC = ({ closeCustomEmojiTooltip, insertCustomEmoji, } = useCustomEmojiTooltip( - Boolean(isReady && isForCurrentMessageList && shouldSuggestCustomEmoji && !hasAttachments), + Boolean(isReady && isOnActiveTab && isForCurrentMessageList && shouldSuggestCustomEmoji && !hasAttachments), getHtml, setHtml, getSelectionRange, @@ -455,7 +457,12 @@ const Composer: FC = ({ isStickerTooltipOpen, closeStickerTooltip, } = useStickerTooltip( - Boolean(isReady && isForCurrentMessageList && shouldSuggestStickers && canSendStickers && !hasAttachments), + Boolean(isReady + && isOnActiveTab + && isForCurrentMessageList + && shouldSuggestStickers + && canSendStickers + && !hasAttachments), getHtml, stickersForEmoji, ); @@ -1582,6 +1589,7 @@ export default memo(withGlobal( const tabState = selectTabState(global); return { + isOnActiveTab: !tabState.isBlurred, editingMessage: selectEditingMessage(global, chatId, threadId, messageListType), connectionState: global.connectionState, replyingToId,