MediaViewer: Fixed navigate

2024-02-01 16:37:42 +05:00 · 2024-02-01 16:37:42 +05:00 · 0fef451f28
commit 0fef451f28
parent b3558f0f66
2 changed files with 9 additions and 2 deletions
--- a/packages/client/src/pages/Home/Hooks/useFiles.js
+++ b/packages/client/src/pages/Home/Hooks/useFiles.js
@ -95,7 +95,8 @@ const useFiles = ({
  };

  React.useEffect(() => {
-    if (isAccountsPage || isSettingsPage) return;
+    if (isAccountsPage || isSettingsPage || location.state?.fromMediaViewer)
+      return;

    if (location.pathname === "/") setIsLoading(true, true, true);
    else setIsLoading(true, false, false);
--- a/packages/client/src/pages/Home/MediaViewer/index.js
+++ b/packages/client/src/pages/Home/MediaViewer/index.js
@ -205,7 +205,13 @@ const FilesMediaViewer = (props) => {
        setScrollToItem({ id: targetFile.id, type: "file" });
      }

-      window.history.replaceState(null, "", url);
+      navigate(url, {
+        replace: true,
+        state: {
+          ...location.state,
+          fromMediaViewer: true,
+        },
+      });
    },
    [
      files,