@file-viewer/renderer-ofd 2.1.28 → 2.1.30

package/dist/ofd.js

@@ -84,8 +84,41 @@ const appendPages = (documentRef, target, pages) => {
     });
     target.appendChild(fragment);
 };
+const replacePages = (documentRef, target, pages) => {
+    const existingFrames = Array.from(target.children).filter((element) => {
+        var _a;
+        return (element instanceof (((_a = target.ownerDocument.defaultView) === null || _a === void 0 ? void 0 : _a.HTMLElement) || HTMLElement) &&
+            element.classList.contains('ofd-page-frame'));
+    });
+    const designerActive = existingFrames.some(frame => (frame.querySelector('.fv-print-mask-canvas')));
+    if (!designerActive) {
+        target.replaceChildren();
+        appendPages(documentRef, target, pages);
+        return true;
+    }
+    if (existingFrames.length !== pages.length) {
+        return false;
+    }
+    // The print-mask designer owns canvases attached to these stable frame
+    // nodes. Replace only the rendered OFD page so a resize cannot detach the
+    // active drawing surface or lose its pointer handlers.
+    pages.forEach((page, index) => {
+        const frame = existingFrames[index];
+        const previousPage = Array.from(frame.children).find(child => (child.classList.contains('ofd-page')));
+        if (!frame || !previousPage) {
+            return;
+        }
+        page.classList.add('ofd-page');
+        page.dataset.viewerThemeBoundary = 'light';
+        page.style.backgroundColor = '#fff';
+        page.style.color = '#111827';
+        page.style.colorScheme = 'only light';
+        previousPage.replaceWith(page);
+    });
+    return true;
+};
 export default async function renderOfd(buffer, target, context) {
-    var _a;
+    var _a, _b;
     const t = createFileViewerTranslator(context === null || context === void 0 ? void 0 : context.options);
     const documentRef = target.ownerDocument || document;
     const targetWindow = documentRef.defaultView || (typeof window !== 'undefined' ? window : null);
@@ -185,10 +218,13 @@ export default async function renderOfd(buffer, target, context) {
         return Promise.resolve(ofd.renderOfd(width, ofdDocument));
     };
     const render = async (options = {}) => {
-        var _a;
+        var _a, _b, _c;
         if (disposed) {
             return;
         }
+        if ((_a = context === null || context === void 0 ? void 0 : context.signal) === null || _a === void 0 ? void 0 : _a.aborted) {
+            throw context.signal.reason || new DOMException('OFD rendering aborted.', 'AbortError');
+        }
         const width = getRenderWidth();
         if (!options.force && state === 'ready' && Math.abs(width - lastRenderedWidth) < 8) {
             return;
@@ -206,15 +242,19 @@ export default async function renderOfd(buffer, target, context) {
             if (disposed || version !== renderVersion) {
                 return;
             }
-            clearStage();
-            appendPages(documentRef, stage, pages);
+            if ((_b = context === null || context === void 0 ? void 0 : context.signal) === null || _b === void 0 ? void 0 : _b.aborted) {
+                throw context.signal.reason || new DOMException('OFD rendering aborted.', 'AbortError');
+            }
+            if (!replacePages(documentRef, stage, pages)) {
+                return;
+            }
             lastRenderedWidth = width;
             await waitForPaint(targetWindow);
             syncPageZoom();
             state = 'ready';
             syncState();
             zoomEmitter.emit();
-            (_a = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _a === void 0 ? void 0 : _a.call(context);
+            (_c = context === null || context === void 0 ? void 0 : context.onProgressiveRender) === null || _c === void 0 ? void 0 : _c.call(context);
         }
         catch (reason) {
             if (disposed || version !== renderVersion) {
@@ -224,6 +264,9 @@ export default async function renderOfd(buffer, target, context) {
             state = 'error';
             errorMessage = normalizeError(reason, t('ofd.error.parseFailed'), context) || t('ofd.error.parseFailed');
             syncState();
+            if (options.rejectOnError) {
+                throw reason;
+            }
         }
     };
     const startResizeObserver = () => {
@@ -238,11 +281,19 @@ export default async function renderOfd(buffer, target, context) {
         });
         resizeObserver.observe(viewer);
     };
-    void render({ force: true, showLoading: true }).finally(() => {
+    try {
+        // Do not report the renderer as loaded until page surfaces exist. This
+        // keeps immediate print/mask operations page-aware and propagates initial
+        // parse failures through the normal renderer error lifecycle.
+        await render({ force: true, showLoading: true, rejectOnError: true });
         if (!disposed) {
             startResizeObserver();
         }
-    });
+    }
+    catch (error) {
+        unregisterFileViewerZoomProvider(viewer);
+        throw error;
+    }
     (_a = context === null || context === void 0 ? void 0 : context.registerThumbnailAdapter) === null || _a === void 0 ? void 0 : _a.call(context, {
         beforeCapture: async ({ signal }) => {
             while (state === 'loading' && !disposed) {
@@ -262,6 +313,19 @@ export default async function renderOfd(buffer, target, context) {
         },
         getTarget: () => stage.querySelector('.ofd-page-frame, .ofd-page') || stage,
     });
+    (_b = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _b === void 0 ? void 0 : _b.call(context, {
+        print: true,
+        exportHtml: true,
+        includeDocumentStyles: true,
+        getPrintMaskPages: () => Array.from(stage.querySelectorAll('.ofd-page-frame')),
+        toHtml: () => {
+            const clone = stage.cloneNode(true);
+            clone.querySelectorAll('.ofd-page-frame').forEach((page, index) => {
+                page.dataset.viewerPrintPageIndex = String(index);
+            });
+            return clone.outerHTML;
+        },
+    });
     return {
         $el: viewer,
         unmount() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-ofd",
-  "version": "2.1.28",
+  "version": "2.1.30",
   "private": false,
   "type": "module",
   "description": "Standalone OFD renderer plugin for Flyfish File Viewer powered by DLTech21/ofd.js.",
@@ -53,7 +53,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "2.1.28",
+    "@file-viewer/core": "2.1.30",
     "jszip": "^3.10.1"
   },
   "devDependencies": {

package/vendor/dltech/ofd/pipeline.js

@@ -1,26 +1,11 @@
 
 'use strict';
-Array.prototype.pipeline = async function(callback){
-  if (null === this || 'undefined' === typeof this) {
-    // At the moment all modern browsers, that support strict mode, have
-    // native implementation of Array.prototype.reduce. For instance, IE8
-    // does not support strict mode, so this check is actually useless.
-    throw new TypeError(
-      'Array.prototype.pipeline called on null or undefined');
-  }
-  if ('function' !== typeof callback) {
-    throw new TypeError(callback + ' is not a function');
-  }
-  var index, value,
-    length = this.length >>> 0;
-  for (index = 0; length > index; ++index) {
-    value = await callback(value, this[index], index, this);
+const _pipeline = async function(...funcs){
+  let value;
+  for (let index = 0; index < funcs.length; index += 1) {
+    value = await funcs[index].call(this, value);
   }
   return value;
 };
 
-let _pipeline = function(...funcs){
-  return funcs.pipeline((a, b) => b.call(this, a));
-}
-
 export const pipeline = _pipeline;