From 52189af7786188b4bf60d98c4216ef073e0d3a46 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 16 Aug 2023 15:27:38 +0200 Subject: [PATCH] Contact Greeting: Fix media animation --- src/components/middle/ContactGreeting.scss | 6 +--- src/components/middle/ContactGreeting.tsx | 40 ++++++++-------------- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/components/middle/ContactGreeting.scss b/src/components/middle/ContactGreeting.scss index 539dc51e7..5e4b50c8e 100644 --- a/src/components/middle/ContactGreeting.scss +++ b/src/components/middle/ContactGreeting.scss @@ -32,10 +32,6 @@ height: 10rem; width: 10rem; cursor: var(--custom-cursor, pointer); - - .thumbnail { - height: 10rem; - width: 10rem; - } + position: relative; } } diff --git a/src/components/middle/ContactGreeting.tsx b/src/components/middle/ContactGreeting.tsx index 9b63b3d0d..c8f88484e 100644 --- a/src/components/middle/ContactGreeting.tsx +++ b/src/components/middle/ContactGreeting.tsx @@ -10,9 +10,8 @@ import { getUserIdDividend } from '../../global/helpers'; import useLastCallback from '../../hooks/useLastCallback'; import useLang from '../../hooks/useLang'; -import { useIntersectionObserver } from '../../hooks/useIntersectionObserver'; -import StickerButton from '../common/StickerButton'; +import StickerView from '../common/StickerView'; import './ContactGreeting.scss'; @@ -27,8 +26,6 @@ type StateProps = { currentMessageList?: MessageList; }; -const INTERSECTION_DEBOUNCE_MS = 200; - const ContactGreeting: FC = ({ sticker, connectionState, @@ -42,14 +39,10 @@ const ContactGreeting: FC = ({ } = getActions(); const lang = useLang(); + // eslint-disable-next-line no-null/no-null const containerRef = useRef(null); - const { - observe: observeIntersection, - } = useIntersectionObserver({ - rootRef: containerRef, - debounceMs: INTERSECTION_DEBOUNCE_MS, - }); + useEffect(() => { if (sticker || connectionState !== 'connectionStateReady') { return; @@ -64,35 +57,32 @@ const ContactGreeting: FC = ({ } }, [connectionState, markMessageListRead, lastUnreadMessageId]); - const handleStickerSelect = useLastCallback((selectedSticker: ApiSticker) => { + const handleStickerSelect = useLastCallback(() => { if (!currentMessageList) { return; } - selectedSticker = { - ...selectedSticker, - isPreloadedGlobally: true, - }; - sendMessage({ sticker: selectedSticker, messageList: currentMessageList }); + sendMessage({ + sticker: { + ...sticker!, + isPreloadedGlobally: true, + }, + messageList: currentMessageList, + }); }); return ( -
+

{lang('Conversation.EmptyPlaceholder')}

{lang('Conversation.GreetingText')}

-
+
{sticker && ( - )}