@file-viewer/renderer-pdf 2.1.16 → 2.1.18

package/dist/pdf.js

@@ -1,6 +1,6 @@
 import { getDocument, GlobalWorkerOptions, PDFWorker as PdfJsWorker, PixelsPerInch, } from 'pdfjs-dist/legacy/build/pdf.mjs';
 import { EventBus, GenericL10n, PDFFindController, PDFLinkService, PDFViewer, } from 'pdfjs-dist/legacy/web/pdf_viewer.mjs';
-import { registerFileViewerSearchProvider, registerFileViewerZoomProvider, unregisterFileViewerSearchProvider, unregisterFileViewerZoomProvider, registerFileViewerViewStateProvider, unregisterFileViewerViewStateProvider, createFileViewerZoomChangeEmitter, createFileViewerViewStateChange, createFileViewerViewStateChangeEmitter, createFileViewerTranslator, buildPrintPageStyle, formatCssPixels, DEFAULT_PDF_RANGE_CHUNK_SIZE, resolveFileViewerLocale, } from '@file-viewer/core';
+import { registerFileViewerSearchProvider, registerFileViewerZoomProvider, unregisterFileViewerSearchProvider, unregisterFileViewerZoomProvider, registerFileViewerViewStateProvider, unregisterFileViewerViewStateProvider, createFileViewerZoomChangeEmitter, createFileViewerViewStateChange, createFileViewerViewStateChangeEmitter, createFileViewerTranslator, buildPrintPageStyle, formatCssPixels, DEFAULT_PDF_RANGE_CHUNK_SIZE, resolveFileViewerLocale, resolveFileViewerFitScale, } from '@file-viewer/core';
 import { DEFAULT_FILE_VIEWER_PDF_WORKER_PATH, resolveFileViewerPdfAssetUrls, } from '@file-viewer/core/assets';
 import { pdfViewerStyle } from './pdfStyles.js';
 export const DEFAULT_FILE_VIEWER_PDF_WORKER_URL = DEFAULT_FILE_VIEWER_PDF_WORKER_PATH;
@@ -242,6 +242,7 @@ export default async function renderPdf(buffer, target, context) {
     let viewStateApplyVersion = 0;
     let activeViewStateApplyVersion = 0;
     let pendingInitialViewState = initialViewState;
+    let pendingFitRequest = null;
     let suppressScrollEventUntil = 0;
     let scrollStateFrame = 0;
     let pdfSearchState = createPdfSearchState();
@@ -902,21 +903,33 @@ export default async function renderPdf(buffer, target, context) {
             emitViewStateChange(action, source);
         }
     };
-    const getPageWidthAtScaleOne = (pdfViewer) => {
-        var _a;
-        const pageView = pdfViewer.getPageView(0);
+    const getPageSizeAtScaleOne = (pdfViewer) => {
+        var _a, _b;
+        const pageIndex = Math.max(0, Math.min(pageCount - 1, currentPage - 1));
+        const pageView = pdfViewer.getPageView(pageIndex) || pdfViewer.getPageView(0);
         const pdfPage = pageView === null || pageView === void 0 ? void 0 : pageView.pdfPage;
         if (pdfPage) {
-            return pdfPage.getViewport({
+            const viewportAtScaleOne = pdfPage.getViewport({
                 scale: PixelsPerInch.PDF_TO_CSS_UNITS,
                 rotation: currentRotation,
-            }).width;
+            });
+            return {
+                width: viewportAtScaleOne.width,
+                height: viewportAtScaleOne.height,
+            };
         }
         const viewportWidth = (_a = pageView === null || pageView === void 0 ? void 0 : pageView.viewport) === null || _a === void 0 ? void 0 : _a.width;
-        if (viewportWidth && currentScale) {
-            return viewportWidth / currentScale;
-        }
-        return 0;
+        const viewportHeight = (_b = pageView === null || pageView === void 0 ? void 0 : pageView.viewport) === null || _b === void 0 ? void 0 : _b.height;
+        if (viewportWidth && viewportHeight && currentScale) {
+            return {
+                width: viewportWidth / currentScale,
+                height: viewportHeight / currentScale,
+            };
+        }
+        return { width: 0, height: 0 };
+    };
+    const getPageWidthAtScaleOne = (pdfViewer) => {
+        return getPageSizeAtScaleOne(pdfViewer).width;
     };
     const getFitWidthScale = (pdfViewer) => {
         const pageWidth = getPageWidthAtScaleOne(pdfViewer);
@@ -935,6 +948,59 @@ export default async function renderPdf(buffer, target, context) {
             (_a = pdfContext.viewer) === null || _a === void 0 ? void 0 : _a.update();
         });
     };
