superdoc 1.7.0-next.1 → 1.7.0-next.3

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.1") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.7.0-next.3") {
       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.1";
+  const summaryVersion = "1.7.0-next.3";
   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.1");
+      console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.3");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -69127,18 +69127,22 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   function computeTabStops$1(context) {
     const { explicitStops, defaultTabInterval, paragraphIndent } = context;
     const leftIndent = paragraphIndent.left ?? 0;
+    const hanging = paragraphIndent.hanging ?? 0;
+    const effectiveMinIndent = Math.max(0, leftIndent - hanging);
     const clearPositions = explicitStops.filter((stop) => stop.val === "clear").map((stop) => stop.pos);
-    const stops = explicitStops.filter((stop) => stop.val !== "clear");
-    const maxExplicit = stops.reduce((max2, stop) => Math.max(max2, stop.pos), 0);
-    const hasExplicit = stops.length > 0;
-    const defaultStart = hasExplicit ? Math.max(maxExplicit, leftIndent ?? 0) : 0;
-    let pos = hasExplicit ? defaultStart : 0;
-    const targetLimit = Math.max(defaultStart, leftIndent ?? 0) + 14400;
+    const filteredExplicitStops = explicitStops.filter((stop) => stop.val !== "clear").filter((stop) => stop.pos >= effectiveMinIndent);
+    const maxExplicit = filteredExplicitStops.reduce((max2, stop) => Math.max(max2, stop.pos), 0);
+    const hasExplicit = filteredExplicitStops.length > 0;
+    const stops = [...filteredExplicitStops];
+    const defaultStart = hasExplicit ? Math.max(maxExplicit, leftIndent) : 0;
+    let pos = defaultStart;
+    const targetLimit = Math.max(defaultStart, leftIndent) + 14400;
     while (pos < targetLimit) {
       pos += defaultTabInterval;
-      const hasExplicitStop = stops.some((s2) => Math.abs(s2.pos - pos) < 20);
+      const hasExplicitStop = filteredExplicitStops.some((s2) => Math.abs(s2.pos - pos) < 20);
       const hasClearStop = clearPositions.some((clearPos) => Math.abs(clearPos - pos) < 20);
-      if (!hasExplicitStop && !hasClearStop) {
+      const isValidDefault = pos >= leftIndent;
+      if (!hasExplicitStop && !hasClearStop && isValidDefault) {
         stops.push({
           val: "start",
           pos,
@@ -69146,7 +69150,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         });
       }
     }
-    return stops.filter((stop) => stop.pos >= leftIndent).sort((a2, b2) => a2.pos - b2.pos);
+    return stops.sort((a2, b2) => a2.pos - b2.pos);
   }
   function layoutWithTabs(runs2, stops, lineWidth, options = {}) {
     const result = [];
@@ -73202,6 +73206,50 @@ ${o}
     lineContainer.appendChild(lineEl);
     return lineContainer;
   }
+  function applyTableCellLineIndentation(params2) {
+    const {
+      lineEl,
+      line,
+      indent: indent2,
+      indentLeftPx,
+      hasListMarkerLayout,
+      lineIndex,
+      localStartLine,
+      suppressFirstLineIndent
+    } = params2;
+    const paraIndentLeft = indent2?.left ?? 0;
+    const paraIndentRight = indent2?.right ?? 0;
+    const firstLineOffset = suppressFirstLineIndent ? 0 : (indent2?.firstLine ?? 0) - (indent2?.hanging ?? 0);
+    const isFirstLine = lineIndex === 0 && localStartLine === 0;
+    const hasExplicitSegmentPositioning = line.segments?.some((seg) => seg.x !== void 0) ?? false;
+    if (hasListMarkerLayout && indentLeftPx) {
+      if (!hasExplicitSegmentPositioning) {
+        lineEl.style.paddingLeft = `${indentLeftPx}px`;
+      }
+    } else {
+      if (hasExplicitSegmentPositioning) {
+        if (isFirstLine && firstLineOffset !== 0) {
+          const effectiveLeftIndent = paraIndentLeft < 0 ? 0 : paraIndentLeft;
+          const adjustedPadding = effectiveLeftIndent + firstLineOffset;
+          if (adjustedPadding > 0) {
+            lineEl.style.paddingLeft = `${adjustedPadding}px`;
+          }
+        }
+      } else if (paraIndentLeft && paraIndentLeft > 0) {
+        lineEl.style.paddingLeft = `${paraIndentLeft}px`;
+      } else if (!isFirstLine && indent2?.hanging && indent2.hanging > 0 && (paraIndentLeft == null || paraIndentLeft >= 0)) {
+        lineEl.style.paddingLeft = `${indent2.hanging}px`;
+      }
+    }
+    if (paraIndentRight && paraIndentRight > 0) {
+      lineEl.style.paddingRight = `${paraIndentRight}px`;
+    }
+    if (isFirstLine && firstLineOffset && !hasExplicitSegmentPositioning) {
+      lineEl.style.textIndent = `${firstLineOffset}px`;
+    } else if (firstLineOffset && hasExplicitSegmentPositioning) {
+      lineEl.style.textIndent = "0px";
+    }
+  }
   const applyInlineStyles = (el, styles) => {
     Object.entries(styles).forEach(([key2, value]) => {
       if (value != null && value !== "" && key2 in el.style) {
@@ -73488,6 +73536,7 @@ ${o}
           const markerLayout = wordLayout?.marker;
           const markerMeasure = paragraphMeasure.marker;
           const indentLeftPx = markerMeasure?.indentLeft ?? wordLayout?.indentLeftPx ?? (block.attrs?.indent && typeof block.attrs.indent.left === "number" ? block.attrs.indent.left : 0);
+          const suppressFirstLineIndent = block.attrs?.suppressFirstLineIndent === true;
           const blockStartGlobal = cumulativeLineCount;
           const blockEndGlobal = cumulativeLineCount + blockLineCount;
           if (blockEndGlobal <= globalFromLine) {
@@ -73538,33 +73587,16 @@ ${o}
               });
               paraWrapper.appendChild(lineContainer);
             } else {
-              if (markerLayout && indentLeftPx) {
-                lineEl.style.paddingLeft = `${indentLeftPx}px`;
-              } else {
-                const indent2 = block.attrs?.indent;
-                if (indent2) {
-                  const leftIndent = typeof indent2.left === "number" ? indent2.left : 0;
-                  const hanging = typeof indent2.hanging === "number" ? indent2.hanging : 0;
-                  const firstLine = typeof indent2.firstLine === "number" ? indent2.firstLine : 0;
-                  const isFirstLine = lineIdx === 0 && localStartLine === 0;
-                  const firstLineOffset = firstLine - hanging;
-                  if (isFirstLine) {
-                    if (leftIndent > 0) {
-                      lineEl.style.paddingLeft = `${leftIndent}px`;
-                    }
-                    if (firstLineOffset !== 0) {
-                      lineEl.style.textIndent = `${firstLineOffset}px`;
-                    }
-                  } else {
-                    if (leftIndent > 0) {
-                      lineEl.style.paddingLeft = `${leftIndent}px`;
-                    }
-                  }
-                  if (typeof indent2.right === "number" && indent2.right > 0) {
-                    lineEl.style.paddingRight = `${indent2.right}px`;
-                  }
-                }
-              }
+              applyTableCellLineIndentation({
+                lineEl,
+                line,
+                indent: block.attrs?.indent,
+                indentLeftPx,
+                hasListMarkerLayout: Boolean(markerLayout),
+                lineIndex: lineIdx,
+                localStartLine,
+                suppressFirstLineIndent
+              });
               paraWrapper.appendChild(lineEl);
             }
             renderedHeight += line.lineHeight;
@@ -150686,7 +150718,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.7.0-next.1";
+      this.version = "1.7.0-next.3";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;