@beyondwork/docx-react-component 1.0.85 → 1.0.87

package/src/runtime/layout/layout-engine-version.ts

@@ -1000,8 +1000,26 @@
  *   layout changes. The facet contract widened by one public method —
  *   persisted cache envelopes from v58 must re-derive their page-field
  *   projections.
+ *
+ *  60 — Refactor/04 measured layout geometry and page-field drift closure.
+ *   Page-stack pagination now
+ *   carries measured fragment heights through `fragmentMeasurementsByPageIndex`;
+ *   paragraph/table slices carry their measured slice height and column;
+ *   `projectLineBoxesForPageFragments` emits body line boxes from those
+ *   measurements; and `buildPageGraph` can consume page-index keyed line
+ *   boxes for partial incremental rebuilds. Table row-height measurement
+ *   gained an opt-in content-aware mode while production pagination keeps
+ *   the legacy row-boundary calibration until row-follow fragments exist.
+ *   `PageLayoutSnapshot.pageNumbering` also now carries a runtime-derived
+ *   `chapterNumber` resolved from active chapter headings during
+ *   `buildPageStackWithSplits` and incremental tail pagination. PAGE /
+ *   PAGEREF field display consumes that graph truth through
+ *   `resolvePageFieldDisplayText` / `formatPageNumberWithChapter` instead
+ *   of reconstructing chapter-prefixed numbering in caller-local formulas.
+ *   Cache envelopes from v59 invalidate because page graph line-box,
+ *   fragment geometry, and page-numbering payloads changed.
  */
