Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Keep caption hidden until expanded view finishes closing

Anand Baburajanab29880c7df9
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 7aa1c90488..08835f5825 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -595,6 +595,8 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
);
const [isCaptionEditing, setIsCaptionEditing] = React.useState(false);
const [isCaptionDialogOpen, setIsCaptionDialogOpen] = React.useState(false);
+ const [hasCaptionDialogExited, setHasCaptionDialogExited] =
+ React.useState(true);
const [captionUpdateActionPhase, setCaptionUpdateActionPhase] =
React.useState<SpaceActionPhase | null>(null);
const [hasCaptionUpdateError, setHasCaptionUpdateError] =
@@ -2736,7 +2738,10 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
<SpaceViewerPhotoOverlay
key={activePostKey}
caption={displayCaption}
- isCaptionHidden={isCaptionDialogOpen}
+ isCaptionHidden={
+ isCaptionDialogOpen ||
+ !hasCaptionDialogExited
+ }
onOpenCaption={() =>
setIsCaptionDialogOpen(true)
}
@@ -2811,7 +2816,9 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
>
<CaptionTransition
in={isCaptionDialogOpen}
+ onEnter={() => setHasCaptionDialogExited(false)}
onEntered={(node) => node.focus({ preventScroll: true })}
+ onExited={() => setHasCaptionDialogExited(true)}
>
<Box
role="dialog"