Skip to content

armgit / ente

Public Imported from GitHub
0

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

Restore page scroll when closing the post viewer

Anand Baburajan3effdbbc3656
diff --git a/web/apps/space/src/components/FileViewer.tsx b/web/apps/space/src/components/FileViewer.tsx
index 496d8f11ae..997be0b6cb 100644
--- a/web/apps/space/src/components/FileViewer.tsx
+++ b/web/apps/space/src/components/FileViewer.tsx
@@ -675,6 +675,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
? Fade
: SpaceBottomSheetTransition;
const viewerRootRef = React.useRef<HTMLDivElement | null>(null);
+ const pageScrollRef = React.useRef({ left: 0, top: 0 });
const viewerHeaderRef = React.useRef<HTMLDivElement>(null);
const stableViewportSizeRef = React.useRef<ViewerViewportSize>(
currentViewerViewportSize(null),
@@ -822,6 +823,7 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
);
src = element.currentSrc || element.src;
}
+ window.scrollTo({ ...pageScrollRef.current, behavior: "instant" });
const origin =
item && !isDraftPost && !item.video
? findViewerOrigin(viewerOriginKey(item.spaceId, item.postId))
@@ -1780,9 +1782,10 @@ export const SpaceFileViewer: React.FC<SpaceFileViewerProps> = ({
};
}, [headerHeight, isDraftPost, viewerViewportSize]);
- React.useEffect(() => {
+ React.useLayoutEffect(() => {
if (typeof document == "undefined") return;
+ pageScrollRef.current = { left: window.scrollX, top: window.scrollY };
const previousOverflow = document.body.style.overflow;
document.body.style.overflow = "hidden";
return () => {