Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
refactor: change location of viewers
Marc Seitzcae9580b8404
diff --git a/components/PDFViewer.tsx b/components/view/PDFViewer.tsxsimilarity index 100%rename from components/PDFViewer.tsxrename to components/view/PDFViewer.tsxdiff --git a/components/PagesViewer.tsx b/components/view/PagesViewer.tsxsimilarity index 72%rename from components/PagesViewer.tsxrename to components/view/PagesViewer.tsxindex da888a58..f049b936 100644--- a/components/PagesViewer.tsx+++ b/components/view/PagesViewer.tsx@@ -1,6 +1,10 @@import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/20/solid";import { useEffect, useRef, useState } from "react";import { BlurImage } from "@/components/shared/blur-image";+import Image from "next/image";+import LoadingSpinner from "../ui/loading-spinner";++const DEFAULT_PRELOADED_IMAGES_NUM = 10;export default function PagesViewer({pages,@@ -15,13 +19,15 @@ export default function PagesViewer({viewId: string;versionNumber: number;}) {+ const numPages = pages.length;const [pageNumber, setPageNumber] = useState<number>(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 numPages = pages.length;-// Update the previous page number after the effect hook has runuseEffect(() => {pageNumberRef.current = pageNumber;@@ -53,15 +59,37 @@ export default function PagesViewer({};}, []);- // Go to next page- function goToNextPage() {- setPageNumber((prevPageNumber) => prevPageNumber + 1);- }+ useEffect(() => {+ setLoadedImages((prev) =>+ prev.map((loaded, index) =>+ index < DEFAULT_PRELOADED_IMAGES_NUM ? true : loaded,+ ),+ );+ }, []);- // Go to previous page- function goToPreviousPage() {- setPageNumber((prevPageNumber) => prevPageNumber - 1);- }+ // Function to preload next image+ const preloadImage = (index: number) => {+ if (index < numPages && !loadedImages[index]) {+ const newLoadedImages = [...loadedImages];+ newLoadedImages[index] = true;+ setLoadedImages(newLoadedImages);+ }+ };++ // Navigate to previous page+ const goToPreviousPage = () => {+ if (pageNumber > 1) {+ setPageNumber(pageNumber - 1);+ }+ };++ // Navigate to next page and preload next image+ const goToNextPage = () => {+ if (pageNumber < numPages) {+ preloadImage(DEFAULT_PRELOADED_IMAGES_NUM - 1 + pageNumber); // Preload the next image+ setPageNumber(pageNumber + 1);+ }+ };async function trackPageView(duration: number = 0) {await fetch("/api/record_view", {@@ -117,31 +145,25 @@ export default function PagesViewer({</div><div className="flex justify-center mx-auto">- <BlurImage- className="object-contain mx-auto"- src={pages[pageNumber - 1].file}- alt={`Page ${pageNumber}`}- sizes="100vw"- fill- priority={true}- quality={100}- />+ {pages && loadedImages[pageNumber - 1] ? (+ pages.map((page, index) => (+ <Image+ key={index}+ className={`object-contain mx-auto ${+ pageNumber - 1 === index ? "block" : "hidden"+ }`}+ src={loadedImages[index] ? page.file : ""}+ alt={`Page ${index + 1}`}+ priority={loadedImages[index] ? true : false}+ fill+ sizes="100vw"+ quality={100}+ />+ ))+ ) : (+ <LoadingSpinner className="h-20 w-20 text-foreground" />+ )}</div>-- {/* Preload the next few images off-screen */}- {/* <div className="absolute top-0 left-full">- {pages.slice(pageNumber, pageNumber + 3).map((page, idx) => (- <BlurImage- key={idx}- src={page.file}- alt={`Preload Page ${page.pageNumber}`}- quality={100}- sizes="100vw"- fill- className="object-contain"- />- ))}- </div> */}</div></>);diff --git a/components/view/document-view.tsx b/components/view/document-view.tsxindex 06dc695d..dca4e3dd 100644--- a/components/view/document-view.tsx+++ b/components/view/document-view.tsx@@ -1,5 +1,4 @@import React, { useEffect, useRef, useState } from "react";-import PDFViewer from "@/components/PDFViewer";import AccessForm, {DEFAULT_ACCESS_FORM_DATA,DEFAULT_ACCESS_FORM_TYPE,@@ -7,8 +6,9 @@ import AccessForm, {import { usePlausible } from "next-plausible";import { toast } from "sonner";import { LinkWithDocument } from "@/lib/types";-import LoadingSpinner from "../ui/loading-spinner";-import PagesViewer from "@/components/PagesViewer";+import LoadingSpinner from "@/components/ui/loading-spinner";+import PagesViewer from "@/components/view/PagesViewer";+import PDFViewer from "@/components/view/PDFViewer";export type DEFAULT_DOCUMENT_VIEW_TYPE = {viewId: string;@@ -19,10 +19,12 @@ export type DEFAULT_DOCUMENT_VIEW_TYPE = {export default function DocumentView({link,userEmail,+ userId,isProtected,}: {link: LinkWithDocument;userEmail: string | null | undefined;+ userId: string | null | undefined;isProtected: boolean;}) {const { document, emailProtected, password: linkPassword } = link;@@ -53,6 +55,9 @@ export default function DocumentView({email: data.email || userEmail,linkId: link.id,documentId: document.id,+ userId: userId || null,+ documentVersionId: document.versions[0].id,+ hasPages: document.versions[0].hasPages,}),});