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

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.4") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.5") {
       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.4";
+  const summaryVersion = "1.3.0-next.5";
   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.4");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.5");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -87920,6 +87920,19 @@ ${l}
     const effectiveMarks = nodeMarks.length > 0 ? nodeMarks : marksAsAttrs;
     const marks = [...effectiveMarks, ...inheritedMarks ?? []];
     applyMarksToRun(run2, marks, hyperlinkConfig, themeColors);
+    if (marksAsAttrs.length > 0) {
+      run2._explicitFont = true;
+    }
+    console.debug("[token-debug] tokenNodeToRun", {
+      token,
+      fontFamily: run2.fontFamily,
+      fontSize: run2.fontSize,
+      defaultFont,
+      defaultSize,
+      nodeMarksCount: nodeMarks.length,
+      marksAsAttrsCount: marksAsAttrs.length,
+      inheritedMarksCount: inheritedMarks?.length ?? 0
+    });
     return run2;
   }
   const EIGHTHS_PER_POINT = 8;
@@ -91668,6 +91681,10 @@ ${l}
       if (TOKEN_INLINE_TYPES.has(node2.type)) {
         const tokenKind = TOKEN_INLINE_TYPES.get(node2.type);
         if (tokenKind) {
+          const marksAsAttrs = Array.isArray(node2.attrs?.marksAsAttrs) ? node2.attrs.marksAsAttrs : [];
+          const nodeMarks = node2.marks ?? [];
+          const effectiveMarks = nodeMarks.length > 0 ? nodeMarks : marksAsAttrs;
+          const mergedMarks = [...effectiveMarks, ...inheritedMarks ?? []];
           const tokenRun = tokenNodeToRun(
             node2,
             positions,
@@ -91684,6 +91701,23 @@ ${l}
           const inlineStyleId = getInlineStyleId(inheritedMarks);
           applyRunStyles2(tokenRun, inlineStyleId, activeRunStyleId);
           applyBaseRunDefaults(tokenRun, baseRunDefaults, defaultFont, defaultSize);
+          if (mergedMarks.length > 0) {
+            applyMarksToRun(
+              tokenRun,
+              mergedMarks,
+              hyperlinkConfig,
+              themeColors,
+              converterContext?.backgroundColor
+            );
+          }
+          console.debug("[token-debug] paragraph-token-run", {
+            token: tokenRun.token,
+            fontFamily: tokenRun.fontFamily,
+            fontSize: tokenRun.fontSize,
+            inlineStyleId,
+            runStyleId: activeRunStyleId,
+            mergedMarksCount: mergedMarks.length
+          });
           currentRuns.push(tokenRun);
         }
         return;
@@ -94668,6 +94702,77 @@ ${l}
   function isFieldAnnotationRun(run2) {
     return run2.kind === "fieldAnnotation";
   }
+  function measureTabAlignmentGroup(startRunIndex, runs2, ctx2, decimalSeparator = ".") {
+    const result = {
+      totalWidth: 0,
+      runs: [],
+      endRunIndex: runs2.length
+    };
+    let foundDecimal = false;
+    for (let i2 = startRunIndex; i2 < runs2.length; i2++) {
+      const run2 = runs2[i2];
+      if (isTabRun(run2)) {
+        result.endRunIndex = i2;
+        break;
+      }
+      if (isLineBreakRun(run2) || run2.kind === "break" && run2.breakType === "line") {
+        result.endRunIndex = i2;
+        break;
+      }
+      if (run2.kind === "text" || run2.kind === void 0) {
+        const textRun = run2;
+        const text2 = textRun.text || "";
+        if (text2.length > 0) {
+          const { font } = buildFontString(textRun);
+          const width = measureRunWidth(text2, font, ctx2, textRun, 0);
+          let beforeDecimalWidth;
+          if (!foundDecimal) {
+            const decimalIdx = text2.indexOf(decimalSeparator);
+            if (decimalIdx >= 0) {
+              foundDecimal = true;
+              const beforeText = text2.slice(0, decimalIdx);
+              beforeDecimalWidth = beforeText.length > 0 ? measureRunWidth(beforeText, font, ctx2, textRun, 0) : 0;
+              result.beforeDecimalWidth = result.totalWidth + beforeDecimalWidth;
+            }
+          }
+          result.runs.push({
+            runIndex: i2,
+            width,
+            text: text2,
+            beforeDecimalWidth
+          });
+          result.totalWidth += width;
+        } else {
+          result.runs.push({ runIndex: i2, width: 0, text: "" });
+        }
+        continue;
+      }
+      if (isImageRun(run2)) {
+        const leftSpace = run2.distLeft ?? 0;
+        const rightSpace = run2.distRight ?? 0;
+        const imageWidth = run2.width + leftSpace + rightSpace;
+        result.runs.push({ runIndex: i2, width: imageWidth });
+        result.totalWidth += imageWidth;
+        continue;
+      }
+      if (isFieldAnnotationRun(run2)) {
+        const fontSize2 = run2.fontSize ?? DEFAULT_FIELD_ANNOTATION_FONT_SIZE;
+        const { font } = buildFontString({
+          fontFamily: run2.fontFamily ?? "Arial",
+          fontSize: fontSize2,
+          bold: run2.bold,
+          italic: run2.italic
+        });
+        const textWidth = run2.displayLabel ? measureRunWidth(run2.displayLabel, font, ctx2, run2, 0) : 0;
+        const pillWidth = textWidth + FIELD_ANNOTATION_PILL_PADDING;
+        result.runs.push({ runIndex: i2, width: pillWidth });
+        result.totalWidth += pillWidth;
+        continue;
+      }
+      result.runs.push({ runIndex: i2, width: 0 });
+    }
+    return result;
+  }
   async function measureBlock(block, constraints) {
     const normalized = normalizeConstraints(constraints);
     if (block.kind === "drawing") {
@@ -94791,6 +94896,7 @@ ${l}
     let pendingTabAlignment = null;
     let lastAppliedTabAlign = null;
     const warnedTabVals = /* @__PURE__ */ new Set();
+    let activeTabGroup = null;
     const validateTabStopVal = (stop) => {
       if (!ALLOWED_TAB_VALS.has(stop.val) && !warnedTabVals.has(stop.val)) {
         warnedTabVals.add(stop.val);
@@ -94970,6 +95076,7 @@ ${l}
         continue;
       }
       if (isTabRun(run2)) {
+        activeTabGroup = null;
         if (!currentLine) {
           currentLine = {
             fromRun: runIndex,
@@ -94994,12 +95101,6 @@ ${l}
         currentLine.maxFontSize = Math.max(currentLine.maxFontSize, 12);
         currentLine.toRun = runIndex;
         currentLine.toChar = 1;
-        if (stop) {
-          validateTabStopVal(stop);
-          pendingTabAlignment = { target: clampedTarget, val: stop.val };
-        } else {
-          pendingTabAlignment = null;
-        }
         if (stop && stop.leader && stop.leader !== "none") {
           const leaderStyle = stop.leader;
           const from2 = Math.min(originX, clampedTarget);
@@ -95007,6 +95108,36 @@ ${l}
           if (!currentLine.leaders) currentLine.leaders = [];
           currentLine.leaders.push({ from: from2, to, style: leaderStyle });
         }
+        if (stop) {
+          validateTabStopVal(stop);
+          if (stop.val === "end" || stop.val === "center" || stop.val === "decimal") {
+            const groupMeasure = measureTabAlignmentGroup(runIndex + 1, runsToProcess, ctx2, decimalSeparator);
+            if (groupMeasure.totalWidth > 0) {
+              let groupStartX;
+              if (stop.val === "end") {
+                groupStartX = Math.max(0, clampedTarget - groupMeasure.totalWidth);
+              } else if (stop.val === "center") {
+                groupStartX = Math.max(0, clampedTarget - groupMeasure.totalWidth / 2);
+              } else {
+                const beforeDecimal = groupMeasure.beforeDecimalWidth ?? groupMeasure.totalWidth;
+                groupStartX = Math.max(0, clampedTarget - beforeDecimal);
+              }
+              activeTabGroup = {
+                measure: groupMeasure,
+                startX: groupStartX,
+                currentX: groupStartX,
+                target: clampedTarget,
+                val: stop.val
+              };
+              currentLine.width = roundValue(groupStartX);
+            }
+            pendingTabAlignment = null;
+          } else {
+            pendingTabAlignment = { target: clampedTarget, val: stop.val };
+          }
+        } else {
+          pendingTabAlignment = null;
+        }
         continue;
       }
       if (isImageRun(run2)) {
@@ -95017,7 +95148,10 @@ ${l}
         const bottomSpace = run2.distBottom ?? 0;
         const imageHeight = run2.height + topSpace + bottomSpace;
         let imageStartX;
-        if (pendingTabAlignment && currentLine) {
+        if (activeTabGroup && currentLine) {
+          imageStartX = activeTabGroup.currentX;
+          activeTabGroup.currentX = roundValue(activeTabGroup.currentX + imageWidth);
+        } else if (pendingTabAlignment && currentLine) {
           imageStartX = alignPendingTabForWidth(imageWidth);
         }
         if (!currentLine) {
@@ -95042,10 +95176,14 @@ ${l}
               }
             ]
           };
+          if (activeTabGroup && runIndex + 1 >= activeTabGroup.measure.endRunIndex) {
+            activeTabGroup = null;
+          }
           continue;
         }
         const appliedTabAlign = lastAppliedTabAlign;
-        if (currentLine.width + imageWidth > currentLine.maxWidth && currentLine.width > 0) {
+        const skipFitCheck = activeTabGroup !== null;
+        if (!skipFitCheck && currentLine.width + imageWidth > currentLine.maxWidth && currentLine.width > 0) {
           trimTrailingWrapSpaces(currentLine);
           const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
           const lineBase = currentLine;
@@ -95058,6 +95196,7 @@ ${l}
           tabStopCursor = 0;
           pendingTabAlignment = null;
           lastAppliedTabAlign = null;
+          activeTabGroup = null;
           currentLine = {
             fromRun: runIndex,
             fromChar: 0,
@@ -95090,6 +95229,9 @@ ${l}
             ...imageStartX !== void 0 ? { x: imageStartX } : {}
           });
         }
+        if (activeTabGroup && runIndex + 1 >= activeTabGroup.measure.endRunIndex) {
+          activeTabGroup = null;
+        }
         const tabAlign = appliedTabAlign;
         if (tabAlign && currentLine && tabAlign.val === "end") {
           currentLine.width = roundValue(tabAlign.target);
@@ -95265,7 +95407,11 @@ ${l}
           }
         }
         let segmentStartX;
-        if (currentLine && pendingTabAlignment) {
+        let inActiveTabGroup = false;
+        if (activeTabGroup && currentLine) {
+          segmentStartX = activeTabGroup.currentX;
+          inActiveTabGroup = true;
+        } else if (currentLine && pendingTabAlignment) {
           segmentStartX = alignSegmentAtTab(segment, font, run2, charPosInRun);
           if (segmentStartX == null) {
             segmentStartX = currentLine.width;
@@ -95302,6 +95448,7 @@ ${l}
                 tabStopCursor = 0;
                 pendingTabAlignment = null;
                 lastAppliedTabAlign = null;
+                activeTabGroup = null;
                 currentLine = {
                   fromRun: runIndex,
                   fromChar: spaceStartChar,
@@ -95320,7 +95467,19 @@ ${l}
                 currentLine.width = roundValue(currentLine.width + boundarySpacing2 + singleSpaceWidth);
                 currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
                 currentLine.maxFontSize = Math.max(currentLine.maxFontSize, run2.fontSize);
-                appendSegment(currentLine.segments, runIndex, spaceStartChar, spaceEndChar, singleSpaceWidth);
+                let spaceExplicitX;
+                if (inActiveTabGroup && activeTabGroup) {
+                  spaceExplicitX = activeTabGroup.currentX;
+                  activeTabGroup.currentX = roundValue(activeTabGroup.currentX + singleSpaceWidth);
+                }
+                appendSegment(
+                  currentLine.segments,
+                  runIndex,
+                  spaceStartChar,
+                  spaceEndChar,
+                  singleSpaceWidth,
+                  spaceExplicitX
+                );
                 currentLine.spaceCount += 1;
               }
             }
@@ -95468,7 +95627,7 @@ ${l}
           const totalWidthWithWord = currentLine.width + boundarySpacing + wordCommitWidth + // Safe cast: only TextRuns produce word segments from split(), other run types are handled earlier
           (shouldIncludeDelimiterSpace ? run2.letterSpacing ?? 0 : 0);
           const availableWidth = currentLine.maxWidth - WIDTH_FUDGE_PX2;
-          let shouldBreak = currentLine.width + boundarySpacing + wordOnlyWidth > availableWidth && currentLine.width > 0 && !isTocEntry;
+          let shouldBreak = !inActiveTabGroup && currentLine.width + boundarySpacing + wordOnlyWidth > availableWidth && currentLine.width > 0 && !isTocEntry;
           let compressedWidth = null;
           if (shouldBreak && justifyAlignment) {
             const isLastNonEmptyWordInSegment = wordIndex === lastNonEmptyWordIndex;
@@ -95533,15 +95692,14 @@ ${l}
               currentLine.width = roundValue(currentLine.width + boundarySpacing + wordOnlyWidth);
               currentLine.maxFontInfo = updateMaxFontInfo(currentLine.maxFontSize, currentLine.maxFontInfo, run2);
               currentLine.maxFontSize = Math.max(currentLine.maxFontSize, run2.fontSize);
-              const useExplicitXHere = wordIndex === 0 && segmentStartX !== void 0;
-              appendSegment(
-                currentLine.segments,
-                runIndex,
-                wordStartChar,
-                wordEndNoSpace,
-                wordOnlyWidth,
-                useExplicitXHere ? segmentStartX : void 0
-              );
+              let explicitXHere;
+              if (inActiveTabGroup && activeTabGroup) {
+                explicitXHere = activeTabGroup.currentX;
+                activeTabGroup.currentX = roundValue(activeTabGroup.currentX + wordOnlyWidth);
+              } else if (wordIndex === 0 && segmentStartX !== void 0) {
+                explicitXHere = segmentStartX;
+              }
+              appendSegment(currentLine.segments, runIndex, wordStartChar, wordEndNoSpace, wordOnlyWidth, explicitXHere);
               trimTrailingWrapSpaces(currentLine);
               const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
               const lineBase = currentLine;
@@ -95556,8 +95714,13 @@ ${l}
             }
             const newToChar = shouldIncludeDelimiterSpace ? wordEndWithSpace : wordEndNoSpace;
             currentLine.toChar = newToChar;
-            const useExplicitX = wordIndex === 0 && segmentStartX !== void 0;
-            const explicitX = useExplicitX ? segmentStartX : void 0;
+            let explicitX;
+            if (inActiveTabGroup && activeTabGroup) {
+              explicitX = activeTabGroup.currentX;
+              activeTabGroup.currentX = roundValue(activeTabGroup.currentX + wordCommitWidth);
+            } else if (wordIndex === 0 && segmentStartX !== void 0) {
+              explicitX = segmentStartX;
+            }
             const targetWidth = compressedWidth != null ? compressedWidth : currentLine.width + boundarySpacing + wordCommitWidth + (shouldIncludeDelimiterSpace ? run2.letterSpacing ?? 0 : 0);
             if (compressedWidth != null) {
               currentLine.naturalWidth = roundValue(totalWidthWithWord);
@@ -95579,6 +95742,12 @@ ${l}
           }
         }
         lastAppliedTabAlign = null;
+        if (activeTabGroup && runIndex + 1 >= activeTabGroup.measure.endRunIndex) {
+          if (currentLine && activeTabGroup.val === "end") {
+            currentLine.width = roundValue(activeTabGroup.target);
+          }
+          activeTabGroup = null;
+        }
         if (!isLastSegment) {
           pendingTabAlignment = null;
           if (!currentLine) {
@@ -143695,7 +143864,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0-next.4";
+      this.version = "1.3.0-next.5";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;