From aca4322526e498e825fcec7068bc949d323e13d1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 31 May 2023 20:01:30 -0500 Subject: [PATCH] MediaModal: support not having a status --- .../ui/components/modals/media-modal.tsx | 85 ++++++++++--------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/app/soapbox/features/ui/components/modals/media-modal.tsx b/app/soapbox/features/ui/components/modals/media-modal.tsx index 18c24a5da..1348e1e96 100644 --- a/app/soapbox/features/ui/components/modals/media-modal.tsx +++ b/app/soapbox/features/ui/components/modals/media-modal.tsx @@ -70,7 +70,7 @@ const MediaModal: React.FC = (props) => { const [next, setNext] = useState(); const [index, setIndex] = useState(null); const [navigationHidden, setNavigationHidden] = useState(false); - const [isFullScreen, setIsFullScreen] = useState(false); + const [isFullScreen, setIsFullScreen] = useState(!status); const hasMultipleImages = media.size > 1; @@ -219,12 +219,14 @@ const MediaModal: React.FC = (props) => { }; }, [index]); - if (!actualStatus && isLoaded) { - return ( - - ); - } else if (!actualStatus) { - return ; + if (status) { + if (!actualStatus && isLoaded) { + return ( + + ); + } else if (!actualStatus) { + return ; + } } return ( @@ -255,21 +257,22 @@ const MediaModal: React.FC = (props) => { - setIsFullScreen(!isFullScreen)} - /> + {status && ( + setIsFullScreen(!isFullScreen)} + /> + )} @@ -311,31 +314,35 @@ const MediaModal: React.FC = (props) => { )} - - - + {actualStatus && ( + + + + )} - + {actualStatus && ( + + )} );