@harbour-enterprises/superdoc 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/superdoc.umd.js

@@ -35581,7 +35581,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 = "1.0.0-beta.3") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.4") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -60069,7 +60069,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.3";
+  const summaryVersion = "1.0.0-beta.4";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -60848,7 +60848,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexCJUy3fVi),
+        Promise.resolve().then(() => indexBNGaD3Up),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -61053,7 +61053,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.3");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.4");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -62884,6 +62884,19 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return sanitized;
   };
+  const normalizeFontSizePx = (value) => {
+    if (isFiniteNumber(value)) return value;
+    if (typeof value !== "string") return void 0;
+    const trimmed = value.trim();
+    if (!trimmed) return void 0;
+    const numeric = Number.parseFloat(trimmed);
+    if (!Number.isFinite(numeric)) return void 0;
+    const unit = trimmed.match(/[a-zA-Z%]+$/)?.[0]?.toLowerCase();
+    if (unit === "pt") {
+      return ptToPx(numeric);
+    }
+    return numeric;
+  };
   const applyTextStyleMark = (run2, attrs, themeColors) => {
     const resolvedColor = resolveColorFromAttributes(attrs, themeColors);
     if (resolvedColor) {
@@ -62895,9 +62908,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         run2.fontFamily = sanitized;
       }
     }
