@file-viewer/doc 2.1.23 → 2.1.25

package/dist/render/html.js

@@ -150,11 +150,67 @@ function renderTextNode(node) {
     }
     return inner;
 }
+function inlineImageDisplaySizePx(asset) {
+    const widthPx = twipsToPx(asset.meta?.displayWidthTwips);
+    const heightPx = twipsToPx(asset.meta?.displayHeightTwips);
+    return {
+        widthPx: widthPx && widthPx > 0 ? widthPx : undefined,
+        heightPx: heightPx && heightPx > 0 ? heightPx : undefined,
+    };
+}
+function applyInlineImageDisplaySize(style, asset) {
+    const { widthPx, heightPx } = inlineImageDisplaySizePx(asset);
+    if (!widthPx && !heightPx)
+        return;
+    if (widthPx)
+        style.width = `${widthPx}px`;
+    if (heightPx)
+        style.height = `${heightPx}px`;
+}
+function sanitizeImageSource(src) {
+    const value = String(src || '').trim();
+    if (!value)
+        return null;
+    if (/^data:image\//i.test(value))
+        return value;
+    if (/^(?:https?:|blob:)/i.test(value))
+        return value;
+    return null;
+}
+function sanitizeAssetHref(href) {
+    const value = String(href || '').trim();
+    if (!value)
+        return null;
+    if (/^(?:data:|blob:|https?:)/i.test(value))
+        return value;
+    return null;
+}
 function renderImageNode(node) {
+    const src = sanitizeImageSource(node.asset.sourceUrl) || sanitizeImageSource(node.asset.dataUrl);
     const baseStyle = inlineStyleToCss(node.style);
-    baseStyle['max-width'] = '100%';
-    baseStyle.height = 'auto';
-    const img = `<img class="msdoc-image" src="${escapeHtml(node.asset.dataUrl)}" alt="" style="${styleObjectToCss(baseStyle)}">`;
+    const displaySize = inlineImageDisplaySizePx(node.asset);
+    if (displaySize.widthPx || displaySize.heightPx) {
+        applyInlineImageDisplaySize(baseStyle, node.asset);
+        baseStyle['max-width'] = 'none';
+        if (!displaySize.heightPx)
+            baseStyle.height = 'auto';
+    }
+    else {
+        baseStyle['max-width'] = '100%';
+        baseStyle.height = 'auto';
+    }
+    if (!src || node.asset.displayable === false) {
+        const fallbackHref = sanitizeAssetHref(node.asset.dataUrl) || sanitizeAssetHref(node.asset.sourceUrl);
+        const label = escapeHtml(String(node.asset.meta?.linkedPath || node.asset.mime || 'image'));
+        const inner = fallbackHref
+            ? `<a class="msdoc-attachment msdoc-image-fallback" href="${escapeHtml(fallbackHref)}" target="_blank" rel="noreferrer noopener">🖼 ${label}</a>`
+            : `<span class="msdoc-image-fallback">🖼 ${label}</span>`;
+        if (node.href) {
+            return `<a class="msdoc-link" href="${escapeHtml(node.href)}" target="_blank" rel="noreferrer noopener">${inner}</a>`;
+        }
+        return inner;
+    }
+    const img = `<img class="msdoc-image" src="${escapeHtml(src)}" alt="" style="${styleObjectToCss(baseStyle)}">`;
     if (node.href) {
         return `<a class="msdoc-link" href="${escapeHtml(node.href)}" target="_blank" rel="noreferrer noopener">${img}</a>`;
     }
@@ -278,6 +334,7 @@ export function defaultMsDocCss() {
 .msdoc-link{color:#1a73e8;text-decoration:none}
 .msdoc-link:hover{text-decoration:underline}
 .msdoc-image{display:inline-block;vertical-align:middle}
+.msdoc-image-fallback{display:inline-flex;align-items:center;gap:6px}
 .msdoc-attachment{display:inline-flex;align-items:center;gap:6px;padding:4px 8px;border:1px solid #d0d7de;border-radius:6px;background:#f6f8fa;color:#0969da;text-decoration:none}
 .msdoc-attachments{margin-top:20px;padding-top:12px;border-top:1px solid #e5e7eb}
 .msdoc-attachments-title{font-weight:600;margin-bottom:8px}

package/dist/types.d.ts

@@ -421,13 +421,75 @@ export interface FieldInstructionRaw {
     raw: string;
 }
 export type FieldInstruction = FieldInstructionHyperlink | FieldInstructionIncludePicture | FieldInstructionRaw;
+export interface PicfSummary {
+    pictureOffset: number;
+    lcb: number;
+    cbHeader: number;
+    mm?: number;
+    xExt?: number;
+    yExt?: number;
+    dxaGoalTwips?: number;
+    dyaGoalTwips?: number;
+    scaleXPermille?: number;
+    scaleYPermille?: number;
+    displayWidthTwips?: number;
+    displayHeightTwips?: number;
+}
+export interface OfficeArtBlipMeta {
+    recType?: number;
+    recInstance?: number;
+    fbseBlipType?: number;
+    fbseMime?: string | null;
+    fbseTag?: number;
+    fbseSize?: number;
+    fbseRefCount?: number;
+    fbseDelayOffset?: number;
+    fbseName?: string;
+    fbseDelayStream?: string;
+    blipIndex?: number;
+    sourceShapeId?: number;
+}
+/** PICF / OfficeArt BLIP / linked-picture metadata used by the HTML renderer. */
+export interface ImageAssetMeta extends PicfSummary, OfficeArtBlipMeta {
+    linkedPath?: string;
+    sourceKind?: 'embedded' | 'linked' | 'fallback';
+    localExternal?: boolean;
+    browserRenderable?: boolean;
+    metafileCompressed?: boolean;
+    metafileCompression?: number;
+    metafileFilter?: number;
+    metafileUncompressedSize?: number;
+    metafileCompressedSize?: number;
+    metafileOriginalByteLength?: number;
+    metafileDecompressed?: boolean;
+    vectorConverted?: boolean;
+    vectorSourceMime?: string;
+    vectorWidth?: number;
+    vectorHeight?: number;
+    vectorRecordCount?: number;
+    fbseIndex?: number;
+    dggOffset?: number;
+    blipIndex?: number;
+    sourceShapeId?: number;
+}
+export interface AttachmentAssetMeta {
+    stream?: string;
+    label?: string;
+    originalPath?: string;
+    tempPath?: string;
+    dataSize?: number;
+    sourceKind?: 'ole10-native' | 'package' | 'content' | 'unknown';
+    [key: string]: unknown;
+}
 export interface ImageAsset {
     id: string;
     type: 'image';
     mime: string;
     bytes: Uint8Array;
     dataUrl: string;
-    meta?: Record<string, unknown>;
+    sourceUrl?: string;
+    displayable?: boolean;
+    meta?: ImageAssetMeta;
 }
 export interface AttachmentAsset {
     id: string;
@@ -436,7 +498,7 @@ export interface AttachmentAsset {
     mime: string;
     bytes: Uint8Array;
     dataUrl: string;
-    meta?: Record<string, unknown>;
+    meta?: AttachmentAssetMeta;
 }
 export type MsDocAsset = ImageAsset | AttachmentAsset;
 export interface ObjectPoolInfo {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/doc",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "private": false,
   "type": "module",
   "description": "Browser-native legacy MS-DOC (.doc) parser and HTML renderer extracted from the public msdoc-viewer 0.2.0 line.",
@@ -68,6 +68,7 @@
   "scripts": {
     "build": "tsc -b tsconfig.json",
     "type-check": "tsc -b tsconfig.json",
-    "verify:github-34": "pnpm build && node scripts/verify-github-34.mjs"
+    "verify:github-34": "pnpm build && node scripts/verify-github-34.mjs",
+    "verify:github-87": "pnpm build && node scripts/verify-github-87.mjs"
   }
 }