diff --git a/src/components/mediaViewer/MediaViewer.tsx b/src/components/mediaViewer/MediaViewer.tsx index 944e3f48c..94e3dea7d 100644 --- a/src/components/mediaViewer/MediaViewer.tsx +++ b/src/components/mediaViewer/MediaViewer.tsx @@ -304,6 +304,7 @@ const MediaViewer: FC = ({ id="MediaViewer" isOpen={isOpen} isHidden={isHidden} + shouldAnimateFirstRender noCloseTransition={shouldSkipHistoryAnimations} >
diff --git a/src/components/ui/ShowTransition.tsx b/src/components/ui/ShowTransition.tsx index 628057b27..819284d12 100644 --- a/src/components/ui/ShowTransition.tsx +++ b/src/components/ui/ShowTransition.tsx @@ -13,6 +13,7 @@ type OwnProps = { className?: string; onClick?: (e: React.MouseEvent) => void; noCloseTransition?: boolean; + shouldAnimateFirstRender?: boolean; children: React.ReactNode; }; @@ -25,6 +26,7 @@ const ShowTransition: FC = ({ onClick, children, noCloseTransition, + shouldAnimateFirstRender, }) => { const prevIsOpen = usePrevious(isOpen); const prevChildren = usePrevious(children); @@ -34,7 +36,11 @@ const ShowTransition: FC = ({ shouldRender, transitionClassNames, } = useShowTransition( - isOpen && !isHidden, undefined, isFirstRender, isCustom ? false : undefined, noCloseTransition, + isOpen && !isHidden, + undefined, + isFirstRender && !shouldAnimateFirstRender, + isCustom ? false : undefined, + noCloseTransition, ); if (prevIsOpen && !isOpen) {