From fa08832fca88e24d6fabea1860c993bedda1651f Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Mon, 21 Jun 2021 03:52:26 +0300 Subject: [PATCH] Remove redundant freezes --- src/components/middle/MessageList.tsx | 14 +------------- src/components/middle/MessageScroll.tsx | 12 ------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx index 4c0abbc14..0919dbc85 100644 --- a/src/components/middle/MessageList.tsx +++ b/src/components/middle/MessageList.tsx @@ -162,7 +162,6 @@ const MessageList: FC = ({ const [hasFocusing, setHasFocusing] = useState(Boolean(focusingId)); const areMessagesLoaded = Boolean(messageIds); - const isFocusing = Boolean(focusingId); useOnChange(() => { // We only need it first time when message list appears @@ -183,7 +182,7 @@ const MessageList: FC = ({ }, [firstUnreadId]); const { - observe: observeIntersectionForMedia, freeze: freezeForMedia, unfreeze: unfreezeForMedia, + observe: observeIntersectionForMedia, } = useIntersectionObserver({ rootRef: containerRef, throttleMs: INTERSECTION_THROTTLE_FOR_MEDIA, @@ -236,16 +235,6 @@ const MessageList: FC = ({ memoFocusingIdRef.current = focusingId; }, [focusingId]); - useOnChange(() => { - if (isFocusing) { - freezeForMedia(); - freezeForReading(); - } else { - unfreezeForReading(); - unfreezeForMedia(); - } - }, [isFocusing]); - const { observe: observeIntersectionForAnimatedStickers } = useIntersectionObserver({ rootRef: containerRef, throttleMs: INTERSECTION_THROTTLE_FOR_MEDIA, @@ -545,7 +534,6 @@ const MessageList: FC = ({ containerRef={containerRef} className="messages-container" messageIds={messageIds || [lastMessage!.id]} - isFocusing={isFocusing} loadMoreForwards={loadMoreForwards} loadMoreBackwards={loadMoreBackwards} isViewportNewest={isViewportNewest} diff --git a/src/components/middle/MessageScroll.tsx b/src/components/middle/MessageScroll.tsx index cee4a48f1..8c248ad01 100644 --- a/src/components/middle/MessageScroll.tsx +++ b/src/components/middle/MessageScroll.tsx @@ -10,7 +10,6 @@ type OwnProps = { containerRef: MutableRefObject; className: string; messageIds: number[]; - isFocusing: boolean; loadMoreForwards?: NoneToVoidFunction; loadMoreBackwards?: NoneToVoidFunction; isViewportNewest?: boolean; @@ -27,7 +26,6 @@ const MessageScroll: FC = ({ containerRef, className, messageIds, - isFocusing, loadMoreForwards, loadMoreBackwards, isViewportNewest, @@ -67,8 +65,6 @@ const MessageScroll: FC = ({ const { observe: observeIntersection, - freeze: freezeForLoadMore, - unfreeze: unfreezeForLoadMore, } = useIntersectionObserver({ rootRef: containerRef, margin: MESSAGE_LIST_SENSITIVE_AREA, @@ -117,14 +113,6 @@ const MessageScroll: FC = ({ useOnIntersect(fabTriggerRef, observeIntersectionForNotch); - useOnChange(() => { - if (isFocusing) { - freezeForLoadMore(); - } else { - unfreezeForLoadMore(); - } - }, [isFocusing]); - // Workaround for FAB and notch flickering with tall incoming message useOnChange(() => { freezeForFab();