@beyondwork/docx-react-component 1.0.84 → 1.0.85

package/src/io/ooxml/parse-headers-footers.ts

@@ -20,6 +20,7 @@ import { classifyFieldInstruction } from "./parse-fields.ts";
 import { isSafeTableFieldInstruction } from "./table-opaque-preservation.ts";
 import { parseXmlWithOffsets as parseXml } from "./xml-parser.ts";
 import { localName, readStringAttr } from "./xml-attr-helpers.ts";
+import { readHeaderFooterReferenceAttributes } from "./header-footer-reference.ts";
 import {
   readCellBorders,
   readCellCnfStyle,
@@ -200,40 +201,27 @@ function extractSectPrRefs(
     const name = localName(child.name);
     if (name === "headerReference" || name === "footerReference") {
       const kind: "header" | "footer" = name === "headerReference" ? "header" : "footer";
-      const rawType =
-        readStringAttr(child, "w:type") ?? "default";
-      const variant = toHeaderFooterVariant(rawType);
-      const relationshipId =
-        child.attributes["r:id"] ??
-        child.attributes["r:Id"] ??
-        child.attributes.id ??
-        child.attributes.Id ??
-        "";
-
-      if (relationshipId) {
+      const ref = readHeaderFooterReferenceAttributes(child);
+
+      if (ref) {
         // Avoid duplicates (multiple sectPr may reference same header)
-        const dedupeKey = `${kind}:${variant}:${relationshipId}`;
+        const dedupeKey = `${kind}:${ref.variant}:${ref.relationshipId}`;
         const alreadyAdded = refs.some(
           (ref) => `${ref.kind}:${ref.variant}:${ref.relationshipId}` === dedupeKey,
         );
         if (!alreadyAdded) {
-          refs.push({ variant, relationshipId, kind, sectionIndex });
+          refs.push({
+            variant: ref.variant,
+            relationshipId: ref.relationshipId,
+            kind,
+            sectionIndex,
+          });
         }
       }
     }
   }
 }
 
-function toHeaderFooterVariant(raw: string): HeaderFooterVariant {
-  if (raw === "first") {
-    return "first";
-  }
-  if (raw === "even") {
-    return "even";
-  }
-  return "default";
-}
-
 function parseHdrFtrXml(
   xml: string,
   rootLocalName: "hdr" | "ftr",

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

@@ -21,8 +21,6 @@ import type {
   PageMargins,
   ColumnProperties,
   PageNumbering,
-  HeaderFooterReference,
-  HeaderFooterVariant,
   SectionDocumentGrid,
   SectionLineNumbering,
   SectionPageBorders,
@@ -45,6 +43,7 @@ import { parseComplexContentXml, type ChartPartLookup } from "./parse-complex-co
 import { parseShapeXml, parseVmlXml } from "./parse-shapes.ts";
 import { parseObject } from "./parse-object.ts";
 import { parseDrawingFrame } from "./parse-drawing.ts";
+import { readHeaderFooterReferenceAttributes } from "./header-footer-reference.ts";
 import { readFrameProperties } from "./parse-paragraph-formatting.ts";
 import { tableRequiresOpaquePreservation } from "./table-opaque-preservation.ts";
 import { classifyFieldInstruction } from "./parse-fields.ts";
@@ -3756,20 +3755,18 @@ export function parseSectionPropertiesFromElement(
         break;
       }
       case "headerReference": {
-        const variant = child.attributes["w:type"] as HeaderFooterVariant | undefined;
-        const rId = child.attributes["r:id"];
-        if (variant && rId) {
+        const ref = readHeaderFooterReferenceAttributes(child);
+        if (ref) {
           if (!props.headerReferences) props.headerReferences = [];
-          props.headerReferences.push({ variant, relationshipId: rId });
+          props.headerReferences.push(ref);
         }
         break;
       }
       case "footerReference": {
-        const variant = child.attributes["w:type"] as HeaderFooterVariant | undefined;
-        const rId = child.attributes["r:id"];
-        if (variant && rId) {
+        const ref = readHeaderFooterReferenceAttributes(child);
+        if (ref) {
           if (!props.footerReferences) props.footerReferences = [];
-          props.footerReferences.push({ variant, relationshipId: rId });
+          props.footerReferences.push(ref);
         }
         break;
       }

package/src/model/canonical-document.ts

@@ -2095,6 +2095,12 @@ export interface CommentThreadMetadata {
   source?: "runtime" | "import";
   rootOoxmlCommentId?: string;
   rootParaId?: string;
+  /**
+   * Runtime-authored discussion thread for a tracked change. The comment
+   * anchor points at the revision range; this metadata keeps the review
+   * relation stable after remaps and lets suggestion cards surface replies.
+   */
+  linkedRevisionId?: string;
   detachedReason?: "incomplete-markers" | "multi-paragraph" | "opaque-region" | "revision-overlap";
   actionabilityNote?: string;
 }
@@ -3323,6 +3329,9 @@ function validateCommentThreadMetadata(
   if (record.rootParaId !== undefined) {
     expectString(record.rootParaId, `${path}.rootParaId`, issues);
   }
+  if (record.linkedRevisionId !== undefined) {
+    expectString(record.linkedRevisionId, `${path}.linkedRevisionId`, issues);
+  }
 }
 
 function validateRevisionKind(

package/src/model/review/comment-types.ts

@@ -62,6 +62,8 @@ export interface CommentThreadMetadata {
   source?: "runtime" | "import";
   rootOoxmlCommentId?: string;
   rootParaId?: string;
+  /** Stable link from a comment thread to the tracked change it discusses. */
+  linkedRevisionId?: string;
   detachedReason?: "incomplete-markers" | "multi-paragraph" | "opaque-region" | "revision-overlap";
   actionabilityNote?: string;
 }