@file-viewer/renderer-pdf 2.2.5 → 2.2.7

package/dist/pdf.js

@@ -341,6 +341,10 @@ export default async function renderPdf(buffer, target, context) {
     let suppressScrollEventUntil = 0;
     let userScrollIntentUntil = 0;
     let scrollStateFrame = 0;
+    let rotationOperationVersion = 0;
+    let pendingUserRotationAnchor = null;
+    let zoomOperationVersion = 0;
+    let pendingUserZoomAnchor = null;
     let pdfSearchState = createPdfSearchState();
     let pdfMatchesCount = { current: 0, total: 0 };
     let pdfSearchOptions;
@@ -457,9 +461,22 @@ export default async function renderPdf(buffer, target, context) {
         visit(outlineItems, 0);
         return result;
     };
+    const navScrollTopByMode = {
+        pages: 0,
+        outline: 0,
+    };
     const renderNavList = () => {
+        if (navList.classList.contains('pdf-page-list')) {
+            navScrollTopByMode.pages = navList.scrollTop;
+        }
+        else if (navList.classList.contains('pdf-outline-list')) {
+            navScrollTopByMode.outline = navList.scrollTop;
+        }
         navList.replaceChildren();
         navList.className = navMode === 'pages' ? 'pdf-page-list' : 'pdf-outline-list';
+        const restoreNavScrollTop = () => {
+            navList.scrollTop = navScrollTopByMode[navMode];
+        };
         if (navMode === 'pages') {
             thumbnailObserver === null || thumbnailObserver === void 0 ? void 0 : thumbnailObserver.disconnect();
             for (let page = 1; page <= pageCount; page += 1) {
@@ -479,6 +496,7 @@ export default async function renderPdf(buffer, target, context) {
                 button.addEventListener('click', () => goToPage(page, 'page-click', 'user'));
                 navList.append(button);
             }
+            restoreNavScrollTop();
             return;
         }
         const entries = flattenedOutlineItems();
@@ -501,6 +519,7 @@ export default async function renderPdf(buffer, target, context) {
         if (!entries.length) {
             navList.append(createElement(documentRef, 'div', 'pdf-outline-empty', t('pdf.nav.outlineEmpty')));
         }
+        restoreNavScrollTop();
     };
     const paintPdfThumbnail = (pageNumber, thumb) => {
         const imageUrl = pdfThumbnails.get(pageNumber);
@@ -1020,7 +1039,93 @@ export default async function renderPdf(buffer, target, context) {
         autoFitWidth = false;
         activeFitRequest = null;
     };
+    const getPdfPageElement = (pageNumber) => {
+        var _a;
+        const pageView = (_a = pdfContext.viewer) === null || _a === void 0 ? void 0 : _a.getPageView(pageNumber - 1);
+        return (pageView === null || pageView === void 0 ? void 0 : pageView.div) ||
+            pdfViewerRoot.querySelector(`.page[data-page-number="${pageNumber}"]`);
+    };
+    const captureCurrentPdfPageAnchor = () => {
+        const pageElement = getPdfPageElement(currentPage);
+        if (!pageElement) {
+            return null;
+        }
+        const containerRect = container.getBoundingClientRect();
+        const pageRect = pageElement.getBoundingClientRect();
+        const pageHeight = pageElement.offsetHeight || pageRect.height;
+        if (pageHeight <= 0) {
+            return null;
+        }
+        const pageTop = pageRect.top - containerRect.top + container.scrollTop;
+        const inPageRatio = (container.scrollTop - pageTop) / pageHeight;
+        return {
+            page: currentPage,
+            inPageRatio: Math.max(0, Math.min(1, inPageRatio)),
+        };
+    };
+    const cancelPendingUserRotationRestore = () => {
+        if (!pendingUserRotationAnchor) {
+            return;
+        }
+        pendingUserRotationAnchor = null;
+        rotationOperationVersion += 1;
+    };
+    const cancelPendingUserZoomRestore = () => {
+        if (!pendingUserZoomAnchor) {
+            return;
+        }
+        pendingUserZoomAnchor = null;
+        zoomOperationVersion += 1;
+    };
+    const restorePdfPageAnchor = (anchor, isActive, release) => {
+        const apply = () => {
+            if (destroyed || !isActive()) {
+                return false;
+            }
+            const pageElement = getPdfPageElement(anchor.page);
+            if (!pageElement) {
+                return false;
+            }
+            const containerRect = container.getBoundingClientRect();
+            const pageRect = pageElement.getBoundingClientRect();
+            const pageHeight = pageElement.offsetHeight || pageRect.height;
+            if (pageHeight <= 0) {
+                return false;
+            }
+            const pageTop = pageRect.top - containerRect.top + container.scrollTop;
+            const maxTop = Math.max(0, container.scrollHeight - container.clientHeight);
+            suppressProgrammaticScrollEvents();
+            container.scrollTop = Math.max(0, Math.min(maxTop, pageTop + anchor.inPageRatio * pageHeight));
+            currentPage = anchor.page;
+            syncUi();
+            return true;
+        };
+        apply();
+        void waitForPaint(targetWindow)
+            .then(() => {
+            apply();
+            return waitForPaint(targetWindow);
+        })
+            .then(apply);
+        targetWindow.requestAnimationFrame(() => {
+            apply();
+            targetWindow.requestAnimationFrame(apply);
+        });
+        targetWindow.setTimeout(() => {
+            apply();
+            if (isActive())
+                release();
+        }, 180);
+    };
+    const restoreUserRotationAnchor = (anchor, operationVersion) => restorePdfPageAnchor(anchor, () => operationVersion === rotationOperationVersion && pendingUserRotationAnchor === anchor, () => {
+        pendingUserRotationAnchor = null;
+    });
+    const restoreUserZoomAnchor = (anchor, operationVersion) => restorePdfPageAnchor(anchor, () => operationVersion === zoomOperationVersion && pendingUserZoomAnchor === anchor, () => {
+        pendingUserZoomAnchor = null;
+    });
     const recordUserScrollIntent = () => {
+        cancelPendingUserRotationRestore();
+        cancelPendingUserZoomRestore();
         userScrollIntentUntil = Date.now() + 750;
         suppressScrollEventUntil = 0;
         markFitInteraction('user');
@@ -1190,6 +1295,7 @@ export default async function renderPdf(buffer, target, context) {
         if (!pdfContext.viewer) {
             return;
         }
+        cancelPendingUserZoomRestore();
         userScrollIntentUntil = 0;
         suppressProgrammaticScrollEvents();
         autoFitWidth = true;
@@ -1201,6 +1307,7 @@ export default async function renderPdf(buffer, target, context) {
     };
     const applyPdfFit = async (request) => {
         var _a, _b, _c;
+        cancelPendingUserZoomRestore();
         userScrollIntentUntil = 0;
         activeFitRequest = { ...request };
         if (!pdfContext.viewer || loadStatus !== 'ready') {
@@ -1288,13 +1395,30 @@ export default async function renderPdf(buffer, target, context) {
             fitToWidth('viewer');
         });
     };
+    const setAnchoredScale = (scale, action, source) => {
+        if (!pdfContext.viewer) {
+            return;
+        }
+        cancelPendingUserRotationRestore();
+        pendingUserZoomAnchor || (pendingUserZoomAnchor = captureCurrentPdfPageAnchor());
+        const pageAnchor = pendingUserZoomAnchor;
+        const operationVersion = ++zoomOperationVersion;
+        if (pageAnchor) {
+            suppressProgrammaticScrollEvents();
+            currentPage = pageAnchor.page;
+        }
+        setScale(scale, action, source);
+        if (pageAnchor) {
+            restoreUserZoomAnchor(pageAnchor, operationVersion);
+        }
+    };
     const zoomIn = (source = 'user') => {
         markFitInteraction(source);
-        setScale(currentScale + SCALE_STEP, 'zoom-in', source);
+        setAnchoredScale(currentScale + SCALE_STEP, 'zoom-in', source);
     };
     const zoomOut = (source = 'user') => {
         markFitInteraction(source);
-        setScale(currentScale - SCALE_STEP, 'zoom-out', source);
+        setAnchoredScale(currentScale - SCALE_STEP, 'zoom-out', source);
     };
     const reapplyFitAfterLayout = (source, notifyViewState = true) => {
         if (activeFitRequest) {
@@ -1313,6 +1437,19 @@ export default async function renderPdf(buffer, target, context) {
     const applyRotation = (rotation, action = 'rotation-change', source = 'viewer', notifyViewState = true) => {
         markFitInteraction(source);
         const normalized = normalizeRotation(rotation);
+        if (source === 'user' && pdfContext.viewer) {
+            cancelPendingUserZoomRestore();
+            pendingUserRotationAnchor || (pendingUserRotationAnchor = captureCurrentPdfPageAnchor());
+        }
+        else {
+            cancelPendingUserRotationRestore();
+        }
+        const pageAnchor = source === 'user' ? pendingUserRotationAnchor : null;
+        const operationVersion = ++rotationOperationVersion;
+        if (pageAnchor) {
+            suppressProgrammaticScrollEvents();
+            currentPage = pageAnchor.page;
+        }
         currentRotation = normalized;
         pdfThumbnails.clear();
         pendingPdfThumbnails.clear();
@@ -1323,6 +1460,9 @@ export default async function renderPdf(buffer, target, context) {
         pdfContext.viewer.pagesRotation = normalized;
         void waitForPaint(targetWindow).then(() => {
             var _a;
+            if (operationVersion !== rotationOperationVersion) {
+                return;
+            }
             const refocusBoundingBoxes = () => {
                 if (pdfBoundingBoxController.hasBoxes()) {
                     void waitForPaint(targetWindow)
@@ -1331,6 +1471,9 @@ export default async function renderPdf(buffer, target, context) {
                 }
             };
             if (reapplyFitAfterLayout(source, notifyViewState)) {
+                if (pageAnchor) {
+                    restoreUserRotationAnchor(pageAnchor, operationVersion);
+                }
                 if (notifyViewState) {
                     emitViewStateChange(action, source);
                 }
@@ -1340,6 +1483,9 @@ export default async function renderPdf(buffer, target, context) {
             (_a = pdfContext.viewer) === null || _a === void 0 ? void 0 : _a.update();
             scheduleLegacyPageDimensionPatch();
             syncUi();
+            if (pageAnchor) {
+                restoreUserRotationAnchor(pageAnchor, operationVersion);
+            }
             if (notifyViewState) {
                 emitViewStateChange(action, source);
             }
@@ -1358,6 +1504,10 @@ export default async function renderPdf(buffer, target, context) {
         if (!pdfContext.viewer || !pageCount) {
             return;
         }
+        if (source === 'user') {
+            cancelPendingUserRotationRestore();
+            cancelPendingUserZoomRestore();
+        }
         markFitInteraction(source);
         const nextPage = Math.min(pageCount, Math.max(1, pageNumber));
         runWithStableHorizontalScroll(() => {
@@ -1604,6 +1754,12 @@ export default async function renderPdf(buffer, target, context) {
                 }
             });
             eventBus.on('pagechanging', ({ pageNumber }) => {
+                const pendingPageAnchor = pendingUserRotationAnchor || pendingUserZoomAnchor;
+                if (pendingPageAnchor && pageNumber !== pendingPageAnchor.page) {
+                    currentPage = pendingPageAnchor.page;
+                    syncUi();
+                    return;
+                }
                 const previousPage = currentPage;
                 currentPage = pageNumber;
                 syncUi();
@@ -1823,12 +1979,12 @@ export default async function renderPdf(buffer, target, context) {
         },
         resetZoom: () => {
             markFitInteraction('api');
-            setScale(1, 'zoom-reset', 'api');
+            setAnchoredScale(1, 'zoom-reset', 'api');
             return getPdfZoomState();
         },
         setZoom: scale => {
             markFitInteraction('api');
-            setScale(scale, 'zoom-change', 'api');
+            setAnchoredScale(scale, 'zoom-change', 'api');
             return getPdfZoomState();
         },
         fit: applyPdfFit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-pdf",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "private": false,
   "type": "module",
   "description": "Standalone PDF renderer plugin for File Viewer powered by PDF.js.",
@@ -54,7 +54,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "2.2.5",
+    "@file-viewer/core": "2.2.7",
     "@fontsource-variable/noto-sans-sc": "5.2.10",
     "pdf-lib": "1.17.1",
     "pdfjs-dist": "5.4.624"