@beyondwork/docx-react-component 1.0.128 → 1.0.130

package/dist/api/public-types.cjs

@@ -21,6 +21,43 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/runtime/layout/resolved-formatting-state.ts
+function createLayoutReadyFormattingSnapshot(formatting, runs = /* @__PURE__ */ new Map()) {
+  const snapshot = {
+    version: 1,
+    paragraph: {
+      spacingBefore: formatting.spacingBefore,
+      spacingAfter: formatting.spacingAfter,
+      lineHeight: formatting.lineHeight,
+      lineRule: formatting.lineRule,
+      indentLeft: formatting.indentLeft,
+      indentRight: formatting.indentRight,
+      firstLineIndent: formatting.firstLineIndent,
+      hangingIndent: formatting.hangingIndent,
+      fontSizeHalfPoints: formatting.fontSizeHalfPoints,
+      averageCharWidthTwips: formatting.averageCharWidthTwips,
+      tabStops: formatting.tabStops.map((tab) => ({ ...tab })),
+      defaultTabInterval: formatting.defaultTabInterval,
+      keepNext: formatting.keepNext,
+      keepLines: formatting.keepLines,
+      pageBreakBefore: formatting.pageBreakBefore,
+      widowControl: formatting.widowControl,
+      contextualSpacing: formatting.contextualSpacing,
+      ...formatting.numberingMarkerBox ? { numberingMarkerBox: { ...formatting.numberingMarkerBox } } : {}
+    },
+    runs: Array.from(runs.entries()).map(([runId, run]) => ({
+      runId,
+      ...run.fontFamily ? { fontFamily: run.fontFamily } : {},
+      ...typeof run.fontSizeHalfPoints === "number" ? { fontSizeHalfPoints: run.fontSizeHalfPoints } : {},
+      bold: Boolean(run.bold),
+      italic: Boolean(run.italic),
+      verticalAlign: run.verticalAlign ?? "baseline"
+    })).sort((a, b) => a.runId.localeCompare(b.runId))
+  };
+  return {
+    ...snapshot,
+    hash: hashStable(snapshot)
+  };
+}
 function resolveBlockFormatting(block, defaultTabInterval = 720, themeFonts) {
   if (block.kind !== "paragraph") {
     return null;
@@ -263,6 +300,29 @@ function buildRunFormattingMap(block) {
   }
   return runs;
 }
+function hashStable(value) {
+  return fnv1a(stableStringify(value)).toString(36);
+}
+function stableStringify(value) {
+  if (value === null || typeof value !== "object") return JSON.stringify(value);
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => stableStringify(item)).join(",")}]`;
+  }
+  if (value instanceof Map) {
+    return stableStringify(Array.from(value.entries()));
+  }
+  const object = value;
+  const keys = Object.keys(object).filter((key) => object[key] !== void 0 && typeof object[key] !== "function").sort();
+  return `{${keys.map((key) => `${JSON.stringify(key)}:${stableStringify(object[key])}`).join(",")}}`;
+}
+function fnv1a(input) {
+  let hash = 2166136261;
+  for (let i = 0; i < input.length; i += 1) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return hash >>> 0;
+}
 var FONT_AVG_CHAR_WIDTH, DEFAULT_FONT_AVG_CHAR_WIDTH, DEFAULT_FONT_SIZE_HALF_POINTS, DEFAULT_LINE_HEIGHT_FACTOR, TWIPS_PER_POINT;
 var init_resolved_formatting_state = __esm({
   "src/runtime/layout/resolved-formatting-state.ts"() {
@@ -2525,6 +2585,7 @@ function collectCanonicalLayoutInputs(doc) {
   const blockContexts = collectStoryBlockContexts(doc);
   return {
     stories: collectCanonicalStoryIdentities(doc),
+    layoutIdentities: collectLayoutInputIdentities(doc, blockContexts),
     fieldRegions: collectCanonicalFieldRegionIdentities(doc),
     numbering: collectCanonicalNumberingLayoutInputs(doc, blockContexts),
     tables: collectCanonicalTableLayoutInputs(blockContexts),
@@ -2533,6 +2594,116 @@ function collectCanonicalLayoutInputs(doc) {
     editableTargets: collectEditableTargetRefs(doc)
   };
 }
+function collectLayoutInputIdentities(doc, contexts = collectStoryBlockContexts(doc)) {
+  const identities = [];
+  const editableTargets = collectEditableTargetRefs(doc);
+  const editableByStoryBlock = new Map(
+    editableTargets.map((target) => [`${target.storyKey}:${target.blockPath}`, target])
+  );
+  for (const context of contexts) {
+    walkBlocks(context.blocks, context.storyKey, context.basePath, {
+      paragraph(paragraph, blockPath) {
+        const styleNumbering = paragraph.numbering === void 0 && paragraph.styleId !== void 0 ? resolveParagraphStyleNumbering(doc, paragraph.styleId) : void 0;
+        const numbering = paragraph.numbering ?? styleNumbering;
+        const editableTargetRef = editableByStoryBlock.get(`${context.storyKey}:${blockPath}`);
+        identities.push(
+          createLayoutInputIdentity({
+            storyKey: context.storyKey,
+            blockPath,
+            block: paragraph,
+            ...editableTargetRef !== void 0 ? { editableTargetRef } : {},
+            ...numbering !== void 0 ? {
+              list: {
+                numberingInstanceId: numbering.numberingInstanceId,
+                level: numbering.level ?? 0,
+                ...paragraph.numbering?.sourceRef !== void 0 ? { markerSourceRef: paragraph.numbering.sourceRef } : {}
+              }
+            } : {}
+          })
+        );
+      },
+      table(table, blockPath) {
+        identities.push(
+          createLayoutInputIdentity({
+            storyKey: context.storyKey,
+            blockPath,
+            block: table,
+            table: { tableBlockPath: blockPath }
+          })
+        );
+      },
+      inline(inline, blockPath, inlinePath) {
+        const objectId = objectIdForInline(inline);
+        if (!objectId) return;
+        const sourceRef = sourceRefForInline(inline);
+        identities.push({
+          storyKey: context.storyKey,
+          blockPath,
+          blockId: `${context.storyKey}:${inlinePath}`,
+          ...sourceRef !== void 0 ? { sourceRef } : {},
+          object: {
+            objectId,
+            ...sourceRef !== void 0 ? { anchorSourceRef: sourceRef } : {}
+          }
+        });
+      }
+    });
+  }
+  return identities;
+}
+function createLayoutInputIdentity(input) {
+  const sourceRef = sourceRefForBlock(input.block);
+  const blockId = input.block.type === "paragraph" && input.block.wordExtensionIds?.paraId ? `para:${input.block.wordExtensionIds.paraId}` : sourceRef?.sourceId !== void 0 ? `source:${sourceRef.sourceId}` : `${input.storyKey}:${input.blockPath}`;
+  return {
+    storyKey: input.storyKey,
+    blockPath: input.blockPath,
+    blockId,
+    ...sourceRef !== void 0 ? { sourceRef } : {},
+    ...input.editableTargetRef !== void 0 ? { editableTargetRef: input.editableTargetRef } : {},
+    ...input.table !== void 0 ? { table: input.table } : {},
+    ...input.list !== void 0 ? { list: input.list } : {}
+  };
+}
+function sourceRefForBlock(block) {
+  return "sourceRef" in block ? block.sourceRef : void 0;
+}
+function sourceRefForInline(inline) {
+  return "sourceRef" in inline ? inline.sourceRef : void 0;
+}
+function objectIdForInline(inline) {
+  switch (inline.type) {
+    case "image":
+      return inline.mediaId;
+    case "drawing_frame":
+      return objectIdForDrawingContent(inline.content) ?? inline.sourceRef?.sourceId;
+    case "shape":
+    case "vml_shape":
+    case "wordart":
+      return inline.preserveOnlyObject?.sourceId ?? `raw:${sha256TextHex(inline.rawXml).slice(0, 16)}`;
+    case "chart_preview":
+    case "smartart_preview":
+      return inline.previewMediaId ?? `raw:${sha256TextHex(inline.rawXml).slice(0, 16)}`;
+    case "ole_embed":
+      return inline.relationshipId ?? inline.id ?? inline.sourceRef?.sourceId;
+    case "opaque_inline":
+      return inline.fragmentId;
+    default:
+      return void 0;
+  }
+}
+function objectIdForDrawingContent(content) {
+  switch (content.type) {
+    case "picture":
+      return content.mediaId ?? content.packagePartName ?? content.blipRef;
+    case "chart_preview":
+    case "smartart_preview":
+      return content.previewMediaId ?? `raw:${sha256TextHex(content.rawXml).slice(0, 16)}`;
+    case "shape":
+      return content.preserveOnlyObject?.sourceId ?? `raw:${sha256TextHex(content.rawXml).slice(0, 16)}`;
+    case "opaque":
+      return content.preserveOnlyObject?.sourceId ?? `raw:${sha256TextHex(content.rawXml).slice(0, 16)}`;
+  }
+}
 function collectEditableTargetRefs(doc, cache) {
   const targets = [];
   for (const context of collectStoryBlockContexts(doc)) {
@@ -4102,6 +4273,16 @@ function collectCanonicalNumberingLayoutInputs(doc, contexts = collectStoryBlock
         const instance = doc.numbering.instances[numbering.numberingInstanceId];
         const abstractDefinition = instance?.abstractNumberingId === void 0 ? void 0 : doc.numbering.abstractDefinitions[instance.abstractNumberingId];
         inputs.push({
+          identity: createLayoutInputIdentity({
+            storyKey: context.storyKey,
+            blockPath,
+            block: paragraph,
+            list: {
+              numberingInstanceId: numbering.numberingInstanceId,
+              level: numbering.level ?? 0,
+              ...paragraph.numbering?.sourceRef !== void 0 ? { markerSourceRef: paragraph.numbering.sourceRef } : {}
+            }
+          }),
           numberingKey: `${context.storyKey}:${blockPath}:numbering`,
           storyKey: context.storyKey,
           blockPath,
@@ -4403,6 +4584,12 @@ function projectTableLayoutInput(table, storyKey, blockPath) {
     (row, rowIndex) => projectTableRowLayoutInput(row, tableKey, rowIndex)
   );
   return {
+    identity: createLayoutInputIdentity({
+      storyKey,
+      blockPath,
+      block: table,
+      table: { tableBlockPath: blockPath }
+    }),
     tableKey,
     storyKey,
     blockPath,
@@ -4490,6 +4677,16 @@ function projectDrawingFrameAnchor(node, storyKey, blockPath, inlinePath) {
   const objectKey = `${storyKey}:${inlinePath}`;
   const textBoxBody = projectTextBoxBodyLayoutInput(content, objectKey, sourceRef, `${inlinePath}/txbx`);
   return {
+    identity: {
+      storyKey,
+      blockPath,
+      blockId: objectKey,
+      ...sourceRef !== void 0 ? { sourceRef } : {},
+      object: {
+        objectId: objectKey,
+        ...sourceRef !== void 0 ? { anchorSourceRef: sourceRef } : {}
+      }
+    },
     objectKey,
     storyKey,
     blockPath,
@@ -4611,8 +4808,19 @@ function projectTextBoxRunLayoutInput(inline, paragraphKey, inlineIndex) {
 }
 function projectLegacyImageAnchor(doc, node, storyKey, blockPath, inlinePath) {
   const media = doc.media.items[node.mediaId];
+  const objectKey = `${storyKey}:${inlinePath}`;
   return {
-    objectKey: `${storyKey}:${inlinePath}`,
+    identity: {
+      storyKey,
+      blockPath,
+      blockId: objectKey,
+      ...node.sourceRef !== void 0 ? { sourceRef: node.sourceRef } : {},
+      object: {
+        objectId: objectKey,
+        ...node.sourceRef !== void 0 ? { anchorSourceRef: node.sourceRef } : {}
+      }
+    },
+    objectKey,
     storyKey,
     blockPath,
     inlinePath,
@@ -5749,12 +5957,13 @@ function getLevelStartAt(level, levelDefinitions) {
   return levelDefinitions.get(level)?.startAt ?? DEFAULT_NUMBERING_START_AT;
 }
 function getNumberingFormatPosture(format, value) {
-  if (!isSupportedNumberingFormat(format)) {
+  const registryEntry = getNumberingFormatRegistryEntry(format);
+  if (!registryEntry || registryEntry.renderSupport === "approximated") {
     return {
       status: "approximated",
       requestedFormat: format,
       renderedFormat: "decimal",
-      reason: "unsupported-numbering-format-decimal-fallback"
+      reason: registryEntry?.fallbackReason ?? "unsupported-numbering-format-decimal-fallback"
     };
   }
   if (value !== void 0 && ((format === "upperRoman" || format === "lowerRoman") && (value <= 0 || value >= 4e3) || (format === "cardinalText" || format === "ordinalText") && (!Number.isInteger(value) || value < 1 || value > 999) || (format === "upperLetter" || format === "lowerLetter" || format === "chicago") && value < 1)) {
@@ -5785,56 +5994,148 @@ function renderLevelText(text, counters, levelDefinitions) {
   });
   return rendered.trim().length > 0 ? rendered : null;
 }
-var SUPPORTED_NUMBERING_FORMATS = /* @__PURE__ */ new Set([
-  "decimal",
-  "decimalZero",
-  "upperLetter",
-  "lowerLetter",
-  "upperRoman",
-  "lowerRoman",
-  "hex",
-  "ordinal",
-  "cardinalText",
-  "ordinalText",
-  "chicago",
-  "bullet",
-  "none"
-]);
 function isSupportedNumberingFormat(format) {
-  return SUPPORTED_NUMBERING_FORMATS.has(format);
+  return getNumberingFormatRegistryEntry(format)?.renderSupport === "supported";
+}
+function getNumberingFormatRegistryEntry(format) {
+  return NUMBERING_FORMAT_REGISTRY.get(format);
 }
 function formatCounter(value, format) {
-  switch (format) {
-    case "decimal":
-      return String(value);
-    case "decimalZero":
-      return String(value).padStart(2, "0");
-    case "upperLetter":
-      return toAlphabetic2(value).toUpperCase();
-    case "lowerLetter":
-      return toAlphabetic2(value).toLowerCase();
-    case "upperRoman":
-      return toRoman2(value).toUpperCase();
-    case "lowerRoman":
-      return toRoman2(value).toLowerCase();
-    case "hex":
-      return value >= 0 ? value.toString(16).toUpperCase() : String(value);
-    case "ordinal":
-      return toOrdinal2(value);
-    case "cardinalText":
-      return toCardinalText2(value);
-    case "ordinalText":
-      return toOrdinalText2(value);
-    case "chicago":
-      return toChicago2(value);
-    case "bullet":
-      return "";
-    case "none":
-      return "";
-    default:
-      return String(value);
-  }
+  return getNumberingFormatRegistryEntry(format)?.render(value) ?? String(value);
 }
+var exactNumberingFormatEntries = [
+  {
+    format: "decimal",
+    renderSupport: "supported",
+    renderedFormat: "decimal",
+    supportsMutation: true,
+    render: (value) => String(value)
+  },
+  {
+    format: "decimalZero",
+    renderSupport: "supported",
+    renderedFormat: "decimalZero",
+    supportsMutation: true,
+    render: (value) => String(value).padStart(2, "0")
+  },
+  {
+    format: "upperLetter",
+    renderSupport: "supported",
+    renderedFormat: "upperLetter",
+    supportsMutation: true,
+    render: (value) => toAlphabetic2(value).toUpperCase()
+  },
+  {
+    format: "lowerLetter",
+    renderSupport: "supported",
+    renderedFormat: "lowerLetter",
+    supportsMutation: true,
+    render: (value) => toAlphabetic2(value).toLowerCase()
+  },
+  {
+    format: "upperRoman",
+    renderSupport: "supported",
+    renderedFormat: "upperRoman",
+    supportsMutation: true,
+    render: (value) => toRoman2(value).toUpperCase()
+  },
+  {
+    format: "lowerRoman",
+    renderSupport: "supported",
+    renderedFormat: "lowerRoman",
+    supportsMutation: true,
+    render: (value) => toRoman2(value).toLowerCase()
+  },
+  {
+    format: "hex",
+    renderSupport: "supported",
+    renderedFormat: "hex",
+    supportsMutation: true,
+    render: (value) => value >= 0 ? value.toString(16).toUpperCase() : String(value)
+  },
+  {
+    format: "ordinal",
+    renderSupport: "supported",
+    renderedFormat: "ordinal",
+    supportsMutation: true,
+    render: toOrdinal2
+  },
+  {
+    format: "cardinalText",
+    renderSupport: "supported",
+    renderedFormat: "cardinalText",
+    supportsMutation: true,
+    render: toCardinalText2
+  },
+  {
+    format: "ordinalText",
+    renderSupport: "supported",
+    renderedFormat: "ordinalText",
+    supportsMutation: true,
+    render: toOrdinalText2
+  },
+  {
+    format: "chicago",
+    renderSupport: "supported",
+    renderedFormat: "chicago",
+    supportsMutation: true,
+    render: toChicago2
+  },
+  {
+    format: "bullet",
+    renderSupport: "supported",
+    renderedFormat: "bullet",
+    supportsMutation: true,
+    render: () => ""
+  },
+  {
+    format: "none",
+    renderSupport: "supported",
+    renderedFormat: "none",
+    supportsMutation: true,
+    render: () => ""
+  }
+];
+var approximatedDecimalFormats = [
+  "decimalEnclosedCircle",
+  "decimalEnclosedFullstop",
+  "decimalEnclosedParen",
+  "decimalFullWidth",
+  "decimalHalfWidth",
+  "aiueo",
+  "iroha",
+  "ganada",
+  "chosung",
+  "russianLower",
+  "russianUpper",
+  "hebrew1",
+  "hebrew2",
+  "arabicAlpha",
+  "arabicAbjad",
+  "thaiLetters",
+  "thaiNumbers",
+  "hindiLetters",
+  "hindiNumbers",
+  "ideographDigital",
+  "ideographTraditional",
+  "chineseCounting",
+  "japaneseCounting",
+  "japaneseLegal"
+];
+var approximatedNumberingFormatEntries = approximatedDecimalFormats.map((format) => ({
+  format,
+  renderSupport: "approximated",
+  renderedFormat: "decimal",
+  supportsMutation: false,
+  fallbackReason: "unsupported-numbering-format-decimal-fallback",
+  render: (value) => String(value)
+}));
+var NUMBERING_FORMAT_REGISTRY = new Map(
+  [...exactNumberingFormatEntries, ...approximatedNumberingFormatEntries].map((entry) => [
+    entry.format,
+    entry
+  ])
+);
 function toOrdinal2(value) {
   if (value <= 0) return String(value);
   const lastTwo = value % 100;
@@ -6488,12 +6789,36 @@ var DEFAULT_HYPERLINK_COLOR_HEX = "0563C1";
 function resolveHyperlinkRunFormatting(input, catalog, resolver) {
   const augmentedInput = input.characterStyleId === void 0 ? { ...input, characterStyleId: HYPERLINK_CHARACTER_STYLE_ID } : input;
   const cascade = resolveEffectiveRunFormatting(augmentedInput, catalog);
-  const resolvedColor = resolveHyperlinkColorHex(cascade, resolver);
+  const resolvedColor = resolveHyperlinkColorHex(
+    stripInheritedColorHexForImplicitHyperlink(input, catalog, cascade),
+    resolver
+  );
   if (resolvedColor && resolvedColor !== cascade.colorHex) {
     return { ...cascade, colorHex: resolvedColor };
   }
   return cascade;
 }
+function hasDirectNonAutoColor(input) {
+  return Boolean(input.direct?.colorHex && input.direct.colorHex !== "auto");
+}
+function characterStyleDeclaresColorHex(styleId, catalog) {
+  if (!catalog) return false;
+  const chain = resolveCharacterStyleChain(styleId, catalog);
+  return chain.some((chainStyleId) => {
+    const colorHex = catalog.characters[chainStyleId]?.runProperties?.colorHex;
+    return Boolean(colorHex && colorHex !== "auto");
+  });
+}
+function stripInheritedColorHexForImplicitHyperlink(originalInput, catalog, cascade) {
+  if (originalInput.characterStyleId !== void 0 || hasDirectNonAutoColor(originalInput) || !cascade.colorHex || cascade.colorHex === "auto" || characterStyleDeclaresColorHex(HYPERLINK_CHARACTER_STYLE_ID, catalog)) {
+    return cascade;
+  }
+  const inheritedCascade = resolveEffectiveRunFormatting(originalInput, catalog);
+  if (inheritedCascade.colorHex !== cascade.colorHex) {
+    return cascade;
+  }
+  return { ...cascade, colorHex: void 0 };
+}
 function resolveHyperlinkColorHex(cascade, resolver) {
   if (cascade.colorHex && cascade.colorHex !== "auto") {
     return cascade.colorHex;
@@ -6725,7 +7050,7 @@ function buildEffectiveLayoutFormatting(input) {
   };
 }
 function createStructuralHash(value) {
-  const stable = stableStringify(value);
+  const stable = stableStringify2(value);
   let hash = 2166136261;
   for (let i = 0; i < stable.length; i += 1) {
     hash ^= stable.charCodeAt(i);
@@ -6733,16 +7058,16 @@ function createStructuralHash(value) {
   }
   return `fnv1a32:${(hash >>> 0).toString(16).padStart(8, "0")}`;
 }
-function stableStringify(value) {
+function stableStringify2(value) {
   if (value === null || typeof value !== "object") {
     return JSON.stringify(value);
   }
   if (Array.isArray(value)) {
-    return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
+    return `[${value.map((entry) => stableStringify2(entry)).join(",")}]`;
   }
   const record = value;
   const keys = Object.keys(record).filter((key) => record[key] !== void 0).sort();
-  return `{${keys.map((key) => `${JSON.stringify(key)}:${stableStringify(record[key])}`).join(",")}}`;
+  return `{${keys.map((key) => `${JSON.stringify(key)}:${stableStringify2(record[key])}`).join(",")}}`;
 }
 
 // src/runtime/formatting/formatting-context.ts
@@ -7251,6 +7576,7 @@ function createEditorSurfaceSnapshot(document2, _selection, activeStory = { kind
     ...options.authorColorPalette ? { authorColorPalette: options.authorColorPalette } : {}
   });
   const editableTargetsByBlockPath = options.editableTargetsByBlockPath ?? indexEditableTargetsByBlockPath(document2);
+  const layoutIdentitiesByBlockPath = options.layoutIdentitiesByBlockPath;
   const activeStoryBlockPathBase = getActiveStoryBlockPathBase(document2, activeStory);
   chartModelStore.beginBuildPass(document2);
   const unsupportedNumberingFormatsSeen = options.emitFormattingTelemetry ? /* @__PURE__ */ new Set() : null;
@@ -7274,6 +7600,7 @@ function createEditorSurfaceSnapshot(document2, _selection, activeStory = { kind
       activeStory.kind !== "main",
       !isInViewport,
       editableTargetsByBlockPath,
+      layoutIdentitiesByBlockPath,
       `${activeStoryBlockPathBase}/block[${index}]`
     );
     if (isInViewport) {
@@ -7340,7 +7667,7 @@ function isIndexInAnyRange(index, ranges) {
   }
   return false;
 }
-function createSurfaceBlock(block, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, blockPath) {
+function createSurfaceBlock(block, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, layoutIdentitiesByBlockPath, blockPath) {
   if (block.type === "opaque_block") {
     const fragment = getOpaqueFragment(document2.preservation, block.fragmentId);
     const descriptor = fragment ? describeOpaqueFragment(fragment) : null;
@@ -7377,6 +7704,7 @@ function createSurfaceBlock(block, document2, cursor, counters, formattingContex
       promoteSecondaryStoryTextBoxes,
       cullBuild,
       editableTargetsByBlockPath,
+      layoutIdentitiesByBlockPath,
       blockPath
     );
   }
@@ -7417,6 +7745,7 @@ function createSurfaceBlock(block, document2, cursor, counters, formattingContex
       promoteSecondaryStoryTextBoxes,
       cullBuild,
       editableTargetsByBlockPath,
+      layoutIdentitiesByBlockPath,
       blockPath
     );
   }
@@ -7499,10 +7828,11 @@ function createSurfaceBlock(block, document2, cursor, counters, formattingContex
     cullBuild,
     editableTargetsByBlockPath,
     blockPath,
-    blockPath !== void 0 ? editableTargetsByBlockPath.get(blockPath) : void 0
+    blockPath !== void 0 ? editableTargetsByBlockPath.get(blockPath) : void 0,
+    blockPath !== void 0 ? layoutIdentitiesByBlockPath?.get(blockPath) : void 0
   );
 }
-function createTableBlock(tableIndex, table, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, tablePath) {
+function createTableBlock(tableIndex, table, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, layoutIdentitiesByBlockPath, tablePath) {
   const lockedFragmentIds = [];
   let innerCursor = cursor;
   if (cullBuild) {
@@ -7519,6 +7849,7 @@ function createTableBlock(tableIndex, table, document2, cursor, counters, format
             promoteSecondaryStoryTextBoxes,
             true,
             editableTargetsByBlockPath,
+            layoutIdentitiesByBlockPath,
             tablePath !== void 0 ? `${tablePath}/row[${rowIndex}]/cell[${cellIndex}]/block[${childIndex}]` : void 0
           );
           lockedFragmentIds.push(...result.lockedFragmentIds);
@@ -7534,6 +7865,7 @@ function createTableBlock(tableIndex, table, document2, cursor, counters, format
         to: innerCursor,
         styleId: table.styleId,
         ...table.sourceRef !== void 0 ? { sourceRef: table.sourceRef } : {},
+        ...tablePath !== void 0 && layoutIdentitiesByBlockPath?.get(tablePath) !== void 0 ? { layoutIdentity: layoutIdentitiesByBlockPath.get(tablePath) } : {},
         gridColumns: table.gridColumns,
         rows: []
       },
@@ -7571,6 +7903,7 @@ function createTableBlock(tableIndex, table, document2, cursor, counters, format
           promoteSecondaryStoryTextBoxes,
           cullBuild,
           editableTargetsByBlockPath,
+          layoutIdentitiesByBlockPath,
           tablePath !== void 0 ? `${tablePath}/row[${rowIndex}]/cell[${cellIndex}]/block[${childIndex}]` : void 0
         );
         cellContent.push(result.block);
@@ -7659,6 +7992,7 @@ function createTableBlock(tableIndex, table, document2, cursor, counters, format
       to: innerCursor,
       styleId: table.styleId,
       ...table.sourceRef !== void 0 ? { sourceRef: table.sourceRef } : {},
+      ...tablePath !== void 0 && layoutIdentitiesByBlockPath?.get(tablePath) !== void 0 ? { layoutIdentity: layoutIdentitiesByBlockPath.get(tablePath) } : {},
       gridColumns: table.gridColumns,
       ...gridColumnsRelative ? { gridColumnsRelative } : {},
       ...resolvedTable.table?.alignment ? { alignment: resolvedTable.table.alignment } : {},
@@ -7846,7 +8180,7 @@ function resolveCellBorderStyles(borders, tableBorders, position) {
   if (left) result.borderLeft = left;
   return result;
 }
-function createSdtBlock(sdtIndex, block, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, sdtPath) {
+function createSdtBlock(sdtIndex, block, document2, cursor, counters, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, layoutIdentitiesByBlockPath, sdtPath) {
   const children = [];
   const lockedFragmentIds = [];
   let innerCursor = cursor;
@@ -7863,6 +8197,7 @@ function createSdtBlock(sdtIndex, block, document2, cursor, counters, formatting
       promoteSecondaryStoryTextBoxes,
       cullBuild,
       editableTargetsByBlockPath,
+      layoutIdentitiesByBlockPath,
       sdtPath !== void 0 ? `${sdtPath}/block[${childIndex}]` : void 0
     );
     children.push(result.block);
@@ -7905,7 +8240,7 @@ function getRecursableSdtBlockedReasonCode(block) {
   ].filter(Boolean).join(" ").toLowerCase();
   return searchText.includes("table of contents") || /\btoc\b/u.test(searchText) ? "workflow_preserve_only" : null;
 }
-function createParagraphBlock(paragraphIndex, paragraph, document2, start, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, blockPath, editableTarget) {
+function createParagraphBlock(paragraphIndex, paragraph, document2, start, formattingContext, promoteSecondaryStoryTextBoxes, cullBuild = false, editableTargetsByBlockPath = EMPTY_EDITABLE_TARGETS_BY_BLOCK_PATH, blockPath, editableTarget, layoutIdentity) {
   const themeResolver = formattingContext.theme;
   const effectiveNumbering = formattingContext.resolveEffectiveParagraphNumbering(paragraph);
   let resolvedNumbering = null;
@@ -7928,6 +8263,7 @@ function createParagraphBlock(paragraphIndex, paragraph, document2, start, forma
     from: start,
     to: start,
     ...editableTarget !== void 0 ? { editableTarget } : {},
+    ...layoutIdentity !== void 0 ? { layoutIdentity } : {},
     ...paragraph.styleId ? { styleId: paragraph.styleId } : {},
     ...effectiveNumbering ? { numbering: effectiveNumbering } : {},
     ...resolvedNumbering ? {
@@ -11703,6 +12039,14 @@ function paginateSectionBlocksWithSplits(section, blocks, layout, footnotes, mea
         pushPage(block.from);
         continue;
       }
+      if (isStandalonePageBreakParagraph(block)) {
+        if (columnHeight > 0) {
+          pushPage(nextBoundary);
+        } else {
+          pageStart = Math.max(pageStart, Math.min(nextBoundary, section.end));
+        }
+        break;
+      }
       const effectiveNoteHeight = estimateFootnoteReservation(
         block,
         footnotes,
@@ -11877,6 +12221,21 @@ function hasPageBreak(block) {
   }
   return nestedBlocks(block).some(hasPageBreak);
 }
+function isStandalonePageBreakParagraph(block) {
+  if (block.kind !== "paragraph") return false;
+  let sawPageBreak = false;
+  for (const segment of block.segments) {
+    if (segment.kind === "opaque_inline" && segment.label === "Page break") {
+      sawPageBreak = true;
+      continue;
+    }
+    if (segment.kind === "text" && segment.text.trim().length === 0) {
+      continue;
+    }
+    return false;
+  }
+  return sawPageBreak;
+}
 function nestedBlocks(block) {
   if (block.kind === "sdt_block") {
     return block.children;
@@ -13338,6 +13697,9 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
   for (let blockIndex = 0; blockIndex < surface.blocks.length; blockIndex += 1) {
     const block = surface.blocks[blockIndex];
     const blockPath = `main/block[${blockIndex}]`;
+    if (isStandalonePageBreakParagraph2(block)) {
+      continue;
+    }
     if (block.kind === "table") {
       const tableSliceList = splits?.tablesByBlockId.get(block.blockId);
       if (tableSliceList && tableSliceList.length > 1) {
@@ -13423,6 +13785,23 @@ function projectSurfaceBlocksToPageFragments(surface, pages, splits, columnByBlo
   }
   return byPage;
 }
+function isStandalonePageBreakParagraph2(block) {
+  if (block.kind !== "paragraph") {
+    return false;
+  }
+  let sawPageBreak = false;
+  for (const segment of block.segments) {
+    if (segment.kind === "opaque_inline" && segment.label === "Page break") {
+      sawPageBreak = true;
+      continue;
+    }
+    if (segment.kind === "text" && segment.text.trim().length === 0) {
+      continue;
+    }
+    return false;
+  }
+  return sawPageBreak;
+}
 function projectLineBoxesForPageFragments(pages, fragmentsByPageIndex, fragmentMeasurementsByPageIndex, surface) {
   const byPage = /* @__PURE__ */ new Map();
   const blocksById = surface ? new Map(surface.blocks.map((block) => [block.blockId, block])) : /* @__PURE__ */ new Map();
@@ -13935,13 +14314,11 @@ function buildBookmarkRanges(targets) {
 }
 var EMPTY_NUMBERING_INPUT_INDEX = {
   byNumberingKey: /* @__PURE__ */ new Map(),
-  byBlockPath: /* @__PURE__ */ new Map(),
-  byParagraphIndex: /* @__PURE__ */ new Map()
+  byBlockPath: /* @__PURE__ */ new Map()
 };
 function buildNumberingInputIndex(numberingInputs) {
   const byNumberingKey = /* @__PURE__ */ new Map();
   const byBlockPath = /* @__PURE__ */ new Map();
-  const byParagraph = /* @__PURE__ */ new Map();
   for (const input of numberingInputs) {
     if (!byNumberingKey.has(input.numberingKey)) {
       byNumberingKey.set(input.numberingKey, input);
@@ -13949,11 +14326,8 @@ function buildNumberingInputIndex(numberingInputs) {
     if (!byBlockPath.has(input.blockPath)) {
       byBlockPath.set(input.blockPath, input);
     }
-    if (!byParagraph.has(input.paragraphIndex)) {
-      byParagraph.set(input.paragraphIndex, input);
-    }
   }
-  return { byNumberingKey, byBlockPath, byParagraphIndex: byParagraph };
+  return { byNumberingKey, byBlockPath };
 }
 function collectBookmarkRangeLayoutFacts(fragmentId, blockPath, bookmarkRanges) {
   if (!blockPath || !bookmarkRanges || bookmarkRanges.length === 0) return [];
@@ -14073,8 +14447,7 @@ function collectNumberingLayoutFactsForBlock(block, blockPath, numberingIndex, n
     const canonical = lookupNumberingInput(
       numberingIndex,
       numberingKey,
-      context.path,
-      paragraphIndex
+      context.path
     );
     const target = findNumberingTarget(numberingTargets, context.path);
     const numberingLayoutId = numberingKey ?? [
@@ -14114,7 +14487,7 @@ function findNumberingTarget(numberingTargets, blockPath) {
   if (blockPath === void 0) return void 0;
   return numberingTargets.find((target) => target.blockPath === blockPath);
 }
-function lookupNumberingInput(numberingIndex, numberingKey, blockPath, paragraphIndex) {
+function lookupNumberingInput(numberingIndex, numberingKey, blockPath) {
   if (!numberingIndex) return void 0;
   if (numberingKey !== void 0) {
     const byKey = numberingIndex.byNumberingKey.get(numberingKey);
@@ -14124,7 +14497,7 @@ function lookupNumberingInput(numberingIndex, numberingKey, blockPath, paragraph
     const byPath = numberingIndex.byBlockPath.get(blockPath);
     if (byPath !== void 0) return byPath;
   }
-  return paragraphIndex !== void 0 ? numberingIndex.byParagraphIndex.get(paragraphIndex) : void 0;
+  return void 0;
 }
 function collectNumberingUnavailableReasons(numbering, canonical) {
   const reasons = [];
@@ -14514,12 +14887,330 @@ function createEmpiricalProvider() {
   return createEmpiricalBackend();
 }
 
+// src/runtime/layout/persistent-layout-measurement-cache.ts
+init_resolved_formatting_state();
+var DEFAULT_MAX_ENTRIES = 1e4;
+var DEFAULT_MAX_ESTIMATED_BYTES = 50 * 1024 * 1024;
+function createPersistentLayoutMeasurementCache(options = {}) {
+  const maxEntries = Math.max(1, options.maxEntries ?? DEFAULT_MAX_ENTRIES);
+  const maxEstimatedBytes = Math.max(
+    1024,
+    options.maxEstimatedBytes ?? DEFAULT_MAX_ESTIMATED_BYTES
+  );
+  const entries = /* @__PURE__ */ new Map();
+  const counters = {
+    hits: 0,
+    misses: 0,
+    sets: 0,
+    evictions: 0,
+    clears: 0,
+    estimatedBytes: 0,
+    invalidatedByReason: {}
+  };
+  function evictOldest() {
+    const oldest = entries.keys().next();
+    if (oldest.done) return;
+    const entry = entries.get(oldest.value);
+    if (entry) {
+      counters.estimatedBytes -= entry.estimatedBytes;
+    }
+    entries.delete(oldest.value);
+    counters.evictions += 1;
+  }
+  return {
+    get(key) {
+      const cacheKey = serializeCacheKey(key);
+      const entry = entries.get(cacheKey);
+      if (!entry) {
+        counters.misses += 1;
+        return void 0;
+      }
+      entries.delete(cacheKey);
+      entries.set(cacheKey, entry);
+      counters.hits += 1;
+      return entry.value;
+    },
+    set(key, value) {
+      const cacheKey = serializeCacheKey(key);
+      const previous = entries.get(cacheKey);
+      if (previous) {
+        counters.estimatedBytes -= previous.estimatedBytes;
+        entries.delete(cacheKey);
+      }
+      const estimatedBytes = estimateBytes(key, value);
+      entries.set(cacheKey, { key, value, estimatedBytes });
+      counters.estimatedBytes += estimatedBytes;
+      counters.sets += 1;
+      while (entries.size > maxEntries || counters.estimatedBytes > maxEstimatedBytes) {
+        evictOldest();
+      }
+    },
+    invalidate(reason, predicate) {
+      if (!predicate) {
+        const removed2 = entries.size;
+        counters.estimatedBytes = 0;
+        entries.clear();
+        counters.invalidatedByReason[reason] = (counters.invalidatedByReason[reason] ?? 0) + removed2;
+        return;
+      }
+      let removed = 0;
+      for (const [cacheKey, entry] of entries) {
+        if (!predicate(entry.key)) continue;
+        counters.estimatedBytes -= entry.estimatedBytes;
+        entries.delete(cacheKey);
+        removed += 1;
+      }
+      counters.invalidatedByReason[reason] = (counters.invalidatedByReason[reason] ?? 0) + removed;
+    },
+    clear(reason) {
+      const removed = entries.size;
+      counters.estimatedBytes = 0;
+      entries.clear();
+      counters.clears += 1;
+      counters.invalidatedByReason[reason] = (counters.invalidatedByReason[reason] ?? 0) + removed;
+    },
+    stats() {
+      return {
+        hits: counters.hits,
+        misses: counters.misses,
+        sets: counters.sets,
+        evictions: counters.evictions,
+        clears: counters.clears,
+        size: entries.size,
+        estimatedBytes: Math.max(0, counters.estimatedBytes),
+        invalidatedByReason: { ...counters.invalidatedByReason }
+      };
+    }
+  };
+}
+function createCachedLayoutMeasurementProvider(delegate, options = {}) {
+  const cache = options.cache ?? createPersistentLayoutMeasurementCache(options);
+  function emitCounter(type, key) {
+    const telemetryBus = options.telemetryBus;
+    if (!telemetryBus?.isEnabled("layout")) return;
+    telemetryBus.emitLazy("layout", () => ({
+      type,
+      payload: key ? {
+        measurementKind: key.measurementKind,
+        blockId: key.blockId,
+        backendVersion: key.backendVersion
+      } : void 0
+    }));
+  }
+  return {
+    get fidelity() {
+      return delegate.fidelity;
+    },
+    measurementCache: cache,
+    measurementCacheStats() {
+      return cache.stats();
+    },
+    whenReady() {
+      return delegate.whenReady();
+    },
+    measureLineFragments(input) {
+      const key = buildLineFragmentsKey(input, delegate, options);
+      const cached = cache.get(key);
+      if (cached) {
+        emitCounter("pageRender.measurement.hit", key);
+        return cloneMeasuredLineFragments(cached);
+      }
+      emitCounter("pageRender.measurement.miss", key);
+      const measured = delegate.measureLineFragments(input);
+      cache.set(key, cloneMeasuredLineFragments(measured));
+      return measured;
+    },
+    measureInlineObject(input) {
+      const key = buildInlineObjectKey(input, delegate, options);
+      const cached = cache.get(key);
+      if (cached) {
+        emitCounter("pageRender.measurement.hit", key);
+        return { ...cached };
+      }
+      emitCounter("pageRender.measurement.miss", key);
+      const measured = delegate.measureInlineObject(input);
+      cache.set(key, { ...measured });
+      return measured;
+    },
+    measureTableBlock(input) {
+      const key = buildTableBlockKey(input, delegate, options);
+      const cached = cache.get(key);
+      if (cached) {
+        emitCounter("pageRender.measurement.hit", key);
+        return cloneMeasuredTableBlock(cached);
+      }
+      emitCounter("pageRender.measurement.miss", key);
+      const measured = delegate.measureTableBlock(input);
+      cache.set(key, cloneMeasuredTableBlock(measured));
+      return measured;
+    },
+    invalidateCache() {
+      delegate.invalidateCache();
+      cache.clear("provider.invalidateCache");
+      emitCounter("pageRender.measurement.invalidated.provider.invalidateCache");
+    }
+  };
+}
+function isCachedLayoutMeasurementProvider(provider) {
+  return typeof provider.measurementCacheStats === "function";
+}
+function buildLineFragmentsKey(input, delegate, options) {
+  const block = input.block;
+  const identity = measurementIdentityForBlock(block);
+  return {
+    measurementKind: "line-fragments",
+    blockId: identity.blockId,
+    blockPath: identity.blockPath,
+    contentHash: hashStable2({
+      kind: block.kind,
+      identity: identity.identityHash,
+      segments: block.segments,
+      numbering: block.numbering,
+      numberingPrefix: block.numberingPrefix,
+      numberingSuffix: block.numberingSuffix,
+      resolvedNumbering: block.resolvedNumbering
+    }),
+    formattingHash: createLayoutReadyFormattingSnapshot(
+      input.formatting,
+      input.runs
+    ).hash,
+    constraintsHash: hashStable2({ columnWidth: input.columnWidth }),
+    sectionHash: resolveOptionValue(options.sectionHash, "section:provider-input"),
+    fontEpoch: resolveOptionValue(options.fontEpoch, "font:default"),
+    backendVersion: resolveOptionValue(options.backendVersion, delegate.fidelity),
+    displayModeHash: resolveOptionValue(options.displayModeHash, "display:default")
+  };
+}
+function buildInlineObjectKey(input, delegate, options) {
+  return {
+    measurementKind: "inline-object",
+    blockId: "inline-object",
+    blockPath: "inline-object",
+    contentHash: hashStable2({ display: input.display }),
+    formattingHash: "format:none",
+    constraintsHash: hashStable2({
+      widthTwips: input.widthTwips,
+      heightTwips: input.heightTwips
+    }),
+    sectionHash: resolveOptionValue(options.sectionHash, "section:provider-input"),
+    fontEpoch: resolveOptionValue(options.fontEpoch, "font:default"),
+    backendVersion: resolveOptionValue(options.backendVersion, delegate.fidelity),
+    displayModeHash: resolveOptionValue(options.displayModeHash, "display:default")
+  };
+}
+function buildTableBlockKey(input, delegate, options) {
+  const block = input.block;
+  const identity = measurementIdentityForBlock(block);
+  return {
+    measurementKind: "table-block",
+    blockId: identity.blockId,
+    blockPath: identity.blockPath,
+    contentHash: hashStable2({
+      kind: block.kind,
+      identity: identity.identityHash,
+      rows: block.rows,
+      gridColumns: block.gridColumns,
+      gridColumnsRelative: block.gridColumnsRelative,
+      tableResolved: block.tableResolved,
+      tblLook: block.tblLook
+    }),
+    formattingHash: hashStable2({
+      styleId: block.styleId,
+      alignment: block.alignment
+    }),
+    constraintsHash: hashStable2({ columnWidth: input.columnWidth }),
+    sectionHash: resolveOptionValue(options.sectionHash, "section:provider-input"),
+    fontEpoch: resolveOptionValue(options.fontEpoch, "font:default"),
+    backendVersion: resolveOptionValue(options.backendVersion, delegate.fidelity),
+    displayModeHash: resolveOptionValue(options.displayModeHash, "display:default")
+  };
+}
+function measurementIdentityForBlock(block) {
+  const identity = block.layoutIdentity;
+  if (!identity) {
+    return {
+      blockId: block.blockId,
+      blockPath: blockPathForBlock(block),
+      identityHash: "identity:legacy"
+    };
+  }
+  return {
+    blockId: identity.blockId,
+    blockPath: identity.blockPath,
+    identityHash: hashStable2({
+      storyKey: identity.storyKey,
+      blockId: identity.blockId,
+      blockPath: identity.blockPath,
+      sourceRef: identity.sourceRef,
+      table: identity.table,
+      list: identity.list,
+      field: identity.field,
+      object: identity.object
+    })
+  };
+}
+function blockPathForBlock(block) {
+  return `${block.from}:${block.to}`;
+}
+function resolveOptionValue(option, fallback) {
+  if (typeof option === "function") return option();
+  return option ?? fallback;
+}
+function serializeCacheKey(key) {
+  return stableStringify3(key);
+}
+function estimateBytes(key, value) {
+  return stableStringify3(key).length + stableStringify3(value).length;
+}
+function cloneMeasuredLineFragments(value) {
+  return {
+    lineCount: value.lineCount,
+    maxLineWidth: value.maxLineWidth,
+    lineHeights: [...value.lineHeights]
+  };
+}
+function cloneMeasuredTableBlock(value) {
+  return {
+    totalHeightTwips: value.totalHeightTwips,
+    rowHeights: [...value.rowHeights]
+  };
+}
+function hashStable2(value) {
+  return fnv1a2(stableStringify3(value)).toString(36);
+}
+function stableStringify3(value) {
+  if (value === null || typeof value !== "object") return JSON.stringify(value);
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => stableStringify3(item)).join(",")}]`;
+  }
+  if (value instanceof Map) {
+    return stableStringify3(Array.from(value.entries()));
+  }
+  const object = value;
+  const keys = Object.keys(object).filter((key) => object[key] !== void 0 && typeof object[key] !== "function").sort();
+  return `{${keys.map((key) => `${JSON.stringify(key)}:${stableStringify3(object[key])}`).join(",")}}`;
+}
+function fnv1a2(input) {
+  let hash = 2166136261;
+  for (let i = 0; i < input.length; i += 1) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return hash >>> 0;
+}
+
 // src/runtime/layout/layout-engine-version.ts
