@file-viewer/core 2.1.28 → 2.1.30

package/dist/contracts/types.d.ts

@@ -217,6 +217,8 @@ export interface FileRenderExportAdapter {
     exportHtml?: boolean;
     includeDocumentStyles?: boolean;
     beforeSnapshot?: () => Promise<void> | void;
+    /** Live page surfaces used by the interactive print-mask designer. */
+    getPrintMaskPages?: () => readonly HTMLElement[];
     printStyle?: string | ((options: FileRenderExportOptions) => Promise<string> | string);
     toHtml?: (options: FileRenderExportOptions) => Promise<string> | string;
 }
@@ -806,6 +808,8 @@ export interface FileViewerPrintMaskRegion {
     top: number;
     width: number;
     height: number;
+    /** Zero-based rendered page index. Omitted regions retain legacy whole-document coordinates. */
+    pageIndex?: number;
 }
 export interface FileViewerPrintMaskOptions {
     /** Solid black cover blocks, matching common OFD/business redaction UX. */

package/dist/features/printMask.d.ts

@@ -1,5 +1,6 @@
 import type { FileViewerPrintMaskOptions, FileViewerPrintMaskRegion } from '../contracts/types';
 export declare const normalizeFileViewerPrintMaskRegion: (region: Partial<FileViewerPrintMaskRegion> | null | undefined) => FileViewerPrintMaskRegion | null;
 export declare const normalizeFileViewerPrintMaskOptions: (mask?: FileViewerPrintMaskOptions | null) => FileViewerPrintMaskOptions | null;
-export declare const buildFileViewerPrintMaskOverlayHtml: (mask?: FileViewerPrintMaskOptions | null) => string;
-export declare const FILE_VIEWER_PRINT_MASK_STYLE = "\n  .viewer-export-print-mask{position:absolute;inset:0;z-index:15;pointer-events:none;print-color-adjust:exact;-webkit-print-color-adjust:exact;}\n  .viewer-export-print-mask-block{position:absolute;box-sizing:border-box;print-color-adjust:exact;-webkit-print-color-adjust:exact;}\n";
+export declare const buildFileViewerPrintMaskOverlayHtml: (mask?: FileViewerPrintMaskOptions | null, pageScoped?: boolean) => string;
+export declare const FILE_VIEWER_PRINT_MASK_STYLE = "\n  .viewer-export-print-mask{position:absolute;inset:0;z-index:15;pointer-events:none;print-color-adjust:exact;-webkit-print-color-adjust:exact;}\n  .viewer-export-print-mask--page{z-index:2147483647;}\n  .viewer-export-print-mask-block{position:absolute;box-sizing:border-box;print-color-adjust:exact;-webkit-print-color-adjust:exact;}\n  [data-viewer-print-page-index]{position:relative!important;isolation:isolate;}\n";
+export declare const applyFileViewerPagePrintMasksToHtml: (contentHtml: string, mask?: FileViewerPrintMaskOptions | null) => string;

package/dist/features/printMask.js

@@ -3,6 +3,11 @@ export const normalizeFileViewerPrintMaskRegion = (region) => {
     if (!region) {
         return null;
     }
+    const pageIndex = region.pageIndex;
+    if (pageIndex !== undefined &&
+        (!Number.isInteger(pageIndex) || pageIndex < 0)) {
+        return null;
+    }
     const left = clampPercent(Number(region.left) || 0);
     const top = clampPercent(Number(region.top) || 0);
     const width = clampPercent(Number(region.width) || 0);
@@ -15,6 +20,7 @@ export const normalizeFileViewerPrintMaskRegion = (region) => {
         top,
         width: Math.min(width, 100 - left),
         height: Math.min(height, 100 - top),
+        ...(pageIndex === undefined ? {} : { pageIndex }),
     };
 };
 export const normalizeFileViewerPrintMaskOptions = (mask) => {
@@ -32,7 +38,7 @@ export const normalizeFileViewerPrintMaskOptions = (mask) => {
         color: mask.color || '#000000',
     };
 };
-export const buildFileViewerPrintMaskOverlayHtml = (mask) => {
+export const buildFileViewerPrintMaskOverlayHtml = (mask, pageScoped = false) => {
     var _a;
     const normalized = normalizeFileViewerPrintMaskOptions(mask);
     if (!((_a = normalized === null || normalized === void 0 ? void 0 : normalized.regions) === null || _a === void 0 ? void 0 : _a.length)) {
@@ -40,9 +46,43 @@ export const buildFileViewerPrintMaskOverlayHtml = (mask) => {
     }
     const color = normalized.color || '#000000';
     const blocks = normalized.regions.map(region => (`<div class="viewer-export-print-mask-block" style="left:${region.left}%;top:${region.top}%;width:${region.width}%;height:${region.height}%;background:${color};"></div>`)).join('');
-    return `<div class="viewer-export-print-mask" aria-hidden="true">${blocks}</div>`;
+    const className = pageScoped
+        ? 'viewer-export-print-mask viewer-export-print-mask--page'
+        : 'viewer-export-print-mask';
+    return `<div class="${className}" aria-hidden="true">${blocks}</div>`;
 };
 export const FILE_VIEWER_PRINT_MASK_STYLE = `
   .viewer-export-print-mask{position:absolute;inset:0;z-index:15;pointer-events:none;print-color-adjust:exact;-webkit-print-color-adjust:exact;}
+  .viewer-export-print-mask--page{z-index:2147483647;}
   .viewer-export-print-mask-block{position:absolute;box-sizing:border-box;print-color-adjust:exact;-webkit-print-color-adjust:exact;}
+  [data-viewer-print-page-index]{position:relative!important;isolation:isolate;}
 `;
+export const applyFileViewerPagePrintMasksToHtml = (contentHtml, mask) => {
+    var _a;
+    const normalized = normalizeFileViewerPrintMaskOptions(mask);
+    if (!normalized) {
+        return contentHtml;
+    }
+    const regionsByPage = new Map();
+    (_a = normalized.regions) === null || _a === void 0 ? void 0 : _a.forEach(region => {
+        if (region.pageIndex === undefined) {
+            return;
+        }
+        const pageRegions = regionsByPage.get(region.pageIndex) || [];
+        pageRegions.push(region);
+        regionsByPage.set(region.pageIndex, pageRegions);
+    });
+    if (!regionsByPage.size) {
+        return contentHtml;
+    }
+    return contentHtml.replace(/(<[A-Za-z][^>]*\sdata-viewer-print-page-index=(['"])(\d+)\2[^>]*>)/g, (match, openingTag, _quote, rawPageIndex) => {
+        const pageRegions = regionsByPage.get(Number(rawPageIndex));
+        if (!(pageRegions === null || pageRegions === void 0 ? void 0 : pageRegions.length)) {
+            return match;
+        }
+        return `${openingTag}${buildFileViewerPrintMaskOverlayHtml({
+            regions: pageRegions,
+            color: normalized.color,
+        }, true)}`;
+    });
+};

package/dist/features/printMaskDesigner.d.ts

@@ -2,6 +2,7 @@ import type { FileViewerPrintMaskOptions, FileViewerPrintMaskRegion } from '../c
 import { type FileViewerI18nInput } from '../i18n/messages';
 export interface OpenFileViewerPrintMaskDesignerOptions {
     root: HTMLElement;
+    pages?: readonly HTMLElement[];
     i18n?: FileViewerI18nInput;
     color?: string;
     initialRegions?: FileViewerPrintMaskRegion[];
@@ -10,7 +11,7 @@ export interface FileViewerPrintMaskDesignerResult {
     mask: FileViewerPrintMaskOptions;
 }
 /**
- * Opens an interactive print-mask designer over the rendered content.
- * Loaded asynchronously so the main viewer bundle stays lean.
+ * Opens a page-aware print-mask designer. Browsing remains the default mode;
+ * drawing is armed for the currently visible page only and disarms after one block.
  */
 export declare const openFileViewerPrintMaskDesigner: (options: OpenFileViewerPrintMaskDesignerOptions) => Promise<FileViewerPrintMaskDesignerResult | null>;

package/dist/features/printMaskDesigner.js

@@ -1,14 +1,15 @@
 import { createFileViewerTranslator } from '../i18n/messages.js';
 import { normalizeFileViewerPrintMaskRegion } from './printMask.js';
 const DESIGNER_STYLE = `
-.fv-print-mask-layer{position:absolute;inset:0;z-index:40;pointer-events:none;}
-.fv-print-mask-canvas{position:absolute;inset:0;pointer-events:auto;cursor:crosshair;touch-action:none;}
+.fv-print-mask-layer{position:absolute;inset:0;z-index:2147483000;pointer-events:none;}
+.fv-print-mask-canvas{position:absolute;inset:0;z-index:2147483000;pointer-events:none;cursor:default;}
+.fv-print-mask-canvas.is-armed{pointer-events:auto;cursor:crosshair;touch-action:none;}
 .fv-print-mask-block{position:absolute;background:#000;box-sizing:border-box;pointer-events:auto;}
 .fv-print-mask-block-remove{position:absolute;right:-8px;top:-8px;width:18px;height:18px;border:0;border-radius:999px;background:#111;color:#fff;font:700 12px/18px system-ui,sans-serif;cursor:pointer;padding:0;}
-.fv-print-mask-toolbar{position:absolute;left:50%;bottom:16px;transform:translateX(-50%);z-index:41;display:inline-flex;align-items:center;gap:6px;padding:6px 8px;border:1px solid rgba(20,35,53,.12);border-radius:999px;background:rgba(255,255,255,.94);box-shadow:0 12px 28px rgba(15,23,42,.16);pointer-events:auto;max-width:calc(100% - 24px);flex-wrap:wrap;justify-content:center;}
+.fv-print-mask-toolbar{position:absolute;left:50%;bottom:16px;transform:translateX(-50%);z-index:2147483001;display:inline-flex;align-items:center;gap:6px;padding:6px 8px;border:1px solid rgba(20,35,53,.12);border-radius:999px;background:rgba(255,255,255,.94);box-shadow:0 12px 28px rgba(15,23,42,.16);pointer-events:auto;max-width:calc(100% - 24px);flex-wrap:wrap;justify-content:center;}
 .fv-print-mask-toolbar span{font:600 12px/1.2 system-ui,sans-serif;color:#40546a;white-space:nowrap;}
 .fv-print-mask-toolbar button{min-width:42px;height:30px;padding:0 10px;border:0;border-radius:999px;background:transparent;color:#40546a;font:800 12px/1 system-ui,sans-serif;cursor:pointer;}
-.fv-print-mask-toolbar button:hover{background:rgba(33,163,102,.1);color:#16774c;}
+.fv-print-mask-toolbar button:hover,.fv-print-mask-toolbar button.is-active{background:rgba(33,163,102,.1);color:#16774c;}
 .fv-print-mask-toolbar button.primary{background:#16774c;color:#fff;}
 .fv-print-mask-toolbar button.primary:hover{background:#0f5f3c;}
 `;
@@ -21,7 +22,7 @@ const ensureDesignerStyle = (documentRef) => {
     style.textContent = DESIGNER_STYLE;
     documentRef.head.appendChild(style);
 };
-const toPercentRegion = (start, end, bounds) => {
+const toPercentRegion = (start, end, bounds, pageIndex) => {
     if (!bounds.width || !bounds.height) {
         return null;
     }
@@ -37,11 +38,18 @@ const toPercentRegion = (start, end, bounds) => {
         top: (topPx / bounds.height) * 100,
         width: (widthPx / bounds.width) * 100,
         height: (heightPx / bounds.height) * 100,
+        pageIndex,
     });
 };
+const visibleArea = (element, viewport) => {
+    const rect = element.getBoundingClientRect();
+    const width = Math.max(0, Math.min(rect.right, viewport.right) - Math.max(rect.left, viewport.left));
+    const height = Math.max(0, Math.min(rect.bottom, viewport.bottom) - Math.max(rect.top, viewport.top));
+    return width * height;
+};
 /**
- * Opens an interactive print-mask designer over the rendered content.
- * Loaded asynchronously so the main viewer bundle stays lean.
+ * Opens a page-aware print-mask designer. Browsing remains the default mode;
+ * drawing is armed for the currently visible page only and disarms after one block.
  */
 export const openFileViewerPrintMaskDesigner = (options) => {
     const root = options.root;
@@ -51,25 +59,59 @@ export const openFileViewerPrintMaskDesigner = (options) => {
     const regions = [...(options.initialRegions || [])]
         .map(region => normalizeFileViewerPrintMaskRegion(region))
         .filter((region) => !!region);
+    const providedPages = Array.from(new Set(options.pages || []))
+        .filter(page => page === root || root.contains(page));
+    const pageScoped = providedPages.length > 0;
+    const pageElements = pageScoped ? providedPages : [root];
     ensureDesignerStyle(documentRef);
-    const previousPosition = root.style.position;
-    if (!previousPosition || previousPosition === 'static') {
-        root.style.position = 'relative';
-    }
+    const ensureOverlayContainingBlock = (element) => {
+        var _a, _b, _c;
+        const previousPosition = element.style.position;
+        const computedPosition = ((_c = (_b = (_a = documentRef.defaultView) === null || _a === void 0 ? void 0 : _a.getComputedStyle) === null || _b === void 0 ? void 0 : _b.call(_a, element)) === null || _c === void 0 ? void 0 : _c.position) ||
+            previousPosition ||
+            'static';
+        if (computedPosition === 'static') {
+            element.style.position = 'relative';
+        }
+        return previousPosition;
+    };
+    // The toolbar layer is positioned against the viewer root even when page
+    // canvases live on child page elements.
+    const previousRootPosition = ensureOverlayContainingBlock(root);
     return new Promise(resolve => {
         let settled = false;
         let drawing = null;
         const layer = documentRef.createElement('div');
         layer.className = 'fv-print-mask-layer';
         layer.setAttribute('data-viewer-print-mask-designer', 'true');
-        const canvas = documentRef.createElement('div');
-        canvas.className = 'fv-print-mask-canvas';
+        const createSurface = (element, pageIndex) => {
+            const previousPosition = ensureOverlayContainingBlock(element);
+            const canvas = documentRef.createElement('div');
+            canvas.className = 'fv-print-mask-canvas';
+            element.appendChild(canvas);
+            return {
+                element,
+                pageIndex,
+                canvas,
+                previousPosition,
+            };
+        };
+        const surfaces = pageElements.map((element, index) => (createSurface(element, pageScoped ? index : undefined)));
+        const legacySurface = pageScoped &&
+            !surfaces.some(surface => surface.element === root) &&
+            regions.some(region => region.pageIndex === undefined)
+            ? createSurface(root)
+            : null;
+        const allSurfaces = legacySurface ? [...surfaces, legacySurface] : surfaces;
         const toolbar = documentRef.createElement('div');
         toolbar.className = 'fv-print-mask-toolbar';
         toolbar.setAttribute('role', 'toolbar');
         toolbar.setAttribute('aria-label', t('toolbar.printMaskTitle'));
         const hint = documentRef.createElement('span');
         hint.textContent = t('toolbar.printMaskHint');
+        const addButton = documentRef.createElement('button');
+        addButton.type = 'button';
+        addButton.textContent = t('toolbar.printMaskAdd');
         const clearButton = documentRef.createElement('button');
         clearButton.type = 'button';
         clearButton.textContent = t('toolbar.printMaskClear');
@@ -80,26 +122,49 @@ export const openFileViewerPrintMaskDesigner = (options) => {
         confirmButton.type = 'button';
         confirmButton.className = 'primary';
         confirmButton.textContent = t('toolbar.printMaskConfirm');
-        toolbar.append(hint, clearButton, cancelButton, confirmButton);
-        layer.append(canvas, toolbar);
+        toolbar.append(hint, addButton, clearButton, cancelButton, confirmButton);
+        layer.append(toolbar);
         root.appendChild(layer);
+        const disarm = () => {
+            surfaces.forEach(surface => surface.canvas.classList.remove('is-armed'));
+            addButton.classList.remove('is-active');
+        };
         const finish = (result) => {
             if (settled) {
                 return;
             }
             settled = true;
             layer.remove();
-            if (!previousPosition) {
+            allSurfaces.forEach(surface => {
+                surface.canvas.remove();
+                if (!surface.previousPosition) {
+                    surface.element.style.removeProperty('position');
+                }
+                else {
+                    surface.element.style.position = surface.previousPosition;
+                }
+            });
+            if (!previousRootPosition) {
                 root.style.removeProperty('position');
             }
             else {
-                root.style.position = previousPosition;
+                root.style.position = previousRootPosition;
             }
             resolve(result);
         };
+        const surfaceForRegion = (region) => {
+            if (region.pageIndex === undefined) {
+                return legacySurface || surfaces[0];
+            }
+            return surfaces.find(surface => surface.pageIndex === region.pageIndex) || null;
+        };
         const renderRegions = () => {
-            canvas.replaceChildren();
+            allSurfaces.forEach(surface => surface.canvas.replaceChildren());
             regions.forEach((region, index) => {
+                const surface = surfaceForRegion(region);
+                if (!surface) {
+                    return;
+                }
                 const block = documentRef.createElement('div');
                 block.className = 'fv-print-mask-block';
                 block.style.left = `${region.left}%`;
@@ -120,66 +185,86 @@ export const openFileViewerPrintMaskDesigner = (options) => {
                     renderRegions();
                 });
                 block.appendChild(remove);
-                canvas.appendChild(block);
+                surface.canvas.appendChild(block);
             });
         };
-        const pointFromEvent = (event) => {
+        const pointFromEvent = (event, canvas) => {
             const bounds = canvas.getBoundingClientRect();
             return {
                 x: Math.max(0, Math.min(bounds.width, event.clientX - bounds.left)),
                 y: Math.max(0, Math.min(bounds.height, event.clientY - bounds.top)),
             };
         };
-        canvas.addEventListener('pointerdown', event => {
-            if (event.button !== 0) {
-                return;
-            }
-            event.preventDefault();
-            const start = pointFromEvent(event);
-            const preview = documentRef.createElement('div');
-            preview.className = 'fv-print-mask-block';
-            preview.style.background = color;
-            preview.style.opacity = '0.72';
-            canvas.appendChild(preview);
-            drawing = { start, preview };
-            canvas.setPointerCapture(event.pointerId);
+        surfaces.forEach(surface => {
+            surface.canvas.addEventListener('pointerdown', event => {
+                if (event.button !== 0 || !surface.canvas.classList.contains('is-armed')) {
+                    return;
+                }
+                event.preventDefault();
+                const start = pointFromEvent(event, surface.canvas);
+                const preview = documentRef.createElement('div');
+                preview.className = 'fv-print-mask-block';
+                preview.style.background = color;
+                preview.style.opacity = '0.72';
+                surface.canvas.appendChild(preview);
+                drawing = { surface, start, preview, pointerId: event.pointerId };
+                surface.canvas.setPointerCapture(event.pointerId);
+            });
+            surface.canvas.addEventListener('pointermove', event => {
+                if (!drawing || drawing.surface !== surface) {
+                    return;
+                }
+                const end = pointFromEvent(event, surface.canvas);
+                const left = Math.min(drawing.start.x, end.x);
+                const top = Math.min(drawing.start.y, end.y);
+                drawing.preview.style.left = `${left}px`;
+                drawing.preview.style.top = `${top}px`;
+                drawing.preview.style.width = `${Math.abs(end.x - drawing.start.x)}px`;
+                drawing.preview.style.height = `${Math.abs(end.y - drawing.start.y)}px`;
+            });
+            surface.canvas.addEventListener('pointerup', event => {
+                if (!drawing || drawing.surface !== surface) {
+                    return;
+                }
+                const end = pointFromEvent(event, surface.canvas);
+                const region = toPercentRegion(drawing.start, end, surface.canvas.getBoundingClientRect(), surface.pageIndex);
+                drawing.preview.remove();
+                try {
+                    surface.canvas.releasePointerCapture(drawing.pointerId);
+                }
+                catch {
+                    // Pointer capture may already be released by the browser.
+                }
+                drawing = null;
+                disarm();
+                if (region) {
+                    regions.push(region);
+                }
+                renderRegions();
+            });
+            surface.canvas.addEventListener('pointercancel', () => {
+                if (!drawing || drawing.surface !== surface) {
+                    return;
+                }
+                drawing.preview.remove();
+                drawing = null;
+                disarm();
+                renderRegions();
+            });
         });
-        canvas.addEventListener('pointermove', event => {
-            if (!drawing) {
-                return;
-            }
-            const end = pointFromEvent(event);
-            const left = Math.min(drawing.start.x, end.x);
-            const top = Math.min(drawing.start.y, end.y);
-            drawing.preview.style.left = `${left}px`;
-            drawing.preview.style.top = `${top}px`;
-            drawing.preview.style.width = `${Math.abs(end.x - drawing.start.x)}px`;
-            drawing.preview.style.height = `${Math.abs(end.y - drawing.start.y)}px`;
+        addButton.addEventListener('click', () => {
+            var _a;
+            disarm();
+            const viewport = root.getBoundingClientRect();
+            const activeSurface = ((_a = surfaces
+                .map(surface => ({ surface, area: visibleArea(surface.element, viewport) }))
+                .sort((left, right) => right.area - left.area)[0]) === null || _a === void 0 ? void 0 : _a.surface) || surfaces[0];
+            activeSurface === null || activeSurface === void 0 ? void 0 : activeSurface.canvas.classList.add('is-armed');
+            addButton.classList.toggle('is-active', Boolean(activeSurface));
         });
-        const endDrawing = (event) => {
-            if (!drawing) {
-                return;
-            }
-            const end = pointFromEvent(event);
-            const bounds = canvas.getBoundingClientRect();
-            const region = toPercentRegion(drawing.start, end, bounds);
-            drawing.preview.remove();
-            drawing = null;
-            try {
-                canvas.releasePointerCapture(event.pointerId);
-            }
-            catch {
-                // ignore
-            }
-            if (region) {
-                regions.push(region);
-                renderRegions();
-            }
-        };
-        canvas.addEventListener('pointerup', endDrawing);
-        canvas.addEventListener('pointercancel', endDrawing);
         clearButton.addEventListener('click', () => {
             regions.splice(0, regions.length);
+            disarm();
             renderRegions();
         });
         cancelButton.addEventListener('click', () => finish(null));

package/dist/index.d.ts

@@ -67,7 +67,7 @@ export { DEFAULT_FILE_VIEWER_STATE_THEME, DEFAULT_FILE_VIEWER_UNSUPPORTED_DESCRI
 export type { FileViewerErrorMessageFormatter, FileViewerRendererInstallHint, } from './viewer/state';
 export { buildFileViewerWatermarkBackgroundImage, buildFileViewerWatermarkInlineStyle, buildFileViewerWatermarkStyle, buildFileViewerWatermarkSvg, normalizeFileViewerWatermark, resolveFileViewerWatermarkPresentationState, } from './features/watermark';
 export type { FileViewerWatermarkPresentationState, FileViewerWatermarkStyle, } from './features/watermark';
-export { buildFileViewerPrintMaskOverlayHtml, normalizeFileViewerPrintMaskOptions, normalizeFileViewerPrintMaskRegion, FILE_VIEWER_PRINT_MASK_STYLE, } from './features/printMask';
+export { buildFileViewerPrintMaskOverlayHtml, applyFileViewerPagePrintMasksToHtml, normalizeFileViewerPrintMaskOptions, normalizeFileViewerPrintMaskRegion, FILE_VIEWER_PRINT_MASK_STYLE, } from './features/printMask';
 export { openFileViewerPrintMaskDesignerAsync, } from './features/printMaskLoader';
 export type { FileViewerPrintMaskDesignerResult, OpenFileViewerPrintMaskDesignerOptions, } from './features/printMaskDesigner';
 export { cancelFileViewerPreviewRequest, DEFAULT_FILE_VIEWER_STREAMING_PDF_FILENAME, DEFAULT_FILE_VIEWER_PREVIEW_LOAD_ERROR_LOGGER, DEFAULT_PDF_RANGE_CHUNK_SIZE, FILE_VIEWER_PREVIEW_LOAD_ERROR_PREFIXES, FILE_VIEWER_REMOTE_MISSING_DATA_ERROR_MESSAGE, applyFileViewerEmptyPreviewState, applyFileViewerPreviewFilenameState, applyFileViewerPreviewSourceUrlState, applyFileViewerReadPreviewState, applyFileViewerRenderReadinessState, applyFileViewerPreviewRequestResetState, commitFileViewerEmptyPreviewResetState, commitFileViewerLoadStartState, commitFileViewerPreviewRequestStartState, commitFileViewerRenderCompleteState, commitFileViewerRemoteDownloadState, createFileViewerEmptyPreviewState, createFileViewerLoadStartState, createFileViewerPreviewStateTarget, createFileViewerSourceLoadingActionHandlers, createFileViewerReadPreviewState, createFileViewerPreviewRequestResetState, createFileViewerRenderCompleteState, createFileViewerRequestController, createFileViewerRequestScope, createFileViewerStreamingPdfPlaceholderFile, finalizeFileViewerPreviewLoadState, hasFileViewerPreviewSource, isFileViewerAbortError, isSameOriginUrl, normalizeFileViewerSourceUrl, normalizePdfStreamingMode, resolveFileViewerFileRefSourcePlan, resolveFileViewerLoadStartMessage, resolveFileViewerMissingRemoteDataErrorMessage, resolveFileViewerPreviewLoadErrorMessage, resolveFileViewerPreviewRequestReason, resolveFileViewerRemoteSourcePlan, resolveFileViewerPageHref, reportFileViewerMissingRemoteData, reportFileViewerPreviewLoadError, runFileViewerLocalFilePreview, runFileViewerPreviewComponentUnmount, runFileViewerPreviewRequest, runFileViewerPreviewSourceChange, runFileViewerRemoteFilePreview, runFileViewerReadAndRenderFile, runFileViewerStreamingPdfPreview, shouldStreamPdfUrl, } from './source/loading';

package/dist/index.js

@@ -173,7 +173,7 @@ export { appendFileViewerStyle, buildFileRenderContextFromLoadContext, applyFile
 export { DEFAULT_FILE_VIEWER_SOURCE_FILENAME, decodeFilename, getExtension, normalizeFileExtension, normalizeFilename, resolveFileViewerSourceFilename, normalizeSource, readFileViewerBuffer, readFileViewerDataUrl, readFileViewerText, wrapFileViewerFileRef, } from './source/index.js';
 export { DEFAULT_FILE_VIEWER_STATE_THEME, DEFAULT_FILE_VIEWER_UNSUPPORTED_DESCRIPTION, FILE_VIEWER_PREVIEW_MESSAGES, createFileViewerEmptyState, createFileViewerErrorState, createFileViewerPreviewLoadingState, createFileViewerReadyState, createFileViewerUnsupportedState, formatFileViewerErrorMessage, normalizeFileViewerErrorMessage, resolveFileViewerRendererInstallHint, } from './viewer/state.js';
 export { buildFileViewerWatermarkBackgroundImage, buildFileViewerWatermarkInlineStyle, buildFileViewerWatermarkStyle, buildFileViewerWatermarkSvg, normalizeFileViewerWatermark, resolveFileViewerWatermarkPresentationState, } from './features/watermark.js';
-export { buildFileViewerPrintMaskOverlayHtml, normalizeFileViewerPrintMaskOptions, normalizeFileViewerPrintMaskRegion, FILE_VIEWER_PRINT_MASK_STYLE, } from './features/printMask.js';
+export { buildFileViewerPrintMaskOverlayHtml, applyFileViewerPagePrintMasksToHtml, normalizeFileViewerPrintMaskOptions, normalizeFileViewerPrintMaskRegion, FILE_VIEWER_PRINT_MASK_STYLE, } from './features/printMask.js';
 export { openFileViewerPrintMaskDesignerAsync, } from './features/printMaskLoader.js';
 export { cancelFileViewerPreviewRequest, DEFAULT_FILE_VIEWER_STREAMING_PDF_FILENAME, DEFAULT_FILE_VIEWER_PREVIEW_LOAD_ERROR_LOGGER, DEFAULT_PDF_RANGE_CHUNK_SIZE, FILE_VIEWER_PREVIEW_LOAD_ERROR_PREFIXES, FILE_VIEWER_REMOTE_MISSING_DATA_ERROR_MESSAGE, applyFileViewerEmptyPreviewState, applyFileViewerPreviewFilenameState, applyFileViewerPreviewSourceUrlState, applyFileViewerReadPreviewState, applyFileViewerRenderReadinessState, applyFileViewerPreviewRequestResetState, commitFileViewerEmptyPreviewResetState, commitFileViewerLoadStartState, commitFileViewerPreviewRequestStartState, commitFileViewerRenderCompleteState, commitFileViewerRemoteDownloadState, createFileViewerEmptyPreviewState, createFileViewerLoadStartState, createFileViewerPreviewStateTarget, createFileViewerSourceLoadingActionHandlers, createFileViewerReadPreviewState, createFileViewerPreviewRequestResetState, createFileViewerRenderCompleteState, createFileViewerRequestController, createFileViewerRequestScope, createFileViewerStreamingPdfPlaceholderFile, finalizeFileViewerPreviewLoadState, hasFileViewerPreviewSource, isFileViewerAbortError, isSameOriginUrl, normalizeFileViewerSourceUrl, normalizePdfStreamingMode, resolveFileViewerFileRefSourcePlan, resolveFileViewerLoadStartMessage, resolveFileViewerMissingRemoteDataErrorMessage, resolveFileViewerPreviewLoadErrorMessage, resolveFileViewerPreviewRequestReason, resolveFileViewerRemoteSourcePlan, resolveFileViewerPageHref, reportFileViewerMissingRemoteData, reportFileViewerPreviewLoadError, runFileViewerLocalFilePreview, runFileViewerPreviewComponentUnmount, runFileViewerPreviewRequest, runFileViewerPreviewSourceChange, runFileViewerRemoteFilePreview, runFileViewerReadAndRenderFile, runFileViewerStreamingPdfPreview, shouldStreamPdfUrl, } from './source/loading.js';
 export { createViewer } from './viewer/createViewer.js';

package/dist/output/export.js

@@ -1,4 +1,4 @@
-import { buildFileViewerPrintMaskOverlayHtml, FILE_VIEWER_PRINT_MASK_STYLE, normalizeFileViewerPrintMaskOptions, } from '../features/printMask.js';
+import { applyFileViewerPagePrintMasksToHtml, buildFileViewerPrintMaskOverlayHtml, FILE_VIEWER_PRINT_MASK_STYLE, normalizeFileViewerPrintMaskOptions, } from '../features/printMask.js';
 const escapeHtmlAttribute = (value) => value
     .replace(/&/g, '&')
     .replace(/"/g, '"')
@@ -289,13 +289,22 @@ export const collectDocumentStyles = () => {
         .join('\n');
 };
 export const buildExportHtmlDocument = ({ contentHtml, includeDocumentStyles = true, printStyle = '', title, watermarkInlineStyle = '', mask = null, }) => {
+    var _a;
     const watermark = watermarkInlineStyle
         ? `<div class="viewer-export-watermark" style="${watermarkInlineStyle}"></div>`
         : '';
-    const maskHtml = buildFileViewerPrintMaskOverlayHtml(mask);
+    const normalizedMask = normalizeFileViewerPrintMaskOptions(mask);
+    const globalMask = normalizedMask
+        ? {
+            ...normalizedMask,
+            regions: (_a = normalizedMask.regions) === null || _a === void 0 ? void 0 : _a.filter(region => region.pageIndex === undefined),
+        }
+        : null;
+    const maskHtml = buildFileViewerPrintMaskOverlayHtml(globalMask);
+    const maskedContentHtml = applyFileViewerPagePrintMasksToHtml(contentHtml, normalizedMask);
     const styles = includeDocumentStyles ? collectDocumentStyles() : '';
     const printOverrideStyle = printStyle ? `<style data-viewer-print-style>${printStyle}</style>` : '';
-    const maskStyle = maskHtml ? `<style data-viewer-print-mask-style>${FILE_VIEWER_PRINT_MASK_STYLE}</style>` : '';
+    const maskStyle = normalizedMask ? `<style data-viewer-print-mask-style>${FILE_VIEWER_PRINT_MASK_STYLE}</style>` : '';
     const safeTitle = escapeHtmlAttribute(title);
     return `<!doctype html>
 <html lang="zh-CN">
@@ -309,7 +318,7 @@ export const buildExportHtmlDocument = ({ contentHtml, includeDocumentStyles = t
 </head>
 <body>
   <main class="viewer-export-shell">
-    <div class="viewer-export-content">${contentHtml}</div>
+    <div class="viewer-export-content">${maskedContentHtml}</div>
     ${maskHtml}
     ${watermark}
   </main>

package/dist/platform/assets.d.ts

@@ -79,7 +79,7 @@ export interface ResolveFileViewerRendererAssetsOptions extends ResolveFileViewe
 export declare const DEFAULT_FILE_VIEWER_RENDERER_ASSET_MANIFESTS: readonly FileViewerRendererAssetManifest[];
 export declare const resolveFileViewerAssetUrl: (value: string | URL | undefined, fallback: string, options?: ResolveFileViewerAssetUrlOptions) => string;
 export declare const resolveFileViewerArchiveWorkerUrl: (options?: Pick<FileViewerArchiveOptions, "workerUrl"> | null, baseUrl?: string) => string;
-export declare const resolveFileViewerArchiveWasmUrl: (options?: Pick<FileViewerArchiveOptions, "wasmUrl"> | null, fallback?: string) => string;
+export declare const resolveFileViewerArchiveWasmUrl: (options?: Pick<FileViewerArchiveOptions, "wasmUrl"> | null, fallback?: string, documentBaseUrl?: string) => string;
 export declare const resolveFileViewerCadAssetUrls: (options?: Pick<FileViewerCadOptions, "wasmPath" | "workerUrl" | "dwfWasmUrl"> | null, documentBaseUrl?: string) => ResolvedFileViewerCadAssetUrls;
 export declare const resolveFileViewerPdfAssetUrls: (options?: Pick<FileViewerPdfOptions, "assetBaseUrl" | "workerUrl" | "cMapUrl" | "wasmUrl" | "standardFontDataUrl" | "cjkFontFallbackPath"> | null, documentBaseUrl?: string) => ResolvedFileViewerPdfAssetUrls;
 export declare const resolveFileViewerDrawioViewerScriptUrl: (options?: Pick<FileViewerDrawingOptions, "viewerScriptUrl"> | null, documentBaseUrl?: string) => string;

package/dist/platform/assets.js

@@ -32,9 +32,18 @@ const resolveFileViewerScriptAssetBaseCandidate = (script, documentBaseUrl, inde
             return null;
         }
         const scriptUrl = new URL(rawScriptUrl, documentBaseUrl);
-        const assetDirectory = scriptUrl.pathname.match(/^(.*\/)(?:assets|static|js)\/.+\.(?:m?js)$/i);
-        const entryScript = scriptUrl.pathname.match(/^(.*\/)(?:app|index|main|runtime|umi)(?:[.-][^/]*)?\.(?:m?js)$/i);
-        const basePath = (assetDirectory === null || assetDirectory === void 0 ? void 0 : assetDirectory[1]) || (entryScript === null || entryScript === void 0 ? void 0 : entryScript[1]);
+        const viteClient = scriptUrl.pathname.match(/^(.*\/)@vite\/client$/i);
+        const isSourceModule = /\/(?:src|node_modules|@fs|@id|@vite)(?:\/|$)/i.test(scriptUrl.pathname);
+        // Start at the first emitted asset directory so nested layouts such as
+        // `static/js` and `assets/js/chunks` resolve to the deployment root.
+        // Source trees are excluded above and must never become a public base.
+        const assetDirectory = isSourceModule
+            ? null
+            : scriptUrl.pathname.match(/^(.*?\/)(?:assets|static|js)(?:\/[^/]*)*\/[^/]+\.(?:m?js)$/i);
+        const entryScript = isSourceModule
+            ? null
+            : scriptUrl.pathname.match(/^(.*\/)(?:app|index|main|runtime|umi)(?:[.-][^/]*)?\.(?:m?js)$/i);
+        const basePath = (viteClient === null || viteClient === void 0 ? void 0 : viteClient[1]) || (!isSourceModule ? assetDirectory === null || assetDirectory === void 0 ? void 0 : assetDirectory[1] : null) || (entryScript === null || entryScript === void 0 ? void 0 : entryScript[1]);
         if (!basePath) {
             return null;
         }
@@ -55,6 +64,9 @@ const resolveFileViewerScriptAssetBaseCandidate = (script, documentBaseUrl, inde
         if (/^(?:app|index|main|runtime|umi)(?:[.-]|$)/i.test(scriptName)) {
             score += 2;
         }
+        if (viteClient) {
+            score += 8;
+        }
         return { url, score };
     }
     catch {
@@ -345,11 +357,13 @@ export const resolveFileViewerAssetUrl = (value, fallback, options = {}) => {
 export const resolveFileViewerArchiveWorkerUrl = (options, baseUrl) => {
     return resolveFileViewerAssetUrl(options === null || options === void 0 ? void 0 : options.workerUrl, DEFAULT_FILE_VIEWER_ARCHIVE_WORKER_PATH, { baseUrl });
 };
-export const resolveFileViewerArchiveWasmUrl = (options, fallback = '') => {
+export const resolveFileViewerArchiveWasmUrl = (options, fallback = '', documentBaseUrl) => {
     if (!(options === null || options === void 0 ? void 0 : options.wasmUrl)) {
         return fallback;
     }
-    return resolveFileViewerAssetUrl(options.wasmUrl, fallback || options.wasmUrl);
+    return resolveFileViewerAssetUrl(options.wasmUrl, fallback || options.wasmUrl, {
+        documentBaseUrl,
+    });
 };
 export const resolveFileViewerCadAssetUrls = (options, documentBaseUrl) => {
     return {

package/dist/viewer/createViewer.js

@@ -634,12 +634,13 @@ export const createViewer = (container, createOptions = {}) => {
             });
         },
         async printWithMask(printOptions = {}) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             const result = await openFileViewerPrintMaskDesignerAsync({
                 root: container,
+                pages: (_b = (_a = renderSurfaceState.exportAdapter) === null || _a === void 0 ? void 0 : _a.getPrintMaskPages) === null || _b === void 0 ? void 0 : _b.call(_a),
                 i18n: options,
-                color: (_a = printOptions.mask) === null || _a === void 0 ? void 0 : _a.color,
-                initialRegions: (_b = printOptions.mask) === null || _b === void 0 ? void 0 : _b.regions,
+                color: (_c = printOptions.mask) === null || _c === void 0 ? void 0 : _c.color,
+                initialRegions: (_d = printOptions.mask) === null || _d === void 0 ? void 0 : _d.regions,
             });
             if (!(result === null || result === void 0 ? void 0 : result.mask)) {
                 return;

package/dist/viewer/operations.js

@@ -246,18 +246,20 @@ export const createFileViewerOperationActionHandlers = ({ getBuffer, getFile, ge
             }
         },
         async printWithMask(options = {}) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g;
             try {
                 const source = getRenderedSource();
                 if (!source) {
                     throw new Error(translateFileViewerMessage(resolveI18n(), 'error.noExportContent'));
                 }
                 const { openFileViewerPrintMaskDesignerAsync } = await import('../features/printMaskLoader.js');
+                const adapter = (_a = getAdapter === null || getAdapter === void 0 ? void 0 : getAdapter()) !== null && _a !== void 0 ? _a : null;
                 const result = await openFileViewerPrintMaskDesignerAsync({
                     root: source,
+                    pages: (_b = adapter === null || adapter === void 0 ? void 0 : adapter.getPrintMaskPages) === null || _b === void 0 ? void 0 : _b.call(adapter),
                     i18n: resolveI18n(),
-                    color: (_a = options.mask) === null || _a === void 0 ? void 0 : _a.color,
-                    initialRegions: (_b = options.mask) === null || _b === void 0 ? void 0 : _b.regions,
+                    color: (_c = options.mask) === null || _c === void 0 ? void 0 : _c.color,
+                    initialRegions: (_d = options.mask) === null || _d === void 0 ? void 0 : _d.regions,
                 });
                 if (!(result === null || result === void 0 ? void 0 : result.mask)) {
                     return undefined;
@@ -265,9 +267,9 @@ export const createFileViewerOperationActionHandlers = ({ getBuffer, getFile, ge
                 return await executeFileViewerPrintOperation({
                     ...getRenderedOperationInput(),
                     ...options,
-                    watermarkInlineStyle: (_d = (_c = options.watermarkInlineStyle) !== null && _c !== void 0 ? _c : getWatermarkInlineStyle === null || getWatermarkInlineStyle === void 0 ? void 0 : getWatermarkInlineStyle()) !== null && _d !== void 0 ? _d : undefined,
+                    watermarkInlineStyle: (_f = (_e = options.watermarkInlineStyle) !== null && _e !== void 0 ? _e : getWatermarkInlineStyle === null || getWatermarkInlineStyle === void 0 ? void 0 : getWatermarkInlineStyle()) !== null && _f !== void 0 ? _f : undefined,
                     mask: result.mask,
-                    printAvailable: (_e = getPrintAvailable === null || getPrintAvailable === void 0 ? void 0 : getPrintAvailable()) !== null && _e !== void 0 ? _e : true,
+                    printAvailable: (_g = getPrintAvailable === null || getPrintAvailable === void 0 ? void 0 : getPrintAvailable()) !== null && _g !== void 0 ? _g : true,
                 });
             }
             catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/core",
-  "version": "2.1.28",
+  "version": "2.1.30",
   "private": false,
   "type": "module",
   "description": "Framework-neutral modular TypeScript core for Flyfish File Viewer renderer orchestration, lifecycle APIs, search, zoom, print, and export",