@beyondwork/docx-react-component 1.0.106 → 1.0.109

package/src/runtime/formatting/layout-inputs.ts

@@ -47,12 +47,15 @@ export interface NumberingLayoutInput {
 
 export interface FieldLayoutInput {
   readonly fieldId: string;
+  readonly canonicalFieldId?: string;
   readonly regionId: string;
-  readonly regionKind: "field" | "toc-region";
+  readonly regionKind: CanonicalFieldRegionIdentity["kind"];
   readonly storyKey: string;
   readonly fieldIndex: number;
   readonly paragraphIndex: number;
   readonly family: FieldFamily;
+  readonly sourceRef?: CanonicalFieldRegionIdentity["sourceRef"];
+  readonly fieldEvidence?: CanonicalFieldRegionIdentity["fieldEvidence"];
   readonly instruction: string;
   readonly cachedText: string;
   readonly switches?: FieldRegistryEntry["switches"];
@@ -176,12 +179,19 @@ export function toFieldLayoutInput(
 ): FieldLayoutInput {
   return {
     fieldId: `field-${entry.fieldIndex}`,
+    ...(region?.canonicalFieldId !== undefined
+      ? { canonicalFieldId: region.canonicalFieldId }
+      : entry.canonicalFieldId !== undefined
+        ? { canonicalFieldId: entry.canonicalFieldId }
+        : {}),
     regionId: region?.regionId ?? `field:${entry.fieldIndex}`,
     regionKind: region?.kind ?? "field",
     storyKey: region?.storyKey ?? entry.storyKey ?? MAIN_STORY_KEY,
     fieldIndex: entry.fieldIndex,
     paragraphIndex: region?.paragraphIndex ?? entry.paragraphIndex,
     family: entry.fieldFamily,
+    ...(region?.sourceRef !== undefined ? { sourceRef: region.sourceRef } : {}),
+    ...(region?.fieldEvidence !== undefined ? { fieldEvidence: region.fieldEvidence } : {}),
     instruction: entry.instruction,
     cachedText: entry.displayText,
     ...(entry.switches ? { switches: entry.switches } : {}),
@@ -197,9 +207,8 @@ export function collectFieldLayoutInputs(
   resolve?: (entry: FieldRegistryEntry) => ResolvedField | undefined,
   regions: readonly CanonicalFieldRegionIdentity[] = [],
 ): readonly FieldLayoutInput[] {
-  if (!registry) return [];
   const inputs: FieldLayoutInput[] = [];
-  const entries = [...registry.supported, ...registry.preserveOnly];
+  const entries = [...(registry?.supported ?? []), ...(registry?.preserveOnly ?? [])];
   const fieldRegions = new Map(
     regions
       .filter((region) => region.kind === "field")
@@ -210,11 +219,12 @@ export function collectFieldLayoutInputs(
       .filter((region) => region.kind === "toc-region" && region.tocId !== undefined)
       .map((region) => [region.tocId!, region]),
   );
+  const hyperlinkRegions = regions.filter((region) => region.kind === "hyperlink-field");
   for (const entry of entries) {
     inputs.push(toFieldLayoutInput(entry, resolve?.(entry), fieldRegions.get(entry.fieldIndex)));
   }
-  for (const region of registry.tocRegions ?? []) {
-    const source = registry.supported.find(
+  for (const region of registry?.tocRegions ?? []) {
+    const source = registry?.supported.find(
       (entry) => entry.fieldIndex === region.sourceFieldIndex,
     );
     if (!source) continue;
@@ -230,9 +240,32 @@ export function collectFieldLayoutInputs(
       tocEntryCount: region.cachedEntries.length + region.generatedEntries.length,
     });
   }
+  for (const region of hyperlinkRegions) {
+    inputs.push(toHyperlinkFieldLayoutInput(region));
+  }
   return inputs;
 }
 
+function toHyperlinkFieldLayoutInput(
+  region: CanonicalFieldRegionIdentity,
+): FieldLayoutInput {
+  return {
+    fieldId: `hyperlink-${region.fieldIndex}`,
+    canonicalFieldId: region.canonicalFieldId,
+    regionId: region.regionId,
+    regionKind: "hyperlink-field",
+    storyKey: region.storyKey,
+    fieldIndex: region.fieldIndex,
+    paragraphIndex: region.paragraphIndex,
+    family: region.fieldFamily,
+    ...(region.sourceRef !== undefined ? { sourceRef: region.sourceRef } : {}),
+    ...(region.fieldEvidence !== undefined ? { fieldEvidence: region.fieldEvidence } : {}),
+    instruction: "",
+    cachedText: "",
+    refreshState: region.refreshStatus,
+  };
+}
+
 export function buildRevisionLayoutPosture(
   mode: RevisionLayoutPosture["mode"],
   displays: readonly RevisionDisplayFlags[] = [],

package/src/runtime/formatting/numbering/geometry.ts

@@ -72,7 +72,18 @@ export function resolveNumberingDefinitionSet(
   }
 
   const effectiveLevels = buildEffectiveLevelDefinitions(abstractDefinition.levels, instance.overrides);
-  const effectiveLevel = effectiveLevels.get(numbering.level);
+  let effectiveLevel = effectiveLevels.get(numbering.level);
+  if (!effectiveLevel && abstractDefinition.multiLevelType === "singleLevel") {
+    // ECMA-376 §17.9.16 — `singleLevel` abstractNums define a single ilvl
+    // (conventionally 0). When a paragraph references a level that isn't
+    // defined, Word (and LibreOffice) render using the sole defined level
+    // rather than omitting the marker. Mirror that: pick the first
+    // available level. Observed in CCEP `aps-supply-of-services.docx` where
+    // paragraph "No-Deforestation" carries `<w:numPr w:ilvl="2" w:numId="8"/>`
+    // against a singleLevel abstractNum that defines only ilvl=0 (bullet).
+    const [firstDefinedLevel] = effectiveLevels.values();
+    effectiveLevel = firstDefinedLevel;
+  }
   if (!effectiveLevel) {
     return null;
   }
@@ -205,6 +216,15 @@ function resolveNumberingGeometry(
   // meaning "no custom indent beyond the list style" — use level geometry directly.
   // This also covers the prior CO3.8 heuristic (para.left === level.left) since Word
   // typically writes hanging=left in that situation too.
+  //
+  // Extension (CCEP bullet fidelity, 2026-04-23 truth-baseline): Word also writes
+  // bullet paragraphs with a lone `<w:ind w:hanging="L"/>` (no w:left) where L equals
+  // the numbering level's `left`. Example from eu-global-it-services
+  // `<w:pStyle w:val="ListParagraph"/> <w:numPr w:ilvl=0 w:numId=34/> <w:ind w:hanging="720"/>`
+  // against abstractNum lvl 0 `<w:ind w:left="720" w:hanging="360"/>`. Strict per-attribute
+  // override yields `left=720, hanging=720` (marker flush at body margin), but LO/Word
+  // actually render `left=720, hanging=360` (marker hangs half the list-level indent).
+  // Detect this shape and treat it as a stale Word snapshot — use level geometry directly.
   const paraInd = paragraph?.indentation;
   const levelInd = levelGeometry?.indentation;
   const isDegenerateParaInd =
@@ -212,8 +232,14 @@ function resolveNumberingGeometry(
     paraInd.hanging !== undefined &&
     paraInd.left !== undefined &&
     paraInd.hanging === paraInd.left;
+  const isLoneHangingMatchingLevelLeft =
+    paraInd !== undefined &&
+    paraInd.hanging !== undefined &&
+    paraInd.left === undefined &&
+    levelInd?.left !== undefined &&
+    paraInd.hanging === levelInd.left;
 
-  const indentation = isDegenerateParaInd
+  const indentation = isDegenerateParaInd || isLoneHangingMatchingLevelLeft
     ? levelInd ? { ...levelInd } : undefined
     : mergeParagraphIndentation(levelInd, paraInd);