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

package/dist/superdoc.umd.js

@@ -36366,7 +36366,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.5") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.6") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -62076,7 +62076,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       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) {
@@ -64710,7 +64710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * 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");
@@ -77585,8 +77585,7 @@ ${l}
     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) {
@@ -79643,6 +79642,45 @@ ${l}
       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),
@@ -79650,9 +79688,6 @@ ${l}
       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),
@@ -79660,8 +79695,12 @@ ${l}
       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;
@@ -79670,6 +79709,10 @@ ${l}
     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;
@@ -79875,6 +79918,7 @@ ${l}
     }
     let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
     let pendingSectionIndex = null;
+    const sectionFirstPageNumbers = /* @__PURE__ */ new Map();
     const paginator = createPaginator({
       margins: paginatorMargins,
       getActiveTopMargin: () => activeTopMargin,
@@ -79888,6 +79932,7 @@ ${l}
       createPage,
       onNewPage: (state) => {
         if (!state) {
+          const isEnteringNewSection = pendingSectionIndex !== null;
           const applied = applyPendingToActive({
             activeTopMargin,
             activeBottomMargin,
@@ -79955,7 +80000,69 @@ ${l}
             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) {
@@ -80161,6 +80268,20 @@ ${l}
         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) {
@@ -80179,7 +80300,6 @@ ${l}
         }
         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;
@@ -82369,6 +82489,7 @@ ${l}
       `[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)) {
@@ -82408,7 +82529,8 @@ ${l}
         }
       }
       if (hasHeaderBlocksByRId && headerFooter.headerBlocksByRId) {
-        for (const [_rId, blocks2] of headerFooter.headerBlocksByRId) {
+        headerContentHeightsByRId = /* @__PURE__ */ new Map();
+        for (const [rId, blocks2] of headerFooter.headerBlocksByRId) {
           if (!blocks2 || blocks2.length === 0) continue;
           const measureConstraints = {
             maxWidth: headerFooter.constraints.width,
@@ -82420,8 +82542,7 @@ ${l}
             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);
           }
         }
       }
@@ -82429,6 +82550,7 @@ ${l}
       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)) {
@@ -82471,7 +82593,8 @@ ${l}
           }
         }
         if (hasFooterBlocksByRId && headerFooter.footerBlocksByRId) {
-          for (const [_rId, blocks2] of headerFooter.footerBlocksByRId) {
+          footerContentHeightsByRId = /* @__PURE__ */ new Map();
+          for (const [rId, blocks2] of headerFooter.footerBlocksByRId) {
             if (!blocks2 || blocks2.length === 0) continue;
             const measureConstraints = {
               maxWidth: headerFooter.constraints.width,
@@ -82483,8 +82606,7 @@ ${l}
               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);
             }
           }
         }
@@ -82499,9 +82621,13 @@ ${l}
     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();
@@ -82549,9 +82675,13 @@ ${l}
         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();
@@ -100036,7 +100166,26 @@ ${l}
         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;
         }
@@ -143864,7 +144013,7 @@ ${reason}`);
       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 = config2.superdocId || v4();
       this.colors = this.config.colors;