-var LAYOUT_ENGINE_VERSION = 88;
+var LAYOUT_ENGINE_VERSION = 93;
 
 // src/runtime/layout/layout-engine-instance.ts
 var FULL_VIEWPORT_WINDOW_KEY = "full";
 var DEFAULT_VIEWPORT_PAGE_WINDOW_BUFFER = 1;
+function indexLayoutIdentitiesByBlockPath(identities) {
+  return new Map(identities.map((identity) => [identity.blockPath, identity]));
+}
+function indexEditableTargetsByBlockPath2(targets) {
+  return new Map(targets.map((target) => [target.blockPath, target]));
+}
 function normalizeViewportPageWindow(window2) {
   if (!window2) return void 0;
   const buffer = Number.isFinite(window2.bufferPages) ? Math.max(0, Math.floor(window2.bufferPages ?? 0)) : DEFAULT_VIEWPORT_PAGE_WINDOW_BUFFER;
@@ -14715,8 +15406,22 @@ function recordFullRebuildReason(reasonKind) {
   probe.invalidationCounts[totalKey] = (probe.invalidationCounts[totalKey] ?? 0) + 1;
   probe.invalidationCounts[byReasonKey] = (probe.invalidationCounts[byReasonKey] ?? 0) + 1;
 }
+function wrapMeasurementProvider(provider, measurementCache, telemetryBus) {
+  if (!measurementCache || isCachedLayoutMeasurementProvider(provider)) {
+    return provider;
+  }
+  const cacheOptions = measurementCache === true ? {} : measurementCache;
+  return createCachedLayoutMeasurementProvider(provider, {
+    ...cacheOptions,
+    ...telemetryBus ? { telemetryBus } : {}
+  });
+}
 function createLayoutEngine(options = {}) {
-  let measurementProvider = options.measurementProvider ?? createEmpiricalMeasurementProvider();
+  let measurementProvider = wrapMeasurementProvider(
+    options.measurementProvider ?? createEmpiricalMeasurementProvider(),
+    options.measurementCache,
+    options.telemetryBus
+  );
   const autoUpgradeToCanvas = options.autoUpgradeToCanvasBackend !== false;
   const telemetryBus = options.telemetryBus;
   const dirtyFieldFamilies = /* @__PURE__ */ new Set();
@@ -14816,13 +15521,20 @@ function createLayoutEngine(options = {}) {
     const pageCountBeforeRecompute = previousPageCount;
     const document2 = input.document;
     const viewportWindow = normalizeViewportPageWindow(input.viewportPageWindow);
+    const layoutInputs = collectCanonicalLayoutInputs(document2);
+    const layoutIdentitiesByBlockPath = indexLayoutIdentitiesByBlockPath(
+      layoutInputs.layoutIdentities
+    );
+    const editableTargetsByBlockPath = indexEditableTargetsByBlockPath2(
+      layoutInputs.editableTargets
+    );
     const mainSurface = createEditorSurfaceSnapshot(
       document2,
       createSelectionSnapshot(0, 0),
-      MAIN_STORY_TARGET
+      MAIN_STORY_TARGET,
+      { editableTargetsByBlockPath, layoutIdentitiesByBlockPath }
     );
     const sections = buildResolvedSections(document2);
-    const layoutInputs = collectCanonicalLayoutInputs(document2);
     const fieldRegions = layoutInputs.fieldRegions;
     const pageStack = buildPageStackWithSplits(
       document2,
@@ -14934,10 +15646,18 @@ function createLayoutEngine(options = {}) {
     const firstDirty = range.firstPageIndex;
     if (firstDirty < 0 || firstDirty >= priorGraph.pages.length) return null;
     const document2 = input.document;
+    const layoutInputs = collectCanonicalLayoutInputs(document2);
+    const layoutIdentitiesByBlockPath = indexLayoutIdentitiesByBlockPath(
+      layoutInputs.layoutIdentities
+    );
+    const editableTargetsByBlockPath = indexEditableTargetsByBlockPath2(
+      layoutInputs.editableTargets
+    );
     const mainSurface = createEditorSurfaceSnapshot(
       document2,
       createSelectionSnapshot(0, 0),
-      MAIN_STORY_TARGET
+      MAIN_STORY_TARGET,
+      { editableTargetsByBlockPath, layoutIdentitiesByBlockPath }
     );
     const sections = buildResolvedSections(document2);
     const dirtyPage = priorGraph.pages[firstDirty];
@@ -14966,7 +15686,6 @@ function createLayoutEngine(options = {}) {
     const freshSnapshotsToRebuild = freshSnapshots.slice(0, convergenceIndex);
     const convergedTailStart = convergenceIndex < freshSnapshots.length ? firstDirty + convergenceIndex : void 0;
     const freshStories = resolvePageStories(freshSnapshotsToRebuild);
-    const layoutInputs = collectCanonicalLayoutInputs(document2);
     const fieldRegions = layoutInputs.fieldRegions;
     const freshBodyFragmentsByPageIndex = projectSurfaceBlocksToPageFragments(
       mainSurface,
@@ -15098,7 +15817,11 @@ function createLayoutEngine(options = {}) {
       try {
         const mod = await Promise.resolve().then(() => (init_measurement_backend_canvas(), measurement_backend_canvas_exports));
         const canvasProvider = mod.createCanvasBackend();
-        measurementProvider = canvasProvider;
+        measurementProvider = wrapMeasurementProvider(
+          canvasProvider,
+          options.measurementCache,
+          telemetryBus
+        );
         cachedKey = null;
         cachedGraph = null;
         cachedFormatting = null;
@@ -15183,7 +15906,11 @@ function createLayoutEngine(options = {}) {
     },
     swapMeasurementProvider(provider) {
       const previousFidelity = measurementProvider.fidelity;
-      measurementProvider = provider;
+      measurementProvider = wrapMeasurementProvider(
+        provider,
+        options.measurementCache,
+        telemetryBus
+      );
       if (previousFidelity !== provider.fidelity) {
         cachedKey = null;
         cachedGraph = null;
@@ -15212,6 +15939,10 @@ function createLayoutEngine(options = {}) {
       cachedFormatting = null;
       cachedMapper = null;
     },
+    getMeasurementCacheStats() {
+      if (!isCachedLayoutMeasurementProvider(measurementProvider)) return null;
+      return measurementProvider.measurementCacheStats();
+    },
     /**
      * L7 Phase 2.5 — seed the cached graph from a prerender envelope.
      * Populates both `cachedGraph` and `cachedKey` (keyed on the provided