-export const LAYOUT_ENGINE_VERSION = 59 as const;
+export const LAYOUT_ENGINE_VERSION = 60 as const;
 
 /**
  * Serialization schema version for the LayCache payload (the cache envelope

package/src/runtime/layout/measurement-backend-canvas.ts

@@ -216,17 +216,22 @@ export function createCanvasBackend(
           break;
         case "image": {
           // Route through this backend's own `measureInlineObject` so
-          // the provider contract is live inside the canvas backend
-          // (Task 3, 2026-04-23). Intrinsic dimensions are not carried
-          // on the surface segment here; backends that later want
-          // glyph-height-aware displacement can resolve from the
-          // segment's `anchor.extent` at the caller.
+          // the provider contract is live inside the canvas backend.
+          // DrawingFrame images carry anchor extent in EMUs; convert to
+          // twips so large inline/floating objects reserve their height.
+          const imageHeightTwips = emuToTwips(segment.anchor?.extent.heightEmu);
           const measured = measureInlineObject({
-            widthTwips: 0,
-            heightTwips: 0,
+            widthTwips: emuToTwips(segment.anchor?.extent.widthEmu),
+            heightTwips: imageHeightTwips,
             display: segment.display === "floating" ? "floating" : "inline",
           });
-          lineCount += Math.max(1, measured.displacedLineCount);
+          lineCount += Math.max(
+            1,
+            measured.displacedLineCount,
+            imageHeightTwips > 0
+              ? Math.ceil(imageHeightTwips / Math.max(1, formatting.lineHeight))
+              : 0,
+          );
           currentLineWidth = 0;
           currentCapacity = subsequentLineWidth;
           break;
@@ -260,10 +265,17 @@ export function createCanvasBackend(
     return {
       widthTwips: input.widthTwips,
       heightTwips: input.heightTwips,
-      displacedLineCount: input.display === "floating" ? 2 : 1,
+      displacedLineCount: Math.max(
+        input.display === "floating" ? 2 : 1,
+        input.heightTwips > 0 ? Math.ceil(input.heightTwips / 240) : 0,
+      ),
     };
   }
 
+  function emuToTwips(emu: number | undefined): number {
+    return emu && emu > 0 ? Math.round(emu / 635) : 0;
+  }
+
   function measureTableBlock(
     input: MeasureTableBlockInput,
   ): MeasuredTableBlock {

package/src/runtime/layout/measurement-backend-empirical.ts

@@ -107,12 +107,19 @@ function measureLineFragments(
         currentLineCapacity = subsequentLineCapacity;
         break;
       case "image": {
+        const imageHeightTwips = emuToTwips(segment.anchor?.extent.heightEmu);
         const measured = inlineObjectMeasurer({
-          widthTwips: 0,
-          heightTwips: 0,
+          widthTwips: emuToTwips(segment.anchor?.extent.widthEmu),
+          heightTwips: imageHeightTwips,
           display: segment.display === "floating" ? "floating" : "inline",
         });
-        lineCount += Math.max(1, measured.displacedLineCount);
+        lineCount += Math.max(
+          1,
+          measured.displacedLineCount,
+          imageHeightTwips > 0
+            ? Math.ceil(imageHeightTwips / Math.max(1, formatting.lineHeight))
+            : 0,
+        );
         currentLineChars = 0;
         currentLineCapacity = subsequentLineCapacity;
         break;
@@ -151,13 +158,20 @@ function measureLineFragments(
   };
 }
 
+function emuToTwips(emu: number | undefined): number {
+  return emu && emu > 0 ? Math.round(emu / 635) : 0;
+}
+
 function measureInlineObject(
   input: MeasureInlineObjectInput,
 ): MeasuredInlineObject {
   return {
     widthTwips: input.widthTwips,
     heightTwips: input.heightTwips,
-    displacedLineCount: input.display === "floating" ? 2 : 1,
+    displacedLineCount: Math.max(
+      input.display === "floating" ? 2 : 1,
+      input.heightTwips > 0 ? Math.ceil(input.heightTwips / MIN_BLOCK_HEIGHT_TWIPS) : 0,
+    ),
   };
 }
 

package/src/runtime/layout/page-graph.ts

@@ -103,10 +103,16 @@ export function buildPageGraph(
 
   const pages: RuntimePageNode[] = [];
   const aggregatedFragments: RuntimeBlockFragment[] = [...(input.fragments ?? [])];
+  const pageIdByGlobalPageIndex = new Map<number, string>();
+  for (let index = 0; index < input.pages.length; index += 1) {
+    const page = input.pages[index]!;
+    pageIdByGlobalPageIndex.set(page.pageIndex, `page-${graphRevision}-${index}`);
+  }
   // Rehydrate fragmentsByPageIndex with the fresh graphRevision's pageIds.
   if (input.fragmentsByPageIndex) {
     for (const [pageIndex, fragments] of input.fragmentsByPageIndex) {
-      const pageId = `page-${graphRevision}-${pageIndex}`;
+      const pageId =
+        pageIdByGlobalPageIndex.get(pageIndex) ?? `page-${graphRevision}-${pageIndex}`;
       for (const fragment of fragments) {
         aggregatedFragments.push({ ...fragment, pageId });
       }
@@ -153,6 +159,7 @@ export function buildPageGraph(
     // pageId) falling back to noteAllocations (pageId-keyed, used by the
     // engine once it emits allocations).
     const pageNoteAllocations: RuntimeNoteAllocation[] =
+      input.noteAllocationsByPageIndex?.get(page.pageIndex) ??
       input.noteAllocationsByPageIndex?.get(index) ??
       input.noteAllocations?.get(pageId) ??
       [];
@@ -167,7 +174,11 @@ export function buildPageGraph(
       layout: page.layout,
       stories,
       regions: buildRegions(page.layout, bodyPageFragments, stories, pageNoteAllocations),
-      lineBoxes: input.lineBoxes?.get(pageId) ?? [],
+      lineBoxes:
+        input.lineBoxesByPageIndex?.get(page.pageIndex) ??
+        input.lineBoxesByPageIndex?.get(index) ??
+        input.lineBoxes?.get(pageId) ??
+        [],
       noteAllocations: pageNoteAllocations,
       isBlankFiller: page.pageInSection === -1,
     };