@harbour-enterprises/superdoc 1.3.0-next.5 → 1.3.0-next.6

package/dist/chunks/{PdfViewer-CvoctNPw.cjs → PdfViewer-0pJuKd1x.cjs}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("./vue-De9wkgLl.cjs");
-const superdoc = require("./index-79lZpkMi.cjs");
-const index = require("./index-BHIGTNEQ.cjs");
+const superdoc = require("./index-CEDW4NYV.cjs");
+const index = require("./index-C4RVDXKX.cjs");
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{PdfViewer-Dbc_J_1L.es.js → PdfViewer-oYYAvC47.es.js}

@@ -1,6 +1,6 @@
 import { d as defineComponent, h, T as Transition, p as process$1, w as watchEffect, c as computed, r as ref, f as onMounted, X as onUnmounted, E as createElementBlock, G as openBlock, K as createBaseVNode, M as createCommentVNode, I as createVNode, v as unref } from "./vue-BnBKJwCW.es.js";
-import { N as NBaseLoading, u as useSuperdocStore, s as storeToRefs, a as useSelection } from "./index-B697vddF.es.js";
-import { C as derived, r as c, q as cB, aF as fadeInTransition, y as cM, I as warnOnce, J as useConfig, N as useTheme, aG as pxfy, P as createKey, Q as useThemeClass, aH as useCompitable, ai as _export_sfc } from "./index-BSxlafD_.es.js";
+import { N as NBaseLoading, u as useSuperdocStore, s as storeToRefs, a as useSelection } from "./index-9qGjdWOS.es.js";
+import { C as derived, r as c, q as cB, aF as fadeInTransition, y as cM, I as warnOnce, J as useConfig, N as useTheme, aG as pxfy, P as createKey, Q as useThemeClass, aH as useCompitable, ai as _export_sfc } from "./index-CqbujvlE.es.js";
 function self(vars) {
   const {
     opacityDisabled,

package/dist/chunks/{SuperConverter-tcg6NQjY.cjs → SuperConverter-BdOf8skU.cjs}

@@ -30939,7 +30939,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.5") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.6") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**

package/dist/chunks/{SuperConverter-DMbipzpl.es.js → SuperConverter-S9b1fFw5.es.js}

@@ -30938,7 +30938,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.5") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.6") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**

package/dist/chunks/{index-B697vddF.es.js → index-9qGjdWOS.es.js}

@@ -1,5 +1,5 @@
-import { B as BIT8, M as MAX_SAFE_INTEGER, c as create, a as BITS7, u as utf8TextDecoder, b as create$1, s as setIfUndefined, d as create$2, f as from, e as floor$1, g as equalityDeep, w as writeVarUint, h as writeVarString, t as toUint8Array, i as createEncoder, j as createInjectionKey, k as toString, l as throwError, m as useSsrAdapter, n as configProviderInjectionKey, o as cssrAnchorMetaName, p as globalStyle, q as cB, r as c, v as isMounted, x as commonVariables$2, y as cM, z as cNotM, A as cE, C as derived, D as changeColor, E as insideModal, F as insidePopover, G as resolveWrappedSlot, H as on, I as warnOnce, J as useConfig, K as useMergedState, L as useMemo, N as useTheme, O as useRtl, P as createKey, Q as useThemeClass, R as createId, S as call, T as render, U as messageProviderInjectionKey, V as messageApiInjectionKey, W as fromBase64, X as onChange, Y as varStorage, Z as toBase64, _ as createUint8ArrayFromArrayBuffer, $ as offChange, a0 as writeVarUint8Array, a1 as map, a2 as length, a3 as isNode, a4 as min, a5 as pow, a6 as comments_module_events, a7 as getFileObject, a8 as getTrackChanges, a9 as CommentsPluginKey, aa as TrackChangesBasePluginKey, ab as Editor, ac as getRichTextExtensions, ad as ellipsisVerticalSvg, ae as xmarkIconSvg, af as checkIconSvg, ag as caretDownIconSvg, ah as commentIconSvg, ai as _export_sfc, aj as NDropdown, ak as SuperInput, al as vClickOutside, am as PresentationEditor, an as SuperEditor, ao as AIWriter, ap as NConfigProvider, aq as SuperToolbar } from "./index-BSxlafD_.es.js";
-import "./SuperConverter-DMbipzpl.es.js";
+import { B as BIT8, M as MAX_SAFE_INTEGER, c as create, a as BITS7, u as utf8TextDecoder, b as create$1, s as setIfUndefined, d as create$2, f as from, e as floor$1, g as equalityDeep, w as writeVarUint, h as writeVarString, t as toUint8Array, i as createEncoder, j as createInjectionKey, k as toString, l as throwError, m as useSsrAdapter, n as configProviderInjectionKey, o as cssrAnchorMetaName, p as globalStyle, q as cB, r as c, v as isMounted, x as commonVariables$2, y as cM, z as cNotM, A as cE, C as derived, D as changeColor, E as insideModal, F as insidePopover, G as resolveWrappedSlot, H as on, I as warnOnce, J as useConfig, K as useMergedState, L as useMemo, N as useTheme, O as useRtl, P as createKey, Q as useThemeClass, R as createId, S as call, T as render, U as messageProviderInjectionKey, V as messageApiInjectionKey, W as fromBase64, X as onChange, Y as varStorage, Z as toBase64, _ as createUint8ArrayFromArrayBuffer, $ as offChange, a0 as writeVarUint8Array, a1 as map, a2 as length, a3 as isNode, a4 as min, a5 as pow, a6 as comments_module_events, a7 as getFileObject, a8 as getTrackChanges, a9 as CommentsPluginKey, aa as TrackChangesBasePluginKey, ab as Editor, ac as getRichTextExtensions, ad as ellipsisVerticalSvg, ae as xmarkIconSvg, af as checkIconSvg, ag as caretDownIconSvg, ah as commentIconSvg, ai as _export_sfc, aj as NDropdown, ak as SuperInput, al as vClickOutside, am as PresentationEditor, an as SuperEditor, ao as AIWriter, ap as NConfigProvider, aq as SuperToolbar } from "./index-CqbujvlE.es.js";
+import "./SuperConverter-S9b1fFw5.es.js";
 import { B as BlankDOCX } from "./blank-docx-ABm6XYAA.es.js";
 import { E as EventEmitter } from "./eventemitter3-CwrdEv8r.es.js";
 import { HocuspocusProvider, HocuspocusProviderWebsocket } from "@hocuspocus/provider";
