Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: improve according to react best practices
Marc Seitz9ed691d131f6
diff --git a/components/view/viewer/pages-horizontal-viewer.tsx b/components/view/viewer/pages-horizontal-viewer.tsxindex 34ff3711..4e3dbea8 100644--- a/components/view/viewer/pages-horizontal-viewer.tsx+++ b/components/view/viewer/pages-horizontal-viewer.tsx@@ -24,7 +24,12 @@ import { AwayPoster } from "./away-poster";import "@/styles/custom-viewer-styles.css";-const DEFAULT_PRELOADED_IMAGES_NUM = 5;+const scaleCoordinates = (coords: string, scaleFactor: number) => {+ return coords+ .split(",")+ .map((coord) => parseFloat(coord) * scaleFactor)+ .join(",");+};export default function PagesHorizontalViewer({pages,@@ -96,21 +101,18 @@ export default function PagesHorizontalViewer({pageQuery >= 1 && pageQuery <= numPages ? pageQuery : 1,); // start on first page- const [loadedImages, setLoadedImages] = useState<boolean[]>(- new Array(numPages).fill(false),- );-const [submittedFeedback, setSubmittedFeedback] = useState<boolean>(false);const [accountCreated, setAccountCreated] = useState<boolean>(false);const [scale, setScale] = useState<number>(1);- const initialViewedPages = Array.from({ length: numPages }, (_, index) => ({- pageNumber: index + 1,- duration: 0,- }));-- const [viewedPages, setViewedPages] =- useState<{ pageNumber: number; duration: number }[]>(initialViewedPages);+ const [viewedPages, setViewedPages] = useState<+ { pageNumber: number; duration: number }[]+ >(() =>+ Array.from({ length: numPages }, (_, index) => ({+ pageNumber: index + 1,+ duration: 0,+ })),+ );const [isWindowFocused, setIsWindowFocused] = useState(true);@@ -125,6 +127,7 @@ export default function PagesHorizontalViewer({const [imageDimensions, setImageDimensions] = useState<Record<number, { width: number; height: number }>>({});+const {trackPageViewSafely,resetTrackingState,@@ -138,13 +141,6 @@ export default function PagesHorizontalViewer({externalStartTimeRef: startTimeRef,});- const scaleCoordinates = (coords: string, scaleFactor: number) => {- return coords- .split(",")- .map((coord) => parseFloat(coord) * scaleFactor)- .join(",");- };-const getScaleFactor = ({naturalHeight,scaleFactor,@@ -185,7 +181,7 @@ export default function PagesHorizontalViewer({return () => {window.removeEventListener("resize", updateImageDimensions);};- }, [loadedImages, pageNumber]);+ }, [pageNumber]);// Update the previous page number after the effect hook has runuseEffect(() => {@@ -350,37 +346,10 @@ export default function PagesHorizontalViewer({};}, [screenshotProtectionEnabled]);- useEffect(() => {- const start = Math.max(0, pageNumber - 1 - DEFAULT_PRELOADED_IMAGES_NUM);- const end = Math.min(numPages - 1, pageNumber - 1 + DEFAULT_PRELOADED_IMAGES_NUM);- setLoadedImages((prev) => {- const next = [...prev];- for (let i = start; i <= end; i++) {- next[i] = true;- }- return next;- });- ensurePagesLoaded?.(pageNumber);- }, []); // Run once on mount-useEffect(() => {ensurePagesLoaded?.(pageNumber);}, [pageNumber, ensurePagesLoaded]);- useEffect(() => {- setLoadedImages((prev) => {- let changed = false;- const next = [...prev];- pages.forEach((page, index) => {- if (page.file && !next[index]) {- next[index] = true;- changed = true;- }- });- return changed ? next : prev;- });- }, [pages]);-useEffect(() => {// Remove token and email query parameters on component mountconst removeQueryParams = (queries: string[]) => {@@ -403,15 +372,6 @@ export default function PagesHorizontalViewer({}}, []); // Run once on mount- // Function to preload next image- const preloadImage = (index: number) => {- if (index < numPages && !loadedImages[index]) {- const newLoadedImages = [...loadedImages];- newLoadedImages[index] = true;- setLoadedImages(newLoadedImages);- }- };-const goToPreviousPage = () => {if (pageNumber <= 1) return;if (enableQuestion && feedback && pageNumber === numPagesWithFeedback) {@@ -426,9 +386,6 @@ export default function PagesHorizontalViewer({return;}- // Preload previous pages every 4 pages in advanced- preloadImage(pageNumber - 4);-const duration = getActiveDuration();trackPageViewSafely({linkId,@@ -442,7 +399,6 @@ export default function PagesHorizontalViewer({isPreview,});- // decrement page numbersetPageNumber(pageNumber - 1);startTimeRef.current = Date.now();};@@ -456,9 +412,6 @@ export default function PagesHorizontalViewer({return;}- // Preload the next page every 2 pages in advanced- preloadImage(pageNumber + 2);-const duration = getActiveDuration();trackPageViewSafely({linkId,@@ -472,7 +425,6 @@ export default function PagesHorizontalViewer({isPreview,});- // increment page numbersetPageNumber(pageNumber + 1);startTimeRef.current = Date.now();};@@ -515,18 +467,6 @@ export default function PagesHorizontalViewer({isPreview,});- // Preload target page and 2 pages on either side- const startPage = Math.max(0, targetPage - 2 - 1);- const endPage = Math.min(numPages - 1, targetPage + 2 - 1);-- setLoadedImages((prev) => {- const newLoadedImages = [...prev];- for (let i = startPage; i <= endPage; i++) {- newLoadedImages[i] = true;- }- return newLoadedImages;- });-setPageNumber(targetPage);pageNumberRef.current = targetPage;@@ -682,9 +622,7 @@ export default function PagesHorizontalViewer({e.stopPropagation();}}>- {pageNumber <= numPagesWithAccountCreation &&- pages &&- loadedImages[pageNumber - 1]+ {pageNumber <= numPagesWithAccountCreation && pages? pages.map((page, index) => (<divkey={index}@@ -718,9 +656,8 @@ export default function PagesHorizontalViewer({}}useMap={`#page-map-${index + 1}`}src={- loadedImages[index] && page.file- ? page.file- : "https://www.papermark.com/_static/blank.gif"+ page.file ||+ "https://www.papermark.com/_static/blank.gif"}alt={`Page ${index + 1}`}/>diff --git a/components/view/viewer/pages-vertical-viewer.tsx b/components/view/viewer/pages-vertical-viewer.tsxindex 195c852b..56d73648 100644--- a/components/view/viewer/pages-vertical-viewer.tsx+++ b/components/view/viewer/pages-vertical-viewer.tsx@@ -23,8 +23,12 @@ import { AwayPoster } from "./away-poster";import "@/styles/custom-viewer-styles.css";-const DEFAULT_PRELOADED_IMAGES_NUM = 5;-const JUMP_WINDOW_SIZE = 3; // Number of pages to load before and after target when jumping+const scaleCoordinates = (coords: string, scaleFactor: number) => {+ return coords+ .split(",")+ .map((coord) => parseFloat(coord) * scaleFactor)+ .join(",");+};const calculateOptimalWidth = (containerWidth: number,@@ -112,21 +116,18 @@ export default function PagesVerticalViewer({pageQuery >= 1 && pageQuery <= numPages ? pageQuery : 1,); // start on first page- const [loadedImages, setLoadedImages] = useState<boolean[]>(- new Array(numPages).fill(false),- );-const [submittedFeedback, setSubmittedFeedback] = useState<boolean>(false);const [accountCreated, setAccountCreated] = useState<boolean>(false);const [scale, setScale] = useState<number>(1);- const initialViewedPages = Array.from({ length: numPages }, (_, index) => ({- pageNumber: index + 1,- duration: 0,- }));-- const [viewedPages, setViewedPages] =- useState<{ pageNumber: number; duration: number }[]>(initialViewedPages);+ const [viewedPages, setViewedPages] = useState<+ { pageNumber: number; duration: number }[]+ >(() =>+ Array.from({ length: numPages }, (_, index) => ({+ pageNumber: index + 1,+ duration: 0,+ })),+ );const [isWindowFocused, setIsWindowFocused] = useState(true);@@ -145,13 +146,6 @@ export default function PagesVerticalViewer({const { isMobile, isTablet } = useMediaQuery();- const scaleCoordinates = (coords: string, scaleFactor: number) => {- return coords- .split(",")- .map((coord) => parseFloat(coord) * scaleFactor)- .join(",");- };-const getScaleFactor = ({naturalHeight,scaleFactor,@@ -192,7 +186,7 @@ export default function PagesVerticalViewer({return () => {window.removeEventListener("resize", updateImageDimensions);};- }, [loadedImages, pageNumber]);+ }, [pageNumber]);// Update the previous page number after the effect hook has runuseEffect(() => {@@ -370,37 +364,10 @@ export default function PagesVerticalViewer({};}, [screenshotProtectionEnabled]);- useEffect(() => {- const start = Math.max(0, pageNumber - 1 - DEFAULT_PRELOADED_IMAGES_NUM);- const end = Math.min(numPages - 1, pageNumber - 1 + DEFAULT_PRELOADED_IMAGES_NUM);- setLoadedImages((prev) => {- const next = [...prev];- for (let i = start; i <= end; i++) {- next[i] = true;- }- return next;- });- ensurePagesLoaded?.(pageNumber);- }, []); // Run once on mount-useEffect(() => {ensurePagesLoaded?.(pageNumber);}, [pageNumber, ensurePagesLoaded]);- useEffect(() => {- setLoadedImages((prev) => {- let changed = false;- const next = [...prev];- pages.forEach((page, index) => {- if (page.file && !next[index]) {- next[index] = true;- changed = true;- }- });- return changed ? next : prev;- });- }, [pages]);-useEffect(() => {// Remove token and email query parameters on component mountconst removeQueryParams = (queries: string[]) => {@@ -427,22 +394,8 @@ export default function PagesVerticalViewer({const container = containerRef.current;if (!container) return;- const scrollPosition = container.scrollTop;- const containerHeight = container.clientHeight;const containerRect = container.getBoundingClientRect();- // Always preload surrounding pages during scroll- const startPage = Math.max(0, pageNumber - 2 - 1);- const endPage = Math.min(numPages - 1, pageNumber + 2 - 1);-- setLoadedImages((prev) => {- const newLoadedImages = [...prev];- for (let i = startPage; i <= endPage; i++) {- newLoadedImages[i] = true;- }- return newLoadedImages;- });-// Find which page is most visible in the viewportlet maxVisiblePage = pageNumber;let maxVisibleArea = 0;@@ -499,15 +452,6 @@ export default function PagesVerticalViewer({}};- // Function to preload next image- const preloadImage = (index: number) => {- if (index < numPages && !loadedImages[index]) {- const newLoadedImages = [...loadedImages];- newLoadedImages[index] = true;- setLoadedImages(newLoadedImages);- }- };-const goToPreviousPage = () => {if (pageNumber <= 1) return;if (enableQuestion && feedback && pageNumber === numPagesWithFeedback) {@@ -530,9 +474,6 @@ export default function PagesVerticalViewer({return;}- // Preload previous pages- preloadImage(pageNumber - 4);-const duration = getActiveDuration();trackPageViewSafely({linkId,@@ -577,9 +518,6 @@ export default function PagesVerticalViewer({return;}- // Preload the next page- preloadImage(pageNumber + 2);-const duration = getActiveDuration();trackPageViewSafely({linkId,@@ -649,23 +587,6 @@ export default function PagesVerticalViewer({isPreview,});- // Only load a bounded window around the target page to avoid unbounded downloads- // Unloaded pages will render as placeholders with correct height from metadata- const startPage = Math.max(0, targetPage - 1 - JUMP_WINDOW_SIZE);- const endPage = Math.min(- numPages - 1,- targetPage - 1 + JUMP_WINDOW_SIZE,- );-- setLoadedImages((prev) => {- const newLoadedImages = [...prev];- // Only load pages within the window around targetPage- for (let i = startPage; i <= endPage; i++) {- newLoadedImages[i] = true;- }- return newLoadedImages;- });-setPageNumber(targetPage);pageNumberRef.current = targetPage;@@ -747,17 +668,20 @@ export default function PagesVerticalViewer({};}, [handleKeyDown, goToNextPage, goToPreviousPage]);+ const handleScrollRef = useRef(handleScroll);+ handleScrollRef.current = handleScroll;+useEffect(() => {- if (containerRef.current) {- containerRef.current.addEventListener("scroll", handleScroll);- }+ const container = containerRef.current;+ if (!container) return;++ const handler = () => handleScrollRef.current();+ container.addEventListener("scroll", handler, { passive: true });return () => {- if (containerRef.current) {- containerRef.current.removeEventListener("scroll", handleScroll);- }+ container.removeEventListener("scroll", handler);};- }, [handleScroll]);+ }, []);const [containerWidth, setContainerWidth] = useState<number>(0);@@ -899,7 +823,7 @@ export default function PagesVerticalViewer({page.metadata.width: 600; // fallback height- if (!loadedImages[index] || !page.file) {+ if (!page.file) {// Render a placeholder div with correct dimensions to preserve scroll heightreturn (<div