From b44a1396db0bc19fdec4e3ead5e09caa4d5189db Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sun, 19 Mar 2023 22:31:24 -0500 Subject: [PATCH] Avatar: Fix missing opacity animation (#2818) --- src/components/main/Main.tsx | 4 ++-- src/hooks/useShowTransition.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/main/Main.tsx b/src/components/main/Main.tsx index 21d5ff095..16ffc5bf5 100644 --- a/src/components/main/Main.tsx +++ b/src/components/main/Main.tsx @@ -347,7 +347,7 @@ const Main: FC = ({ }, [lastSyncTime, openChat]); const leftColumnTransition = useShowTransition( - isLeftColumnOpen, undefined, true, undefined, shouldSkipHistoryAnimations, + isLeftColumnOpen, undefined, true, undefined, shouldSkipHistoryAnimations, undefined, true, ); const willAnimateLeftColumnRef = useRef(false); const forceUpdate = useForceUpdate(); @@ -376,7 +376,7 @@ const Main: FC = ({ }, [animationLevel, forceUpdate, isLeftColumnOpen]); const rightColumnTransition = useShowTransition( - isRightColumnOpen, undefined, true, undefined, shouldSkipHistoryAnimations, + isRightColumnOpen, undefined, true, undefined, shouldSkipHistoryAnimations, undefined, true, ); const willAnimateRightColumnRef = useRef(false); const [isNarrowMessageList, setIsNarrowMessageList] = useState(isRightColumnOpen); diff --git a/src/hooks/useShowTransition.ts b/src/hooks/useShowTransition.ts index bd759ef68..1d305bac8 100644 --- a/src/hooks/useShowTransition.ts +++ b/src/hooks/useShowTransition.ts @@ -6,15 +6,16 @@ const CLOSE_DURATION = 350; const useShowTransition = ( isOpen = false, onCloseTransitionEnd?: () => void, - noOpenTransition = false, + noFirstOpenTransition = false, className: string | false = 'fast', noCloseTransition = false, closeDuration = CLOSE_DURATION, + noOpenTransition = false, ) => { const [isClosed, setIsClosed] = useState(!isOpen); const closeTimeoutRef = useRef(); // СSS class should be added in a separate tick to turn on CSS transition. - const [hasOpenClassName, setHasOpenClassName] = useState(isOpen && noOpenTransition); + const [hasOpenClassName, setHasOpenClassName] = useState(isOpen && noFirstOpenTransition); if (isOpen) { setIsClosed(false);