@file-viewer/renderer-word 2.1.30 → 2.2.0

package/dist/index.d.ts

@@ -1,6 +1,12 @@
 import { type FileRenderHandler, type FileViewerRenderedInstance, type FileViewerRendererPlugin, type RendererDefinition } from '@file-viewer/core';
 export declare const wordRendererDefinitions: RendererDefinition[];
 export declare const renderFileViewerWordDocx: FileRenderHandler<FileViewerRenderedInstance, HTMLDivElement>;
+/**
+ * A surprising number of legacy systems keep the `.doc` suffix after saving
+ * an OOXML document. Route those ZIP-based files through the DOCX engine while
+ * leaving genuine OLE/CFB `.doc` files on the binary parser.
+ */
+export declare const resolveFileViewerWordContainer: (buffer: ArrayBuffer) => "openxml" | "binary";
 export declare const renderFileViewerWordDoc: FileRenderHandler<FileViewerRenderedInstance, HTMLDivElement>;
 export declare const renderFileViewerOpenDocument: FileRenderHandler<FileViewerRenderedInstance, HTMLDivElement>;
 export declare const wordRenderer: FileViewerRendererPlugin<FileRenderHandler<FileViewerRenderedInstance, HTMLDivElement>>;

package/dist/index.js

@@ -10,7 +10,21 @@ if (wordDefinitions.length !== wordRendererIds.length) {
 }
 export const wordRendererDefinitions = wordDefinitions;
 export const renderFileViewerWordDocx = (buffer, target, _type, context) => import('./wordDocx.js').then(({ default: renderWordDocx }) => renderWordDocx(buffer, target, context));
