@file-viewer/renderer-pdf 2.2.6 → 2.2.7

package/dist/pdf.js

@@ -343,6 +343,8 @@ export default async function renderPdf(buffer, target, context) {
     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;
@@ -1068,11 +1070,16 @@ export default async function renderPdf(buffer, target, context) {
         pendingUserRotationAnchor = null;
         rotationOperationVersion += 1;
     };
-    const restoreUserRotationAnchor = (anchor, operationVersion) => {
+    const cancelPendingUserZoomRestore = () => {
+        if (!pendingUserZoomAnchor) {
+            return;
+        }
+        pendingUserZoomAnchor = null;
+        zoomOperationVersion += 1;
+    };
+    const restorePdfPageAnchor = (anchor, isActive, release) => {
         const apply = () => {
-            if (destroyed ||
-                operationVersion !== rotationOperationVersion ||
-                pendingUserRotationAnchor !== anchor) {
+            if (destroyed || !isActive()) {
                 return false;
             }
             const pageElement = getPdfPageElement(anchor.page);
@@ -1106,14 +1113,19 @@ export default async function renderPdf(buffer, target, context) {
         });
         targetWindow.setTimeout(() => {
             apply();
-            if (operationVersion === rotationOperationVersion &&
-                pendingUserRotationAnchor === anchor) {
-                pendingUserRotationAnchor = null;
-            }
+            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');
@@ -1283,6 +1295,7 @@ export default async function renderPdf(buffer, target, context) {
         if (!pdfContext.viewer) {
             return;
         }
+        cancelPendingUserZoomRestore();
         userScrollIntentUntil = 0;
         suppressProgrammaticScrollEvents();
         autoFitWidth = true;
@@ -1294,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') {
@@ -1381,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) {
@@ -1407,6 +1438,7 @@ export default async function renderPdf(buffer, target, context) {
         markFitInteraction(source);
         const normalized = normalizeRotation(rotation);
         if (source === 'user' && pdfContext.viewer) {
+            cancelPendingUserZoomRestore();
             pendingUserRotationAnchor || (pendingUserRotationAnchor = captureCurrentPdfPageAnchor());
         }
         else {
@@ -1474,6 +1506,7 @@ export default async function renderPdf(buffer, target, context) {
         }
         if (source === 'user') {
             cancelPendingUserRotationRestore();
+            cancelPendingUserZoomRestore();
         }
         markFitInteraction(source);
         const nextPage = Math.min(pageCount, Math.max(1, pageNumber));
@@ -1721,8 +1754,9 @@ export default async function renderPdf(buffer, target, context) {
                 }
             });
             eventBus.on('pagechanging', ({ pageNumber }) => {
-                if (pendingUserRotationAnchor && pageNumber !== pendingUserRotationAnchor.page) {
-                    currentPage = pendingUserRotationAnchor.page;
+                const pendingPageAnchor = pendingUserRotationAnchor || pendingUserZoomAnchor;
+                if (pendingPageAnchor && pageNumber !== pendingPageAnchor.page) {
+                    currentPage = pendingPageAnchor.page;
                     syncUi();
                     return;
                 }
@@ -1945,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.6",
+  "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.6",
+    "@file-viewer/core": "2.2.7",
     "@fontsource-variable/noto-sans-sc": "5.2.10",
     "pdf-lib": "1.17.1",
     "pdfjs-dist": "5.4.624"