@file-viewer/renderer-word 3.0.0 → 3.0.2

package/dist/wordDocx.js

@@ -1,6 +1,6 @@
 import JSZip from 'jszip';
 import { resolveFileViewerDocxWorkerJsZipUrl, resolveFileViewerDocxWorkerUrl, resolveFileViewerRuntimeAssetBaseUrl, } from '@file-viewer/core/assets';
-import { applyPrintPageSize, buildPrintPageStyle, createFileViewerTranslator, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, getElementPrintPageSize, normalizeFileViewerTheme, registerFileViewerZoomProvider, resolveFileViewerFitScale, unregisterFileViewerZoomProvider, } from '@file-viewer/core';
+import { applyPrintPageSize, buildPrintPageStyle, createFileViewerTranslator, createFileViewerZoomChangeEmitter as createZoomChangeEmitter, formatCssPixels, getElementPrintPageSize, normalizeFileViewerTheme, replaceFileViewerCanvasWithImages, registerFileViewerZoomProvider, resolveFileViewerFitScale, unregisterFileViewerZoomProvider, waitForFileViewerNextPaint, } from '@file-viewer/core';
 const DOCX_DEFAULT_PAGE_SIZE = {
     width: 794,
     height: 1123
@@ -628,6 +628,9 @@ function getDocxPageElement(frame) {
 function isDocxFlowFrame(frame) {
     return !!(frame === null || frame === void 0 ? void 0 : frame.classList.contains('docx-flow-frame'));
 }
+function isDocxCanvasSheet(frame) {
+    return !!(frame === null || frame === void 0 ? void 0 : frame.classList.contains('docx-canvas-sheet'));
+}
 function getDocxFramePrintSize(frame) {
     const page = frame ? getDocxPageElement(frame) : null;
     if (!page) {
@@ -643,6 +646,17 @@ function getDocxFramePrintSize(frame) {
     };
 }
 function normalizeDocxPageForPrint(frame, pageSize) {
+    var _a;
+    if (isDocxCanvasSheet(frame)) {
+        applyPrintPageSize(frame, pageSize);
+        (_a = frame.dataset).viewerPrintPageIndex || (_a.viewerPrintPageIndex = '0');
+        frame.classList.remove('docx-canvas-sheet-pending', 'docx-canvas-sheet-virtualized');
+        frame.style.position = 'relative';
+        frame.style.contain = 'none';
+        frame.style.margin = '0 auto 18px';
+        frame.style.boxShadow = 'none';
+        return;
+    }
     const flowLayout = isDocxFlowFrame(frame);
     const pageWidth = formatCssPixels(pageSize.width);
     const pageHeight = formatCssPixels(pageSize.height);
@@ -666,11 +680,13 @@ function normalizeDocxPageForPrint(frame, pageSize) {
     page.style.boxShadow = 'none';
 }
 function buildDocxPrintStyle(target) {
-    const firstFrame = target.querySelector('.docx-page-frame, .docx-flow-frame');
+    const firstFrame = target.querySelector('.docx-page-frame, .docx-flow-frame, .docx-canvas-sheet');
     const pageSize = getDocxFramePrintSize(firstFrame || undefined);
-    const selector = (firstFrame === null || firstFrame === void 0 ? void 0 : firstFrame.classList.contains('docx-flow-frame'))
-        ? '.viewer-export-content .docx-flow-frame'
-        : '.viewer-export-content .docx-page-frame';
+    const selector = isDocxCanvasSheet(firstFrame || undefined)
+        ? '.viewer-export-content .docx-canvas-sheet'
+        : (firstFrame === null || firstFrame === void 0 ? void 0 : firstFrame.classList.contains('docx-flow-frame'))
+            ? '.viewer-export-content .docx-flow-frame'
+            : '.viewer-export-content .docx-page-frame';
     return buildPrintPageStyle({
         selector,
         width: pageSize.width,
@@ -680,21 +696,41 @@ function buildDocxPrintStyle(target) {
         heightMode: (firstFrame === null || firstFrame === void 0 ? void 0 : firstFrame.classList.contains('docx-flow-frame')) ? 'min' : 'fixed'
     });
 }
-function prepareDocxCloneForExport(target) {
-    const liveFrames = Array.from(target.querySelectorAll('.docx-page-frame, .docx-flow-frame'));
-    const clone = target.cloneNode(true);
-    const printDocument = target.ownerDocument.createElement('div');
-    printDocument.className = 'docx-print-document';
-    const scopedStyles = Array.from(clone.querySelectorAll('style'))
-        .filter(style => { var _a; return !((_a = style.textContent) === null || _a === void 0 ? void 0 : _a.includes('.docx-fit-viewer')); })
-        .map(style => style.outerHTML)
-        .join('');
-    clone.querySelectorAll('.docx-page-frame, .docx-flow-frame').forEach((frame, index) => {
-        frame.dataset.viewerPrintPageIndex = String(index);
-        normalizeDocxPageForPrint(frame, getDocxFramePrintSize(liveFrames[index]));
-        printDocument.appendChild(frame.cloneNode(true));
-    });
-    return printDocument.childElementCount ? `${scopedStyles}${printDocument.outerHTML}` : clone.innerHTML;
+async function prepareDocxCloneForExport(target) {
+    const view = getTargetWindow(target);
+    const usesVirtualCanvas = !!target.querySelector('.docx-canvas-sheet');
+    const materializeAllPages = view === null || view === void 0 ? void 0 : view.__docxCanvasMaterializeAllPages;
+    let materializedForSnapshot = false;
+    if (usesVirtualCanvas && typeof materializeAllPages === 'function') {
+        await materializeAllPages.call(view, 'file-viewer-print-snapshot');
+        await waitForFileViewerNextPaint(view);
+        materializedForSnapshot = true;
+    }
+    try {
+        const selector = '.docx-page-frame, .docx-flow-frame, .docx-canvas-sheet';
+        const liveFrames = Array.from(target.querySelectorAll(selector));
+        const clone = target.cloneNode(true);
+        replaceFileViewerCanvasWithImages(target, clone);
+        const printDocument = target.ownerDocument.createElement('div');
+        printDocument.className = 'docx-print-document';
+        const scopedStyles = Array.from(clone.querySelectorAll('style'))
+            .filter(style => { var _a; return !((_a = style.textContent) === null || _a === void 0 ? void 0 : _a.includes('.docx-fit-viewer')); })
+            .map(style => style.outerHTML)
+            .join('');
+        clone.querySelectorAll(selector).forEach((frame, index) => {
+            frame.dataset.viewerPrintPageIndex = String(index);
+            normalizeDocxPageForPrint(frame, getDocxFramePrintSize(liveFrames[index]));
+            printDocument.appendChild(frame.cloneNode(true));
+        });
+        return printDocument.childElementCount ? `${scopedStyles}${printDocument.outerHTML}` : clone.innerHTML;
+    }
+    finally {
+        if (materializedForSnapshot && view) {
+            const afterPrint = target.ownerDocument.createEvent('Event');
+            afterPrint.initEvent('afterprint', false, false);
+            view.dispatchEvent(afterPrint);
+        }
+    }
 }
 /**
  * 渲染docx文件
@@ -731,7 +767,7 @@ export default async function (buffer, target, context) {
     const disposeResponsive = makeDocxResponsive(target, context);
     (_a = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _a === void 0 ? void 0 : _a.call(context, {
         includeDocumentStyles: false,
-        getPrintMaskPages: () => Array.from(target.querySelectorAll('.docx-page-frame, .docx-flow-frame')),
+        getPrintMaskPages: () => Array.from(target.querySelectorAll('.docx-page-frame, .docx-flow-frame, .docx-canvas-sheet')),
         beforeSnapshot: () => {
             const view = getTargetWindow(target);
             if (view) {
@@ -742,7 +778,7 @@ export default async function (buffer, target, context) {
         toHtml: () => prepareDocxCloneForExport(target)
     });
     (_b = context === null || context === void 0 ? void 0 : context.registerThumbnailAdapter) === null || _b === void 0 ? void 0 : _b.call(context, {
-        getTarget: () => target.querySelector('.docx-page-frame, .docx-flow-frame') || target
+        getTarget: () => target.querySelector('.docx-page-frame, .docx-flow-frame, .docx-canvas-sheet') || target
     });
     return {
         $el: target,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-word",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "private": false,
   "type": "module",
   "description": "Standalone DOCX, DOC, and OpenDocument renderer for File Viewer; RTF parsing is an explicit opt-in capability.",
@@ -58,9 +58,9 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "3.0.0",
-    "@file-viewer/doc": "3.0.0",
-    "@file-viewer/docx": "0.3.28",
+    "@file-viewer/core": "3.0.2",
+    "@file-viewer/doc": "3.0.2",
+    "@file-viewer/docx": "0.3.29",
     "jszip": "^3.10.1"
   },
   "devDependencies": {