@harbour-enterprises/superdoc 1.7.0-next.4 → 1.7.0-next.5

package/dist/superdoc.umd.js

@@ -38197,7 +38197,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.7.0-next.4") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.7.0-next.5") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -64367,7 +64367,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.7.0-next.4";
+  const summaryVersion = "1.7.0-next.5";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -67035,7 +67035,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.4");
+      console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.5");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -81696,7 +81696,7 @@ ${o}
   const asString = (value) => {
     return typeof value === "string" ? value : void 0;
   };
-  const asBoolean = (value) => {
+  const asBoolean$1 = (value) => {
     if (value === true || value === 1) return true;
     if (typeof value === "string") {
       const normalized = value.toLowerCase();
@@ -81877,8 +81877,9 @@ ${o}
     const attrs = getParagraphAttrs(block);
     const spacing = attrs?.spacing ?? {};
     const styleId = asString(attrs?.styleId);
-    const contextualSpacing = asBoolean(attrs?.contextualSpacing);
+    const contextualSpacing = asBoolean$1(attrs?.contextualSpacing);
     let spacingBefore = Math.max(0, Number(spacing.before ?? spacing.lineSpaceBefore ?? 0));
+    const baseSpacingBefore = spacingBefore;
     const spacingAfter = Math.max(0, Number(spacing.after ?? spacing.lineSpaceAfter ?? 0));
     let appliedSpacingBefore = spacingBefore === 0;
     let lastState = null;
@@ -81973,6 +81974,21 @@ ${o}
           state.trailingSpacing = 0;
         }
       }
+      const keepLines = attrs?.keepLines === true;
+      if (keepLines && fromLine === 0) {
+        const prevTrailing = state.trailingSpacing ?? 0;
+        const neededSpacingBefore = Math.max(spacingBefore - prevTrailing, 0);
+        const pageContentHeight = state.contentBottom - state.topMargin;
+        const fullHeight = lines.reduce((sum, line) => sum + (line.lineHeight || 0), 0);
+        const fitsOnBlankPage = fullHeight + baseSpacingBefore <= pageContentHeight;
+        const remainingHeightAfterSpacing = state.contentBottom - (state.cursorY + neededSpacingBefore);
+        if (fitsOnBlankPage && state.page.fragments.length > 0 && fullHeight > remainingHeightAfterSpacing) {
+          state = advanceColumn(state);
+          spacingBefore = baseSpacingBefore;
+          appliedSpacingBefore = spacingBefore === 0;
+          continue;
+        }
+      }
       if (!appliedSpacingBefore && spacingBefore > 0) {
         while (!appliedSpacingBefore) {
           const prevTrailing = state.trailingSpacing ?? 0;
@@ -83217,6 +83233,14 @@ ${o}
   const DEFAULT_PAGE_SIZE$2 = { w: 612, h: 792 };
   const DEFAULT_MARGINS$2 = { top: 72, right: 72, bottom: 72, left: 72 };
   const COLUMN_EPSILON$1 = 1e-4;
+  const asBoolean = (value) => {
+    if (value === true || value === 1) return true;
+    if (typeof value === "string") {
+      const normalized = value.toLowerCase();
+      return normalized === "true" || normalized === "1" || normalized === "on";
+    }
+    return false;
+  };
   const layoutDebugEnabled$1 = typeof define_process_default$4 !== "undefined" && typeof define_process_default$4.env !== "undefined" && Boolean(define_process_default$4.env.SD_DEBUG_LAYOUT);
   const layoutLog = (...args) => {
     if (!layoutDebugEnabled$1) return;
@@ -84040,11 +84064,23 @@ ${o}
             if (!shouldSkipAnchoredTable) {
               let state = paginator.ensurePage();
               const availableHeight = state.contentBottom - state.cursorY;
+              const spacingBefore = getParagraphSpacingBefore(paraBlock);
               const spacingAfter = getParagraphSpacingAfter$1(paraBlock);
+              const prevTrailing = Number.isFinite(state.trailingSpacing) && state.trailingSpacing > 0 ? state.trailingSpacing : 0;
+              const currentStyleId = typeof paraBlock.attrs?.styleId === "string" ? paraBlock.attrs?.styleId : void 0;
+              const currentContextualSpacing = asBoolean(paraBlock.attrs?.contextualSpacing);
+              const contextualSpacingApplies = currentContextualSpacing && currentStyleId && state.lastParagraphStyleId === currentStyleId;
+              const effectiveSpacingBefore = contextualSpacingApplies ? 0 : Math.max(spacingBefore - prevTrailing, 0);
               const currentHeight = getMeasureHeight(paraBlock, measure);
               const nextHeight = getMeasureHeight(nextBlock, nextMeasure);
               const nextIsParagraph = nextBlock.kind === "paragraph" && nextMeasure.kind === "paragraph";
               const nextSpacingBefore = nextIsParagraph ? getParagraphSpacingBefore(nextBlock) : 0;
+              const nextStyleId = nextIsParagraph && typeof nextBlock.attrs?.styleId === "string" ? nextBlock.attrs?.styleId : void 0;
+              const nextContextualSpacing = nextIsParagraph && asBoolean(nextBlock.attrs?.contextualSpacing);
+              const sameStyleAsNext = currentStyleId && nextStyleId && nextStyleId === currentStyleId;
+              const effectiveSpacingAfter = currentContextualSpacing && sameStyleAsNext ? 0 : spacingAfter;
+              const effectiveNextSpacingBefore = nextContextualSpacing && sameStyleAsNext ? 0 : nextSpacingBefore;
+              const interParagraphSpacing = nextIsParagraph ? Math.max(effectiveSpacingAfter, effectiveNextSpacingBefore) : effectiveSpacingAfter;
               const nextFirstLineHeight = (() => {
                 if (!nextIsParagraph) {
                   return nextHeight;
@@ -84055,8 +84091,9 @@ ${o}
                 }
                 return nextHeight;
               })();
-              const combinedHeight = nextIsParagraph ? currentHeight + Math.max(spacingAfter, nextSpacingBefore) + nextFirstLineHeight : currentHeight + spacingAfter + nextHeight;
-              if (combinedHeight > availableHeight && state.page.fragments.length > 0) {
+              const combinedHeight = nextIsParagraph ? effectiveSpacingBefore + currentHeight + interParagraphSpacing + nextFirstLineHeight : effectiveSpacingBefore + currentHeight + spacingAfter + nextHeight;
+              const effectiveAvailableHeight = contextualSpacingApplies ? availableHeight + prevTrailing : availableHeight;
+              if (combinedHeight > effectiveAvailableHeight && state.page.fragments.length > 0) {
                 state = paginator.advanceColumn(state);
               }
             }
@@ -99988,6 +100025,11 @@ ${o}
         totalHeight: metrics.lineHeight
       };
     }
+    const firstTextRunWithSize = block.runs.find(
+      (run2) => "text" in run2 && "fontSize" in run2 && typeof run2.fontSize === "number"
+    );
+    const fallbackFontSize = firstTextRunWithSize?.fontSize ?? 12;
+    const fallbackFontInfo = firstTextRunWithSize ? getFontInfoFromRun(firstTextRunWithSize) : void 0;
     let currentLine = null;
     const getEffectiveWidth = (baseWidth) => {
       if (dropCapMeasure && lines.length < dropCapMeasure.lines && dropCapMeasure.mode === "drop") {
@@ -99995,7 +100037,8 @@ ${o}
       }
       return baseWidth;
     };
-    let lastFontSize = 12;
+    let lastFontSize = fallbackFontSize;
+    let hasSeenTextRun = false;
     let tabStopCursor = 0;
     let pendingTabAlignment = null;
     let pendingRunSpacing = 0;
@@ -100120,11 +100163,7 @@ ${o}
           lines.push(completedLine);
           currentLine = null;
         } else {
-          const textRunWithSize = block.runs.find(
-            (r2) => r2.kind !== "tab" && r2.kind !== "lineBreak" && r2.kind !== "break" && !("src" in r2) && "fontSize" in r2
-          );
-          const fallbackSize = textRunWithSize?.fontSize ?? 12;
-          const metrics = calculateTypographyMetrics(fallbackSize, spacing);
+          const metrics = calculateTypographyMetrics(fallbackFontSize, spacing, fallbackFontInfo);
           const emptyLine = {
             fromRun: runIndex,
             fromChar: 0,
@@ -100144,6 +100183,7 @@ ${o}
         continue;
       }
       if (isLineBreakRun(run2)) {
+        const lineBreakFontInfo = hasSeenTextRun ? void 0 : fallbackFontInfo;
         if (currentLine) {
           const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
           const completedLine = {
@@ -100153,7 +100193,7 @@ ${o}
           addBarTabsToLine(completedLine);
           lines.push(completedLine);
         } else {
-          const metrics = calculateTypographyMetrics(lastFontSize, spacing);
+          const metrics = calculateTypographyMetrics(lastFontSize, spacing, lineBreakFontInfo);
           const emptyLine = {
             fromRun: runIndex,
             fromChar: 0,
@@ -100176,6 +100216,7 @@ ${o}
           toChar: 0,
           width: 0,
           maxFontSize: lastFontSize,
+          maxFontInfo: lineBreakFontInfo,
           maxWidth: nextLineMaxWidth,
           segments: [],
           spaceCount: 0
@@ -100469,6 +100510,7 @@ ${o}
         continue;
       }
       lastFontSize = run2.fontSize;
+      hasSeenTextRun = true;
       const { font } = buildFontString(run2);
       const tabSegments = run2.text.split("	");
       let charPosInRun = 0;
@@ -145465,6 +145507,7 @@ ${style2}
       };
       const getExtensions = () => getStarterExtensions();
       const initEditor = async ({ content: content2, media: media2 = {}, mediaFiles = {}, fonts = {} } = {}) => {
+        if (!editorElem.value) return;
         const { editorCtor, ...editorOptions } = props.options || {};
         const EditorCtor = editorCtor ?? Editor;
         clearSelectedImage();
@@ -145773,7 +145816,7 @@ ${style2}
       };
     }
   });
-  const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-f5c4f915"]]);
+  const SuperEditor = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-bb7d8a50"]]);
   const _hoisted_1$h = ["innerHTML"];
   const _sfc_main$i = {
     __name: "SuperInput",
@@ -150924,7 +150967,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.7.0-next.4";
+      this.version = "1.7.0-next.5";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;