@@ -7444,7 +7444,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-Dbc_J_1L.es.js"));
+    const PdfViewer = defineAsyncComponent(() => import("./PdfViewer-oYYAvC47.es.js"));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -8350,7 +8350,7 @@ class SuperDoc extends EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "1.3.0-next.5";
+    this.version = "1.3.0-next.6";
     this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || v4();
     this.colors = this.config.colors;

package/dist/chunks/{index-BHIGTNEQ.cjs → index-C4RVDXKX.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 const jszip = require("./jszip-C8_CqJxM.cjs");
 const helpers$1 = require("./helpers-nOdwpmwb.cjs");
-const superEditor_converter = require("./SuperConverter-tcg6NQjY.cjs");
+const superEditor_converter = require("./SuperConverter-BdOf8skU.cjs");
 const vue = require("./vue-De9wkgLl.cjs");
 require("./jszip.min-BPh2MMAa.cjs");
 const eventemitter3 = require("./eventemitter3-BQuRcMPI.cjs");
@@ -15351,7 +15351,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.3.0-next.5";
+const summaryVersion = "1.3.0-next.6";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -17984,7 +17984,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.5");
+    console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.6");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -30859,8 +30859,7 @@ function getHeaderFooterTypeForSection(pageNumber, sectionIndex, identifier, opt
   const titlePgEnabled = sectionTitlePg === true;
   const isFirstPageOfSection = sectionPageNumber === 1;
   if (isFirstPageOfSection && titlePgEnabled) {
-    if (hasFirst) return "first";
-    if (!hasDefault && !hasEven && !hasOdd) return null;
+    if (hasFirst || hasDefault || hasEven || hasOdd) return "first";
     return null;
   }
   if (identifier.alternateHeaders) {
@@ -32916,6 +32915,45 @@ function layoutDocument(blocks, measures, options = {}) {
     return height;
   };
   const headerContentHeights = options.headerContentHeights;
+  const footerContentHeights = options.footerContentHeights;
+  const headerContentHeightsByRId = options.headerContentHeightsByRId;
+  const footerContentHeightsByRId = options.footerContentHeightsByRId;
+  const getVariantTypeForPage = (sectionPageNumber, titlePgEnabled, alternateHeaders) => {
+    if (sectionPageNumber === 1 && titlePgEnabled) {
+      return "first";
+    }
+    return "default";
+  };
+  const getHeaderHeightForPage = (variantType, headerRef) => {
+    if (headerRef && headerContentHeightsByRId?.has(headerRef)) {
+      return validateContentHeight(headerContentHeightsByRId.get(headerRef));
+    }
+    if (headerContentHeights) {
+      return validateContentHeight(headerContentHeights[variantType]);
+    }
+    return 0;
+  };
+  const getFooterHeightForPage = (variantType, footerRef) => {
+    if (footerRef && footerContentHeightsByRId?.has(footerRef)) {
+      return validateContentHeight(footerContentHeightsByRId.get(footerRef));
+    }
+    if (footerContentHeights) {
+      return validateContentHeight(footerContentHeights[variantType]);
+    }
+    return 0;
+  };
+  const calculateEffectiveTopMargin = (headerContentHeight, currentHeaderDistance, baseTopMargin) => {
+    if (headerContentHeight > 0) {
+      return Math.max(baseTopMargin, currentHeaderDistance + headerContentHeight);
+    }
+    return baseTopMargin;
+  };
+  const calculateEffectiveBottomMargin = (footerContentHeight, currentFooterDistance, baseBottomMargin) => {
+    if (footerContentHeight > 0) {
+      return Math.max(baseBottomMargin, currentFooterDistance + footerContentHeight);
+    }
+    return baseBottomMargin;
+  };
   const maxHeaderContentHeight = headerContentHeights ? Math.max(
     0,
     validateContentHeight(headerContentHeights.default),
@@ -32923,9 +32961,6 @@ function layoutDocument(blocks, measures, options = {}) {
     validateContentHeight(headerContentHeights.even),
     validateContentHeight(headerContentHeights.odd)
   ) : 0;
-  const headerDistance = margins.header ?? margins.top;
-  const effectiveTopMargin = maxHeaderContentHeight > 0 ? Math.max(margins.top, headerDistance + maxHeaderContentHeight) : margins.top;
-  const footerContentHeights = options.footerContentHeights;
   const maxFooterContentHeight = footerContentHeights ? Math.max(
     0,
     validateContentHeight(footerContentHeights.default),
@@ -32933,8 +32968,12 @@ function layoutDocument(blocks, measures, options = {}) {
     validateContentHeight(footerContentHeights.even),
     validateContentHeight(footerContentHeights.odd)
   ) : 0;
+  const headerDistance = margins.header ?? margins.top;
   const footerDistance = margins.footer ?? margins.bottom;
-  const effectiveBottomMargin = maxFooterContentHeight > 0 ? Math.max(margins.bottom, footerDistance + maxFooterContentHeight) : margins.bottom;
+  const defaultHeaderHeight = getHeaderHeightForPage("default", void 0);
+  const defaultFooterHeight = getFooterHeightForPage("default", void 0);
+  const effectiveTopMargin = calculateEffectiveTopMargin(defaultHeaderHeight, headerDistance, margins.top);
+  const effectiveBottomMargin = calculateEffectiveBottomMargin(defaultFooterHeight, footerDistance, margins.bottom);
   let activeTopMargin = effectiveTopMargin;
   let activeBottomMargin = effectiveBottomMargin;
   let activeLeftMargin = margins.left;
@@ -32943,6 +32982,10 @@ function layoutDocument(blocks, measures, options = {}) {
   let pendingBottomMargin = null;
   let pendingLeftMargin = null;
   let pendingRightMargin = null;
+  let activeSectionBaseTopMargin = margins.top;
+  let activeSectionBaseBottomMargin = margins.bottom;
+  let pendingSectionBaseTopMargin = null;
+  let pendingSectionBaseBottomMargin = null;
   let activeHeaderDistance = margins.header ?? margins.top;
   let pendingHeaderDistance = null;
   let activeFooterDistance = margins.footer ?? margins.bottom;
@@ -33148,6 +33191,7 @@ function layoutDocument(blocks, measures, options = {}) {
   }
   let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
   let pendingSectionIndex = null;
+  const sectionFirstPageNumbers = /* @__PURE__ */ new Map();
   const paginator = createPaginator({
     margins: paginatorMargins,
     getActiveTopMargin: () => activeTopMargin,
@@ -33161,6 +33205,7 @@ function layoutDocument(blocks, measures, options = {}) {
     createPage,
     onNewPage: (state) => {
       if (!state) {
+        const isEnteringNewSection = pendingSectionIndex !== null;
         const applied = applyPendingToActive({
           activeTopMargin,
           activeBottomMargin,
@@ -33228,7 +33273,69 @@ function layoutDocument(blocks, measures, options = {}) {
           activeVAlign = pendingVAlign;
           pendingVAlign = null;
         }
+        if (pendingSectionBaseTopMargin !== null) {
+          activeSectionBaseTopMargin = pendingSectionBaseTopMargin;
+          pendingSectionBaseTopMargin = null;
+        }
+        if (pendingSectionBaseBottomMargin !== null) {
+          activeSectionBaseBottomMargin = pendingSectionBaseBottomMargin;
+          pendingSectionBaseBottomMargin = null;
+        }
         pageCount += 1;
+        const newPageNumber = pageCount;
+        if (isEnteringNewSection || !sectionFirstPageNumbers.has(activeSectionIndex)) {
+          sectionFirstPageNumbers.set(activeSectionIndex, newPageNumber);
+        }
+        const firstPageInSection = sectionFirstPageNumbers.get(activeSectionIndex) ?? newPageNumber;
+        const sectionPageNumber = newPageNumber - firstPageInSection + 1;
+        const sectionMetadata = sectionMetadataList[activeSectionIndex];
+        const titlePgEnabled = sectionMetadata?.titlePg ?? false;
+        const variantType = getVariantTypeForPage(sectionPageNumber, titlePgEnabled);
+        let headerRef = activeSectionRefs?.headerRefs?.[variantType];
+        let footerRef = activeSectionRefs?.footerRefs?.[variantType];
+        let effectiveVariantType = variantType;
+        if (!headerRef && variantType !== "default" && activeSectionIndex > 0) {
+          const prevSectionMetadata = sectionMetadataList[activeSectionIndex - 1];
+          if (prevSectionMetadata?.headerRefs?.[variantType]) {
+            headerRef = prevSectionMetadata.headerRefs[variantType];
+            layoutLog(
+              `[Layout] Page ${newPageNumber}: Inheriting header '${variantType}' from section ${activeSectionIndex - 1}: ${headerRef}`
+            );
+          }
+        }
+        if (!footerRef && variantType !== "default" && activeSectionIndex > 0) {
+          const prevSectionMetadata = sectionMetadataList[activeSectionIndex - 1];
+          if (prevSectionMetadata?.footerRefs?.[variantType]) {
+            footerRef = prevSectionMetadata.footerRefs[variantType];
+            layoutLog(
+              `[Layout] Page ${newPageNumber}: Inheriting footer '${variantType}' from section ${activeSectionIndex - 1}: ${footerRef}`
+            );
+          }
+        }
+        if (!headerRef && variantType !== "default" && activeSectionRefs?.headerRefs?.default) {
+          headerRef = activeSectionRefs.headerRefs.default;
+          effectiveVariantType = "default";
+        }
+        if (!footerRef && variantType !== "default" && activeSectionRefs?.footerRefs?.default) {
+          footerRef = activeSectionRefs.footerRefs.default;
+        }
+        const headerHeight = getHeaderHeightForPage(effectiveVariantType, headerRef);
+        const footerHeight = getFooterHeightForPage(
+          variantType !== "default" && !activeSectionRefs?.footerRefs?.[variantType] ? "default" : variantType,
+          footerRef
+        );
+        activeTopMargin = calculateEffectiveTopMargin(headerHeight, activeHeaderDistance, activeSectionBaseTopMargin);
+        activeBottomMargin = calculateEffectiveBottomMargin(
+          footerHeight,
+          activeFooterDistance,
+          activeSectionBaseBottomMargin
+        );
+        layoutLog(
+          `[Layout] Page ${newPageNumber}: Using variant '${variantType}' - headerHeight: ${headerHeight}, footerHeight: ${footerHeight}`
+        );
+        layoutLog(
+          `[Layout] Page ${newPageNumber}: Adjusted margins - top: ${activeTopMargin}, bottom: ${activeBottomMargin} (base: ${activeSectionBaseTopMargin}, ${activeSectionBaseBottomMargin})`
+        );
         return;
       }
       if (state?.page) {
@@ -33434,6 +33541,20 @@ function layoutDocument(blocks, measures, options = {}) {
       pendingColumns = updatedState.pendingColumns;
       activeOrientation = updatedState.activeOrientation;
       pendingOrientation = updatedState.pendingOrientation;
+      const isFirstSection = effectiveBlock.attrs?.isFirstSection && states.length === 0;
+      const blockTopMargin = effectiveBlock.margins?.top;
+      const blockBottomMargin = effectiveBlock.margins?.bottom;
+      if (isFirstSection) {
+        activeSectionBaseTopMargin = typeof blockTopMargin === "number" ? blockTopMargin : margins.top;
+        activeSectionBaseBottomMargin = typeof blockBottomMargin === "number" ? blockBottomMargin : margins.bottom;
+      } else if (blockTopMargin !== void 0 || blockBottomMargin !== void 0) {
+        if (blockTopMargin !== void 0) {
+          pendingSectionBaseTopMargin = typeof blockTopMargin === "number" ? blockTopMargin : margins.top;
+        }
+        if (blockBottomMargin !== void 0) {
+          pendingSectionBaseBottomMargin = typeof blockBottomMargin === "number" ? blockBottomMargin : margins.bottom;
+        }
+      }
       if (effectiveBlock.vAlign) {
         const isFirstSection2 = effectiveBlock.attrs?.isFirstSection && states.length === 0;
         if (isFirstSection2) {
@@ -33452,7 +33573,6 @@ function layoutDocument(blocks, measures, options = {}) {
       }
       const sectionIndexRaw = effectiveBlock.attrs?.sectionIndex;
       const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
-      const isFirstSection = effectiveBlock.attrs?.isFirstSection && states.length === 0;
       if (Number.isFinite(metadataIndex)) {
         if (isFirstSection) {
           activeSectionIndex = metadataIndex;
@@ -35640,6 +35760,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     `[Perf] 4.1 Measure all blocks: ${(measureEnd - measureStart).toFixed(2)}ms (${cacheMisses} measured, ${cacheHits} cached)`
   );
   let headerContentHeights;
+  let headerContentHeightsByRId;
   const hasHeaderBlocks = headerFooter?.headerBlocks && Object.keys(headerFooter.headerBlocks).length > 0;
   const hasHeaderBlocksByRId = headerFooter?.headerBlocksByRId && headerFooter.headerBlocksByRId.size > 0;
   if (headerFooter?.constraints && (hasHeaderBlocks || hasHeaderBlocksByRId)) {
@@ -35679,7 +35800,8 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       }
     }
     if (hasHeaderBlocksByRId && headerFooter.headerBlocksByRId) {
-      for (const [_rId, blocks] of headerFooter.headerBlocksByRId) {
+      headerContentHeightsByRId = /* @__PURE__ */ new Map();
+      for (const [rId, blocks] of headerFooter.headerBlocksByRId) {
         if (!blocks || blocks.length === 0) continue;
         const measureConstraints = {
           maxWidth: headerFooter.constraints.width,
@@ -35691,8 +35813,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
           height: headerFooter.constraints.height
         });
         if (layout2.height > 0) {
-          const currentDefault = headerContentHeights.default ?? 0;
-          headerContentHeights.default = Math.max(currentDefault, layout2.height);
+          headerContentHeightsByRId.set(rId, layout2.height);
         }
       }
     }
@@ -35700,6 +35821,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     perfLog(`[Perf] 4.1.5 Pre-layout headers for height: ${(hfPreEnd - hfPreStart).toFixed(2)}ms`);
   }
   let footerContentHeights;
+  let footerContentHeightsByRId;
   const hasFooterBlocks = headerFooter?.footerBlocks && Object.keys(headerFooter.footerBlocks).length > 0;
   const hasFooterBlocksByRId = headerFooter?.footerBlocksByRId && headerFooter.footerBlocksByRId.size > 0;
   if (headerFooter?.constraints && (hasFooterBlocks || hasFooterBlocksByRId)) {
@@ -35742,7 +35864,8 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
         }
       }
       if (hasFooterBlocksByRId && headerFooter.footerBlocksByRId) {
-        for (const [_rId, blocks] of headerFooter.footerBlocksByRId) {
+        footerContentHeightsByRId = /* @__PURE__ */ new Map();
+        for (const [rId, blocks] of headerFooter.footerBlocksByRId) {
           if (!blocks || blocks.length === 0) continue;
           const measureConstraints = {
             maxWidth: headerFooter.constraints.width,
@@ -35754,8 +35877,7 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
             height: headerFooter.constraints.height
           });
           if (layout2.height > 0) {
-            const currentDefault = footerContentHeights.default ?? 0;
-            footerContentHeights.default = Math.max(currentDefault, layout2.height);
+            footerContentHeightsByRId.set(rId, layout2.height);
           }
         }
       }
@@ -35770,9 +35892,13 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
   let layout = layoutDocument(nextBlocks, measures, {
     ...options,
     headerContentHeights,
-    // Pass header heights to prevent overlap
+    // Pass header heights to prevent overlap (per-variant)
     footerContentHeights,
-    // Pass footer heights to prevent overlap
+    // Pass footer heights to prevent overlap (per-variant)
+    headerContentHeightsByRId,
+    // Pass header heights by rId for per-page margin calculation
+    footerContentHeightsByRId,
+    // Pass footer heights by rId for per-page margin calculation
     remeasureParagraph: (block, maxWidth, firstLineIndent) => remeasureParagraph(block, maxWidth, firstLineIndent)
   });
   const layoutEnd = performance.now();
@@ -35820,9 +35946,13 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
       layout = layoutDocument(currentBlocks, currentMeasures, {
         ...options,
         headerContentHeights,
-        // Pass header heights to prevent overlap
+        // Pass header heights to prevent overlap (per-variant)
         footerContentHeights,
-        // Pass footer heights to prevent overlap
+        // Pass footer heights to prevent overlap (per-variant)
+        headerContentHeightsByRId,
+        // Pass header heights by rId for per-page margin calculation
+        footerContentHeightsByRId,
+        // Pass footer heights by rId for per-page margin calculation
         remeasureParagraph: (block, maxWidth, firstLineIndent) => remeasureParagraph(block, maxWidth, firstLineIndent)
       });
       const relayoutEnd = performance.now();
@@ -53403,7 +53533,26 @@ class PresentationEditor extends EventEmitter {
       const firstPageInSection = sectionFirstPageNumbers.get(sectionIndex);
       const sectionPageNumber = typeof firstPageInSection === "number" ? pageNumber - firstPageInSection + 1 : pageNumber;
       const headerFooterType = multiSectionId ? getHeaderFooterTypeForSection(pageNumber, sectionIndex, multiSectionId, { kind, sectionPageNumber }) : getHeaderFooterType(pageNumber, legacyIdentifier, { kind });
-      const sectionRId = page?.sectionRefs && kind === "header" ? page.sectionRefs.headerRefs?.[headerFooterType] ?? void 0 : page?.sectionRefs && kind === "footer" ? page.sectionRefs.footerRefs?.[headerFooterType] ?? void 0 : void 0;
+      let sectionRId;
+      if (page?.sectionRefs && kind === "header") {
+        sectionRId = page.sectionRefs.headerRefs?.[headerFooterType];
+        if (!sectionRId && headerFooterType && headerFooterType !== "default" && sectionIndex > 0 && multiSectionId) {
+          const prevSectionIds = multiSectionId.sectionHeaderIds.get(sectionIndex - 1);
+          sectionRId = prevSectionIds?.[headerFooterType] ?? void 0;
+        }
+        if (!sectionRId && headerFooterType !== "default") {
+          sectionRId = page.sectionRefs.headerRefs?.default;
+        }
+      } else if (page?.sectionRefs && kind === "footer") {
+        sectionRId = page.sectionRefs.footerRefs?.[headerFooterType];
+        if (!sectionRId && headerFooterType && headerFooterType !== "default" && sectionIndex > 0 && multiSectionId) {
+          const prevSectionIds = multiSectionId.sectionFooterIds.get(sectionIndex - 1);
+          sectionRId = prevSectionIds?.[headerFooterType] ?? void 0;
+        }
+        if (!sectionRId && headerFooterType !== "default") {
+          sectionRId = page.sectionRefs.footerRefs?.default;
+        }
+      }
       if (!headerFooterType) {
         return null;
       }

package/dist/chunks/{index-79lZpkMi.cjs → index-CEDW4NYV.cjs}

@@ -1,6 +1,6 @@
 "use strict";
-const index = require("./index-BHIGTNEQ.cjs");
-require("./SuperConverter-tcg6NQjY.cjs");
+const index = require("./index-C4RVDXKX.cjs");
+require("./SuperConverter-BdOf8skU.cjs");
 const blankDocx = require("./blank-docx-DfW3Eeh2.cjs");
 const eventemitter3 = require("./eventemitter3-BQuRcMPI.cjs");
 const provider = require("@hocuspocus/provider");
@@ -7461,7 +7461,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-CvoctNPw.cjs")));
+    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-0pJuKd1x.cjs")));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -8367,7 +8367,7 @@ class SuperDoc extends eventemitter3.EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "1.3.0-next.5";
+    this.version = "1.3.0-next.6";
     this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || uuid.v4();
     this.colors = this.config.colors;