@file-viewer/renderer-word 2.1.18 → 2.1.20

package/dist/wordDoc.js

@@ -1,5 +1,5 @@
 import { defaultMsDocCss, parseMsDocToHtml } from '@file-viewer/doc';
-import { applyPrintPageSize, buildPrintPageStyle, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
+import { applyPrintPageSize, buildPrintPageStyle, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, registerFileViewerZoomProvider, resolveFileViewerFitScale, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
 const PAGE_BREAK_MARKER = '<span class="msdoc-page-break"></span>';
 const EMPTY_PAGE_HTML = '<p class="msdoc-paragraph"><br></p>';
 const MSDOC_PAGE_SIZE = {
@@ -239,12 +239,58 @@ function makeMsDocResponsive(target) {
         applyResponsiveLayout();
         return getZoomState();
     };
+    const setAbsoluteScale = (scale) => {
+        return setUserZoom(scale / Math.max(currentFitScale, 0.01));
+    };
+    const readFitPageSize = () => {
+        var _a;
+        const root = (_a = pages[0]) === null || _a === void 0 ? void 0 : _a.querySelector('.msdoc-root');
+        return {
+            width: (root === null || root === void 0 ? void 0 : root.offsetWidth) || MSDOC_PAGE_SIZE.width,
+            height: MSDOC_PAGE_SIZE.height
+        };
+    };
+    const fitDoc = (request) => {
+        var _a, _b;
+        const pageSize = readFitPageSize();
+        const mode = request.mode === 'auto' ? 'width' : request.mode;
+        const scale = resolveFileViewerFitScale({
+            mode,
+            viewportWidth: Math.max(1, request.viewportWidth || target.clientWidth || 0),
+            viewportHeight: Math.max(1, request.viewportHeight || target.clientHeight || 0),
+            contentWidth: pageSize.width,
+            contentHeight: pageSize.height,
+            currentScale,
+            minScale: (_a = request.minScale) !== null && _a !== void 0 ? _a : MSDOC_MIN_SCALE,
+            maxScale: (_b = request.maxScale) !== null && _b !== void 0 ? _b : MSDOC_MAX_SCALE
+        });
+        if (!scale) {
+            return {
+                applied: false,
+                mode: request.mode,
+                resize: request.resize,
+                source: request.source,
+                reason: 'unmeasurable',
+                provider: 'zoom'
+            };
+        }
+        const state = setAbsoluteScale(scale);
+        return {
+            applied: true,
+            mode: request.mode,
+            resize: request.resize,
+            scale: state.scale,
+            source: request.source,
+            provider: 'zoom'
+        };
+    };
     target.dataset.viewerZoomProvider = 'doc';
     registerFileViewerZoomProvider(target, {
         zoomIn: () => setUserZoom((currentScale + MSDOC_ZOOM_STEP) / Math.max(currentFitScale, 0.01)),
         zoomOut: () => setUserZoom((currentScale - MSDOC_ZOOM_STEP) / Math.max(currentFitScale, 0.01)),
         resetZoom: () => setUserZoom(1),
-        setZoom: scale => setUserZoom(scale / Math.max(currentFitScale, 0.01)),
+        setZoom: setAbsoluteScale,
+        fit: fitDoc,
         getState: getZoomState,
         subscribe: zoomEmitter.subscribe
     });

package/dist/wordDocx.js

@@ -1,5 +1,5 @@
 import { resolveFileViewerDocxWorkerJsZipUrl, resolveFileViewerDocxWorkerUrl, } from '@file-viewer/core/assets';
-import { applyPrintPageSize, buildPrintPageStyle, createFileViewerTranslator, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, getElementPrintPageSize, registerFileViewerZoomProvider, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
+import { applyPrintPageSize, buildPrintPageStyle, createFileViewerTranslator, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, getElementPrintPageSize, registerFileViewerZoomProvider, resolveFileViewerFitScale, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
 const DOCX_DEFAULT_PAGE_SIZE = {
     width: 794,
     height: 1123
@@ -289,12 +289,76 @@ function makeDocxResponsive(target, context) {
         applyResponsiveLayout();
         return getZoomState();
     };
+    const setAbsoluteScale = (scale) => {
+        return setUserZoom(scale / Math.max(currentFitScale, 0.01));
+    };
+    const readFitPageSize = () => {
+        for (const frame of frames) {
+            const page = getDocxPageElement(frame);
+            if (!page) {
+                continue;
+            }
+            const pageSize = getElementPrintPageSize(page, DOCX_DEFAULT_PAGE_SIZE);
+            return {
+                width: page.offsetWidth || pageSize.width || DOCX_DEFAULT_PAGE_SIZE.width,
+                height: isDocxFlowFrame(frame)
+                    ? DOCX_DEFAULT_PAGE_SIZE.height
+                    : page.offsetHeight || pageSize.height || DOCX_DEFAULT_PAGE_SIZE.height
+            };
+        }
+        return null;
+    };
+    const fitDocx = (request) => {
+        var _a, _b;
+        const pageSize = readFitPageSize();
+        if (!pageSize) {
+            return {
+                applied: false,
+                mode: request.mode,
+                resize: request.resize,
+                source: request.source,
+                reason: 'unmeasurable',
+                provider: 'zoom'
+            };
+        }
+        const mode = request.mode === 'auto' ? 'width' : request.mode;
+        const scale = resolveFileViewerFitScale({
+            mode,
+            viewportWidth: Math.max(1, request.viewportWidth || target.clientWidth || 0),
+            viewportHeight: Math.max(1, request.viewportHeight || target.clientHeight || 0),
+            contentWidth: pageSize.width,
+            contentHeight: pageSize.height,
+            currentScale,
+            minScale: (_a = request.minScale) !== null && _a !== void 0 ? _a : DOCX_MIN_SCALE,
+            maxScale: (_b = request.maxScale) !== null && _b !== void 0 ? _b : DOCX_MAX_SCALE
+        });
+        if (!scale) {
+            return {
+                applied: false,
+                mode: request.mode,
+                resize: request.resize,
+                source: request.source,
+                reason: 'unmeasurable',
+                provider: 'zoom'
+            };
+        }
+        const state = setAbsoluteScale(scale);
+        return {
+            applied: true,
+            mode: request.mode,
+            resize: request.resize,
+            scale: state.scale,
+            source: request.source,
+            provider: 'zoom'
+        };
+    };
     target.dataset.viewerZoomProvider = 'docx';
     registerFileViewerZoomProvider(target, {
         zoomIn: () => setUserZoom((currentScale + DOCX_ZOOM_STEP) / Math.max(currentFitScale, 0.01)),
         zoomOut: () => setUserZoom((currentScale - DOCX_ZOOM_STEP) / Math.max(currentFitScale, 0.01)),
         resetZoom: () => setUserZoom(1),
-        setZoom: scale => setUserZoom(scale / Math.max(currentFitScale, 0.01)),
+        setZoom: setAbsoluteScale,
+        fit: fitDocx,
         getState: getZoomState,
         subscribe: zoomEmitter.subscribe
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-word",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "private": false,
   "type": "module",
   "description": "Standalone Word and compatible document renderer plugin for Flyfish File Viewer powered by @file-viewer/docx, @file-viewer/doc, and RTF/ODF parsing.",
@@ -57,8 +57,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "^2.1.18",
-    "@file-viewer/doc": "^2.1.18",
+    "@file-viewer/core": "^2.1.20",
+    "@file-viewer/doc": "^2.1.20",
     "@file-viewer/docx": "^0.3.17",
     "jszip": "^3.10.1",
     "rtf.js": "^3.0.9"