-    const fontSizeValue = pickNumber(attrs.fontSize);
-    if (fontSizeValue !== void 0 && fontSizeValue >= 1 && fontSizeValue <= 1e3) {
-      run2.fontSize = fontSizeValue;
+    const fontSizePx = normalizeFontSizePx(attrs.fontSize);
+    if (fontSizePx !== void 0 && fontSizePx >= 1 && fontSizePx <= 1e3) {
+      run2.fontSize = fontSizePx;
     }
     if (isFiniteNumber(attrs.letterSpacing)) {
       const spacing = Number(attrs.letterSpacing);
@@ -73157,8 +73170,59 @@ ${l}
       this.headerProvider = header;
       this.footerProvider = footer;
     }
-    setData(blocks2, measures) {
+    /**
+     * Updates the painter's block and measure data.
+     *
+     * @param blocks - Main document blocks
+     * @param measures - Measures corresponding to main document blocks
+     * @param headerBlocks - Optional header blocks from header/footer layout results
+     * @param headerMeasures - Optional measures corresponding to header blocks
+     * @param footerBlocks - Optional footer blocks from header/footer layout results
+     * @param footerMeasures - Optional measures corresponding to footer blocks
+     */
+    setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
+      if (blocks2.length !== measures.length) {
+        throw new Error(
+          `setData: blocks and measures arrays must have the same length. Got blocks.length=${blocks2.length}, measures.length=${measures.length}`
+        );
+      }
+      const hasHeaderBlocks = headerBlocks !== void 0;
+      const hasHeaderMeasures = headerMeasures !== void 0;
+      if (hasHeaderBlocks !== hasHeaderMeasures) {
+        throw new Error(
+          `setData: headerBlocks and headerMeasures must both be provided or both be omitted. Got headerBlocks=${hasHeaderBlocks ? "provided" : "omitted"}, headerMeasures=${hasHeaderMeasures ? "provided" : "omitted"}`
+        );
+      }
+      if (hasHeaderBlocks && hasHeaderMeasures && headerBlocks.length !== headerMeasures.length) {
+        throw new Error(
+          `setData: headerBlocks and headerMeasures arrays must have the same length. Got headerBlocks.length=${headerBlocks.length}, headerMeasures.length=${headerMeasures.length}`
+        );
+      }
+      const hasFooterBlocks = footerBlocks !== void 0;
+      const hasFooterMeasures = footerMeasures !== void 0;
+      if (hasFooterBlocks !== hasFooterMeasures) {
+        throw new Error(
+          `setData: footerBlocks and footerMeasures must both be provided or both be omitted. Got footerBlocks=${hasFooterBlocks ? "provided" : "omitted"}, footerMeasures=${hasFooterMeasures ? "provided" : "omitted"}`
+        );
+      }
+      if (hasFooterBlocks && hasFooterMeasures && footerBlocks.length !== footerMeasures.length) {
+        throw new Error(
+          `setData: footerBlocks and footerMeasures arrays must have the same length. Got footerBlocks.length=${footerBlocks.length}, footerMeasures.length=${footerMeasures.length}`
+        );
+      }
       const nextLookup = this.buildBlockLookup(blocks2, measures);
+      if (headerBlocks && headerMeasures) {
+        const headerLookup = this.buildBlockLookup(headerBlocks, headerMeasures);
+        headerLookup.forEach((entry, id) => {
+          nextLookup.set(id, entry);
+        });
+      }
+      if (footerBlocks && footerMeasures) {
+        const footerLookup = this.buildBlockLookup(footerBlocks, footerMeasures);
+        footerLookup.forEach((entry, id) => {
+          nextLookup.set(id, entry);
+        });
+      }
       const changed = /* @__PURE__ */ new Set();
       nextLookup.forEach((entry, id) => {
         const previous2 = this.blockLookup.get(id);
@@ -73481,6 +73545,14 @@ ${l}
       container.style.height = `${data.height}px`;
       container.style.top = `${Math.max(0, offset2)}px`;
       container.style.zIndex = "1";
+      let footerYOffset = 0;
+      if (kind === "footer" && data.fragments.length > 0) {
+        const contentHeight = typeof data.contentHeight === "number" ? data.contentHeight : data.fragments.reduce((max2, f2) => {
+          const fragHeight = "height" in f2 && typeof f2.height === "number" ? f2.height : this.estimateFragmentHeight(f2);
+          return Math.max(max2, f2.y + Math.max(0, fragHeight));
+        }, 0);
+        footerYOffset = Math.max(0, data.height - contentHeight);
+      }
       const context = {
         pageNumber: page.number,
         totalPages: this.totalPages,
@@ -73489,6 +73561,10 @@ ${l}
       };
       data.fragments.forEach((fragment) => {
         const fragEl = this.renderFragment(fragment, context);
+        if (footerYOffset > 0) {
+          const currentTop = parseFloat(fragEl.style.top) || fragment.y;
+          fragEl.style.top = `${currentTop + footerYOffset}px`;
+        }
         container.appendChild(fragEl);
       });
       if (!existing) {
@@ -73800,13 +73876,13 @@ ${l}
         const markerEl = this.doc.createElement("span");
         markerEl.classList.add("superdoc-list-marker");
         const wordLayout = item.paragraph.attrs?.wordLayout;
-        if (wordLayout?.marker) {
-          const marker = wordLayout.marker;
-          markerEl.textContent = marker.markerText;
+        const marker = wordLayout?.marker;
+        if (marker) {
+          markerEl.textContent = marker.markerText ?? null;
           markerEl.style.display = "inline-block";
           markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
           markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
-          markerEl.style.textAlign = marker.justification;
+          markerEl.style.textAlign = marker.justification ?? "";
           markerEl.style.fontFamily = marker.run.fontFamily;
           markerEl.style.fontSize = `${marker.run.fontSize}px`;
           if (marker.run.bold) markerEl.style.fontWeight = "bold";
@@ -74555,6 +74631,33 @@ ${l}
         }
       }
     }
+    /**
+     * Estimates the height of a fragment when explicit height is not available.
+     *
+     * This method provides fallback height calculations for footer bottom-alignment
+     * by consulting measure data for paragraphs and list items, or using the
+     * fragment's height property for tables, images, and drawings.
+     *
+     * @param fragment - The fragment to estimate height for
+     * @returns Estimated height in pixels, or 0 if height cannot be determined
+     */
+    estimateFragmentHeight(fragment) {
+      const lookup2 = this.blockLookup.get(fragment.blockId);
+      const measure = lookup2?.measure;
+      if (fragment.kind === "para" && measure?.kind === "paragraph") {
+        return measure.totalHeight;
+      }
+      if (fragment.kind === "list-item" && measure?.kind === "list") {
+        return measure.totalHeight;
+      }
+      if (fragment.kind === "table") {
+        return fragment.height;
+      }
+      if (fragment.kind === "image" || fragment.kind === "drawing") {
+        return fragment.height;
+      }
+      return 0;
+    }
     buildBlockLookup(blocks2, measures) {
       if (blocks2.length !== measures.length) {
         throw new Error("DomPainter requires the same number of blocks and measures");
@@ -75023,8 +75126,8 @@ ${l}
       paint(layout, mount2) {
         painter.paint(layout, mount2);
       },
-      setData(blocks2, measures) {
-        painter.setData(blocks2, measures);
+      setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
+        painter.setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures);
       },
       // Non-standard extension for demo app to avoid re-instantiating on provider changes
       setProviders(header, footer) {
@@ -78413,7 +78516,30 @@ ${l}
     if (typeof painter.setProviders === "function") {
       painter.setProviders(__privateGet$1(this, _headerDecorationProvider), __privateGet$1(this, _footerDecorationProvider));
     }
-    painter.setData?.(blocks2, measures);
+    const headerBlocks = [];
+    const headerMeasures = [];
+    if (headerLayouts) {
+      for (const headerResult of headerLayouts) {
+        headerBlocks.push(...headerResult.blocks);
+        headerMeasures.push(...headerResult.measures);
+      }
+    }
+    const footerBlocks = [];
+    const footerMeasures = [];
+    if (footerLayouts) {
+      for (const footerResult of footerLayouts) {
+        footerBlocks.push(...footerResult.blocks);
+        footerMeasures.push(...footerResult.measures);
+      }
+    }
+    painter.setData?.(
+      blocks2,
+      measures,
+      headerBlocks.length > 0 ? headerBlocks : void 0,
+      headerMeasures.length > 0 ? headerMeasures : void 0,
+      footerBlocks.length > 0 ? footerBlocks : void 0,
+      footerMeasures.length > 0 ? footerMeasures : void 0
+    );
     painter.paint(layout, __privateGet$1(this, _painterHost));
     __privateSet(this, _layoutError, null);
     __privateSet(this, _layoutErrorState, "healthy");
@@ -78583,7 +78709,8 @@ ${l}
       const finalHeaderId = headerId ?? fallbackId ?? void 0;
       return {
         fragments: slotPage.fragments,
-        height: variant.layout.height ?? box.height,
+        height: box.height,
+        contentHeight: variant.layout.height ?? box.height,
         offset: box.offset,
         marginLeft: box.x,
         contentWidth: box.width,
@@ -78610,18 +78737,19 @@ ${l}
     const left2 = margins.left ?? DEFAULT_MARGINS.left;
     const right2 = margins.right ?? DEFAULT_MARGINS.right;
     const width = Math.max(pageSize.w - (left2 + right2), 1);
-    const defaultHeight = kind === "header" ? margins.top ?? DEFAULT_MARGINS.top : margins.bottom ?? DEFAULT_MARGINS.bottom;
-    const { headerSpace, footerSpace } = extractHeaderFooterSpace(margins);
-    const target = kind === "header" ? headerSpace : footerSpace;
-    const height = Math.max(target || defaultHeight || 1, 1);
     const totalHeight = pageHeight ?? pageSize.h;
-    const offset2 = kind === "header" ? 0 : Math.max(0, totalHeight - height);
-    return {
-      x: left2,
-      width,
-      height,
-      offset: offset2
-    };
+    if (kind === "header") {
+      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 };
+    } else {
+      const footerMargin = margins.footer ?? 0;
+      const bottomMargin = margins.bottom ?? DEFAULT_MARGINS.bottom ?? 0;
+      const height = Math.max(bottomMargin - footerMargin, 1);
+      const offset2 = Math.max(0, totalHeight - footerMargin - height);
+      return { x: left2, width, height, offset: offset2 };
+    }
   };
   rebuildHeaderFooterRegions_fn = function(layout) {
     __privateGet$1(this, _headerRegions).clear();
@@ -131046,7 +131174,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.3";
+      this.version = "1.0.0-beta.4";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -133489,7 +133617,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexCJUy3fVi = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexBNGaD3Up = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));