@harbour-enterprises/superdoc 2.0.0-next.20 → 2.0.0-next.21

package/dist/superdoc.umd.js

@@ -42468,7 +42468,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "2.0.0-next.20") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "2.0.0-next.21") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -68530,7 +68530,7 @@ ${err.toString()}`);
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "2.0.0-next.20";
+  const summaryVersion = "2.0.0-next.21";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -69319,7 +69319,7 @@ ${err.toString()}`);
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexXnRj2biz),
+        Promise.resolve().then(() => index_W_Fk0WX),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -69524,7 +69524,7 @@ ${err.toString()}`);
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "2.0.0-next.20");
+      console.debug("[checkVersionMigrations] Current editor version", "2.0.0-next.21");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -83083,13 +83083,13 @@ ${l}
       if (maxHeaderContentHeight > 0) {
         return Math.max(baseTop, headerDistance + maxHeaderContentHeight);
       }
-      return Math.max(baseTop, headerDistance);
+      return baseTop;
     };
     const calcRequiredBottomMargin = (footerDistance, baseBottom) => {
       if (maxFooterContentHeight > 0) {
         return Math.max(baseBottom, footerDistance + maxFooterContentHeight);
       }
-      return Math.max(baseBottom, footerDistance);
+      return baseBottom;
     };
     if (block.attrs?.isFirstSection && !next2.hasAnyPages) {
       if (block.pageSize) {
@@ -83590,6 +83590,11 @@ ${l}
           const prevTrailing = state2.trailingSpacing ?? 0;
           const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
           if (state2.cursorY + neededSpacingBefore > state2.contentBottom) {
+            if (state2.cursorY <= state2.topMargin) {
+              state2.trailingSpacing = 0;
+              appliedSpacingBefore = true;
+              break;
+            }
             state2 = advanceColumn(state2);
             if (state2.trailingSpacing == null) state2.trailingSpacing = 0;
             continue;
@@ -84905,12 +84910,12 @@ ${l}
           next2.pendingFooterDistance = footerDistance2;
         }
         if (block.margins?.top !== void 0 || block.margins?.header !== void 0) {
-          const requiredTop = maxHeaderContentHeight > 0 ? headerDistance2 + maxHeaderContentHeight : headerDistance2;
+          const requiredTop = maxHeaderContentHeight > 0 ? headerDistance2 + maxHeaderContentHeight : 0;
           next2.activeTopMargin = Math.max(sectionTop, requiredTop);
           next2.pendingTopMargin = next2.activeTopMargin;
         }
         if (block.margins?.bottom !== void 0 || block.margins?.footer !== void 0) {
-          const requiredBottom = maxFooterContentHeight > 0 ? footerDistance2 + maxFooterContentHeight : footerDistance2;
+          const requiredBottom = maxFooterContentHeight > 0 ? footerDistance2 + maxFooterContentHeight : 0;
           next2.activeBottomMargin = Math.max(sectionBottom, requiredBottom);
           next2.pendingBottomMargin = next2.activeBottomMargin;
         }
@@ -85660,7 +85665,7 @@ ${l}
       throw new Error("layoutHeaderFooter: width must be positive");
     }
     if (!Number.isFinite(height) || height <= 0) {
-      throw new Error("layoutHeaderFooter: height must be positive");
+      return { pages: [], height: 0 };
     }
     const maxBehindDocOverflow = Math.max(192, height * 4);
     const minBehindDocY = -maxBehindDocOverflow;
@@ -87506,7 +87511,9 @@ ${l}
       `[Perf] 4.1 Measure all blocks: ${(measureEnd - measureStart).toFixed(2)}ms (${cacheMisses} measured, ${cacheHits} cached)`
     );
     let headerContentHeights;
-    if (headerFooter?.constraints && headerFooter.headerBlocks) {
+    const hasHeaderBlocks = headerFooter?.headerBlocks && Object.keys(headerFooter.headerBlocks).length > 0;
+    const hasHeaderBlocksByRId = headerFooter?.headerBlocksByRId && headerFooter.headerBlocksByRId.size > 0;
+    if (headerFooter?.constraints && (hasHeaderBlocks || hasHeaderBlocksByRId)) {
       const hfPreStart = performance.now();
       const measureFn = headerFooter.measure ?? measureBlock2;
       invalidateHeaderFooterCache(
@@ -87518,25 +87525,45 @@ ${l}
         options.sectionMetadata
       );
       const HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT = 1;
-      const preHeaderLayouts = await layoutHeaderFooterWithCache(
-        headerFooter.headerBlocks,
-        headerFooter.constraints,
-        measureFn,
-        headerMeasureCache,
-        HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
-        void 0
-        // No page resolver needed for height calculation
-      );
       const isValidHeaderType = (key2) => {
         return ["default", "first", "even", "odd"].includes(key2);
       };
       headerContentHeights = {};
-      for (const [type2, value] of Object.entries(preHeaderLayouts)) {
-        if (!isValidHeaderType(type2)) continue;
-        if (value?.layout && typeof value.layout.height === "number") {
-          const height = value.layout.height;
-          if (Number.isFinite(height) && height >= 0) {
-            headerContentHeights[type2] = height;
+      if (hasHeaderBlocks && headerFooter.headerBlocks) {
+        const preHeaderLayouts = await layoutHeaderFooterWithCache(
+          headerFooter.headerBlocks,
+          headerFooter.constraints,
+          measureFn,
+          headerMeasureCache,
+          HEADER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
+          void 0
+          // No page resolver needed for height calculation
+        );
+        for (const [type2, value] of Object.entries(preHeaderLayouts)) {
+          if (!isValidHeaderType(type2)) continue;
+          if (value?.layout && typeof value.layout.height === "number") {
+            const height = value.layout.height;
+            if (Number.isFinite(height) && height >= 0) {
+              headerContentHeights[type2] = height;
+            }
+          }
+        }
+      }
+      if (hasHeaderBlocksByRId && headerFooter.headerBlocksByRId) {
+        for (const [_rId, blocks2] of headerFooter.headerBlocksByRId) {
+          if (!blocks2 || blocks2.length === 0) continue;
+          const measureConstraints = {
+            maxWidth: headerFooter.constraints.width,
+            maxHeight: headerFooter.constraints.height
+          };
+          const measures2 = await Promise.all(blocks2.map((block) => measureFn(block, measureConstraints)));
+          const layout2 = layoutHeaderFooter(blocks2, measures2, {
+            width: headerFooter.constraints.width,
+            height: headerFooter.constraints.height
+          });
+          if (layout2.height > 0) {
+            const currentDefault = headerContentHeights.default ?? 0;
+            headerContentHeights.default = Math.max(currentDefault, layout2.height);
           }
         }
       }
@@ -87544,10 +87571,12 @@ ${l}
       perfLog(`[Perf] 4.1.5 Pre-layout headers for height: ${(hfPreEnd - hfPreStart).toFixed(2)}ms`);
     }
     let footerContentHeights;
-    if (headerFooter?.constraints && headerFooter.footerBlocks) {
+    const hasFooterBlocks = headerFooter?.footerBlocks && Object.keys(headerFooter.footerBlocks).length > 0;
+    const hasFooterBlocksByRId = headerFooter?.footerBlocksByRId && headerFooter.footerBlocksByRId.size > 0;
+    if (headerFooter?.constraints && (hasFooterBlocks || hasFooterBlocksByRId)) {
       const footerPreStart = performance.now();
       const measureFn = headerFooter.measure ?? measureBlock2;
-      if (!headerFooter.headerBlocks) {
+      if (!hasHeaderBlocks && !hasHeaderBlocksByRId) {
         invalidateHeaderFooterCache(
           headerMeasureCache,
           headerFooterCacheState,
@@ -87558,26 +87587,46 @@ ${l}
         );
       }
       const FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT = 1;
+      const isValidFooterType = (key2) => {
+        return ["default", "first", "even", "odd"].includes(key2);
+      };
+      footerContentHeights = {};
       try {
-        const preFooterLayouts = await layoutHeaderFooterWithCache(
-          headerFooter.footerBlocks,
-          headerFooter.constraints,
-          measureFn,
-          headerMeasureCache,
-          FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
-          void 0
-          // No page resolver needed for height calculation
-        );
-        const isValidFooterType = (key2) => {
-          return ["default", "first", "even", "odd"].includes(key2);
-        };
-        footerContentHeights = {};
-        for (const [type2, value] of Object.entries(preFooterLayouts)) {
-          if (!isValidFooterType(type2)) continue;
-          if (value?.layout && typeof value.layout.height === "number") {
-            const height = value.layout.height;
-            if (Number.isFinite(height) && height >= 0) {
-              footerContentHeights[type2] = height;
+        if (hasFooterBlocks && headerFooter.footerBlocks) {
+          const preFooterLayouts = await layoutHeaderFooterWithCache(
+            headerFooter.footerBlocks,
+            headerFooter.constraints,
+            measureFn,
+            headerMeasureCache,
+            FOOTER_PRELAYOUT_PLACEHOLDER_PAGE_COUNT,
+            void 0
+            // No page resolver needed for height calculation
+          );
+          for (const [type2, value] of Object.entries(preFooterLayouts)) {
+            if (!isValidFooterType(type2)) continue;
+            if (value?.layout && typeof value.layout.height === "number") {
+              const height = value.layout.height;
+              if (Number.isFinite(height) && height >= 0) {
+                footerContentHeights[type2] = height;
+              }
+            }
+          }
+        }
+        if (hasFooterBlocksByRId && headerFooter.footerBlocksByRId) {
+          for (const [_rId, blocks2] of headerFooter.footerBlocksByRId) {
+            if (!blocks2 || blocks2.length === 0) continue;
+            const measureConstraints = {
+              maxWidth: headerFooter.constraints.width,
+              maxHeight: headerFooter.constraints.height
+            };
+            const measures2 = await Promise.all(blocks2.map((block) => measureFn(block, measureConstraints)));
+            const layout2 = layoutHeaderFooter(blocks2, measures2, {
+              width: headerFooter.constraints.width,
+              height: headerFooter.constraints.height
+            });
+            if (layout2.height > 0) {
+              const currentDefault = footerContentHeights.default ?? 0;
+              footerContentHeights.default = Math.max(currentDefault, layout2.height);
             }
           }
         }
@@ -104537,7 +104586,14 @@ ${l}
     const footerMargin = margins.footer ?? 0;
     const headerContentSpace = Math.max(marginTop - headerMargin, 0);
     const footerContentSpace = Math.max(marginBottom - footerMargin, 0);
-    const height = Math.max(headerContentSpace, footerContentSpace, 1);
+    const height = Math.max(
+      headerContentSpace,
+      footerContentSpace,
+      headerMargin,
+      footerMargin,
+      marginTop,
+      marginBottom
+    );
     return {
       width: measurementWidth,
       height,
@@ -104687,7 +104743,8 @@ ${l}
       const headerMargin = margins.header ?? 0;
       const topMargin = margins.top ?? DEFAULT_MARGINS.top ?? 0;
       const height = Math.max(topMargin - headerMargin, 1);
-      return { x: left2, width, height, offset: headerMargin };
+      const offset2 = headerMargin;
+      return { x: left2, width, height, offset: offset2 };
     } else {
       const footerMargin = margins.footer ?? 0;
       const bottomMargin = margins.bottom ?? DEFAULT_MARGINS.bottom ?? 0;
@@ -158004,7 +158061,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "2.0.0-next.20";
+      this.version = "2.0.0-next.21";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -160477,7 +160534,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexXnRj2biz = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const index_W_Fk0WX = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));