@superdoc-dev/cli 0.8.0-next.11 → 0.8.0-next.12

package/dist/index.js

@@ -65535,7 +65535,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-XXBr0N8c.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-D54XfHFt.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -95679,6 +95679,11 @@ function createStoryEditor(parentEditor, content$2, options = {}) {
     fragment: null,
     ...editorOptions
   });
+  const inheritedPresentationEditor = parentEditor.presentationEditor ?? parentEditor._presentationEditor ?? null;
+  if (inheritedPresentationEditor) {
+    storyEditor.presentationEditor = inheritedPresentationEditor;
+    storyEditor._presentationEditor = inheritedPresentationEditor;
+  }
   if (storyEditor.options && typeof storyEditor.options === "object")
     Object.defineProperty(storyEditor.options, "parentEditor", {
       enumerable: false,
@@ -99742,6 +99747,17 @@ function resolveLiveStorySessionRuntime(hostEditor, storyKey) {
     return null;
   return buildLiveSessionRuntime(registration);
 }
+function commitLiveStorySessionRuntimes(hostEditor) {
+  const sessions = liveSessionsByHost.get(hostEditor);
+  if (!sessions || sessions.size === 0)
+    return 0;
+  let committedCount = 0;
+  for (const registration of [...sessions.values()]) {
+    buildLiveSessionRuntime(registration).commit?.(hostEditor);
+    committedCount += 1;
+  }
+  return committedCount;
+}
 function unregisterLiveStorySessionRuntime(hostEditor, storyKey, editor) {
   const sessions = liveSessionsByHost.get(hostEditor);
   if (!sessions)
@@ -117714,7 +117730,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_XXBr0N8c_es = __esm(() => {
+var init_SuperConverter_D54XfHFt_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -155130,7 +155146,7 @@ var init_SuperConverter_XXBr0N8c_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-BAI3xz0T.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DrE9IMiD.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -157722,8 +157738,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, Extension = class Extension2 {
     }
   };
 };
-var init_create_headless_toolbar_BAI3xz0T_es = __esm(() => {
-  init_SuperConverter_XXBr0N8c_es();
+var init_create_headless_toolbar_DrE9IMiD_es = __esm(() => {
+  init_SuperConverter_D54XfHFt_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   CSS_DIMENSION_REGEX = /[\d-.]+(\w+)$/;
@@ -206410,7 +206426,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CGvIfKnh.es.js
+// ../../packages/superdoc/dist/chunks/src-BFNW1Ck5.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -207989,7 +208005,8 @@ function getEditorSurfaceElement(editor) {
     return null;
   if (typeof editor.hitTest === "function" && editor.element instanceof HTMLElement)
     return editor.element;
-  return editor.presentationEditor?.element ?? editor.view?.dom ?? editor.options?.element ?? null;
+  const parentEditor = editor.options?.parentEditor ?? null;
+  return (editor.presentationEditor ?? parentEditor?.presentationEditor ?? parentEditor?._presentationEditor ?? null)?.element ?? editor.view?.dom ?? editor.options?.element ?? null;
 }
 function getSurfaceRelativePoint(editor, eventLocation = {}) {
   const surface = getEditorSurfaceElement(editor);
@@ -249413,30 +249430,6 @@ function assertRequiredBlockMeasurePair(label, blocks2, measures) {
   if (blocks2.length !== measures.length)
     throw new Error(`${label} blocks and measures must have the same length.`);
 }
-function normalizeRequiredBlockMeasurePair(label, blocks2, measures) {
-  if (!Array.isArray(blocks2) || !Array.isArray(measures))
-    throw new Error("DomPainterInput requires body blocks and measures; resolved-layout-only input is not supported.");
-  assertRequiredBlockMeasurePair(label, blocks2, measures);
-  return {
-    blocks: blocks2,
-    measures
-  };
-}
-function normalizeOptionalBlockMeasurePair(label, blocks2, measures) {
-  const hasBlocks = blocks2 !== undefined;
-  const hasMeasures = measures !== undefined;
-  if (hasBlocks !== hasMeasures)
-    throw new Error(`${label}Blocks and ${label}Measures must both be provided or both be omitted.`);
-  if (!hasBlocks || !hasMeasures)
-    return;
-  if (!Array.isArray(blocks2) || !Array.isArray(measures))
-    throw new Error(`${label}Blocks and ${label}Measures must be arrays when provided.`);
-  assertRequiredBlockMeasurePair(label, blocks2, measures);
-  return {
-    blocks: blocks2,
-    measures
-  };
-}
 function createEmptyResolvedLayout(flowMode, pageGap) {
   return {
     version: 1,
@@ -249445,25 +249438,8 @@ function createEmptyResolvedLayout(flowMode, pageGap) {
     pages: []
   };
 }
-function isLegacyLayoutInput(value) {
-  return "pages" in value;
-}
-function normalizeDomPainterInput(input2) {
-  if (!input2.resolvedLayout || !input2.sourceLayout)
-    throw new Error("DomPainterInput requires resolvedLayout and sourceLayout.");
-  const body = normalizeRequiredBlockMeasurePair("body", input2.blocks, input2.measures);
-  const header = normalizeOptionalBlockMeasurePair("header", input2.headerBlocks, input2.headerMeasures);
-  const footer = normalizeOptionalBlockMeasurePair("footer", input2.footerBlocks, input2.footerMeasures);
-  return {
-    resolvedLayout: input2.resolvedLayout,
-    sourceLayout: input2.sourceLayout,
-    blocks: body.blocks,
-    measures: body.measures,
-    headerBlocks: header?.blocks,
-    headerMeasures: header?.measures,
-    footerBlocks: footer?.blocks,
-    footerMeasures: footer?.measures
-  };
+function isDomPainterInput(value) {
+  return "resolvedLayout" in value && "sourceLayout" in value;
 }
 function buildLegacyPaintInput(layout, legacyState, flowMode, pageGap) {
   let resolvedLayout;
@@ -249480,13 +249456,7 @@ function buildLegacyPaintInput(layout, legacyState, flowMode, pageGap) {
     });
   return {
     resolvedLayout,
-    sourceLayout: layout,
-    blocks: legacyState.blocks,
-    measures: legacyState.measures,
-    headerBlocks: legacyState.headerBlocks,
-    headerMeasures: legacyState.headerMeasures,
-    footerBlocks: legacyState.footerBlocks,
-    footerMeasures: legacyState.footerMeasures
+    sourceLayout: layout
   };
 }
 function appendToArrayMap(map$12, key2, value) {
@@ -260839,7 +260809,7 @@ function normalizeConverterContext(context, defaultFont, defaultSize) {
     context.translatedLinkedStyles.docDefaults.runProperties.fontSize = defaultSize * 0.75 * 2;
   return context;
 }
-function buildFootnotesInput(editorState, converter, converterContext, themeColors) {
+function buildFootnotesInput(editorState, converter, converterContext, themeColors, renderOverride = null) {
   if (!editorState)
     return null;
   const footnoteNumberById = converterContext?.footnoteNumberById;
@@ -260866,14 +260836,11 @@ function buildFootnotesInput(editorState, converter, converterContext, themeColo
     return null;
   const blocksById = /* @__PURE__ */ new Map;
   idsInUse.forEach((id2) => {
-    const content3 = findNoteEntryById(importedFootnotes, id2)?.content;
-    if (!Array.isArray(content3) || content3.length === 0)
-      return;
     try {
-      const result = toFlowBlocks(normalizeNotePmJson({
-        type: "doc",
-        content: JSON.parse(JSON.stringify(content3))
-      }), {
+      const footnoteDoc = resolveNoteDocJson(id2, importedFootnotes, renderOverride);
+      if (!footnoteDoc)
+        return;
+      const result = toFlowBlocks(footnoteDoc, {
         blockIdPrefix: `footnote-${id2}-`,
         storyKey: buildStoryKey({
           kind: "story",
@@ -260941,6 +260908,23 @@ function buildMarkerRun$1(markerText, firstTextRun) {
     markerRun.color = firstTextRun.color;
   return markerRun;
 }
+function cloneJsonValue$1(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function cloneNoteContentJson$1(content3) {
+  return cloneJsonValue$1(content3);
+}
+function resolveNoteDocJson(id2, importedFootnotes, renderOverride) {
+  if (renderOverride && renderOverride.noteId === id2)
+    return normalizeNotePmJson(cloneJsonValue$1(renderOverride.docJson));
+  const content3 = findNoteEntryById(importedFootnotes, id2)?.content;
+  if (!Array.isArray(content3) || content3.length === 0)
+    return null;
+  return normalizeNotePmJson({
+    type: "doc",
+    content: cloneNoteContentJson$1(content3)
+  });
+}
 function syncMarkerRun$1(target, source) {
   target.kind = source.kind;
   target.text = source.text;
@@ -265088,7 +265072,7 @@ function getHostEditor(editor) {
 function resolveSessionHostEditor(editor, runtime) {
   return getHostEditor(editor) ?? getHostEditor(runtime.editor) ?? runtime.editor;
 }
-function buildEndnoteBlocks(editorState, converter, converterContext, themeColors) {
+function buildEndnoteBlocks(editorState, converter, converterContext, themeColors, renderOverride = null) {
   if (!editorState)
     return [];
   const endnoteNumberById = converterContext?.endnoteNumberById;
@@ -265113,14 +265097,11 @@ function buildEndnoteBlocks(editorState, converter, converterContext, themeColor
     return [];
   const blocks2 = [];
   orderedEndnoteIds.forEach((id2) => {
-    const content3 = findNoteEntryById(importedEndnotes, id2)?.content;
-    if (!Array.isArray(content3) || content3.length === 0)
-      return;
     try {
-      const result = toFlowBlocks(normalizeNotePmJson({
-        type: "doc",
-        content: JSON.parse(JSON.stringify(content3))
-      }), {
+      const endnoteDoc = resolveEndnoteDocJson(id2, importedEndnotes, renderOverride);
+      if (!endnoteDoc)
+        return;
+      const result = toFlowBlocks(endnoteDoc, {
         blockIdPrefix: `endnote-${id2}-`,
         storyKey: buildStoryKey({
           kind: "story",
@@ -265195,6 +265176,23 @@ function syncMarkerRun(target, source) {
   delete target.pmStart;
   delete target.pmEnd;
 }
+function cloneJsonValue(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function cloneNoteContentJson(content3) {
+  return cloneJsonValue(content3);
+}
+function resolveEndnoteDocJson(id2, importedEndnotes, renderOverride) {
+  if (renderOverride && renderOverride.noteId === id2)
+    return normalizeNotePmJson(cloneJsonValue(renderOverride.docJson));
+  const content3 = findNoteEntryById(importedEndnotes, id2)?.content;
+  if (!Array.isArray(content3) || content3.length === 0)
+    return null;
+  return normalizeNotePmJson({
+    type: "doc",
+    content: cloneNoteContentJson(content3)
+  });
+}
 function ensureEndnoteMarker(blocks2, id2, endnoteNumberById) {
   const firstParagraph = blocks2.find((block) => block.kind === "paragraph");
   if (!firstParagraph)
@@ -267166,26 +267164,26 @@ var Node$13 = class Node$14 {
     cleanup();
     headlessCleanupRegisteredEditors.delete(editor);
   });
-}, cloneJsonValue = (value) => {
+}, cloneJsonValue$2 = (value) => {
   if (value == null)
     return null;
   return JSON.parse(JSON.stringify(value));
 }, serializeComparableValue = (value) => JSON.stringify(value ?? null), getEditorBodySectPr = (editor) => editor?.state?.doc?.attrs?.bodySectPr ?? null, setEditorConverterBodySectPr = (editor, bodySectPr) => {
   if (!editor?.converter)
     return;
-  editor.converter.bodySectPr = cloneJsonValue(bodySectPr);
+  editor.converter.bodySectPr = cloneJsonValue$2(bodySectPr);
 }, syncBodySectPrToMetaMap = (ydoc, editor) => {
   const metaMap = ydoc.getMap("meta");
-  const nextBodySectPr = cloneJsonValue(getEditorBodySectPr(editor));
-  const currentMetaBodySectPr = cloneJsonValue(metaMap.get(META_BODY_SECT_PR_KEY) ?? null);
+  const nextBodySectPr = cloneJsonValue$2(getEditorBodySectPr(editor));
+  const currentMetaBodySectPr = cloneJsonValue$2(metaMap.get(META_BODY_SECT_PR_KEY) ?? null);
   setEditorConverterBodySectPr(editor, nextBodySectPr);
   if (serializeComparableValue(nextBodySectPr) === serializeComparableValue(currentMetaBodySectPr))
     return false;
   metaMap.set(META_BODY_SECT_PR_KEY, nextBodySectPr);
   return true;
 }, applyBodySectPrFromMetaMap = (editor, ydoc) => {
-  const nextBodySectPr = cloneJsonValue(ydoc.getMap("meta").get(META_BODY_SECT_PR_KEY) ?? null);
-  const currentBodySectPr = cloneJsonValue(getEditorBodySectPr(editor));
+  const nextBodySectPr = cloneJsonValue$2(ydoc.getMap("meta").get(META_BODY_SECT_PR_KEY) ?? null);
+  const currentBodySectPr = cloneJsonValue$2(getEditorBodySectPr(editor));
   setEditorConverterBodySectPr(editor, nextBodySectPr);
   if (serializeComparableValue(nextBodySectPr) === serializeComparableValue(currentBodySectPr))
     return false;
@@ -267228,8 +267226,8 @@ var Node$13 = class Node$14 {
         applyBodySectPrFromMetaMap(editor, ydoc);
         return;
       }
-      const previousBodySectPr = cloneJsonValue(transaction.before?.attrs?.bodySectPr ?? null);
-      const nextBodySectPr = cloneJsonValue(getEditorBodySectPr(editor));
+      const previousBodySectPr = cloneJsonValue$2(transaction.before?.attrs?.bodySectPr ?? null);
+      const nextBodySectPr = cloneJsonValue$2(getEditorBodySectPr(editor));
       if (serializeComparableValue(previousBodySectPr) === serializeComparableValue(nextBodySectPr))
         return;
       syncBodySectPrToMetaMap(ydoc, editor);
@@ -267362,8 +267360,8 @@ var Node$13 = class Node$14 {
     }
     if (transaction.getMeta?.(BODY_SECT_PR_SYNC_META_KEY))
       return;
-    const previousBodySectPr = cloneJsonValue(transaction.before?.attrs?.bodySectPr ?? null);
-    const nextBodySectPr = cloneJsonValue(getEditorBodySectPr(editor));
+    const previousBodySectPr = cloneJsonValue$2(transaction.before?.attrs?.bodySectPr ?? null);
+    const nextBodySectPr = cloneJsonValue$2(getEditorBodySectPr(editor));
     const bodySectPrChanged = serializeComparableValue(previousBodySectPr) !== serializeComparableValue(nextBodySectPr);
     const binding = ensureInitializedBinding();
     if (binding && typeof binding._prosemirrorChanged === "function") {
@@ -272553,7 +272551,7 @@ var Node$13 = class Node$14 {
         ...node3.attrs,
         marksAsAttrs: newMarks
       };
-      dispatch(state.tr.setNodeMarkup(pos, undefined, newAttrs));
+      dispatch(state.tr.setNodeMarkup(pos, undefined, newAttrs).setMeta("skipTrackChanges", true).setMeta("addToHistory", false));
     }, 0);
   }
   update(node3) {
@@ -279944,89 +279942,6 @@ var Node$13 = class Node$14 {
   if (borders.between)
     parts.push(`bw:[${hashParagraphBorder$2(borders.between)}]`);
   return parts.join(";");
-}, isNoneBorder$2 = (value) => {
-  return typeof value === "object" && value !== null && "none" in value && value.none === true;
-}, isBorderSpec$2 = (value) => {
-  return typeof value === "object" && value !== null && !("none" in value);
-}, hashBorderSpec$2 = (border) => {
-  const parts = [];
-  if (border.style !== undefined)
-    parts.push(`s:${border.style}`);
-  if (border.width !== undefined)
-    parts.push(`w:${border.width}`);
-  if (border.color !== undefined)
-    parts.push(`c:${border.color}`);
-  if (border.space !== undefined)
-    parts.push(`sp:${border.space}`);
-  return parts.join(",");
-}, hashTableBorderValue$2 = (borderValue) => {
-  if (borderValue === undefined)
-    return "";
-  if (borderValue === null)
-    return "null";
-  if (isNoneBorder$2(borderValue))
-    return "none";
-  if (isBorderSpec$2(borderValue))
-    return hashBorderSpec$2(borderValue);
-  return "";
-}, hashTableBorders$2 = (borders) => {
-  if (!borders)
-    return "";
-  const parts = [];
-  if (borders.top !== undefined)
-    parts.push(`t:[${hashTableBorderValue$2(borders.top)}]`);
-  if (borders.right !== undefined)
-    parts.push(`r:[${hashTableBorderValue$2(borders.right)}]`);
-  if (borders.bottom !== undefined)
-    parts.push(`b:[${hashTableBorderValue$2(borders.bottom)}]`);
-  if (borders.left !== undefined)
-    parts.push(`l:[${hashTableBorderValue$2(borders.left)}]`);
-  if (borders.insideH !== undefined)
-    parts.push(`ih:[${hashTableBorderValue$2(borders.insideH)}]`);
-  if (borders.insideV !== undefined)
-    parts.push(`iv:[${hashTableBorderValue$2(borders.insideV)}]`);
-  return parts.join(";");
-}, hashCellBorders$2 = (borders) => {
-  if (!borders)
-    return "";
-  const parts = [];
-  if (borders.top)
-    parts.push(`t:[${hashBorderSpec$2(borders.top)}]`);
-  if (borders.right)
-    parts.push(`r:[${hashBorderSpec$2(borders.right)}]`);
-  if (borders.bottom)
-    parts.push(`b:[${hashBorderSpec$2(borders.bottom)}]`);
-  if (borders.left)
-    parts.push(`l:[${hashBorderSpec$2(borders.left)}]`);
-  return parts.join(";");
-}, hasStringProp$1 = (run2, prop) => {
-  return prop in run2 && typeof run2[prop] === "string";
-}, hasNumberProp$1 = (run2, prop) => {
-  return prop in run2 && typeof run2[prop] === "number";
-}, hasBooleanProp$1 = (run2, prop) => {
-  return prop in run2 && typeof run2[prop] === "boolean";
-}, getRunStringProp$1 = (run2, prop) => {
-  if (hasStringProp$1(run2, prop))
-    return run2[prop];
-  return "";
-}, getRunNumberProp$1 = (run2, prop) => {
-  if (hasNumberProp$1(run2, prop))
-    return run2[prop];
-  return 0;
-}, getRunBooleanProp$1 = (run2, prop) => {
-  if (hasBooleanProp$1(run2, prop))
-    return run2[prop];
-  return false;
-}, getRunUnderlineStyle$1 = (run2) => {
-  if ("underline" in run2 && typeof run2.underline === "boolean")
-    return run2.underline ? "single" : "";
-  if ("underline" in run2 && run2.underline && typeof run2.underline === "object")
-    return run2.underline.style ?? "";
-  return "";
-}, getRunUnderlineColor$1 = (run2) => {
-  if ("underline" in run2 && run2.underline && typeof run2.underline === "object")
-    return run2.underline.color ?? "";
-  return "";
 }, isDevelopment = () => {
   if (typeof process$1 !== "undefined" && typeof process$1.env !== "undefined")
     return process$1.env.NODE_ENV === "development";
@@ -280711,43 +280626,11 @@ menclose::after {
   styleEl.textContent = MATH_MENCLOSE_STYLES;
   doc$12.head?.appendChild(styleEl);
   mathMencloseStylesInjected = true;
-}, gradientIdCounter = 0, getFragmentParagraphBorders = (fragment2, blockLookup) => {
-  const lookup3 = blockLookup.get(fragment2.blockId);
-  if (!lookup3)
-    return;
-  if (fragment2.kind === "para" && lookup3.block.kind === "paragraph")
-    return lookup3.block.attrs?.borders;
-  if (fragment2.kind === "list-item" && lookup3.block.kind === "list")
-    return lookup3.block.items.find((entry) => entry.id === fragment2.itemId)?.paragraph.attrs?.borders;
-}, getFragmentHeight$1 = (fragment2, blockLookup) => {
-  if (fragment2.kind === "table" || fragment2.kind === "image" || fragment2.kind === "drawing")
-    return fragment2.height;
-  const lookup3 = blockLookup.get(fragment2.blockId);
-  if (!lookup3)
-    return 0;
-  if (fragment2.kind === "para" && lookup3.measure.kind === "paragraph") {
-    const lines = fragment2.lines ?? lookup3.measure.lines.slice(fragment2.fromLine, fragment2.toLine);
-    let totalHeight = 0;
-    for (const line of lines)
-      totalHeight += line.lineHeight ?? 0;
-    return totalHeight;
-  }
-  if (fragment2.kind === "list-item" && lookup3.measure.kind === "list") {
-    const item = lookup3.measure.items.find((it) => it.itemId === fragment2.itemId);
-    if (!item)
-      return 0;
-    const lines = item.paragraph.lines.slice(fragment2.fromLine, fragment2.toLine);
-    let totalHeight = 0;
-    for (const line of lines)
-      totalHeight += line.lineHeight ?? 0;
-    return totalHeight;
-  }
-  return 0;
-}, isBetweenBorderNone = (borders) => {
+}, gradientIdCounter = 0, isBetweenBorderNone = (borders) => {
   if (!borders?.between)
     return true;
   return borders.between.style === "none";
-}, computeBetweenBorderFlags = (fragments, blockLookup, resolvedItems) => {
+}, computeBetweenBorderFlags = (fragments, resolvedItems) => {
   const pairFlags = /* @__PURE__ */ new Set;
   const noBetweenPairs = /* @__PURE__ */ new Set;
   for (let i4 = 0;i4 < fragments.length - 1; i4 += 1) {
@@ -280756,10 +280639,10 @@ menclose::after {
       continue;
     if (frag.continuesOnNext)
       continue;
-    const resolvedCur = resolvedItems?.[i4];
-    const borders = isResolvedFragmentWithBorders(resolvedCur) ? resolvedCur.paragraphBorders : getFragmentParagraphBorders(frag, blockLookup);
-    if (!borders)
+    const resolvedCur = resolvedItems[i4];
+    if (!isResolvedFragmentWithBorders(resolvedCur))
       continue;
+    const borders = resolvedCur.paragraphBorders;
     const next2 = fragments[i4 + 1];
     if (next2.kind !== "para" && next2.kind !== "list-item")
       continue;
@@ -280769,11 +280652,11 @@ menclose::after {
       continue;
     if (next2.blockId === frag.blockId && next2.kind === "list-item" && frag.kind === "list-item" && next2.itemId === frag.itemId)
       continue;
-    const resolvedNext = resolvedItems?.[i4 + 1];
-    const nextBorders = isResolvedFragmentWithBorders(resolvedNext) ? resolvedNext.paragraphBorders : getFragmentParagraphBorders(next2, blockLookup);
-    if (!nextBorders)
+    const resolvedNext = resolvedItems[i4 + 1];
+    if (!isResolvedFragmentWithBorders(resolvedNext))
       continue;
-    if ((resolvedCur && "paragraphBorderHash" in resolvedCur && resolvedCur.paragraphBorderHash ? resolvedCur.paragraphBorderHash : hashParagraphBorders$2(borders)) !== (resolvedNext && "paragraphBorderHash" in resolvedNext && resolvedNext.paragraphBorderHash ? resolvedNext.paragraphBorderHash : hashParagraphBorders$2(nextBorders)))
+    const nextBorders = resolvedNext.paragraphBorders;
+    if (("paragraphBorderHash" in resolvedCur && resolvedCur.paragraphBorderHash ? resolvedCur.paragraphBorderHash : hashParagraphBorders$2(borders)) !== ("paragraphBorderHash" in resolvedNext && resolvedNext.paragraphBorderHash ? resolvedNext.paragraphBorderHash : hashParagraphBorders$2(nextBorders)))
       continue;
     if (frag.x !== next2.x)
       continue;
@@ -280785,8 +280668,8 @@ menclose::after {
   for (const i4 of pairFlags) {
     const frag = fragments[i4];
     const next2 = fragments[i4 + 1];
-    const resolvedCur = resolvedItems?.[i4];
-    const fragHeight = resolvedCur && "height" in resolvedCur && resolvedCur.height != null ? resolvedCur.height : getFragmentHeight$1(frag, blockLookup);
+    const resolvedCur = resolvedItems[i4];
+    const fragHeight = resolvedCur && "height" in resolvedCur && resolvedCur.height != null ? resolvedCur.height : 0;
     const gapBelow = Math.max(0, next2.y - (frag.y + fragHeight));
     const isNoBetween = noBetweenPairs.has(i4);
     if (!result.has(i4))
@@ -282704,31 +282587,14 @@ menclose::after {
     if (value != null)
       element3.dataset[key2] = value;
   });
-}, DomPainter, getFragmentSdtContainerKey = (fragment2, blockLookup) => {
-  const lookup3 = blockLookup.get(fragment2.blockId);
-  if (!lookup3)
-    return null;
-  const block = lookup3.block;
-  if (fragment2.kind === "para" && block.kind === "paragraph") {
-    const attrs = block.attrs;
-    return getSdtContainerKey(attrs?.sdt, attrs?.containerSdt);
-  }
-  if (fragment2.kind === "list-item" && block.kind === "list") {
-    const attrs = block.items.find((listItem2) => listItem2.id === fragment2.itemId)?.paragraph.attrs;
-    return getSdtContainerKey(attrs?.sdt, attrs?.containerSdt);
-  }
-  if (fragment2.kind === "table" && block.kind === "table") {
-    const attrs = block.attrs;
-    return getSdtContainerKey(attrs?.sdt, attrs?.containerSdt);
-  }
-  return null;
-}, computeSdtBoundaries = (fragments, blockLookup, sdtLabelsRendered, resolvedItems) => {
+}, DomPainter, computeSdtBoundaries = (fragments, resolvedItems, sdtLabelsRendered) => {
   const boundaries = /* @__PURE__ */ new Map;
-  const containerKeys = resolvedItems ? resolvedItems.map((item) => {
-    if ("sdtContainerKey" in item)
+  const containerKeys = fragments.map((_frag, idx) => {
+    const item = resolvedItems[idx];
+    if (item && "sdtContainerKey" in item)
       return item.sdtContainerKey ?? null;
     return null;
-  }) : fragments.map((fragment2) => getFragmentSdtContainerKey(fragment2, blockLookup));
+  });
   let i4 = 0;
   while (i4 < fragments.length) {
     const currentKey = containerKeys[i4];
@@ -282751,7 +282617,7 @@ menclose::after {
       let paddingBottomOverride;
       if (!isEnd) {
         const nextFragment = fragments[k$1 + 1];
-        const currentHeight = resolvedItems?.[k$1]?.height ?? getFragmentHeight$1(fragment2, blockLookup);
+        const currentHeight = resolvedItems[k$1]?.height ?? 0;
         const currentBottom = fragment2.y + currentHeight;
         const gapToNext = nextFragment.y - currentBottom;
         if (gapToNext > 0)
@@ -282785,406 +282651,7 @@ menclose::after {
     return `table:${fragment2.blockId}:${fragment2.fromRow}:${fragment2.toRow}${partialKey}`;
   }
   return fragment2;
-}, fragmentSignature$1 = (fragment2, lookup3) => {
-  const base5 = lookup3.get(fragment2.blockId)?.version ?? "missing";
-  if (fragment2.kind === "para")
-    return [
-      base5,
-      fragment2.fromLine,
-      fragment2.toLine,
-      fragment2.continuesFromPrev ? 1 : 0,
-      fragment2.continuesOnNext ? 1 : 0,
-      fragment2.markerWidth ?? ""
-    ].join("|");
-  if (fragment2.kind === "list-item")
-    return [
-      base5,
-      fragment2.itemId,
-      fragment2.fromLine,
-      fragment2.toLine,
-      fragment2.continuesFromPrev ? 1 : 0,
-      fragment2.continuesOnNext ? 1 : 0
-    ].join("|");
-  if (fragment2.kind === "image")
-    return [
-      base5,
-      fragment2.width,
-      fragment2.height
-    ].join("|");
-  if (fragment2.kind === "drawing")
-    return [
-      base5,
-      fragment2.drawingKind,
-      fragment2.drawingContentId ?? "",
-      fragment2.width,
-      fragment2.height,
-      fragment2.geometry.width,
-      fragment2.geometry.height,
-      fragment2.geometry.rotation ?? 0,
-      fragment2.scale ?? 1,
-      fragment2.zIndex ?? ""
-    ].join("|");
-  if (fragment2.kind === "table") {
-    const partialSig = fragment2.partialRow ? `${fragment2.partialRow.fromLineByCell.join(",")}-${fragment2.partialRow.toLineByCell.join(",")}-${fragment2.partialRow.partialHeight}` : "";
-    return [
-      base5,
-      fragment2.fromRow,
-      fragment2.toRow,
-      fragment2.width,
-      fragment2.height,
-      fragment2.continuesFromPrev ? 1 : 0,
-      fragment2.continuesOnNext ? 1 : 0,
-      fragment2.repeatHeaderCount ?? 0,
-      partialSig
-    ].join("|");
-  }
-  return base5;
-}, hasFragmentGeometryChanged = (previous3, next2) => previous3.x !== next2.x || previous3.y !== next2.y || previous3.width !== next2.width || ("height" in previous3) && ("height" in next2) && typeof previous3.height === "number" && typeof next2.height === "number" && previous3.height !== next2.height, isNonBodyStoryBlockId = (blockId) => typeof blockId === "string" && (blockId.startsWith("footnote-") || blockId.startsWith("endnote-") || blockId.startsWith("__sd_semantic_footnote-") || blockId.startsWith("__sd_semantic_endnote-")), getSdtMetadataId$1 = (metadata) => {
-  if (!metadata)
-    return "";
-  if ("id" in metadata && metadata.id != null)
-    return String(metadata.id);
-  return "";
-}, getSdtMetadataLockMode$1 = (metadata) => {
-  if (!metadata)
-    return "";
-  return metadata.type === "structuredContent" ? metadata.lockMode ?? "" : "";
-}, getSdtMetadataVersion$1 = (metadata) => {
-  if (!metadata)
-    return "";
-  return [
-    metadata.type,
-    getSdtMetadataLockMode$1(metadata),
-    getSdtMetadataId$1(metadata)
-  ].join(":");
-}, hasListMarkerProperties$1 = (attrs) => {
-  if (!attrs || typeof attrs !== "object")
-    return false;
-  const obj = attrs;
-  if (!obj.numberingProperties || typeof obj.numberingProperties !== "object")
-    return false;
-  const numProps = obj.numberingProperties;
-  if ("numId" in numProps) {
-    const numId = numProps.numId;
-    if (typeof numId !== "number" && typeof numId !== "string")
-      return false;
-  }
-  if ("ilvl" in numProps) {
-    if (typeof numProps.ilvl !== "number")
-      return false;
-  }
-  if ("wordLayout" in obj && obj.wordLayout !== undefined) {
-    if (typeof obj.wordLayout !== "object" || obj.wordLayout === null)
-      return false;
-    const wordLayout = obj.wordLayout;
-    if ("marker" in wordLayout && wordLayout.marker !== undefined) {
-      if (typeof wordLayout.marker !== "object" || wordLayout.marker === null)
-        return false;
-      const marker = wordLayout.marker;
-      if ("markerText" in marker && marker.markerText !== undefined) {
-        if (typeof marker.markerText !== "string")
-          return false;
-      }
-    }
-  }
-  return true;
-}, deriveBlockVersion$1 = (block) => {
-  if (block.kind === "paragraph") {
-    const markerVersion = hasListMarkerProperties$1(block.attrs) ? `marker:${block.attrs.numberingProperties.numId ?? ""}:${block.attrs.numberingProperties.ilvl ?? 0}:${block.attrs.wordLayout?.marker?.markerText ?? ""}` : "";
-    const runsVersion = block.runs.map((run2) => {
-      if (run2.kind === "image") {
-        const imgRun = run2;
-        return [
-          "img",
-          imgRun.src,
-          imgRun.width,
-          imgRun.height,
-          imgRun.alt ?? "",
-          imgRun.title ?? "",
-          imgRun.clipPath ?? "",
-          imgRun.distTop ?? "",
-          imgRun.distBottom ?? "",
-          imgRun.distLeft ?? "",
-          imgRun.distRight ?? "",
-          readClipPathValue$1(imgRun.clipPath)
-        ].join(",");
-      }
-      if (run2.kind === "lineBreak")
-        return "linebreak";
-      if (run2.kind === "tab")
-        return [run2.text ?? "", "tab"].join(",");
-      if (run2.kind === "fieldAnnotation") {
-        const size$1 = run2.size ? `${run2.size.width ?? ""}x${run2.size.height ?? ""}` : "";
-        const highlighted = run2.highlighted !== false ? 1 : 0;
-        return [
-          "field",
-          run2.variant ?? "",
-          run2.displayLabel ?? "",
-          run2.fieldColor ?? "",
-          run2.borderColor ?? "",
-          highlighted,
-          run2.hidden ? 1 : 0,
-          run2.visibility ?? "",
-          run2.imageSrc ?? "",
-          run2.linkUrl ?? "",
-          run2.rawHtml ?? "",
-          size$1,
-          run2.fontFamily ?? "",
-          run2.fontSize ?? "",
-          run2.textColor ?? "",
-          run2.textHighlight ?? "",
-          run2.bold ? 1 : 0,
-          run2.italic ? 1 : 0,
-          run2.underline ? 1 : 0,
-          run2.fieldId ?? "",
-          run2.fieldType ?? ""
-        ].join(",");
-      }
-      const textRun = run2;
-      const trackedChangeVersion = textRun.trackedChange ? [
-        textRun.trackedChange.kind ?? "",
-        textRun.trackedChange.id ?? "",
-        textRun.trackedChange.storyKey ?? "",
-        textRun.trackedChange.author ?? "",
-        textRun.trackedChange.authorEmail ?? "",
-        textRun.trackedChange.authorImage ?? "",
-        textRun.trackedChange.date ?? "",
-        textRun.trackedChange.before ? JSON.stringify(textRun.trackedChange.before) : "",
-        textRun.trackedChange.after ? JSON.stringify(textRun.trackedChange.after) : ""
-      ].join(":") : "";
-      return [
-        textRun.text ?? "",
-        textRun.fontFamily,
-        textRun.fontSize,
-        textRun.bold ? 1 : 0,
-        textRun.italic ? 1 : 0,
-        textRun.color ?? "",
-        textRun.underline?.style ?? "",
-        textRun.underline?.color ?? "",
-        textRun.strike ? 1 : 0,
-        textRun.highlight ?? "",
-        textRun.letterSpacing != null ? textRun.letterSpacing : "",
-        textRun.vertAlign ?? "",
-        textRun.baselineShift != null ? textRun.baselineShift : "",
-        textRun.token ?? "",
-        trackedChangeVersion,
-        textRun.comments?.length ?? 0
-      ].join(",");
-    }).join("|");
-    const attrs = block.attrs;
-    const paragraphAttrsVersion = attrs ? [
-      attrs.alignment ?? "",
-      attrs.spacing?.before ?? "",
-      attrs.spacing?.after ?? "",
-      attrs.spacing?.line ?? "",
-      attrs.spacing?.lineRule ?? "",
-      attrs.indent?.left ?? "",
-      attrs.indent?.right ?? "",
-      attrs.indent?.firstLine ?? "",
-      attrs.indent?.hanging ?? "",
-      attrs.borders ? hashParagraphBorders$2(attrs.borders) : "",
-      attrs.shading?.fill ?? "",
-      attrs.shading?.color ?? "",
-      attrs.direction ?? "",
-      attrs.rtl ? "1" : "",
-      attrs.tabs?.length ? JSON.stringify(attrs.tabs) : ""
-    ].join(":") : "";
-    const sdtAttrs = block.attrs?.sdt;
-    return [
-      markerVersion,
-      runsVersion,
-      paragraphAttrsVersion,
-      getSdtMetadataVersion$1(sdtAttrs)
-    ].filter(Boolean).join("|");
-  }
-  if (block.kind === "list")
-    return block.items.map((item) => `${item.id}:${item.marker.text}:${deriveBlockVersion$1(item.paragraph)}`).join("|");
-  if (block.kind === "image") {
-    const imgSdt = block.attrs?.sdt;
-    const imgSdtVersion = getSdtMetadataVersion$1(imgSdt);
-    return [
-      block.src ?? "",
-      block.width ?? "",
-      block.height ?? "",
-      block.alt ?? "",
-      block.title ?? "",
-      resolveBlockClipPath$1(block),
-      imgSdtVersion
-    ].join("|");
-  }
-  if (block.kind === "drawing") {
-    if (block.drawingKind === "image") {
-      const imageLike = block;
-      return [
-        "drawing:image",
-        imageLike.src ?? "",
-        imageLike.width ?? "",
-        imageLike.height ?? "",
-        imageLike.alt ?? "",
-        resolveBlockClipPath$1(imageLike)
-      ].join("|");
-    }
-    if (block.drawingKind === "vectorShape") {
-      const vector = block;
-      return [
-        "drawing:vector",
-        vector.shapeKind ?? "",
-        vector.fillColor ?? "",
-        vector.strokeColor ?? "",
-        vector.strokeWidth ?? "",
-        vector.geometry.width,
-        vector.geometry.height,
-        vector.geometry.rotation ?? 0,
-        vector.geometry.flipH ? 1 : 0,
-        vector.geometry.flipV ? 1 : 0
-      ].join("|");
-    }
-    if (block.drawingKind === "shapeGroup") {
-      const group = block;
-      const childSignature = group.shapes.map((child) => `${child.shapeType}:${JSON.stringify(child.attrs ?? {})}`).join(";");
-      return [
-        "drawing:group",
-        group.geometry.width,
-        group.geometry.height,
-        group.groupTransform ? JSON.stringify(group.groupTransform) : "",
-        childSignature
-      ].join("|");
-    }
-    if (block.drawingKind === "chart")
-      return [
-        "drawing:chart",
-        block.chartData?.chartType ?? "",
-        block.chartData?.series?.length ?? 0,
-        block.geometry.width,
-        block.geometry.height,
-        block.chartRelId ?? ""
-      ].join("|");
-    return `drawing:unknown:${block.id}`;
-  }
-  if (block.kind === "table") {
-    const tableBlock = block;
-    const hashString$1 = (seed, value) => {
-      let hash$4 = seed >>> 0;
-      for (let i4 = 0;i4 < value.length; i4++) {
-        hash$4 ^= value.charCodeAt(i4);
-        hash$4 = Math.imul(hash$4, 16777619);
-      }
-      return hash$4 >>> 0;
-    };
-    const hashNumber$1 = (seed, value) => {
-      let hash$4 = seed ^ (Number.isFinite(value) ? value : 0);
-      hash$4 = Math.imul(hash$4, 16777619);
-      hash$4 ^= hash$4 >>> 13;
-      return hash$4 >>> 0;
-    };
-    let hash$3 = 2166136261;
-    hash$3 = hashString$1(hash$3, block.id);
-    hash$3 = hashNumber$1(hash$3, tableBlock.rows.length);
-    hash$3 = (tableBlock.columnWidths ?? []).reduce((acc, width) => hashNumber$1(acc, Math.round(width * 1000)), hash$3);
-    const rows = tableBlock.rows ?? [];
-    for (const row2 of rows) {
-      if (!row2 || !Array.isArray(row2.cells))
-        continue;
-      hash$3 = hashNumber$1(hash$3, row2.cells.length);
-      for (const cell2 of row2.cells) {
-        if (!cell2)
-          continue;
-        const cellBlocks = cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : []);
-        hash$3 = hashNumber$1(hash$3, cellBlocks.length);
-        hash$3 = hashNumber$1(hash$3, cell2.rowSpan ?? 1);
-        hash$3 = hashNumber$1(hash$3, cell2.colSpan ?? 1);
-        if (cell2.attrs) {
-          const cellAttrs = cell2.attrs;
-          if (cellAttrs.borders)
-            hash$3 = hashString$1(hash$3, hashCellBorders$2(cellAttrs.borders));
-          if (cellAttrs.padding) {
-            const p$12 = cellAttrs.padding;
-            hash$3 = hashNumber$1(hash$3, p$12.top ?? 0);
-            hash$3 = hashNumber$1(hash$3, p$12.right ?? 0);
-            hash$3 = hashNumber$1(hash$3, p$12.bottom ?? 0);
-            hash$3 = hashNumber$1(hash$3, p$12.left ?? 0);
-          }
-          if (cellAttrs.verticalAlign)
-            hash$3 = hashString$1(hash$3, cellAttrs.verticalAlign);
-          if (cellAttrs.background)
-            hash$3 = hashString$1(hash$3, cellAttrs.background);
-        }
-        for (const cellBlock of cellBlocks) {
-          hash$3 = hashString$1(hash$3, cellBlock?.kind ?? "unknown");
-          if (cellBlock?.kind === "paragraph") {
-            const paragraphBlock = cellBlock;
-            const runs2 = paragraphBlock.runs ?? [];
-            hash$3 = hashNumber$1(hash$3, runs2.length);
-            const attrs = paragraphBlock.attrs;
-            if (attrs) {
-              hash$3 = hashString$1(hash$3, attrs.alignment ?? "");
-              hash$3 = hashNumber$1(hash$3, attrs.spacing?.before ?? 0);
-              hash$3 = hashNumber$1(hash$3, attrs.spacing?.after ?? 0);
-              hash$3 = hashNumber$1(hash$3, attrs.spacing?.line ?? 0);
-              hash$3 = hashString$1(hash$3, attrs.spacing?.lineRule ?? "");
-              hash$3 = hashNumber$1(hash$3, attrs.indent?.left ?? 0);
-              hash$3 = hashNumber$1(hash$3, attrs.indent?.right ?? 0);
-              hash$3 = hashNumber$1(hash$3, attrs.indent?.firstLine ?? 0);
-              hash$3 = hashNumber$1(hash$3, attrs.indent?.hanging ?? 0);
-              hash$3 = hashString$1(hash$3, attrs.shading?.fill ?? "");
-              hash$3 = hashString$1(hash$3, attrs.shading?.color ?? "");
-              hash$3 = hashString$1(hash$3, attrs.direction ?? "");
-              hash$3 = hashString$1(hash$3, attrs.rtl ? "1" : "");
-              if (attrs.borders)
-                hash$3 = hashString$1(hash$3, hashParagraphBorders$2(attrs.borders));
-            }
-            for (const run2 of runs2) {
-              if ("text" in run2 && typeof run2.text === "string")
-                hash$3 = hashString$1(hash$3, run2.text);
-              hash$3 = hashNumber$1(hash$3, run2.pmStart ?? -1);
-              hash$3 = hashNumber$1(hash$3, run2.pmEnd ?? -1);
-              hash$3 = hashString$1(hash$3, getRunStringProp$1(run2, "color"));
-              hash$3 = hashString$1(hash$3, getRunStringProp$1(run2, "highlight"));
-              hash$3 = hashString$1(hash$3, getRunBooleanProp$1(run2, "bold") ? "1" : "");
-              hash$3 = hashString$1(hash$3, getRunBooleanProp$1(run2, "italic") ? "1" : "");
-              hash$3 = hashNumber$1(hash$3, getRunNumberProp$1(run2, "fontSize"));
-              hash$3 = hashString$1(hash$3, getRunStringProp$1(run2, "fontFamily"));
-              hash$3 = hashString$1(hash$3, getRunUnderlineStyle$1(run2));
-              hash$3 = hashString$1(hash$3, getRunUnderlineColor$1(run2));
-              hash$3 = hashString$1(hash$3, getRunBooleanProp$1(run2, "strike") ? "1" : "");
-              hash$3 = hashString$1(hash$3, getRunStringProp$1(run2, "vertAlign"));
-              hash$3 = hashNumber$1(hash$3, getRunNumberProp$1(run2, "baselineShift"));
-            }
-          } else if (cellBlock?.kind)
-            hash$3 = hashString$1(hash$3, deriveBlockVersion$1(cellBlock));
-        }
-      }
-    }
-    if (tableBlock.attrs) {
-      const tblAttrs = tableBlock.attrs;
-      if (tblAttrs.borders)
-        hash$3 = hashString$1(hash$3, hashTableBorders$2(tblAttrs.borders));
-      if (tblAttrs.borderCollapse)
-        hash$3 = hashString$1(hash$3, tblAttrs.borderCollapse);
-      if (tblAttrs.cellSpacing !== undefined) {
-        const cs = tblAttrs.cellSpacing;
-        if (typeof cs === "number")
-          hash$3 = hashNumber$1(hash$3, cs);
-        else {
-          const v = cs.value ?? 0;
-          const t = cs.type ?? "px";
-          hash$3 = hashString$1(hash$3, `cs:${v}:${t}`);
-        }
-      }
-      if (tblAttrs.sdt) {
-        hash$3 = hashString$1(hash$3, tblAttrs.sdt.type);
-        hash$3 = hashString$1(hash$3, getSdtMetadataLockMode$1(tblAttrs.sdt));
-        hash$3 = hashString$1(hash$3, getSdtMetadataId$1(tblAttrs.sdt));
-      }
-    }
-    return [
-      block.id,
-      tableBlock.rows.length,
-      hash$3.toString(16)
-    ].join("|");
-  }
-  return block.id;
-}, DEFAULT_SUPERSCRIPT_RAISE_RATIO = 0.33, DEFAULT_SUBSCRIPT_LOWER_RATIO = 0.14, hasVerticalPositioning = (run2) => normalizeBaselineShift(run2.baselineShift) != null || run2.vertAlign === "superscript" || run2.vertAlign === "subscript", applyRunVerticalPositioning = (element3, run2) => {
+}, hasFragmentGeometryChanged = (previous3, next2) => previous3.x !== next2.x || previous3.y !== next2.y || previous3.width !== next2.width || ("height" in previous3) && ("height" in next2) && typeof previous3.height === "number" && typeof next2.height === "number" && previous3.height !== next2.height, isNonBodyStoryBlockId = (blockId) => typeof blockId === "string" && (blockId.startsWith("footnote-") || blockId.startsWith("endnote-") || blockId.startsWith("__sd_semantic_footnote-") || blockId.startsWith("__sd_semantic_endnote-")), DEFAULT_SUPERSCRIPT_RAISE_RATIO = 0.33, DEFAULT_SUBSCRIPT_LOWER_RATIO = 0.14, hasVerticalPositioning = (run2) => normalizeBaselineShift(run2.baselineShift) != null || run2.vertAlign === "superscript" || run2.vertAlign === "subscript", applyRunVerticalPositioning = (element3, run2) => {
   if (hasVerticalPositioning(run2))
     element3.style.lineHeight = "1";
   const explicitBaselineShift = normalizeBaselineShift(run2.baselineShift);
@@ -283911,19 +283378,13 @@ menclose::after {
   };
   return {
     paint(input2, mount, mapping) {
-      const normalizedInput = isLegacyLayoutInput(input2) ? buildLegacyPaintInput(input2, legacyState, options.flowMode, options.pageGap) : normalizeDomPainterInput(input2);
+      const normalizedInput = isDomPainterInput(input2) ? input2 : buildLegacyPaintInput(input2, legacyState, options.flowMode, options.pageGap);
       painter.paint(normalizedInput, mount, mapping);
     },
-    setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
+    setData(blocks2, measures) {
       assertRequiredBlockMeasurePair("body", blocks2, measures);
-      const normalizedHeader = normalizeOptionalBlockMeasurePair("header", headerBlocks, headerMeasures);
-      const normalizedFooter = normalizeOptionalBlockMeasurePair("footer", footerBlocks, footerMeasures);
       legacyState.blocks = blocks2;
       legacyState.measures = measures;
-      legacyState.headerBlocks = normalizedHeader?.blocks;
-      legacyState.headerMeasures = normalizedHeader?.measures;
-      legacyState.footerBlocks = normalizedFooter?.blocks;
-      legacyState.footerMeasures = normalizedFooter?.measures;
     },
     setResolvedLayout(resolvedLayout) {
       legacyState.resolvedLayout = resolvedLayout;
@@ -290552,7 +290013,7 @@ menclose::after {
     }
     const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (region) {
-      if (sessionMode === "body") {
+      if (sessionMode === "body" || this.#isDifferentHeaderFooterRegionFromActiveSession(region)) {
         event.preventDefault();
         event.stopPropagation();
         this.#callbacks.activateHeaderFooterRegion?.(region, {
@@ -290840,17 +290301,49 @@ menclose::after {
       this.#callbacks.exitHeaderFooterMode?.();
       return false;
     }
-    if (!this.#callbacks.hitTestHeaderFooterRegion?.(x, y$1, pageIndex, pageLocalY)) {
+    const headerFooterRegion = this.#callbacks.hitTestHeaderFooterRegion?.(x, y$1, pageIndex, pageLocalY);
+    if (!headerFooterRegion) {
       this.#callbacks.exitHeaderFooterMode?.();
       return false;
     }
     if (visiblePointerSurface?.kind === "headerFooter" && !clickedInsideVisibleActiveSurface) {
+      if (this.#isDifferentHeaderFooterRegionFromActiveSession(headerFooterRegion)) {
+        event.preventDefault();
+        return true;
+      }
       this.#callbacks.exitHeaderFooterMode?.();
       return false;
     }
     this.#syncNonBodyCommentSelection(event, event.target, this.#deps.getEditor(), { clearOnMiss: true });
     return false;
   }
+  #isDifferentHeaderFooterRegionFromActiveSession(region) {
+    const session = this.#deps?.getHeaderFooterSession()?.session;
+    if (!session || session.mode === "body")
+      return true;
+    if (session.mode !== region.kind)
+      return true;
+    if (session.headerFooterRefId && region.headerFooterRefId && session.headerFooterRefId !== region.headerFooterRefId)
+      return true;
+    if (Number.isFinite(session.pageIndex) && Number.isFinite(region.pageIndex) && session.pageIndex !== region.pageIndex)
+      return true;
+    return (session.sectionType ?? null) !== (region.sectionType ?? null);
+  }
+  #isSameHeaderFooterRegion(left$1, right$1) {
+    if (!left$1 || !right$1)
+      return false;
+    if (left$1.kind !== right$1.kind || left$1.pageIndex !== right$1.pageIndex)
+      return false;
+    if ((left$1.sectionId ?? null) !== (right$1.sectionId ?? null))
+      return false;
+    if ((left$1.sectionType ?? null) !== (right$1.sectionType ?? null))
+      return false;
+    const leftRefId = left$1.headerFooterRefId ?? null;
+    const rightRefId = right$1.headerFooterRefId ?? null;
+    if (leftRefId && rightRefId && leftRefId !== rightRefId)
+      return false;
+    return true;
+  }
   #handleInlineImageClick(event, targetImg, rawHit, doc$12, epochMapper) {
     if (!targetImg)
       return false;
@@ -291042,21 +290535,22 @@ menclose::after {
   #handleHover(normalized) {
     if (!this.#deps)
       return;
-    if ((this.#deps.getHeaderFooterSession()?.session?.mode ?? "body") !== "body") {
-      this.#callbacks.clearHoverRegion?.();
-      return;
-    }
     if (this.#deps.getDocumentMode() === "viewing") {
       this.#callbacks.clearHoverRegion?.();
       return;
     }
+    const sessionMode = this.#deps.getHeaderFooterSession()?.session?.mode ?? "body";
     const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (!region) {
       this.#callbacks.clearHoverRegion?.();
       return;
     }
+    if (sessionMode !== "body" && !this.#isDifferentHeaderFooterRegionFromActiveSession(region)) {
+      this.#callbacks.clearHoverRegion?.();
+      return;
+    }
     const currentHover = this.#deps.getHeaderFooterSession()?.hoverRegion;
-    if (currentHover && currentHover.kind === region.kind && currentHover.pageIndex === region.pageIndex && currentHover.sectionType === region.sectionType)
+    if (this.#isSameHeaderFooterRegion(currentHover, region))
       return;
     this.#deps.getHeaderFooterSession()?.renderHover(region);
     this.#callbacks.renderHoverRegion?.(region);
@@ -292510,6 +292004,7 @@ menclose::after {
   #hoverOverlay = null;
   #hoverTooltip = null;
   #modeBanner = null;
+  #activeBorderLine = null;
   #hoverRegion = null;
   #documentMode = "editing";
   #trackedChangesRenderConfig = {
@@ -292733,6 +292228,7 @@ menclose::after {
         if (!region.sectionId)
           console.error("[HeaderFooterSessionManager] Footer region missing sectionId", region);
     }
+    this.#syncActiveBorder();
   }
   #buildSectionIdMap() {
     const map$12 = /* @__PURE__ */ new Map;
@@ -292960,22 +292456,11 @@ menclose::after {
         });
         return null;
       }
+      const shouldRestoreInitialSelection = options?.initialSelection !== "defer";
       try {
         this.#applyChildEditorDocumentMode(editor, this.#documentMode);
-        if (options?.initialSelection !== "defer")
-          try {
-            const doc$12 = editor.state?.doc;
-            if (doc$12) {
-              const endPos = doc$12.content.size - 1;
-              const pos = Math.max(1, endPos);
-              editor.commands?.setTextSelection?.({
-                from: pos,
-                to: pos
-              });
-            }
-          } catch (cursorError) {
-            console.warn("[HeaderFooterSessionManager] Could not set cursor to end:", cursorError);
-          }
+        if (shouldRestoreInitialSelection)
+          this.#applyDefaultSelectionAtStoryEnd(editor, "Could not set cursor to end");
       } catch (editableError) {
         console.error("[HeaderFooterSessionManager] Error setting editor editable:", editableError);
         this.clearHover();
@@ -293001,6 +292486,15 @@ menclose::after {
       } catch (focusError) {
         console.warn("[HeaderFooterSessionManager] Could not focus editor:", focusError);
       }
+      if (shouldRestoreInitialSelection) {
+        this.#applyDefaultSelectionAtStoryEnd(editor, "Could not restore cursor after focus");
+        try {
+          editor.view?.focus();
+        } catch (focusError) {
+          console.warn("[HeaderFooterSessionManager] Could not refocus editor after restoring selection:", focusError);
+        }
+        this.#scheduleSelectionRestoreAfterFocus(editor);
+      }
       this.#emitModeChanged();
       this.#emitEditingContext(editor);
       this.#deps?.notifyInputBridgeTargetChanged();
@@ -293046,6 +292540,45 @@ menclose::after {
       pm.classList.toggle("view-mode", mode === "viewing");
     }
   }
+  #getDefaultSelectionAtStoryEnd(editor) {
+    const doc$12 = editor.state?.doc;
+    if (!doc$12)
+      return null;
+    const endPos = doc$12.content.size - 1;
+    const pos = Math.max(1, endPos);
+    return {
+      from: pos,
+      to: pos
+    };
+  }
+  #applyEditorTextSelection(editor, selection, warningMessage) {
+    try {
+      editor.commands?.setTextSelection?.(selection);
+    } catch (error3) {
+      console.warn(`[HeaderFooterSessionManager] ${warningMessage}:`, error3);
+    }
+  }
+  #applyDefaultSelectionAtStoryEnd(editor, warningMessage) {
+    const selection = this.#getDefaultSelectionAtStoryEnd(editor);
+    if (!selection)
+      return;
+    this.#applyEditorTextSelection(editor, selection, warningMessage);
+  }
+  #scheduleSelectionRestoreAfterFocus(editor) {
+    const win = editor.view?.dom?.ownerDocument?.defaultView;
+    if (!win)
+      return;
+    win.requestAnimationFrame(() => {
+      if (this.#activeEditor !== editor || this.#session.mode === "body")
+        return;
+      this.#applyDefaultSelectionAtStoryEnd(editor, "Could not restore cursor on the next frame");
+      try {
+        editor.view?.focus();
+      } catch (focusError) {
+        console.warn("[HeaderFooterSessionManager] Could not refocus editor on the next frame:", focusError);
+      }
+    });
+  }
   #validateEditPermission() {
     if (this.#deps?.isViewLocked())
       return {
@@ -293078,6 +292611,7 @@ menclose::after {
     this.#callbacks.onModeChanged?.(this.#session);
     this.#callbacks.onUpdateAwarenessSession?.(this.#session);
     this.#updateModeBanner();
+    this.#syncActiveBorder();
   }
   #emitEditingContext(editor) {
     this.#callbacks.onEditingContext?.({
@@ -293181,6 +292715,42 @@ menclose::after {
   get hoverRegion() {
     return this.#hoverRegion;
   }
+  #getActiveRegion() {
+    if (this.#session.mode === "header")
+      return this.#headerRegions.get(this.#session.pageIndex ?? -1) ?? null;
+    if (this.#session.mode === "footer")
+      return this.#footerRegions.get(this.#session.pageIndex ?? -1) ?? null;
+    return null;
+  }
+  #hideActiveBorder() {
+    if (this.#activeBorderLine) {
+      this.#activeBorderLine.remove();
+      this.#activeBorderLine = null;
+    }
+  }
+  #syncActiveBorder() {
+    this.#hideActiveBorder();
+    const region = this.#getActiveRegion();
+    if (!region || this.#session.mode === "body")
+      return;
+    const pageElement = this.#deps?.getPageElement(region.pageIndex);
+    if (!pageElement)
+      return;
+    const borderLine = pageElement.ownerDocument.createElement("div");
+    borderLine.className = "superdoc-header-footer-border";
+    Object.assign(borderLine.style, {
+      position: "absolute",
+      left: "0",
+      right: "0",
+      top: `${region.kind === "header" ? region.localY + region.height : region.localY}px`,
+      height: "1px",
+      backgroundColor: "#4472c4",
+      pointerEvents: "none",
+      zIndex: "8"
+    });
+    pageElement.appendChild(borderLine);
+    this.#activeBorderLine = borderLine;
+  }
   buildLayoutInput() {
     if (!this.#headerFooterAdapter)
       return null;
@@ -293834,6 +293404,7 @@ menclose::after {
     this.#footerRegions.clear();
     this.#session = { mode: "body" };
     this.#activeEditor = null;
+    this.#hideActiveBorder();
     this.#hoverOverlay = null;
     this.#hoverTooltip = null;
     this.#modeBanner = null;
@@ -294035,12 +293606,12 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions;
-var init_src_CGvIfKnh_es = __esm(() => {
+var init_src_BFNW1Ck5_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_XXBr0N8c_es();
+  init_SuperConverter_D54XfHFt_es();
   init_jszip_C49i9kUs_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_BAI3xz0T_es();
+  init_create_headless_toolbar_DrE9IMiD_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -295596,7 +295167,7 @@ ${err.toString()}`);
                   isRightClick = true;
                 } else {
                   const relativePoint = getSurfaceRelativePoint(editor, meta2);
-                  const surface = editor.presentationEditor?.element ?? editor.view?.dom ?? editor.options?.element;
+                  const surface = getEditorSurfaceElement(editor);
                   if (relativePoint && surface)
                     try {
                       const rect = surface.getBoundingClientRect();
@@ -295616,7 +295187,7 @@ ${err.toString()}`);
                       return ensureStateShape(value);
                     }
                 }
-                const containingBlock = findContainingBlockAncestor(editor.presentationEditor?.element ?? editor.view?.dom ?? editor.options?.element);
+                const containingBlock = findContainingBlockAncestor(getEditorSurfaceElement(editor));
                 if (containingBlock)
                   try {
                     const cbRect = containingBlock.getBoundingClientRect();
@@ -318949,6 +318520,7 @@ function print() { __p += __j.call(arguments, '') }
     }
     async exportDocx({ isFinalDoc = false, commentsType = "external", exportJsonOnly = false, exportXmlOnly = false, comments, getUpdatedDocs = false, fieldsHighlightColor = null, compression } = {}) {
       try {
+        commitLiveStorySessionRuntimes(resolveMainBodyEditor(this));
         const preparedComments = (comments ?? this.converter.comments ?? []).map((comment2) => {
           const elements = Array.isArray(comment2.elements) && comment2.elements.length ? comment2.elements : undefined;
           return {
@@ -319951,7 +319523,6 @@ function print() { __p += __j.call(arguments, '') }
       this.options = options;
       this.layoutMode = options.layoutMode ?? "vertical";
       this.isSemanticFlow = (options.flowMode ?? "paginated") === "semantic";
-      this.blockLookup = /* @__PURE__ */ new Map;
       this.headerProvider = options.headerProvider;
       this.footerProvider = options.footerProvider;
       const defaultGap = this.layoutMode === "horizontal" ? 20 : 24;
@@ -320138,45 +319709,10 @@ function print() { __p += __j.call(arguments, '') }
         entities: collectPaintSnapshotEntitiesFromDomRoot(rootEl)
       };
     }
-    normalizeOptionalBlockMeasurePair(label, blocks2, measures) {
-      const hasBlocks = blocks2 !== undefined;
-      const hasMeasures = measures !== undefined;
-      if (hasBlocks !== hasMeasures)
-        throw new Error(`DomPainter.paint requires ${label}Blocks and ${label}Measures to both be provided or both be omitted`);
-      if (!hasBlocks || !hasMeasures)
-        return;
-      return {
-        blocks: blocks2,
-        measures
-      };
-    }
-    updateBlockLookup(input2) {
-      const { blocks: blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures } = input2;
-      const resolvedBlockVersions = this.resolvedLayout?.blockVersions;
-      const nextLookup = this.buildBlockLookup(blocks2, measures, resolvedBlockVersions);
-      const normalizedHeader = this.normalizeOptionalBlockMeasurePair("header", headerBlocks, headerMeasures);
-      if (normalizedHeader)
-        this.buildBlockLookup(normalizedHeader.blocks, normalizedHeader.measures, resolvedBlockVersions).forEach((entry, id2) => {
-          nextLookup.set(id2, entry);
-        });
-      const normalizedFooter = this.normalizeOptionalBlockMeasurePair("footer", footerBlocks, footerMeasures);
-      if (normalizedFooter)
-        this.buildBlockLookup(normalizedFooter.blocks, normalizedFooter.measures, resolvedBlockVersions).forEach((entry, id2) => {
-          nextLookup.set(id2, entry);
-        });
-      const changed = /* @__PURE__ */ new Set;
-      nextLookup.forEach((entry, id2) => {
-        const previous3 = this.blockLookup.get(id2);
-        if (!previous3 || previous3.version !== entry.version)
-          changed.add(id2);
-      });
-      this.blockLookup = nextLookup;
-      this.changedBlocks = changed;
-    }
     paint(input2, mount, mapping) {
       const layout = input2.sourceLayout;
       this.resolvedLayout = input2.resolvedLayout;
-      this.updateBlockLookup(input2);
+      this.changedBlocks.clear();
       if (!(mount instanceof HTMLElement))
         throw new Error("DomPainter.paint requires a valid HTMLElement mount");
       const doc$12 = mount.ownerDocument ?? (typeof document !== "undefined" ? document : null);
@@ -320190,7 +319726,6 @@ function print() { __p += __j.call(arguments, '') }
           for (const item of page.items)
             if ("blockId" in item)
               this.changedBlocks.add(item.blockId);
-        this.blockLookup.forEach((_$1, id2) => this.changedBlocks.add(id2));
         this.currentMapping = null;
       } else
         this.currentMapping = mapping ?? null;
@@ -320610,8 +320145,9 @@ function print() { __p += __j.call(arguments, '') }
         pageNumberText: resolvedPage?.numberText ?? page.numberText,
         pageIndex
       };
-      const sdtBoundaries = computeSdtBoundaries(page.fragments, this.blockLookup, this.sdtLabelsRendered, resolvedPage?.items);
-      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, this.blockLookup, resolvedPage?.items);
+      const resolvedItems = resolvedPage?.items ?? [];
+      const sdtBoundaries = computeSdtBoundaries(page.fragments, resolvedItems, this.sdtLabelsRendered);
+      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, resolvedItems);
       page.fragments.forEach((fragment2, index2) => {
         const sdtBoundary = sdtBoundaries.get(index2);
         const resolvedItem = this.getResolvedFragmentItem(pageIndex, index2);
@@ -320743,7 +320279,7 @@ function print() { __p += __j.call(arguments, '') }
     isPageRelativeAnchoredFragment(fragment2, resolvedItem) {
       if (fragment2.kind !== "image" && fragment2.kind !== "drawing")
         return false;
-      const block = (resolvedItem && "block" in resolvedItem ? resolvedItem.block : undefined) ?? this.blockLookup.get(fragment2.blockId)?.block;
+      const block = resolvedItem && "block" in resolvedItem ? resolvedItem.block : undefined;
       if (!block || block.kind !== "image" && block.kind !== "drawing")
         return false;
       return block.anchor?.vRelativeFrom === "page";
@@ -320812,14 +320348,17 @@ function print() { __p += __j.call(arguments, '') }
         pageNumberText: resolvedPage?.numberText ?? page.numberText,
         pageIndex
       };
-      const betweenBorderFlags = computeBetweenBorderFlags(data.fragments, this.blockLookup, data.items);
+      const decorationItems = data.items ?? [];
+      const betweenBorderFlags = computeBetweenBorderFlags(data.fragments, decorationItems);
       const behindDocFragments = [];
       const normalFragments = [];
       for (let fi = 0;fi < data.fragments.length; fi += 1) {
         const fragment2 = data.fragments[fi];
         let isBehindDoc = false;
-        if (fragment2.kind === "image" || fragment2.kind === "drawing")
-          isBehindDoc = fragment2.behindDoc === true || fragment2.behindDoc == null && "zIndex" in fragment2 && fragment2.zIndex === 0 || this.shouldRenderBehindPageContent(fragment2, kind);
+        if (fragment2.kind === "image" || fragment2.kind === "drawing") {
+          const resolvedItem = decorationItems[fi];
+          isBehindDoc = fragment2.behindDoc === true || fragment2.behindDoc == null && "zIndex" in fragment2 && fragment2.zIndex === 0 || this.shouldRenderBehindPageContent(fragment2, kind, resolvedItem);
+        }
         if (isBehindDoc)
           behindDocFragments.push({
             fragment: fragment2,
@@ -320953,8 +320492,9 @@ function print() { __p += __j.call(arguments, '') }
       pageEl.dataset.layoutEpoch = String(this.layoutEpoch);
       const existing = new Map(state.fragments.map((frag) => [frag.key, frag]));
       const nextFragments = [];
-      const sdtBoundaries = computeSdtBoundaries(page.fragments, this.blockLookup, this.sdtLabelsRendered, resolvedPage?.items);
-      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, this.blockLookup, resolvedPage?.items);
+      const resolvedItems = resolvedPage?.items ?? [];
+      const sdtBoundaries = computeSdtBoundaries(page.fragments, resolvedItems, this.sdtLabelsRendered);
+      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, resolvedItems);
       const contextBase = {
         pageNumber: page.number,
         totalPages: this.totalPages,
@@ -320968,6 +320508,7 @@ function print() { __p += __j.call(arguments, '') }
         const sdtBoundary = sdtBoundaries.get(index2);
         const betweenInfo = betweenBorderFlags.get(index2);
         const resolvedItem = this.getResolvedFragmentItem(pageIndex, index2);
+        const resolvedSig = resolvedItem?.version ?? "";
         if (current) {
           existing.delete(key2);
           const geometryChanged = hasFragmentGeometryChanged(current.fragment, fragment2);
@@ -320975,12 +320516,11 @@ function print() { __p += __j.call(arguments, '') }
           const betweenBorderMismatch = current.element.dataset.betweenBorder === "true" !== (betweenInfo?.showBetweenBorder ?? false) || current.element.dataset.suppressTopBorder === "true" !== (betweenInfo?.suppressTopBorder ?? false) || (current.element.dataset.gapBelow ?? "") !== (betweenInfo?.gapBelow ? String(betweenInfo.gapBelow) : "");
           const newPmStart = fragment2.pmStart;
           const mappingUnreliable = this.currentMapping != null && newPmStart != null && current.element.dataset.pmStart != null && this.currentMapping.map(Number(current.element.dataset.pmStart)) !== newPmStart;
-          const resolvedSig = resolvedItem && "version" in resolvedItem ? resolvedItem.version : undefined;
-          if (geometryChanged || this.changedBlocks.has(fragment2.blockId) || current.signature !== (resolvedSig ?? fragmentSignature$1(fragment2, this.blockLookup)) || sdtBoundaryMismatch || betweenBorderMismatch || mappingUnreliable) {
+          if (geometryChanged || this.changedBlocks.has(fragment2.blockId) || current.signature !== resolvedSig || sdtBoundaryMismatch || betweenBorderMismatch || mappingUnreliable) {
             const replacement = this.renderFragment(fragment2, contextBase, sdtBoundary, betweenInfo, resolvedItem);
             pageEl.replaceChild(replacement, current.element);
             current.element = replacement;
-            current.signature = resolvedSig ?? fragmentSignature$1(fragment2, this.blockLookup);
+            current.signature = resolvedSig;
           } else if (this.currentMapping)
             this.updatePositionAttributes(current.element, this.currentMapping);
           this.updateFragmentElement(current.element, fragment2, contextBase.section, resolvedItem);
@@ -320994,12 +320534,11 @@ function print() { __p += __j.call(arguments, '') }
         }
         const fresh = this.renderFragment(fragment2, contextBase, sdtBoundary, betweenInfo, resolvedItem);
         pageEl.insertBefore(fresh, pageEl.children[index2] ?? null);
-        const freshSig = resolvedItem && "version" in resolvedItem ? resolvedItem.version : undefined;
         nextFragments.push({
           key: key2,
           fragment: fragment2,
           element: fresh,
-          signature: freshSig ?? fragmentSignature$1(fragment2, this.blockLookup),
+          signature: resolvedSig,
           context: contextBase
         });
       });
@@ -321061,17 +320600,18 @@ function print() { __p += __j.call(arguments, '') }
         pageNumberText: resolvedPage?.numberText ?? page.numberText,
         pageIndex
       };
-      const sdtBoundaries = computeSdtBoundaries(page.fragments, this.blockLookup, this.sdtLabelsRendered, resolvedPage?.items);
-      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, this.blockLookup, resolvedPage?.items);
+      const resolvedItems = resolvedPage?.items ?? [];
+      const sdtBoundaries = computeSdtBoundaries(page.fragments, resolvedItems, this.sdtLabelsRendered);
+      const betweenBorderFlags = computeBetweenBorderFlags(page.fragments, resolvedItems);
       const fragmentStates = page.fragments.map((fragment2, index2) => {
         const sdtBoundary = sdtBoundaries.get(index2);
         const resolvedItem = this.getResolvedFragmentItem(pageIndex, index2);
         const fragmentEl = this.renderFragment(fragment2, contextBase, sdtBoundary, betweenBorderFlags.get(index2), resolvedItem);
         el.appendChild(fragmentEl);
-        const initSig = resolvedItem && "version" in resolvedItem ? resolvedItem.version : undefined;
+        const initSig = resolvedItem?.version ?? "";
         return {
           key: fragmentKey(fragment2),
-          signature: initSig ?? fragmentSignature$1(fragment2, this.blockLookup),
+          signature: initSig,
           fragment: fragment2,
           element: fragmentEl,
           context: contextBase
@@ -321126,7 +320666,10 @@ function print() { __p += __j.call(arguments, '') }
       try {
         if (!this.doc)
           throw new Error("DomPainter: document is not available");
-        const { block, measure } = this.resolveBlockAndMeasure(fragment2, resolvedItem?.block, resolvedItem?.measure, "paragraph", "paragraph", "paragraph block/measure");
+        if (resolvedItem?.block?.kind !== "paragraph" || resolvedItem?.measure?.kind !== "paragraph")
+          throw new Error(`DomPainter: missing resolved paragraph block/measure for fragment ${fragment2.blockId}`);
+        const block = resolvedItem.block;
+        const measure = resolvedItem.measure;
         const wordLayout = isMinimalWordLayout$1(block.attrs?.wordLayout) ? block.attrs.wordLayout : undefined;
         const content3 = resolvedItem?.content;
         const paraContinuesFromPrev = resolvedItem?.continuesFromPrev ?? fragment2.continuesFromPrev;
@@ -321478,7 +321021,10 @@ function print() { __p += __j.call(arguments, '') }
       try {
         if (!this.doc)
           throw new Error("DomPainter: document is not available");
-        const { block, measure } = this.resolveBlockAndMeasure(fragment2, resolvedItem?.block, resolvedItem?.measure, "list", "list", "list block/measure");
+        if (resolvedItem?.block?.kind !== "list" || resolvedItem?.measure?.kind !== "list")
+          throw new Error(`DomPainter: missing resolved list block/measure for fragment ${fragment2.blockId}`);
+        const block = resolvedItem.block;
+        const measure = resolvedItem.measure;
         const item = block.items.find((entry) => entry.id === fragment2.itemId);
         const itemMeasure = measure.items.find((entry) => entry.itemId === fragment2.itemId);
         if (!item || !itemMeasure)
@@ -321577,7 +321123,9 @@ function print() { __p += __j.call(arguments, '') }
     }
     renderImageFragment(fragment2, context, resolvedItem) {
       try {
-        const block = this.resolveBlock(fragment2, resolvedItem?.block, "image", "image block");
+        if (resolvedItem?.block?.kind !== "image")
+          throw new Error(`DomPainter: missing resolved image block for fragment ${fragment2.blockId}`);
+        const block = resolvedItem.block;
         if (!this.doc)
           throw new Error("DomPainter: document is not available");
         const fragmentEl = this.doc.createElement("div");
@@ -321692,7 +321240,9 @@ function print() { __p += __j.call(arguments, '') }
     }
     renderDrawingFragment(fragment2, context, resolvedItem) {
       try {
-        const block = this.resolveBlock(fragment2, resolvedItem?.block, "drawing", "drawing block");
+        if (resolvedItem?.block?.kind !== "drawing")
+          throw new Error(`DomPainter: missing resolved drawing block for fragment ${fragment2.blockId}`);
+        const block = resolvedItem.block;
         if (!this.doc)
           throw new Error("DomPainter: document is not available");
         const fragmentEl = this.doc.createElement("div");
@@ -322355,23 +321905,13 @@ function print() { __p += __j.call(arguments, '') }
       return createChartElement(this.doc, block.chartData, block.geometry);
     }
     resolveTableRenderData(fragment2, resolvedItem) {
-      if (resolvedItem)
-        return {
-          block: resolvedItem.block,
-          measure: resolvedItem.measure,
-          cellSpacingPx: resolvedItem.cellSpacingPx,
-          effectiveColumnWidths: resolvedItem.effectiveColumnWidths
-        };
-      const lookup3 = this.blockLookup.get(fragment2.blockId);
-      if (!lookup3 || lookup3.block.kind !== "table" || lookup3.measure.kind !== "table")
-        throw new Error(`DomPainter: missing table block for fragment ${fragment2.blockId}`);
-      const block = lookup3.block;
-      const measure = lookup3.measure;
+      if (!resolvedItem)
+        throw new Error(`DomPainter: missing resolved table item for fragment ${fragment2.blockId}`);
       return {
-        block,
-        measure,
-        cellSpacingPx: measure.cellSpacingPx ?? getCellSpacingPx(block.attrs?.cellSpacing),
-        effectiveColumnWidths: fragment2.columnWidths ?? measure.columnWidths
+        block: resolvedItem.block,
+        measure: resolvedItem.measure,
+        cellSpacingPx: resolvedItem.cellSpacingPx,
+        effectiveColumnWidths: resolvedItem.effectiveColumnWidths
       };
     }
     renderTableFragment(fragment2, context, sdtBoundary, resolvedItem) {
@@ -323569,16 +323109,14 @@ function print() { __p += __j.call(arguments, '') }
     isAnchoredMediaFragment(fragment2) {
       return (fragment2.kind === "image" || fragment2.kind === "drawing") && fragment2.isAnchored === true;
     }
-    shouldRenderBehindPageContent(fragment2, section) {
+    shouldRenderBehindPageContent(fragment2, section, resolvedItem) {
       if (fragment2.behindDoc === true || fragment2.behindDoc == null && "zIndex" in fragment2 && fragment2.zIndex === 0)
         return true;
-      return section === "header" && fragment2.kind === "drawing" && this.isHeaderWordArtWatermark(fragment2);
+      return section === "header" && fragment2.kind === "drawing" && this.isHeaderWordArtWatermark(resolvedItem?.block);
     }
-    isHeaderWordArtWatermark(fragment2) {
-      const lookup3 = this.blockLookup.get(fragment2.blockId);
-      if (!lookup3 || lookup3.block.kind !== "drawing" || lookup3.block.drawingKind !== "vectorShape")
+    isHeaderWordArtWatermark(block) {
+      if (!block || block.kind !== "drawing" || block.drawingKind !== "vectorShape")
         return false;
-      const block = lookup3.block;
       const attrs = block.attrs ?? {};
       const hasTextContent = Array.isArray(block.textContent?.parts) && block.textContent.parts.length > 0;
       return attrs.isWordArt === true && attrs.isTextBox === true && hasTextContent && block.anchor?.isAnchored === true && block.anchor.hRelativeFrom === "page" && block.anchor.alignH === "center" && block.anchor.vRelativeFrom === "page" && block.anchor.alignV === "center" && block.wrap?.type === "None";
@@ -323612,52 +323150,10 @@ function print() { __p += __j.call(arguments, '') }
     estimateFragmentHeight(fragment2, resolvedItem) {
       if (resolvedItem && "height" in resolvedItem && typeof resolvedItem.height === "number")
         return resolvedItem.height;
-      const measure = this.blockLookup.get(fragment2.blockId)?.measure;
-      if (fragment2.kind === "para" && measure?.kind === "paragraph")
-        return measure.totalHeight;
-      if (fragment2.kind === "list-item" && measure?.kind === "list")
-        return measure.totalHeight;
-      if (fragment2.kind === "table")
-        return fragment2.height;
-      if (fragment2.kind === "image" || fragment2.kind === "drawing")
+      if (fragment2.kind === "table" || fragment2.kind === "image" || fragment2.kind === "drawing")
         return fragment2.height;
       return 0;
     }
-    resolveBlockAndMeasure(fragment2, resolvedBlock, resolvedMeasure, blockKind, measureKind, errorLabel) {
-      if (resolvedBlock?.kind === blockKind && resolvedMeasure?.kind === measureKind)
-        return {
-          block: resolvedBlock,
-          measure: resolvedMeasure
-        };
-      const lookup3 = this.blockLookup.get(fragment2.blockId);
-      if (!lookup3 || lookup3.block.kind !== blockKind || lookup3.measure.kind !== measureKind)
-        throw new Error(`DomPainter: missing ${errorLabel} for fragment ${fragment2.blockId}`);
-      return {
-        block: lookup3.block,
-        measure: lookup3.measure
-      };
-    }
-    resolveBlock(fragment2, resolvedBlock, blockKind, errorLabel) {
-      if (resolvedBlock?.kind === blockKind)
-        return resolvedBlock;
-      const lookup3 = this.blockLookup.get(fragment2.blockId);
-      if (!lookup3 || lookup3.block.kind !== blockKind)
-        throw new Error(`DomPainter: missing ${errorLabel} for fragment ${fragment2.blockId}`);
-      return lookup3.block;
-    }
-    buildBlockLookup(blocks2, measures, precomputedVersions) {
-      if (blocks2.length !== measures.length)
-        throw new Error("DomPainter requires the same number of blocks and measures");
-      const lookup3 = /* @__PURE__ */ new Map;
-      blocks2.forEach((block, index2) => {
-        lookup3.set(block.id, {
-          block,
-          measure: measures[index2],
-          version: precomputedVersions?.[block.id] ?? deriveBlockVersion$1(block)
-        });
-      });
-      return lookup3;
-    }
     static {
       this.SDT_DATASET_KEYS = [
         "sdtType",
@@ -324979,6 +324475,10 @@ function print() { __p += __j.call(arguments, '') }
     #storySessionSelectionHandler = null;
     #storySessionTransactionHandler = null;
     #storySessionEditor = null;
+    #activeSurfaceUiEventEditor = null;
+    #activeSurfaceUiUpdateHandler = null;
+    #activeSurfaceUiContextMenuOpenHandler = null;
+    #activeSurfaceUiContextMenuCloseHandler = null;
     #lastSelectedFieldAnnotation = null;
     #lastSelectedStructuredContentBlock = null;
     #lastSelectedStructuredContentInline = null;
@@ -325372,6 +324872,19 @@ function print() { __p += __j.call(arguments, '') }
         return null;
       return session;
     }
+    #buildActiveNoteRenderOverride(storyType) {
+      const session = this.#getActiveNoteStorySession();
+      if (!session || session.locator.storyType !== storyType)
+        return null;
+      const storyEditor = session.editor;
+      const docJson = typeof storyEditor.getUpdatedJson === "function" ? storyEditor.getUpdatedJson() : typeof storyEditor.getJSON === "function" ? storyEditor.getJSON() : null;
+      if (!docJson || typeof docJson !== "object")
+        return null;
+      return {
+        noteId: session.locator.noteId,
+        docJson
+      };
+    }
     #getActiveTrackedChangeStorySurface() {
       const storySession = this.#getActiveStorySession();
       if (storySession)
@@ -325396,6 +324909,12 @@ function print() { __p += __j.call(arguments, '') }
     getStorySessionManager() {
       return this.#storySessionManager;
     }
+    exitActiveStorySurface() {
+      if ((this.#headerFooterSession?.session?.mode ?? "body") !== "body")
+        this.#exitHeaderFooterMode();
+      if (this.#getActiveStorySession())
+        this.#exitActiveStorySession();
+    }
     #resolveActiveSurface() {
       const mode = this.#headerFooterSession?.session?.mode ?? "body";
       if (mode === "header")
@@ -325903,13 +325422,16 @@ function print() { __p += __j.call(arguments, '') }
       }).filter((rect) => Boolean(rect));
       if (!rects.length)
         return null;
-      const bounds = this.#aggregateLayoutBounds(rects);
+      const groupedRects = this.#groupRangeRectsByPage(rects);
+      const preferredPageIndex = this.#getPreferredRenderedTrackedChangePageIndex(storyKey, groupedRects, relativeTo);
+      const anchorRects = groupedRects.get(preferredPageIndex) ?? rects;
+      const bounds = this.#aggregateLayoutBounds(anchorRects);
       if (!bounds)
         return null;
       return {
         bounds,
         rects,
-        pageIndex: rects[0]?.pageIndex ?? 0
+        pageIndex: preferredPageIndex
       };
     }
     #findRenderedTrackedChangeElements(rawId, storyKey) {
@@ -325917,8 +325439,69 @@ function print() { __p += __j.call(arguments, '') }
       if (!host)
         return [];
       const baseSelector = `[data-track-change-id="${escapeAttrValue(rawId)}"]`;
-      const selector = storyKey ? `${baseSelector}[data-story-key="${escapeAttrValue(storyKey)}"]` : baseSelector;
-      return Array.from(host.querySelectorAll(selector));
+      if (!storyKey)
+        return Array.from(host.querySelectorAll(baseSelector));
+      const storySelector = `${baseSelector}[data-story-key="${escapeAttrValue(storyKey)}"]`;
+      const exactMatches = Array.from(host.querySelectorAll(storySelector));
+      const allMatches = Array.from(host.querySelectorAll(baseSelector));
+      if (exactMatches.length > 1 || exactMatches.length === allMatches.length || allMatches.length === 0)
+        return exactMatches;
+      return allMatches;
+    }
+    #groupRangeRectsByPage(rects) {
+      const grouped = /* @__PURE__ */ new Map;
+      rects.forEach((rect) => {
+        const pageIndex = Number.isFinite(rect.pageIndex) ? rect.pageIndex : 0;
+        const pageRects = grouped.get(pageIndex);
+        if (pageRects) {
+          pageRects.push(rect);
+          return;
+        }
+        grouped.set(pageIndex, [rect]);
+      });
+      return grouped;
+    }
+    #getPreferredRenderedTrackedChangePageIndex(storyKey, groupedRects, relativeTo) {
+      const activeHeaderFooterSession = this.#headerFooterSession?.session;
+      const activePageIndex = (activeHeaderFooterSession?.mode !== "body" && activeHeaderFooterSession?.headerFooterRefId ? buildStoryKey({
+        kind: "story",
+        storyType: "headerFooterPart",
+        refId: activeHeaderFooterSession.headerFooterRefId
+      }) : null) === storyKey && Number.isFinite(activeHeaderFooterSession?.pageIndex) ? Number(activeHeaderFooterSession?.pageIndex) : null;
+      if (activePageIndex != null && groupedRects.has(activePageIndex))
+        return activePageIndex;
+      const viewportRect = (this.#scrollContainer instanceof Window ? {
+        top: 0,
+        bottom: this.#scrollContainer.innerHeight
+      } : this.#scrollContainer instanceof Element ? this.#scrollContainer.getBoundingClientRect() : this.#visibleHost?.ownerDocument?.defaultView ? {
+        top: 0,
+        bottom: this.#visibleHost.ownerDocument.defaultView.innerHeight
+      } : this.#visibleHost?.getBoundingClientRect?.()) ?? null;
+      if (viewportRect) {
+        const relativeRect = relativeTo?.getBoundingClientRect?.();
+        const visibleTop = viewportRect.top - (relativeRect?.top ?? 0);
+        const visibleBottom = viewportRect.bottom - (relativeRect?.top ?? 0);
+        const viewportCenter = visibleTop + (visibleBottom - visibleTop) / 2;
+        let bestPageIndex = null;
+        let bestIntersection = -1;
+        let bestDistance = Number.POSITIVE_INFINITY;
+        groupedRects.forEach((pageRects, pageIndex) => {
+          const pageBounds = this.#aggregateLayoutBounds(pageRects);
+          if (!pageBounds)
+            return;
+          const intersection = Math.max(0, Math.min(pageBounds.bottom, visibleBottom) - Math.max(pageBounds.top, visibleTop));
+          const pageCenter = pageBounds.top + pageBounds.height / 2;
+          const distance2 = Math.abs(pageCenter - viewportCenter);
+          if (intersection > bestIntersection || intersection === bestIntersection && distance2 < bestDistance || intersection === bestIntersection && distance2 === bestDistance && (bestPageIndex == null || pageIndex < bestPageIndex)) {
+            bestPageIndex = pageIndex;
+            bestIntersection = intersection;
+            bestDistance = distance2;
+          }
+        });
+        if (bestPageIndex != null)
+          return bestPageIndex;
+      }
+      return [...groupedRects.keys()].sort((left$1, right$1) => left$1 - right$1)[0] ?? 0;
     }
     getLayoutSnapshot() {
       return {
@@ -326675,6 +326258,7 @@ function print() { __p += __j.call(arguments, '') }
         this.#a11ySelectionAnnounceTimeout = null;
       }
       this.#teardownStorySessionEventBridge();
+      this.#teardownActiveSurfaceUiEventBridge();
       if (this.#registryKey) {
         PresentationEditor2.#instances.delete(this.#registryKey);
         this.#registryKey = null;
@@ -326925,6 +326509,7 @@ function print() { __p += __j.call(arguments, '') }
         event: "stylesDefaultsChanged",
         handler: handleStylesDefaultsChanged
       });
+      this.#syncActiveSurfaceUiEventBridge(this.#editor);
       const handleNotesPartChanged = () => {
         this.#flowBlockCache.setHasExternalChanges(true);
         this.#pendingDocChange = true;
@@ -327255,6 +326840,7 @@ function print() { __p += __j.call(arguments, '') }
             this.#scheduleSelectionUpdate({ immediate: true });
             this.#scheduleA11ySelectionAnnouncement({ immediate: true });
           }
+          this.#syncActiveSurfaceUiEventBridge();
         },
         onEditBlocked: (reason) => {
           this.emit("headerFooterEditBlocked", { reason });
@@ -327315,6 +326901,47 @@ function print() { __p += __j.call(arguments, '') }
       this.#storySessionSelectionHandler = null;
       this.#storySessionTransactionHandler = null;
     }
+    #teardownActiveSurfaceUiEventBridge() {
+      if (this.#activeSurfaceUiEventEditor) {
+        if (this.#activeSurfaceUiUpdateHandler)
+          this.#activeSurfaceUiEventEditor.off?.("update", this.#activeSurfaceUiUpdateHandler);
+        if (this.#activeSurfaceUiContextMenuOpenHandler)
+          this.#activeSurfaceUiEventEditor.off?.("contextMenu:open", this.#activeSurfaceUiContextMenuOpenHandler);
+        if (this.#activeSurfaceUiContextMenuCloseHandler)
+          this.#activeSurfaceUiEventEditor.off?.("contextMenu:close", this.#activeSurfaceUiContextMenuCloseHandler);
+      }
+      this.#activeSurfaceUiEventEditor = null;
+      this.#activeSurfaceUiUpdateHandler = null;
+      this.#activeSurfaceUiContextMenuOpenHandler = null;
+      this.#activeSurfaceUiContextMenuCloseHandler = null;
+    }
+    #syncActiveSurfaceUiEventBridge(editor = this.getActiveEditor()) {
+      const nextEditor = editor ?? null;
+      if (nextEditor === this.#activeSurfaceUiEventEditor)
+        return;
+      this.#teardownActiveSurfaceUiEventBridge();
+      if (!nextEditor)
+        return;
+      const updateHandler = (event) => {
+        this.emit("update", {
+          ...event ?? {},
+          editor: this
+        });
+      };
+      const contextMenuOpenHandler = (event) => {
+        this.emit("contextMenu:open", event ?? {});
+      };
+      const contextMenuCloseHandler = () => {
+        this.emit("contextMenu:close");
+      };
+      nextEditor.on?.("update", updateHandler);
+      nextEditor.on?.("contextMenu:open", contextMenuOpenHandler);
+      nextEditor.on?.("contextMenu:close", contextMenuCloseHandler);
+      this.#activeSurfaceUiEventEditor = nextEditor;
+      this.#activeSurfaceUiUpdateHandler = updateHandler;
+      this.#activeSurfaceUiContextMenuOpenHandler = contextMenuOpenHandler;
+      this.#activeSurfaceUiContextMenuCloseHandler = contextMenuCloseHandler;
+    }
     #syncStorySessionEventBridge(session) {
       this.#teardownStorySessionEventBridge();
       if (!session) {
@@ -327330,7 +326957,6 @@ function print() { __p += __j.call(arguments, '') }
           return;
         if (session.kind === "note") {
           this.#invalidateTrackedChangesForStory(session.locator);
-          this.#flowBlockCache.setHasExternalChanges(true);
           this.#pendingDocChange = true;
           this.#selectionSync.onLayoutStart();
           this.#scheduleRerender();
@@ -327343,6 +326969,7 @@ function print() { __p += __j.call(arguments, '') }
       this.#storySessionTransactionHandler = transactionHandler;
       this.#scheduleSelectionUpdate({ immediate: true });
       this.#scheduleA11ySelectionAnnouncement({ immediate: true });
+      this.#syncActiveSurfaceUiEventBridge();
     }
     #syncActiveStorySessionDocumentMode(session) {
       if (!session || session.kind !== "note")
@@ -327393,6 +327020,7 @@ function print() { __p += __j.call(arguments, '') }
             this.#wrapOffscreenEditorFocus(activeSession.editor);
           this.#syncActiveStorySessionDocumentMode(activeSession);
           this.#syncStorySessionEventBridge(activeSession);
+          this.#syncActiveSurfaceUiEventBridge();
           this.#inputBridge?.notifyTargetChanged();
         }
       });
@@ -327623,9 +327251,11 @@ function print() { __p += __j.call(arguments, '') }
         this.#applyHtmlAnnotationMeasurements(blocks2);
         const isSemanticFlow = this.#isSemanticFlowMode();
         const baseLayoutOptions = this.#resolveLayoutOptions(blocks2, sectionMetadata);
-        const footnotesLayoutInput = buildFootnotesInput(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined);
+        const activeFootnoteOverride = this.#buildActiveNoteRenderOverride("footnote");
+        const footnotesLayoutInput = buildFootnotesInput(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeFootnoteOverride);
         const semanticFootnoteBlocks = isSemanticFlow ? buildSemanticFootnoteBlocks(footnotesLayoutInput, this.#layoutOptions.semanticOptions?.footnotesMode) : [];
-        const endnoteBlocks = buildEndnoteBlocks(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined);
+        const activeEndnoteOverride = this.#buildActiveNoteRenderOverride("endnote");
+        const endnoteBlocks = buildEndnoteBlocks(this.#editor?.state, this.#editor?.converter, converterContext, this.#editor?.converter?.themeColors ?? undefined, activeEndnoteOverride);
         const blocksForLayout = semanticFootnoteBlocks.length > 0 || endnoteBlocks.length > 0 ? [
           ...blocks2,
           ...semanticFootnoteBlocks,
@@ -327736,45 +327366,13 @@ function print() { __p += __j.call(arguments, '') }
         this.#ensurePainter();
         if (!isSemanticFlow)
           this.#painterAdapter.setProviders(this.#headerFooterSession?.headerDecorationProvider, this.#headerFooterSession?.footerDecorationProvider);
-        const headerBlocks = [];
-        const headerMeasures = [];
-        if (headerLayouts)
-          for (const headerResult of headerLayouts) {
-            headerBlocks.push(...headerResult.blocks);
-            headerMeasures.push(...headerResult.measures);
-          }
-        const headerLayoutsByRId = this.#headerFooterSession?.headerLayoutsByRId;
-        if (headerLayoutsByRId)
-          for (const rIdResult of headerLayoutsByRId.values()) {
-            headerBlocks.push(...rIdResult.blocks);
-            headerMeasures.push(...rIdResult.measures);
-          }
-        const footerBlocks = [];
-        const footerMeasures = [];
-        if (footerLayouts)
-          for (const footerResult of footerLayouts) {
-            footerBlocks.push(...footerResult.blocks);
-            footerMeasures.push(...footerResult.measures);
-          }
-        const footerLayoutsByRId = this.#headerFooterSession?.footerLayoutsByRId;
-        if (footerLayoutsByRId)
-          for (const rIdResult of footerLayoutsByRId.values()) {
-            footerBlocks.push(...rIdResult.blocks);
-            footerMeasures.push(...rIdResult.measures);
-          }
         this.#domIndexObserverManager?.pause();
         const mapping = this.#pendingMapping;
         this.#pendingMapping = null;
         const painterPaintStart = perfNow();
         const paintInput = {
           resolvedLayout,
-          sourceLayout: layout,
-          blocks: bodyBlocksForPaint,
-          measures: bodyMeasuresForPaint,
-          headerBlocks: headerBlocks.length > 0 ? headerBlocks : undefined,
-          headerMeasures: headerMeasures.length > 0 ? headerMeasures : undefined,
-          footerBlocks: footerBlocks.length > 0 ? footerBlocks : undefined,
-          footerMeasures: footerMeasures.length > 0 ? footerMeasures : undefined
+          sourceLayout: layout
         };
         this.#painterAdapter.paint(paintInput, this.#painterHost, mapping ?? undefined);
         perfLog(`[Perf] painter.paint: ${(perfNow() - painterPaintStart).toFixed(2)}ms`);
@@ -328720,7 +328318,7 @@ function print() { __p += __j.call(arguments, '') }
         storyType: target.storyType,
         noteId: target.noteId
       }, {
-        commitPolicy: "continuous",
+        commitPolicy: "onExit",
         preferHiddenHost: true,
         hostWidthPx: targetContext?.hostWidthPx ?? this.#visibleHost.clientWidth ?? 1,
         editorContext: {
@@ -328964,7 +328562,7 @@ function print() { __p += __j.call(arguments, '') }
           if (target.entityType === "comment")
             return await this.#navigateToComment(target.entityId);
           if (target.entityType === "trackedChange")
-            return await this.#navigateToTrackedChange(target.entityId, resolveStoryKeyFromAddress(target.story));
+            return await this.#navigateToTrackedChange(target.entityId, resolveStoryKeyFromAddress(target.story), target.pageIndex);
         }
         return false;
       } catch (error3) {
@@ -329038,18 +328636,18 @@ function print() { __p += __j.call(arguments, '') }
       });
       return true;
     }
-    async#navigateToTrackedChange(entityId, storyKey) {
+    async#navigateToTrackedChange(entityId, storyKey, preferredPageIndex) {
       const editor = this.#editor;
       if (!editor)
         return false;
       if (storyKey && storyKey !== "body") {
         if (this.#navigateToActiveStoryTrackedChange(entityId, storyKey))
           return true;
-        if (await this.#activateTrackedChangeStorySurface(entityId, storyKey)) {
+        if (await this.#activateTrackedChangeStorySurface(entityId, storyKey, preferredPageIndex)) {
           if (this.#navigateToActiveStoryTrackedChange(entityId, storyKey))
             return true;
         }
-        return this.#scrollToRenderedTrackedChange(entityId, storyKey);
+        return this.#scrollToRenderedTrackedChange(entityId, storyKey, preferredPageIndex);
       }
       const setCursorById = editor.commands?.setCursorById;
       if (typeof setCursorById === "function" && setCursorById(entityId, { preferredActiveThreadId: entityId })) {
@@ -329061,7 +328659,7 @@ function print() { __p += __j.call(arguments, '') }
       }
       const resolved = resolveTrackedChange(editor, entityId);
       if (!resolved)
-        return this.#scrollToRenderedTrackedChange(entityId);
+        return this.#scrollToRenderedTrackedChange(entityId, undefined, preferredPageIndex);
       if (typeof setCursorById === "function" && resolved.rawId !== entityId) {
         if (setCursorById(resolved.rawId, { preferredActiveThreadId: resolved.rawId })) {
           await this.scrollToPositionAsync(editor.state.selection.from, {
@@ -329083,7 +328681,7 @@ function print() { __p += __j.call(arguments, '') }
       editor.view?.focus?.();
       return true;
     }
-    async#activateTrackedChangeStorySurface(entityId, storyKey) {
+    async#activateTrackedChangeStorySurface(entityId, storyKey, preferredPageIndex) {
       let locator = null;
       try {
         locator = parseStoryKey(storyKey);
@@ -329092,7 +328690,7 @@ function print() { __p += __j.call(arguments, '') }
       }
       if (!locator || locator.storyType === "body")
         return false;
-      const candidate = this.#findRenderedTrackedChangeElements(entityId, storyKey)[0] ?? null;
+      const candidate = this.#findRenderedTrackedChangeElement(entityId, storyKey, preferredPageIndex);
       if (!candidate)
         return false;
       const rect = candidate.getBoundingClientRect();
@@ -329170,12 +328768,20 @@ function print() { __p += __j.call(arguments, '') }
       this.#shouldScrollSelectionIntoView = true;
       this.#scheduleSelectionUpdate({ immediate: true });
     }
-    async#scrollToRenderedTrackedChange(entityId, storyKey) {
+    #findRenderedTrackedChangeElement(entityId, storyKey, preferredPageIndex) {
       const candidates = this.#findRenderedTrackedChangeElements(entityId, storyKey);
       if (!candidates.length)
+        return null;
+      if (!Number.isFinite(preferredPageIndex))
+        return candidates[0] ?? null;
+      return candidates.find((candidate) => this.#resolveRenderedPageIndexForElement(candidate) === preferredPageIndex) ?? candidates[0] ?? null;
+    }
+    async#scrollToRenderedTrackedChange(entityId, storyKey, preferredPageIndex) {
+      const candidate = this.#findRenderedTrackedChangeElement(entityId, storyKey, preferredPageIndex);
+      if (!candidate)
         return false;
       try {
-        candidates[0]?.scrollIntoView({
+        candidate.scrollIntoView({
           behavior: "auto",
           block: "center",
           inline: "nearest"
@@ -330033,11 +329639,11 @@ var init_zipper_DbkgrypV_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CGvIfKnh_es();
-  init_SuperConverter_XXBr0N8c_es();
+  init_src_BFNW1Ck5_es();
+  init_SuperConverter_D54XfHFt_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_BAI3xz0T_es();
+  init_create_headless_toolbar_DrE9IMiD_es();
   init_constants_CGhJRd87_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();