-export const renderFileViewerWordDoc = (buffer, target, _type, context) => import('./wordDoc.js').then(({ default: renderWordDoc }) => renderWordDoc(buffer, target, context));
+/**
+ * A surprising number of legacy systems keep the `.doc` suffix after saving
+ * an OOXML document. Route those ZIP-based files through the DOCX engine while
+ * leaving genuine OLE/CFB `.doc` files on the binary parser.
+ */
+export const resolveFileViewerWordContainer = (buffer) => {
+    if (buffer.byteLength < 2) {
+        return 'binary';
+    }
+    const bytes = new Uint8Array(buffer, 0, 2);
+    return bytes[0] === 0x50 && bytes[1] === 0x4b ? 'openxml' : 'binary';
+};
+export const renderFileViewerWordDoc = (buffer, target, _type, context) => resolveFileViewerWordContainer(buffer) === 'openxml'
+    ? import('./wordDocx.js').then(({ default: renderWordDocx }) => renderWordDocx(buffer, target, context))
+    : import('./wordDoc.js').then(({ default: renderWordDoc }) => renderWordDoc(buffer, target, context));
 export const renderFileViewerOpenDocument = (buffer, target, type, context) => import('./openDocument.js').then(({ default: renderOpenDocument }) => renderOpenDocument(buffer, target, type, context));
 export const wordRenderer = {
     id: 'file-viewer-renderer-word',

package/dist/openDocument.js

@@ -1,17 +1,20 @@
 import JSZip from 'jszip';
 import { createFileViewerTranslator, } from '@file-viewer/core';
 const openDocumentStyle = `
-.odf-viewer{min-height:100%;padding:28px;overflow:auto;background:#dfe5eb;box-sizing:border-box}
+.odf-viewer{min-height:100%;padding:28px;overflow:auto;background:var(--file-viewer-render-surface-background,#dfe5eb);box-sizing:border-box}
 .odf-shell{width:min(100%,980px);margin:0 auto}.odf-shell>header{margin-bottom:18px;padding:18px 22px;border-radius:8px;background:#fff;box-shadow:0 10px 26px rgba(15,23,42,.1);box-sizing:border-box}
 .odf-shell>header span{color:#0f766e;font-size:12px;font-weight:800}.odf-shell>header h2{margin:6px 0 0;color:#132235;font-size:24px}
 .odf-page{min-height:360px;margin:0 auto 18px;padding:42px 48px;border-radius:4px;background:#fff;box-shadow:0 16px 38px rgba(15,23,42,.12);color:#1f2937;box-sizing:border-box}
 .odf-page h3{margin:0 0 20px;color:#334155;font-size:18px}.odf-page p{margin:0 0 12px;font-size:15px;line-height:1.85;white-space:pre-wrap}
-.flyfish-rtf-viewer{min-height:100%;padding:28px;overflow:auto;background:#dfe5eb;color:#1f2937;box-sizing:border-box}
+.flyfish-rtf-viewer{min-height:100%;padding:28px;overflow:auto;background:var(--file-viewer-render-surface-background,#dfe5eb);color:#1f2937;box-sizing:border-box}
 .flyfish-rtf-header{width:min(100%,900px);margin:0 auto 18px;padding:18px 22px;border-radius:8px;background:#fff;box-shadow:0 10px 26px rgba(15,23,42,.1);box-sizing:border-box}
 .flyfish-rtf-header span{display:block;color:#0f766e;font-size:12px;font-weight:800}.flyfish-rtf-header strong{display:block;margin-top:6px;color:#132235;font-size:24px}
 .flyfish-rtf-paper{width:min(100%,900px);min-height:980px;margin:0 auto;padding:54px 62px;background:#fff;box-shadow:0 16px 38px rgba(15,23,42,.12);line-height:1.75;box-sizing:border-box}.flyfish-rtf-paper p{margin:0 0 12px}
-[data-viewer-theme='dark'] .odf-viewer,[data-viewer-theme='dark'] .flyfish-rtf-viewer{background:#111827}[data-viewer-theme='dark'] .odf-shell>header,[data-viewer-theme='dark'] .odf-page,[data-viewer-theme='dark'] .flyfish-rtf-header,[data-viewer-theme='dark'] .flyfish-rtf-paper{background:#f8fafc;color:#1f2937}
-@media (prefers-color-scheme:dark){[data-viewer-theme='system'] .odf-viewer,[data-viewer-theme='system'] .flyfish-rtf-viewer{background:#111827}[data-viewer-theme='system'] .odf-shell>header,[data-viewer-theme='system'] .odf-page,[data-viewer-theme='system'] .flyfish-rtf-header,[data-viewer-theme='system'] .flyfish-rtf-paper{background:#f8fafc;color:#1f2937}}
+[data-viewer-theme='dark'] .odf-viewer,[data-viewer-theme='dark'] .flyfish-rtf-viewer{color-scheme:dark;background:var(--file-viewer-render-surface-background,#0d1117);color:#e6edf3}
+[data-viewer-theme='dark'] .odf-shell>header,[data-viewer-theme='dark'] .odf-page,[data-viewer-theme='dark'] .flyfish-rtf-header,[data-viewer-theme='dark'] .flyfish-rtf-paper{border:1px solid rgba(139,148,158,.24);background:#161b22;color:#e6edf3;box-shadow:0 18px 44px rgba(0,0,0,.34)}
+[data-viewer-theme='dark'] .odf-shell>header h2,[data-viewer-theme='dark'] .odf-page h3,[data-viewer-theme='dark'] .flyfish-rtf-header strong{color:#f0f6fc}
+[data-viewer-theme='dark'] .odf-shell>header span,[data-viewer-theme='dark'] .flyfish-rtf-header span{color:#6ee7b7}
+@media (prefers-color-scheme:dark){[data-viewer-theme='system'] .odf-viewer,[data-viewer-theme='system'] .flyfish-rtf-viewer{color-scheme:dark;background:var(--file-viewer-render-surface-background,#0d1117);color:#e6edf3}[data-viewer-theme='system'] .odf-shell>header,[data-viewer-theme='system'] .odf-page,[data-viewer-theme='system'] .flyfish-rtf-header,[data-viewer-theme='system'] .flyfish-rtf-paper{border:1px solid rgba(139,148,158,.24);background:#161b22;color:#e6edf3;box-shadow:0 18px 44px rgba(0,0,0,.34)}[data-viewer-theme='system'] .odf-shell>header h2,[data-viewer-theme='system'] .odf-page h3,[data-viewer-theme='system'] .flyfish-rtf-header strong{color:#f0f6fc}[data-viewer-theme='system'] .odf-shell>header span,[data-viewer-theme='system'] .flyfish-rtf-header span{color:#6ee7b7}}
 @media (max-width:720px){.odf-viewer,.flyfish-rtf-viewer{padding:14px}.odf-page{padding:28px 24px}.flyfish-rtf-paper{padding:36px 28px}}
 `;
 const createStyle = () => {

package/dist/wordDoc.js

@@ -14,7 +14,7 @@ const WORD_PAGE_CSS = `
   box-sizing:border-box;
   min-height:100%;
   padding:32px 24px 48px;
-  background:#ececec;
+  background:var(--file-viewer-render-surface-background,#ececec);
   display:flex;
   flex-direction:column;
   align-items:center;
@@ -71,23 +71,47 @@ const WORD_PAGE_CSS = `
   display:none;
 }
 [data-viewer-theme='dark'] .msdoc-stage{
-  background:#111827;
+  background:var(--file-viewer-render-surface-background,#111827);
 }
 [data-viewer-theme='dark'] .msdoc-page > .msdoc-root{
-  color-scheme:only light;
-  forced-color-adjust:none;
-  background:#fff;
-  color:#111;
+  color-scheme:dark;
+  background:#161b22;
+  border-color:rgba(139,148,158,.24);
+  color:#e6edf3;
+  box-shadow:0 18px 44px rgba(0,0,0,.36);
+}
+[data-viewer-theme='dark'] .msdoc-page > .msdoc-root span[style*='color:#000000']{
+  color:#e6edf3!important;
+}
+[data-viewer-theme='dark'] .msdoc-page .msdoc-link{
+  color:#58a6ff;
+}
+[data-viewer-theme='dark'] .msdoc-page .msdoc-attachment{
+  border-color:rgba(139,148,158,.3);
+  background:#21262d;
+  color:#58a6ff;
 }
 @media (prefers-color-scheme:dark){
   [data-viewer-theme='system'] .msdoc-stage{
-    background:#111827;
+    background:var(--file-viewer-render-surface-background,#111827);
   }
   [data-viewer-theme='system'] .msdoc-page > .msdoc-root{
-    color-scheme:only light;
-    forced-color-adjust:none;
-    background:#fff;
-    color:#111;
+    color-scheme:dark;
+    background:#161b22;
+    border-color:rgba(139,148,158,.24);
+    color:#e6edf3;
+    box-shadow:0 18px 44px rgba(0,0,0,.36);
+  }
+  [data-viewer-theme='system'] .msdoc-page > .msdoc-root span[style*='color:#000000']{
+    color:#e6edf3!important;
+  }
+  [data-viewer-theme='system'] .msdoc-page .msdoc-link{
+    color:#58a6ff;
+  }
+  [data-viewer-theme='system'] .msdoc-page .msdoc-attachment{
+    border-color:rgba(139,148,158,.3);
+    background:#21262d;
+    color:#58a6ff;
   }
 }
 @media (max-width: 860px){
@@ -110,14 +134,14 @@ const MSDOC_ZOOM_CSS = `
   box-sizing:border-box;
   height:100%;
   overflow:auto;
-  background:#ececec;
+  background:var(--file-viewer-render-surface-background,#ececec);
 }
 [data-viewer-theme='dark'] .msdoc-zoom-viewer{
-  background:#111827;
+  background:var(--file-viewer-render-surface-background,#111827);
 }
 @media (prefers-color-scheme:dark){
   [data-viewer-theme='system'] .msdoc-zoom-viewer{
-    background:#111827;
+    background:var(--file-viewer-render-surface-background,#111827);
   }
 }
 .msdoc-zoom-viewer .msdoc-stage{

package/dist/wordDocx.d.ts

@@ -1,5 +1,16 @@
+import type { Options, renderAsync } from '@file-viewer/docx';
 import { type FileRenderContext, type FileViewerRenderedInstance as AppWrapper } from '@file-viewer/core';
+type DocxRenderAsync = typeof renderAsync;
+export declare const isMissingDocxHeaderFooterRootError: (error: unknown) => boolean;
+/**
+ * Some malformed or partially generated DOCX files reference a header/footer
+ * part whose parsed root is missing. @file-viewer/docx 0.3.21 skips that part;
+ * this retry keeps older installed engines usable while the dependency update
+ * rolls through lockfiles and private registries.
+ */
+export declare const renderDocxWithHeaderFooterFallback: (render: DocxRenderAsync, buffer: ArrayBuffer, target: HTMLDivElement, options: Options) => Promise<boolean>;
 /**
  * 渲染docx文件
  */
 export default function (buffer: ArrayBuffer, target: HTMLDivElement, context?: FileRenderContext): Promise<AppWrapper>;
+export {};

package/dist/wordDocx.js

@@ -1,4 +1,4 @@
-import { resolveFileViewerDocxWorkerJsZipUrl, resolveFileViewerDocxWorkerUrl, } from '@file-viewer/core/assets';
+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';
 const DOCX_DEFAULT_PAGE_SIZE = {
     width: 794,
@@ -33,6 +33,37 @@ const loadLibrary = (() => {
         return resolveDocxLibrary(await loader.load());
     };
 })();
+export const isMissingDocxHeaderFooterRootError = (error) => {
+    if (!(error instanceof Error)) {
+        return false;
+    }
+    return /(?:undefined|null).*children|children.*(?:undefined|null)/i.test(error.message) &&
+        /renderHeaderFooter/i.test(error.stack || '');
+};
+/**
+ * Some malformed or partially generated DOCX files reference a header/footer
+ * part whose parsed root is missing. @file-viewer/docx 0.3.21 skips that part;
+ * this retry keeps older installed engines usable while the dependency update
+ * rolls through lockfiles and private registries.
+ */
+export const renderDocxWithHeaderFooterFallback = async (render, buffer, target, options) => {
+    try {
+        await render(buffer, target, undefined, options);
+        return false;
+    }
+    catch (error) {
+        if (!isMissingDocxHeaderFooterRootError(error)) {
+            throw error;
+        }
+        target.innerHTML = '';
+        await render(buffer, target, undefined, {
+            ...options,
+            renderHeaders: false,
+            renderFooters: false
+        });
+        return true;
+    }
+};
 /**
  * DOCX / DOCM / DOTX / DOTM are OOXML packages, so a valid file must start
  * with a ZIP signature. This catches common enterprise download failures where
@@ -73,11 +104,14 @@ const shouldUseDocxWorker = (target, docxOptions) => {
     if ((docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.worker) === true) {
         return true;
     }
+    // Auto mode is asset-aware. A browser can expose Worker even when a host has
+    // not copied the optional DOCX vendor files; probing that missing URL often
+    // returns an SPA HTML fallback and emits a SyntaxError before main-thread
+    // rendering recovers. Full packages inject workerUrl, so they still use it.
     const WorkerCtor = (_b = (_a = getTargetWindow(target)) === null || _a === void 0 ? void 0 : _a.Worker) !== null && _b !== void 0 ? _b : globalThis.Worker;
-    if (!WorkerCtor) {
-        return false;
-    }
-    return !DOCX_WORKER_UNSAFE_PROTOCOLS.has(getTargetProtocol(target));
+    return Boolean(WorkerCtor &&
+        (docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.workerUrl) &&
+        !DOCX_WORKER_UNSAFE_PROTOCOLS.has(getTargetProtocol(target)));
 };
 const prefersDarkColorScheme = (target) => {
     var _a;
@@ -108,7 +142,7 @@ const appendDocxVendorAssetVersion = (url, explicitUrl) => {
 const createDocxOptions = (target, context, notifyProgressiveRender) => {
     var _a, _b;
     const docxOptions = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.docx;
-    const documentBaseUrl = target.ownerDocument.URL || undefined;
+    const documentBaseUrl = resolveFileViewerRuntimeAssetBaseUrl(target.ownerDocument);
     const useWorker = shouldUseDocxWorker(target, docxOptions);
     const usePagedLayout = (docxOptions === null || docxOptions === void 0 ? void 0 : docxOptions.visualPagination) === true;
     const darkMode = resolveDocxDarkMode(target, context, docxOptions);
@@ -173,11 +207,11 @@ const DOCX_RESPONSIVE_CSS = `
   box-sizing: border-box;
   height: 100%;
   overflow: auto;
-  background: #ececec;
+  background: var(--file-viewer-render-surface-background, #ececec);
   color-scheme: light;
 }
 .docx-fit-viewer[data-docx-dark-mode='true'] {
-  background: #242424;
+  background: var(--file-viewer-render-surface-background, #242424);
   color-scheme: dark;
 }
 .docx-fit-viewer .docx-wrapper {
@@ -185,10 +219,10 @@ const DOCX_RESPONSIVE_CSS = `
   min-width: 0 !important;
   width: 100% !important;
   padding: 24px 14px 40px !important;
-  background: #e7e9ec !important;
+  background: var(--file-viewer-render-surface-background, #e7e9ec) !important;
 }
 .docx-fit-viewer[data-docx-dark-mode='true'] .docx-wrapper {
-  background: #242424 !important;
+  background: var(--file-viewer-render-surface-background, #242424) !important;
 }
 .docx-fit-viewer .docx-page-frame {
   position: relative;
@@ -521,10 +555,11 @@ export default async function (buffer, target, context) {
     const { defaultOptions, renderAsync } = await loadLibrary();
     target.dataset.docxWorker = docxOptions.useWorker ? 'self' : 'false';
     target.dataset.docxDarkMode = docxOptions.darkMode ? 'true' : 'false';
-    await renderAsync(buffer, target, undefined, {
+    const usedHeaderFooterFallback = await renderDocxWithHeaderFooterFallback(renderAsync, buffer, target, {
         ...defaultOptions,
         ...docxOptions
     });
+    target.dataset.docxHeaderFooterFallback = usedHeaderFooterFallback ? 'true' : 'false';
     notifyProgressiveRender();
     const disposeResponsive = makeDocxResponsive(target, context);
     (_a = context === null || context === void 0 ? void 0 : context.registerExportAdapter) === null || _a === void 0 ? void 0 : _a.call(context, {
@@ -551,6 +586,7 @@ export default async function (buffer, target, context) {
             disposeResponsive();
             delete target.dataset.docxWorker;
             delete target.dataset.docxDarkMode;
+            delete target.dataset.docxHeaderFooterFallback;
             target.innerHTML = '';
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-word",
-  "version": "2.1.30",
+  "version": "2.2.0",
   "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.30",
-    "@file-viewer/doc": "2.1.30",
+    "@file-viewer/core": "2.2.0",
+    "@file-viewer/doc": "2.2.0",
     "@file-viewer/docx": "^0.3.20",
     "jszip": "^3.10.1",
     "rtf.js": "^3.0.9"