Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
enhance: enhanched logic by removing useEffect & hard router-push
ashrafchowdury6a0ad1fe2269
diff --git a/components/view/PagesViewer.tsx b/components/view/PagesViewer.tsxindex 3c064f77..df32f57e 100644--- a/components/view/PagesViewer.tsx+++ b/components/view/PagesViewer.tsx@@ -6,7 +6,7 @@ import BlankImg from "@/public/_static/blank.gif";import Nav from "./nav";import Toolbar from "./toolbar";import { Brand } from "@prisma/client";-import { useSearchParams, useRouter, usePathname } from "next/navigation";+import { useRouter } from "next/router";const DEFAULT_PRELOADED_IMAGES_NUM = 10;@@ -31,17 +31,20 @@ export default function PagesViewer({versionNumber: number;brand?: Brand;}) {+ const router = useRouter();const numPages = pages.length;- const [pageNumber, setPageNumber] = useState<number>(1); // start on first page+ const pageQuery = router.query.p ? Number(router.query.p) : 1;++ const [pageNumber, setPageNumber] = useState<number>(() =>+ pageQuery <= numPages ? pageQuery : 1,+ ); // start on first page+const [loadedImages, setLoadedImages] = useState<boolean[]>(new Array(numPages).fill(false),);const startTimeRef = useRef(Date.now());const pageNumberRef = useRef<number>(pageNumber);- const searchParams = useSearchParams();- const router = useRouter();- const pathname = usePathname();// Update the previous page number after the effect hook has runuseEffect(() => {@@ -82,17 +85,6 @@ export default function PagesViewer({);}, []);- useEffect(() => {- if (numPages === 1) return;- const getPageNumberFromUrl = Number(searchParams?.get("p"));-- if (searchParams?.has("p") && getPageNumberFromUrl <= numPages) {- setPageNumber(getPageNumberFromUrl);- } else {- updatePageNumberInUrl(1);- }- }, []);-const handleKeyDown = (event: KeyboardEvent) => {switch (event.key) {case "ArrowRight":@@ -135,7 +127,14 @@ export default function PagesViewer({};const updatePageNumberInUrl = (pageNum: number) => {- router.push(`${pathname}?p=${pageNum}`);+ router.push(+ {+ pathname: window.location.pathname,+ query: `p=${pageNum}`,+ },+ undefined,+ { shallow: true },+ );};async function trackPageView(duration: number = 0) {