@superdoc-dev/cli 0.2.0-next.2 → 0.2.0-next.3

package/dist/index.js

@@ -18045,7 +18045,7 @@ var init_constants_DBKi0Amm_es = __esm(() => {
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-D9XMPi6H.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-Cf1y7bFA.es.js
 function getExtensionConfigField(extension, field, context = { name: "" }) {
   const fieldValue = extension.config[field];
   if (typeof fieldValue === "function")
@@ -35280,6 +35280,16 @@ var isRegExp = (value) => {
         i2++;
         continue;
       }
+      const childElements = node2.elements || [];
+      if (childElements.length > 0) {
+        for (const child of childElements) {
+          if (Array.isArray(child.elements))
+            child.elements = preProcessPageFieldsOnly(child.elements, depth + 1).processedNodes;
+          processedNodes.push(child);
+        }
+        i2++;
+        continue;
+      }
     }
     if (fldType === "begin") {
       const fieldInfo = scanFieldSequence(nodes, i2);
@@ -35301,6 +35311,12 @@ var isRegExp = (value) => {
         continue;
       }
     }
+    if (node2.name === "w:r" && node2.elements?.some((el) => el.name === "w:pgNum")) {
+      const processedField = preProcessPageInstruction([], "", node2.elements.find((el) => el.name === "w:rPr") || null);
+      processedNodes.push(...processedField);
+      i2++;
+      continue;
+    }
     if (Array.isArray(node2.elements))
       node2.elements = preProcessPageFieldsOnly(node2.elements, depth + 1).processedNodes;
     processedNodes.push(node2);
@@ -41780,7 +41796,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_D9XMPi6H_es = __esm(() => {
+var init_SuperConverter_Cf1y7bFA_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
@@ -87168,9 +87184,9 @@ var init_remark_gfm_RDxetNVS_es = __esm(() => {
   emptyOptions4 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/src-CYnAk7Cg.es.js
-var exports_src_CYnAk7Cg_es = {};
-__export(exports_src_CYnAk7Cg_es, {
+// ../../packages/superdoc/dist/chunks/src-eL3w4G7e.es.js
+var exports_src_eL3w4G7e_es = {};
+__export(exports_src_eL3w4G7e_es, {
   zt: () => defineMark,
   z: () => cM,
   yt: () => removeAwarenessStates,
@@ -107085,24 +107101,26 @@ function normalizeClientPoint(options, clientX, clientY) {
   const baseX = (clientX - rect.left + scrollLeft) / options.zoom;
   const baseY = (clientY - rect.top + scrollTop) / options.zoom;
   let adjustedX = baseX;
-  let adjustedY = baseY;
+  let detectedPageIndex;
+  let pageLocalY;
   const doc$2 = options.visibleHost.ownerDocument ?? document;
   const hitChain = typeof doc$2.elementsFromPoint === "function" ? doc$2.elementsFromPoint(clientX, clientY) : [];
   const pageEl = Array.isArray(hitChain) ? hitChain.find((el) => el?.classList?.contains("superdoc-page")) : null;
   if (pageEl) {
     const pageIndex = Number(pageEl.dataset.pageIndex ?? "NaN");
     if (Number.isFinite(pageIndex)) {
+      detectedPageIndex = pageIndex;
       const pageOffsetX = options.getPageOffsetX(pageIndex);
       if (pageOffsetX != null)
         adjustedX = baseX - pageOffsetX;
-      const pageOffsetY = options.getPageOffsetY(pageIndex);
-      if (pageOffsetY != null)
-        adjustedY = baseY - pageOffsetY;
+      pageLocalY = (clientY - pageEl.getBoundingClientRect().top) / options.zoom;
     }
   }
   return {
     x: adjustedX,
-    y: adjustedY
+    y: baseY,
+    pageIndex: detectedPageIndex,
+    pageLocalY
   };
 }
 function denormalizeClientPoint(options, layoutX, layoutY, pageIndex, height) {
@@ -107474,7 +107492,9 @@ function publishSectionMetadata(sectionRanges, options) {
       footerRefs: section.footerRefs,
       numbering: section.numbering,
       titlePg: section.titlePg,
-      vAlign: section.vAlign
+      vAlign: section.vAlign,
+      margins: section.margins,
+      pageSize: section.pageSize
     });
   });
 }
@@ -116255,6 +116275,84 @@ async function measureListBlock(block, constraints) {
     totalHeight
   };
 }
+function buildSectionContentWidth(section, fallback) {
+  const pageW = section.pageSize?.w ?? fallback.pageWidth;
+  const marginL = section.margins?.left ?? fallback.margins.left;
+  const marginR = section.margins?.right ?? fallback.margins.right;
+  return pageW - marginL - marginR;
+}
+function buildConstraintsForSection(section, fallback, minWidth) {
+  const pageW = section.pageSize?.w ?? fallback.pageWidth;
+  const marginL = section.margins?.left ?? fallback.margins.left;
+  const marginR = section.margins?.right ?? fallback.margins.right;
+  const contentWidth = pageW - marginL - marginR;
+  const maxWidth = pageW - marginL;
+  return {
+    width: minWidth ? Math.min(Math.max(contentWidth, minWidth), maxWidth) : contentWidth,
+    height: fallback.height,
+    pageWidth: pageW,
+    margins: {
+      left: marginL,
+      right: marginR
+    }
+  };
+}
+function getTableWidthSpec(blocks2) {
+  let result;
+  let maxResolvedWidth = 0;
+  for (const block of blocks2) {
+    if (block.kind !== "table")
+      continue;
+    const tableWidth = block.attrs?.tableWidth;
+    const widthValue = tableWidth?.width ?? tableWidth?.value;
+    if (tableWidth?.type === "pct" && typeof widthValue === "number" && widthValue > 0) {
+      if (!result || result.type !== "pct" || widthValue > result.value) {
+        result = {
+          type: "pct",
+          value: widthValue
+        };
+        maxResolvedWidth = Infinity;
+      }
+    } else if ((tableWidth?.type === "px" || tableWidth?.type === "pixel") && typeof widthValue === "number") {
+      if (widthValue > maxResolvedWidth) {
+        maxResolvedWidth = widthValue;
+        result = {
+          type: "px",
+          value: widthValue
+        };
+      }
+    } else if (block.columnWidths && block.columnWidths.length > 0) {
+      const gridTotal = block.columnWidths.reduce((sum, w2) => sum + w2, 0);
+      if (gridTotal > maxResolvedWidth) {
+        maxResolvedWidth = gridTotal;
+        result = {
+          type: "grid",
+          value: gridTotal
+        };
+      }
+    }
+  }
+  return result;
+}
+function resolveTableMinWidth(spec, contentWidth) {
+  if (!spec)
+    return 0;
+  if (spec.type === "pct")
+    return contentWidth * (spec.value / OOXML_PCT_DIVISOR);
+  return spec.value;
+}
+function resolveRIdPerSection(sectionMetadata, kind) {
+  const result = /* @__PURE__ */ new Map;
+  let inherited;
+  for (const section of sectionMetadata) {
+    const rId = (kind === "header" ? section.headerRefs : section.footerRefs)?.default;
+    if (rId)
+      inherited = rId;
+    if (inherited)
+      result.set(section.sectionIndex, inherited);
+  }
+  return result;
+}
 async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetadata, deps) {
   deps.headerLayoutsByRId.clear();
   deps.footerLayoutsByRId.clear();
@@ -116269,42 +116367,127 @@ async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetad
       totalPages
     };
   };
-  if (headerBlocksByRId)
-    for (const [rId, blocks2] of headerBlocksByRId) {
-      if (!blocks2 || blocks2.length === 0)
-        continue;
-      try {
-        const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
-        if (batchResult.default)
-          deps.headerLayoutsByRId.set(rId, {
-            kind: "header",
-            type: "default",
-            layout: batchResult.default.layout,
-            blocks: batchResult.default.blocks,
-            measures: batchResult.default.measures
-          });
-      } catch (error) {
-        console.warn(`[PresentationEditor] Failed to layout header rId=${rId}:`, error);
-      }
+  if (sectionMetadata.length > 1 && sectionMetadata.some((s2) => s2.margins || s2.pageSize)) {
+    await layoutWithPerSectionConstraints("header", headerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.headerLayoutsByRId);
+    await layoutWithPerSectionConstraints("footer", footerBlocksByRId, sectionMetadata, constraints, pageResolver, deps.footerLayoutsByRId);
+  } else {
+    await layoutBlocksByRId("header", headerBlocksByRId, constraints, pageResolver, deps.headerLayoutsByRId);
+    await layoutBlocksByRId("footer", footerBlocksByRId, constraints, pageResolver, deps.footerLayoutsByRId);
+  }
+}
+async function layoutBlocksByRId(kind, blocksByRId, constraints, pageResolver, layoutsByRId) {
+  if (!blocksByRId)
+    return;
+  for (const [rId, blocks2] of blocksByRId) {
+    if (!blocks2 || blocks2.length === 0)
+      continue;
+    try {
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
+      if (batchResult.default)
+        layoutsByRId.set(rId, {
+          kind,
+          type: "default",
+          layout: batchResult.default.layout,
+          blocks: batchResult.default.blocks,
+          measures: batchResult.default.measures
+        });
+    } catch (error) {
+      console.warn(`[PresentationEditor] Failed to layout ${kind} rId=${rId}:`, error);
     }
-  if (footerBlocksByRId)
-    for (const [rId, blocks2] of footerBlocksByRId) {
-      if (!blocks2 || blocks2.length === 0)
+  }
+}
+function cloneHeaderFooterLayout(layout) {
+  return {
+    ...layout,
+    pages: layout.pages.map((page) => ({
+      ...page,
+      fragments: page.fragments.map((f) => ({ ...f }))
+    }))
+  };
+}
+function adjustFramePositionsForContentWidth(layout, blocks2, effectiveWidth, contentWidth) {
+  if (effectiveWidth <= contentWidth)
+    return;
+  const widthDiff = effectiveWidth - contentWidth;
+  const blockById = /* @__PURE__ */ new Map;
+  for (const block of blocks2)
+    blockById.set(block.id, block);
+  for (const page of layout.pages)
+    for (const fragment of page.fragments) {
+      if (fragment.kind !== "para")
         continue;
-      try {
-        const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, constraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
-        if (batchResult.default)
-          deps.footerLayoutsByRId.set(rId, {
-            kind: "footer",
+      const block = blockById.get(fragment.blockId);
+      if (!block || block.kind !== "paragraph")
+        continue;
+      const frame = block.attrs?.frame;
+      if (!frame || frame.wrap !== "none")
+        continue;
+      if (frame.xAlign === "right")
+        fragment.x -= widthDiff;
+      else if (frame.xAlign === "center")
+        fragment.x -= widthDiff / 2;
+    }
+}
+async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadata, fallbackConstraints, pageResolver, layoutsByRId) {
+  if (!blocksByRId)
+    return;
+  const rIdPerSection = resolveRIdPerSection(sectionMetadata, kind);
+  const tableWidthSpecByRId = /* @__PURE__ */ new Map;
+  for (const [rId, blocks2] of blocksByRId) {
+    const spec = getTableWidthSpec(blocks2);
+    if (spec)
+      tableWidthSpecByRId.set(rId, spec);
+  }
+  const groups = /* @__PURE__ */ new Map;
+  for (const section of sectionMetadata) {
+    const rId = rIdPerSection.get(section.sectionIndex);
+    if (!rId || !blocksByRId.has(rId))
+      continue;
+    const contentWidth = buildSectionContentWidth(section, fallbackConstraints);
+    const sectionConstraints = buildConstraintsForSection(section, fallbackConstraints, resolveTableMinWidth(tableWidthSpecByRId.get(rId), contentWidth) || undefined);
+    const effectiveWidth = sectionConstraints.width;
+    const groupKey = `${rId}::w${effectiveWidth}`;
+    let group = groups.get(groupKey);
+    if (!group) {
+      group = {
+        sectionConstraints,
+        sectionIndices: [],
+        rId,
+        effectiveWidth
+      };
+      groups.set(groupKey, group);
+    }
+    group.sectionIndices.push(section.sectionIndex);
+  }
+  for (const [, group] of groups) {
+    const blocks2 = blocksByRId.get(group.rId);
+    if (!blocks2 || blocks2.length === 0)
+      continue;
+    try {
+      const batchResult = await layoutHeaderFooterWithCache({ default: blocks2 }, group.sectionConstraints, (block, c$3) => measureBlock(block, c$3), undefined, undefined, pageResolver);
+      if (batchResult.default)
+        for (const sectionIndex of group.sectionIndices) {
+          const contentWidth = buildSectionContentWidth(sectionMetadata.find((s2) => s2.sectionIndex === sectionIndex), fallbackConstraints);
+          const needsFrameAdjust = group.effectiveWidth > contentWidth;
+          let layout = batchResult.default.layout;
+          if (needsFrameAdjust) {
+            layout = cloneHeaderFooterLayout(layout);
+            adjustFramePositionsForContentWidth(layout, batchResult.default.blocks, group.effectiveWidth, contentWidth);
+          }
+          const result = {
+            kind,
             type: "default",
-            layout: batchResult.default.layout,
+            layout,
             blocks: batchResult.default.blocks,
-            measures: batchResult.default.measures
-          });
-      } catch (error) {
-        console.warn(`[PresentationEditor] Failed to layout footer rId=${rId}:`, error);
-      }
+            measures: batchResult.default.measures,
+            effectiveWidth: needsFrameAdjust ? group.effectiveWidth : undefined
+          };
+          layoutsByRId.set(`${group.rId}::s${sectionIndex}`, result);
+        }
+    } catch (error) {
+      console.warn(`[PresentationEditor] Failed to layout ${kind} rId=${group.rId}:`, error);
     }
+  }
 }
 function dropCursor(options = {}) {
   return new Plugin({ view(editorView) {
@@ -143527,11 +143710,13 @@ var Node$13 = class Node$14 {
       return;
     }
     if ((this.#deps.getHeaderFooterSession()?.session?.mode ?? "body") !== "body") {
-      if (this.#handleClickInHeaderFooterMode(event, x2, y$1))
+      if (this.#handleClickInHeaderFooterMode(event, x2, y$1, normalizedPoint.pageIndex, normalizedPoint.pageLocalY))
         return;
     }
-    if (this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1))
+    if (this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1, normalizedPoint.pageIndex, normalizedPoint.pageLocalY)) {
+      event.preventDefault();
       return;
+    }
     const viewportHost = this.#deps.getViewportHost();
     const pageGeometryHelper = this.#deps.getPageGeometryHelper();
     const rawHit = clickToPosition(layoutState.layout, layoutState.blocks, layoutState.measures, {
@@ -143758,15 +143943,10 @@ var Node$13 = class Node$14 {
     }
     if (!this.#deps.getLayoutState().layout)
       return;
-    const viewportHost = this.#deps.getViewportHost();
-    const visibleHost = this.#deps.getVisibleHost();
-    const zoom = this.#deps.getZoom();
-    const rect = viewportHost.getBoundingClientRect();
-    const scrollLeft = visibleHost.scrollLeft ?? 0;
-    const scrollTop = visibleHost.scrollTop ?? 0;
-    const x2 = (event.clientX - rect.left + scrollLeft) / zoom;
-    const y$1 = (event.clientY - rect.top + scrollTop) / zoom;
-    const region = this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1);
+    const normalized = this.#callbacks.normalizeClientPoint?.(event.clientX, event.clientY);
+    if (!normalized)
+      return;
+    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (region) {
       event.preventDefault();
       event.stopPropagation();
@@ -144020,15 +144200,15 @@ var Node$13 = class Node$14 {
       document.activeElement.blur();
     this.#focusEditorAtFirstPosition();
   }
-  #handleClickInHeaderFooterMode(event, x2, y$1) {
+  #handleClickInHeaderFooterMode(event, x2, y$1, pageIndex, pageLocalY) {
     const activeEditorHost = this.#deps?.getHeaderFooterSession()?.overlayManager?.getActiveEditorHost?.();
     if (activeEditorHost && (activeEditorHost.contains(event.target) || activeEditorHost === event.target))
       return true;
-    if (!this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1)) {
+    if (!this.#callbacks.hitTestHeaderFooterRegion?.(x2, y$1, pageIndex, pageLocalY)) {
       this.#callbacks.exitHeaderFooterMode?.();
       return false;
     }
-    return true;
+    return false;
   }
   #handleInlineImageClick(event, targetImg, rawHit, doc$2, epochMapper) {
     if (!targetImg)
@@ -144230,7 +144410,7 @@ var Node$13 = class Node$14 {
       this.#callbacks.clearHoverRegion?.();
       return;
     }
-    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y);
+    const region = this.#callbacks.hitTestHeaderFooterRegion?.(normalized.x, normalized.y, normalized.pageIndex, normalized.pageLocalY);
     if (!region) {
       this.#callbacks.clearHoverRegion?.();
       return;
@@ -145000,6 +145180,7 @@ var Node$13 = class Node$14 {
     pm.style.minHeight = "100%";
     pm.style.outline = "none";
     pm.style.border = "none";
+    pm.classList.add("sd-header-footer");
     pm.setAttribute("role", "textbox");
     pm.setAttribute("aria-multiline", true);
     pm.setAttribute("aria-label", `${type} content area. Double click to start typing.`);
@@ -145242,7 +145423,7 @@ var Node$13 = class Node$14 {
         position: "absolute",
         pointerEvents: "auto",
         visibility: "hidden",
-        overflow: "hidden",
+        overflow: "visible",
         boxSizing: "border-box"
       });
       if (decorationContainer)
@@ -145669,12 +145850,14 @@ var Node$13 = class Node$14 {
       const actualPageHeight = page.size?.h ?? pageHeight;
       const headerPayload = this.#headerDecorationProvider?.(page.number, margins, page);
       const headerBox = this.#computeDecorationBox("header", margins, actualPageHeight);
+      const displayPageNumber = page.numberText ?? String(page.number);
       this.#headerRegions.set(pageIndex, {
         kind: "header",
         headerId: headerPayload?.headerId,
         sectionType: headerPayload?.sectionType ?? this.#computeExpectedSectionType("header", page, sectionFirstPageNumbers),
         pageIndex,
         pageNumber: page.number,
+        displayPageNumber,
         localX: headerPayload?.hitRegion?.x ?? headerBox.x,
         localY: headerPayload?.hitRegion?.y ?? headerBox.offset,
         width: headerPayload?.hitRegion?.width ?? headerBox.width,
@@ -145689,6 +145872,7 @@ var Node$13 = class Node$14 {
         sectionType: footerPayload?.sectionType ?? this.#computeExpectedSectionType("footer", page, sectionFirstPageNumbers),
         pageIndex,
         pageNumber: page.number,
+        displayPageNumber,
         localX: footerPayload?.hitRegion?.x ?? footerBox.x,
         localY: footerPayload?.hitRegion?.y ?? footerBox.offset,
         width: footerPayload?.hitRegion?.width ?? footerBox.width,
@@ -145698,16 +145882,29 @@ var Node$13 = class Node$14 {
       });
     });
   }
-  hitTestRegion(x2, y$1, layout) {
+  hitTestRegion(x2, y$1, layout, knownPageIndex, knownPageLocalY) {
     if (!layout)
       return null;
     const layoutOptions = this.#deps?.getLayoutOptions() ?? {};
-    const pageHeight = layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? this.#options.defaultPageSize.h;
+    const defaultPageHeight = layout.pageSize?.h ?? layoutOptions.pageSize?.h ?? this.#options.defaultPageSize.h;
     const pageGap = layout.pageGap ?? 0;
-    if (pageHeight <= 0)
+    if (defaultPageHeight <= 0)
       return null;
-    const pageIndex = Math.max(0, Math.floor(y$1 / (pageHeight + pageGap)));
-    const pageLocalY = y$1 - pageIndex * (pageHeight + pageGap);
+    let pageIndex;
+    let pageLocalY;
+    if (knownPageIndex != null && knownPageLocalY != null) {
+      pageIndex = knownPageIndex;
+      pageLocalY = knownPageLocalY;
+    } else if (knownPageIndex != null) {
+      pageIndex = knownPageIndex;
+      let pageTopY = 0;
+      for (let i$1 = 0;i$1 < pageIndex && i$1 < layout.pages.length; i$1++)
+        pageTopY += (layout.pages[i$1].size?.h ?? defaultPageHeight) + pageGap;
+      pageLocalY = y$1 - pageTopY;
+    } else {
+      pageIndex = Math.max(0, Math.floor(y$1 / (defaultPageHeight + pageGap)));
+      pageLocalY = y$1 - pageIndex * (defaultPageHeight + pageGap);
+    }
     const headerRegion = this.#headerRegions.get(pageIndex);
     if (headerRegion && this.#pointInRegion(headerRegion, x2, pageLocalY))
       return headerRegion;
@@ -145795,6 +145992,15 @@ var Node$13 = class Node$14 {
         this.clearHover();
         return;
       }
+      if (this.#session.mode !== "body") {
+        if (this.#activeEditor) {
+          this.#activeEditor.setEditable(false);
+          this.#activeEditor.setOptions({ documentMode: "viewing" });
+        }
+        this.#overlayManager.hideEditingOverlay();
+        this.#activeEditor = null;
+        this.#session = { mode: "body" };
+      }
       const descriptor = this.#resolveDescriptorForRegion(region);
       if (!descriptor) {
         console.warn("[HeaderFooterSessionManager] No descriptor found for region:", region);
@@ -145849,7 +146055,7 @@ var Node$13 = class Node$14 {
         });
         return;
       }
-      const layout = this.#headerLayoutResults?.[0]?.layout;
+      const bodyPageCount = this.#deps?.getBodyPageCount() ?? 1;
       let editor;
       try {
         editor = await this.#headerFooterManager.ensureEditor(descriptor, {
@@ -145857,7 +146063,7 @@ var Node$13 = class Node$14 {
           availableWidth: region.width,
           availableHeight: region.height,
           currentPageNumber: region.pageNumber,
-          totalPageCount: layout?.pages?.length ?? 1
+          totalPageCount: bodyPageCount
         });
       } catch (editorError) {
         console.error("[HeaderFooterSessionManager] Error creating editor:", editorError);
@@ -146310,8 +146516,10 @@ var Node$13 = class Node$14 {
       }
       if (!headerFooterType)
         return null;
-      if (sectionRId && layoutsByRId.has(sectionRId)) {
-        const rIdLayout = layoutsByRId.get(sectionRId);
+      const compositeKey = sectionRId ? `${sectionRId}::s${sectionIndex}` : undefined;
+      const rIdLayoutKey = compositeKey && layoutsByRId.has(compositeKey) && compositeKey || sectionRId && layoutsByRId.has(sectionRId) && sectionRId || undefined;
+      if (rIdLayoutKey) {
+        const rIdLayout = layoutsByRId.get(rIdLayoutKey);
         if (!rIdLayout)
           console.warn(`[HeaderFooterSessionManager] Inconsistent state: layoutsByRId.has('${sectionRId}') returned true but get() returned undefined`);
         else {
@@ -146322,6 +146530,7 @@ var Node$13 = class Node$14 {
             const margins$1 = pageMargins ?? layout.pages[0]?.margins ?? layoutOptions.margins ?? defaultMargins;
             const decorationMargins$1 = kind === "footer" ? this.#stripFootnoteReserveFromBottomMargin(margins$1, page ?? null) : margins$1;
             const box$1 = this.#computeDecorationBox(kind, decorationMargins$1, pageHeight$1);
+            const effectiveWidth = rIdLayout.effectiveWidth ?? box$1.width;
             const rawLayoutHeight$1 = rIdLayout.layout.height ?? 0;
             const metrics$1 = this.#computeMetrics(kind, rawLayoutHeight$1, box$1, pageHeight$1, margins$1?.footer ?? 0);
             const layoutMinY$1 = rIdLayout.layout.minY ?? 0;
@@ -146334,20 +146543,20 @@ var Node$13 = class Node$14 {
               contentHeight: metrics$1.layoutHeight > 0 ? metrics$1.layoutHeight : metrics$1.containerHeight,
               offset: metrics$1.offset,
               marginLeft: box$1.x,
-              contentWidth: box$1.width,
+              contentWidth: effectiveWidth,
               headerId: sectionRId,
               sectionType: headerFooterType,
               minY: layoutMinY$1,
               box: {
                 x: box$1.x,
                 y: metrics$1.offset,
-                width: box$1.width,
+                width: effectiveWidth,
                 height: metrics$1.containerHeight
               },
               hitRegion: {
                 x: box$1.x,
                 y: metrics$1.offset,
-                width: box$1.width,
+                width: effectiveWidth,
                 height: metrics$1.containerHeight
               }
             };
@@ -148922,7 +149131,7 @@ var Node$13 = class Node$14 {
       };
     case "total-page-number":
       return {
-        text: editor.options.parentEditor?.currentTotalPages || "1",
+        text: editor.options.totalPageCount || editor.options.parentEditor?.currentTotalPages || "1",
         className: "sd-editor-auto-total-pages",
         dataId: "auto-total-pages",
         ariaLabel: "Total page count node"
@@ -148984,6 +149193,10 @@ var Node$13 = class Node$14 {
     if (!incomingType || incomingType !== currentType)
       return false;
     this.node = node3;
+    const attrs = getNodeAttributes(this.node.type.name, this.editor);
+    const newText = String(attrs.text);
+    if (this.dom.textContent !== newText)
+      this.dom.textContent = newText;
     return true;
   }
 }, getMarksFromNeighbors = (currentPos, view) => {
@@ -152132,9 +152345,9 @@ var Node$13 = class Node$14 {
     trackedChanges: context.trackedChanges ?? []
   });
 }, _hoisted_1$6, _hoisted_2$1, _hoisted_3, _hoisted_4, ContextMenu_default, _hoisted_1$5, BasicUpload_default, _hoisted_1$4, MIN_WIDTH = 200, PPI = 96, alignment = "flex-end", Ruler_default, GenericPopover_default, _hoisted_1$3, RESIZE_HANDLE_WIDTH_PX = 9, RESIZE_HANDLE_OFFSET_PX = 4, DRAG_OVERLAY_EXTENSION_PX = 1000, MIN_DRAG_OVERLAY_WIDTH_PX = 2000, THROTTLE_INTERVAL_MS = 16, MIN_RESIZE_DELTA_PX = 1, TableResizeOverlay_default, _hoisted_1$2, OVERLAY_EXPANSION_PX = 2000, RESIZE_HANDLE_SIZE_PX = 12, MOUSE_MOVE_THROTTLE_MS = 16, DIMENSION_CHANGE_THRESHOLD_PX = 1, Z_INDEX_OVERLAY = 10, Z_INDEX_HANDLE = 15, Z_INDEX_GUIDELINE = 20, ImageResizeOverlay_default, LINK_CLICK_DEBOUNCE_MS = 300, CURSOR_UPDATE_TIMEOUT_MS = 10, LinkClickHandler_default, _hoisted_1$1, _hoisted_2, DOCX2 = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", TABLE_RESIZE_HOVER_THRESHOLD = 8, TABLE_RESIZE_THROTTLE_MS = 16, SuperEditor_default, _hoisted_1, SuperInput_default, SlashMenu, Extensions;
-var init_src_CYnAk7Cg_es = __esm(() => {
+var init_src_eL3w4G7e_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
-  init_SuperConverter_D9XMPi6H_es();
+  init_SuperConverter_Cf1y7bFA_es();
   init_jszip_ChlR43oI_es();
   init_uuid_2IzDu5nl_es();
   init_constants_DBKi0Amm_es();
@@ -170753,8 +170966,10 @@ function print() { __p += __j.call(arguments, '') }
             updateOptions.availableWidth = options.availableWidth;
           if (options.availableHeight !== undefined)
             updateOptions.availableHeight = options.availableHeight;
-          if (Object.keys(updateOptions).length > 0)
+          if (Object.keys(updateOptions).length > 0) {
             existing.editor.setOptions(updateOptions);
+            this.#refreshPageNumberDisplay(existing.editor);
+          }
         }
         return existing.editor;
       }
@@ -170785,6 +171000,25 @@ function print() { __p += __j.call(arguments, '') }
       this.#pendingCreations.set(descriptor.id, creationPromise);
       return creationPromise;
     }
+    #refreshPageNumberDisplay(editor) {
+      const container = editor.view?.dom;
+      if (!container)
+        return;
+      const opts = editor.options;
+      const parentEditor = opts.parentEditor;
+      const currentPage = String(opts.currentPageNumber || "1");
+      const totalPages = String(opts.totalPageCount || parentEditor?.currentTotalPages || "1");
+      const pageNumberEls = container.querySelectorAll('[data-id="auto-page-number"]');
+      const totalPagesEls = container.querySelectorAll('[data-id="auto-total-pages"]');
+      pageNumberEls.forEach((el) => {
+        if (el.textContent !== currentPage)
+          el.textContent = currentPage;
+      });
+      totalPagesEls.forEach((el) => {
+        if (el.textContent !== totalPages)
+          el.textContent = totalPages;
+      });
+    }
     getEditor(descriptor) {
       if (!descriptor?.id)
         return null;
@@ -172465,7 +172699,7 @@ function print() { __p += __j.call(arguments, '') }
         goToAnchor: (href) => this.goToAnchor(href),
         emit: (event, payload) => this.emit(event, payload),
         normalizeClientPoint: (clientX, clientY) => this.#normalizeClientPoint(clientX, clientY),
-        hitTestHeaderFooterRegion: (x2, y$1) => this.#hitTestHeaderFooterRegion(x2, y$1),
+        hitTestHeaderFooterRegion: (x2, y$1, pageIndex, pageLocalY) => this.#hitTestHeaderFooterRegion(x2, y$1, pageIndex, pageLocalY),
         exitHeaderFooterMode: () => this.#exitHeaderFooterMode(),
         activateHeaderFooterRegion: (region) => this.#activateHeaderFooterRegion(region),
         createDefaultHeaderFooter: (region) => this.#createDefaultHeaderFooter(region),
@@ -172588,7 +172822,8 @@ function print() { __p += __j.call(arguments, '') }
         scheduleRerender: () => this.#scheduleRerender(),
         setPendingDocChange: () => {
           this.#pendingDocChange = true;
-        }
+        },
+        getBodyPageCount: () => this.#layoutState?.layout?.pages?.length ?? 1
       });
       this.#headerFooterSession.setCallbacks({
         onModeChanged: (session) => {
@@ -173504,8 +173739,8 @@ function print() { __p += __j.call(arguments, '') }
     #updateDecorationProviders(layout) {
       this.#headerFooterSession?.updateDecorationProviders(layout);
     }
-    #hitTestHeaderFooterRegion(x2, y$1) {
-      return this.#headerFooterSession?.hitTestRegion(x2, y$1, this.#layoutState.layout) ?? null;
+    #hitTestHeaderFooterRegion(x2, y$1, pageIndex, pageLocalY) {
+      return this.#headerFooterSession?.hitTestRegion(x2, y$1, this.#layoutState.layout, pageIndex, pageLocalY) ?? null;
     }
     #activateHeaderFooterRegion(region) {
       this.#headerFooterSession?.activateRegion(region);
@@ -178257,7 +178492,7 @@ function print() { __p += __j.call(arguments, '') }
         const { schema } = state;
         if (!schema.nodes?.["total-page-number"])
           return false;
-        const currentPages = editor?.options?.parentEditor?.currentTotalPages || 1;
+        const currentPages = editor?.options?.totalPageCount || editor?.options?.parentEditor?.currentTotalPages || 1;
         const pageNumberNode = {
           type: "total-page-number",
           content: [{
@@ -183582,8 +183817,8 @@ function print() { __p += __j.call(arguments, '') }
     return isObjectLike_default(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
   };
   stubFalse_default = stubFalse;
-  freeExports$2 = typeof exports_src_CYnAk7Cg_es == "object" && exports_src_CYnAk7Cg_es && !exports_src_CYnAk7Cg_es.nodeType && exports_src_CYnAk7Cg_es;
-  freeModule$2 = freeExports$2 && typeof module_src_CYnAk7Cg_es == "object" && module_src_CYnAk7Cg_es && !module_src_CYnAk7Cg_es.nodeType && module_src_CYnAk7Cg_es;
+  freeExports$2 = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule$2 = freeExports$2 && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   Buffer$1 = freeModule$2 && freeModule$2.exports === freeExports$2 ? _root_default.Buffer : undefined;
   isBuffer_default = (Buffer$1 ? Buffer$1.isBuffer : undefined) || stubFalse_default;
   typedArrayTags = {};
@@ -183591,8 +183826,8 @@ function print() { __p += __j.call(arguments, '') }
   typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$1] = typedArrayTags[boolTag$1] = typedArrayTags[dataViewTag$2] = typedArrayTags[dateTag$1] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag] = typedArrayTags[mapTag$2] = typedArrayTags[numberTag$1] = typedArrayTags[objectTag$3] = typedArrayTags[regexpTag$1] = typedArrayTags[setTag$2] = typedArrayTags[stringTag$1] = typedArrayTags[weakMapTag$1] = false;
   _baseIsTypedArray_default = baseIsTypedArray;
   _baseUnary_default = baseUnary;
-  freeExports$1 = typeof exports_src_CYnAk7Cg_es == "object" && exports_src_CYnAk7Cg_es && !exports_src_CYnAk7Cg_es.nodeType && exports_src_CYnAk7Cg_es;
-  freeModule$1 = freeExports$1 && typeof module_src_CYnAk7Cg_es == "object" && module_src_CYnAk7Cg_es && !module_src_CYnAk7Cg_es.nodeType && module_src_CYnAk7Cg_es;
+  freeExports$1 = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule$1 = freeExports$1 && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   freeProcess = freeModule$1 && freeModule$1.exports === freeExports$1 && _freeGlobal_default.process;
   _nodeUtil_default = function() {
     try {
@@ -183697,8 +183932,8 @@ function print() { __p += __j.call(arguments, '') }
   Stack.prototype.has = _stackHas_default;
   Stack.prototype.set = _stackSet_default;
   _Stack_default = Stack;
-  freeExports = typeof exports_src_CYnAk7Cg_es == "object" && exports_src_CYnAk7Cg_es && !exports_src_CYnAk7Cg_es.nodeType && exports_src_CYnAk7Cg_es;
-  freeModule = freeExports && typeof module_src_CYnAk7Cg_es == "object" && module_src_CYnAk7Cg_es && !module_src_CYnAk7Cg_es.nodeType && module_src_CYnAk7Cg_es;
+  freeExports = typeof exports_src_eL3w4G7e_es == "object" && exports_src_eL3w4G7e_es && !exports_src_eL3w4G7e_es.nodeType && exports_src_eL3w4G7e_es;
+  freeModule = freeExports && typeof module_src_eL3w4G7e_es == "object" && module_src_eL3w4G7e_es && !module_src_eL3w4G7e_es.nodeType && module_src_eL3w4G7e_es;
   Buffer4 = freeModule && freeModule.exports === freeExports ? _root_default.Buffer : undefined;
   allocUnsafe = Buffer4 ? Buffer4.allocUnsafe : undefined;
   _cloneBuffer_default = cloneBuffer;
@@ -191317,8 +191552,8 @@ var init_zipper_BJHqrQMq_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CYnAk7Cg_es();
-  init_SuperConverter_D9XMPi6H_es();
+  init_src_eL3w4G7e_es();
+  init_SuperConverter_Cf1y7bFA_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_DLE8mr0n_es();
   init_constants_DBKi0Amm_es();
@@ -219406,6 +219641,18 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES3, shouldSkipFieldProcessing3 = (node3) => S
         i4++;
         continue;
       }
+      const childElements = node3.elements || [];
+      if (childElements.length > 0) {
+        for (const child of childElements) {
+          if (Array.isArray(child.elements)) {
+            const childResult = preProcessPageFieldsOnly2(child.elements, depth + 1);
+            child.elements = childResult.processedNodes;
+          }
+          processedNodes.push(child);
+        }
+        i4++;
+        continue;
+      }
     }
     if (fldType === "begin") {
       const fieldInfo = scanFieldSequence2(nodes, i4);
@@ -219431,6 +219678,13 @@ var SKIP_FIELD_PROCESSING_NODE_NAMES3, shouldSkipFieldProcessing3 = (node3) => S
         }
       }
     }
+    if (node3.name === "w:r" && node3.elements?.some((el) => el.name === "w:pgNum")) {
+      const rPr = node3.elements.find((el) => el.name === "w:rPr") || null;
+      const processedField = preProcessPageInstruction2([], "", rPr);
+      processedNodes.push(...processedField);
+      i4++;
+      continue;
+    }
     if (Array.isArray(node3.elements)) {
       const childResult = preProcessPageFieldsOnly2(node3.elements, depth + 1);
       node3.elements = childResult.processedNodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.2.0-next.2",
+  "version": "0.2.0-next.3",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -28,11 +28,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.2",
-    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.2",
-    "@superdoc-dev/cli-linux-x64": "0.2.0-next.2",
-    "@superdoc-dev/cli-windows-x64": "0.2.0-next.2",
-    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.2"
+    "@superdoc-dev/cli-darwin-arm64": "0.2.0-next.3",
+    "@superdoc-dev/cli-darwin-x64": "0.2.0-next.3",
+    "@superdoc-dev/cli-linux-arm64": "0.2.0-next.3",
+    "@superdoc-dev/cli-windows-x64": "0.2.0-next.3",
+    "@superdoc-dev/cli-linux-x64": "0.2.0-next.3"
   },
   "scripts": {
     "dev": "bun run src/index.ts",