@beyondwork/docx-react-component 1.0.43 → 1.0.46

package/src/io/normalize/normalize-text.ts

@@ -23,6 +23,7 @@ import type {
 import type {
   ParsedAltChunkNode,
   ParsedBlockNode,
+  ParsedChartPreviewNode,
   ParsedCustomXmlNode,
   ParsedHyperlinkNode,
   ParsedInlineNode,
@@ -31,6 +32,7 @@ import type {
   ParsedParagraphNode,
   ParsedSectionBreakNode,
   ParsedSdtNode,
+  ParsedSmartArtPreviewNode,
   ParsedTableBlockNode,
   ParsedTableCellNode,
   ParsedTableRowNode,
@@ -476,6 +478,7 @@ function normalizeInlineChildren(
         state.cursor += 1;
         break;
       case "chart_preview":
+        registerComplexPreviewMedia(state, node);
         normalized.push({
           type: "chart_preview",
           ...(node.previewMediaId ? { previewMediaId: node.previewMediaId } : {}),
@@ -484,6 +487,7 @@ function normalizeInlineChildren(
         state.cursor += 1;
         break;
       case "smartart_preview":
+        registerComplexPreviewMedia(state, node);
         normalized.push({
           type: "smartart_preview",
           ...(node.previewMediaId ? { previewMediaId: node.previewMediaId } : {}),
@@ -611,6 +615,35 @@ function normalizeImageNode(
   };
 }
 
+/**
+ * Register a chart/SmartArt preview bitmap in the media catalog so the
+ * surface renderer can resolve `previewMediaId` → `previewSrc` the same
+ * way it does for inline images. Chart/SmartArt nodes weren't previously
+ * registered because only image nodes walked through `normalizeImageNode`.
+ * Needed by docs/plans/lane-5-charts.md Stage 0 (real mc:Fallback bitmaps) and
+ * Stage 0B (synthesized previews from the demo harness decorator) —
+ * without this, previewMediaId sits in the canonical model but
+ * `canonicalDocument.media.items` has no corresponding MediaItem and
+ * the editor's mediaPreview resolver skips the bitmap.
+ */
+function registerComplexPreviewMedia(
+  state: NormalizationState,
+  node: ParsedChartPreviewNode | ParsedSmartArtPreviewNode,
+): void {
+  if (!node.previewMediaId) return;
+  if (state.media.items[node.previewMediaId]) return; // already registered (e.g. via another reference)
+  const packagePartName =
+    node.previewPackagePartName ?? `/${node.previewMediaId.slice("media:".length)}`;
+  const filename =
+    packagePartName.slice(packagePartName.lastIndexOf("/") + 1) || "chart-preview.bin";
+  state.media.items[node.previewMediaId] = {
+    mediaId: node.previewMediaId,
+    contentType: node.previewContentType ?? "application/octet-stream",
+    filename,
+    packagePartName,
+  };
+}
+
 function normalizeHyperlink(node: ParsedHyperlinkNode): {
   type: "hyperlink";
   href: string;

package/src/io/ooxml/parse-comments.ts

@@ -173,39 +173,6 @@ export function parseCommentsFromOoxml(
       continue;
     }
 
-    if (startParagraphIndex !== endParagraphIndex) {
-      diagnostics.push({
-        commentId: rootCommentId,
-        code: "multi_paragraph_anchor_preserve_only",
-        message:
-          "Comment anchor spans multiple paragraphs. Thread is visible but detached; cross-paragraph anchoring is not yet supported for live editing.",
-        featureClass: "preserve-only",
-        detachedReason: "multi-paragraph",
-        actionabilityNote: "The comment thread and body are preserved. Operators see the thread in the sidebar but cannot navigate to an inline highlight.",
-      });
-      threads.push(
-        createImportedCommentThread({
-          commentId: rootCommentId,
-          body: rootDefinition.body,
-          createdBy,
-          createdAt,
-          range: detachedRange,
-          entries,
-          status: "detached",
-          resolution,
-          metadata: {
-            source: "import",
-            rootOoxmlCommentId: rootDefinition.commentId,
-            rootParaId: rootDefinition.paraId,
-            detachedReason: "multi-paragraph",
-            actionabilityNote:
-              "The comment thread and body are preserved. Operators see the thread in the sidebar but cannot navigate to an inline highlight.",
-          },
-        }),
-      );
-      continue;
-    }
-
     threads.push(
       createImportedCommentThread({
         commentId: rootCommentId,

package/src/io/ooxml/parse-complex-content.ts

@@ -21,6 +21,10 @@ export interface ParsedChartContent {
   type: "chart_preview";
   /** Media ID of the fallback preview image, if one is present in mc:Fallback. */
   previewMediaId?: string;
+  /** Absolute package path of the preview media (e.g. `/word/media/chartN.png`); required by the media catalog when the preview media needs an entry. */
+  previewPackagePartName?: string;
+  /** MIME type of the preview media (e.g. `image/png`, `image/svg+xml`). */
+  previewContentType?: string;
   /** Original drawing XML slice for lossless round-trip export. */
   rawXml: string;
 }
@@ -29,6 +33,10 @@ export interface ParsedSmartArtContent {
   type: "smartart_preview";
   /** Media ID of the fallback preview image, if one is present in mc:Fallback. */
   previewMediaId?: string;
+  /** Absolute package path of the preview media. */
+  previewPackagePartName?: string;
+  /** MIME type of the preview media. */
+  previewContentType?: string;
   /** Original drawing XML slice for lossless round-trip export. */
   rawXml: string;
 }
@@ -116,6 +124,8 @@ function parseAlternateContent(
 
   // Extract fallback preview image if present
   let previewMediaId: string | undefined;
+  let previewPackagePartName: string | undefined;
+  let previewContentType: string | undefined;
   if (fallback) {
     const fallbackBlip = findFirstDescendant(fallback, "blip");
     if (fallbackBlip) {
@@ -132,6 +142,8 @@ function parseAlternateContent(
           const mediaPart = mediaParts.get(packagePartName);
           if (mediaPart) {
             previewMediaId = `media:${packagePartName.slice(1)}`;
+            previewPackagePartName = packagePartName;
+            previewContentType = mediaPart.contentType;
           }
         }
       }
@@ -141,6 +153,8 @@ function parseAlternateContent(
   return {
     type: contentType,
     ...(previewMediaId ? { previewMediaId } : {}),
+    ...(previewPackagePartName ? { previewPackagePartName } : {}),
+    ...(previewContentType ? { previewContentType } : {}),
     rawXml: fullDrawingXml,
   };
 }

package/src/io/ooxml/parse-main-document.ts

@@ -211,12 +211,16 @@ export interface ParsedOpaqueInlineNode {
 export interface ParsedChartPreviewNode {
   type: "chart_preview";
   previewMediaId?: string;
+  previewPackagePartName?: string;
+  previewContentType?: string;
   rawXml: string;
 }
 
 export interface ParsedSmartArtPreviewNode {
   type: "smartart_preview";
   previewMediaId?: string;
+  previewPackagePartName?: string;
+  previewContentType?: string;
   rawXml: string;
 }
 

package/src/preservation/opaque-region.ts

@@ -121,6 +121,11 @@ export function createOpaqueRegionSurfaceModel(
 export function createOpaqueRegionSurfaceModelFromSurfaceBlock(
   block: Extract<SurfaceBlockSnapshot, { kind: "opaque_block" }>,
 ): OpaqueRegionSurfaceModel {
+  if (block.state === "placeholder-culled") {
+    throw new Error(
+      "createOpaqueRegionSurfaceModelFromSurfaceBlock: placeholder-culled block has no real fragment",
+    );
+  }
   return {
     fragmentId: block.fragmentId,
     warningId: block.warningId,

package/src/review/store/comment-remapping.ts

@@ -4,7 +4,7 @@ import {
   getAnchorRange,
   mapReviewAnchor,
   mappingTouchesAnchorContent,
-  rangeStaysWithinSingleParagraph,
+  rangeStaysWithinCommentableStory,
   type ReviewAnchor,
 } from "../../core/selection/review-anchors.ts";
 import type { TransactionMapping } from "../../core/selection/mapping.ts";
@@ -85,7 +85,7 @@ function normalizeCommentAnchor(
 
   if (
     mappedAnchor.kind === "range" &&
-    !rangeStaysWithinSingleParagraph(nextContent, mappedAnchor.range)
+    !rangeStaysWithinCommentableStory(nextContent, mappedAnchor.range)
   ) {
     return detachReviewAnchor(previousRange, "invalidatedByStructureChange");
   }