+    const applyPdfFit = async (request) => {
+        var _a, _b, _c;
+        if (!pdfContext.viewer || loadStatus !== 'ready') {
+            pendingFitRequest = request;
+            return {
+                applied: false,
+                mode: request.mode,
+                resize: request.resize,
+                source: request.source,
+                reason: 'pending',
+                provider: 'view-state',
+            };
+        }
+        const pageSize = getPageSizeAtScaleOne(pdfContext.viewer);
+        const mode = request.mode === 'auto' ? 'width' : request.mode;
+        const scale = resolveFileViewerFitScale({
+            mode,
+            viewportWidth: Math.max(96, (request.viewportWidth || container.clientWidth || targetWindow.innerWidth) -
+                FIT_HORIZONTAL_PADDING -
+                PAGE_BORDER_WIDTH),
+            viewportHeight: Math.max(96, (container.clientHeight || request.viewportHeight || targetWindow.innerHeight) -
+                PAGE_BORDER_WIDTH),
+            contentWidth: pageSize.width,
+            contentHeight: pageSize.height,
+            currentScale,
+            minScale: (_a = request.minScale) !== null && _a !== void 0 ? _a : MIN_SCALE,
+            maxScale: (_b = request.maxScale) !== null && _b !== void 0 ? _b : MAX_SCALE,
+        });
+        if (!scale) {
+            return {
+                applied: false,
+                mode: request.mode,
+                resize: request.resize,
+                source: request.source,
+                reason: 'unmeasurable',
+                provider: 'view-state',
+            };
+        }
+        autoFitWidth = request.mode === 'auto' || request.mode === 'width';
+        setScale(scale, 'fit', request.source);
+        await waitForPaint(targetWindow);
+        (_c = pdfContext.viewer) === null || _c === void 0 ? void 0 : _c.update();
+        const state = getPdfViewState();
+        return {
+            applied: true,
+            mode: request.mode,
+            resize: request.resize,
+            scale: state.scale,
+            source: request.source,
+            provider: 'view-state',
+            state,
+        };
+    };
     const scheduleFitToWidth = () => {
         if (!autoFitWidth || !pdfContext.viewer) {
             return;
@@ -1207,7 +1273,14 @@ export default async function renderPdf(buffer, target, context) {
                     });
                 }
                 else {
-                    emitViewStateChange('init', 'viewer');
+                    const fitRequest = pendingFitRequest;
+                    pendingFitRequest = null;
+                    if (fitRequest) {
+                        void applyPdfFit(fitRequest);
+                    }
+                    else {
+                        emitViewStateChange('init', 'viewer');
+                    }
                 }
                 if (pdfContext.search) {
                     eventBus.dispatch('find', { type: '', query: pdfContext.search });
@@ -1321,12 +1394,14 @@ export default async function renderPdf(buffer, target, context) {
             setScale(scale, 'zoom-change', 'api');
             return getPdfZoomState();
         },
+        fit: applyPdfFit,
         getState: getPdfZoomState,
         subscribe: zoomEmitter.subscribe,
     });
     registerFileViewerViewStateProvider(root, {
         getState: getPdfViewState,
         applyState: applyPdfViewState,
+        fit: applyPdfFit,
         subscribe: viewStateEmitter.subscribe,
     });
     navToggleButton.addEventListener('click', () => toggleNav('user'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-pdf",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "private": false,
   "type": "module",
   "description": "Standalone PDF renderer plugin for Flyfish File Viewer powered by PDF.js.",
@@ -34,7 +34,7 @@
   },
   "funding": {
     "type": "individual",
-    "url": "https://dev.flyfish.group/shop"
+    "url": "https://dev.flyfish.group/donate?source=npm"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -54,7 +54,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "^2.1.16",
+    "@file-viewer/core": "^2.1.18",
     "pdfjs-dist": "^6.0.227"
   },
   "devDependencies": {