superdoc 1.0.0-beta.28 → 1.0.0-beta.29

package/dist/superdoc.umd.js

@@ -41859,7 +41859,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.28") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.29") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -66889,7 +66889,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.28";
+  const summaryVersion = "1.0.0-beta.29";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -67678,7 +67678,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexCLV7RJY),
+        Promise.resolve().then(() => indexCFdgXvG),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -67883,7 +67883,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.28");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.29");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -68752,7 +68752,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         sectionIndex: section.sectionIndex,
         headerRefs: section.headerRefs,
         footerRefs: section.footerRefs,
-        numbering: section.numbering
+        numbering: section.numbering,
+        titlePg: section.titlePg
       });
     });
   }
@@ -69911,6 +69912,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     enableRichHyperlinks: false
   };
   const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors) => {
+    const isTabRun2 = run2.kind === "tab";
     marks.forEach((mark2) => {
       const forwardedDataAttrs = extractDataAttributes(mark2.attrs);
       try {
@@ -69943,11 +69945,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             break;
           }
           case "textStyle":
-            applyTextStyleMark(run2, mark2.attrs ?? {}, themeColors);
+            if (!isTabRun2) {
+              applyTextStyleMark(run2, mark2.attrs ?? {}, themeColors);
+            }
             break;
           case "commentMark":
           case "comment": {
-            pushCommentAnnotation(run2, mark2.attrs ?? {});
+            if (!isTabRun2) {
+              pushCommentAnnotation(run2, mark2.attrs ?? {});
+            }
             break;
           }
           case "underline": {
@@ -69974,31 +69980,33 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             run2.highlight = resolveColorFromAttributes(mark2.attrs ?? {}, themeColors);
             break;
           case "link": {
-            const attrs = mark2.attrs ?? {};
-            if (hyperlinkConfig.enableRichHyperlinks) {
-              try {
-                const link2 = buildFlowRunLink(attrs);
-                if (link2) {
-                  run2.link = link2;
-                }
-              } catch (error) {
-                if (process$1$1.env.NODE_ENV === "development") {
-                  console.warn("[PM-Adapter] Failed to build rich hyperlink:", error);
-                }
-              }
-            } else if (typeof attrs.href === "string" && attrs.href.trim()) {
-              try {
-                const sanitized = sanitizeHref(attrs.href);
-                if (sanitized && sanitized.href) {
-                  const legacyLink = {
-                    href: sanitized.href,
-                    title: typeof attrs.title === "string" ? attrs.title : void 0
-                  };
-                  run2.link = migrateLegacyLink(legacyLink);
+            if (!isTabRun2) {
+              const attrs = mark2.attrs ?? {};
+              if (hyperlinkConfig.enableRichHyperlinks) {
+                try {
+                  const link2 = buildFlowRunLink(attrs);
+                  if (link2) {
+                    run2.link = link2;
+                  }
+                } catch (error) {
+                  if (process$1$1.env.NODE_ENV === "development") {
+                    console.warn("[PM-Adapter] Failed to build rich hyperlink:", error);
+                  }
                 }
-              } catch (error) {
-                if (process$1$1.env.NODE_ENV === "development") {
-                  console.warn("[PM-Adapter] Failed to sanitize link href:", error);
+              } else if (typeof attrs.href === "string" && attrs.href.trim()) {
+                try {
+                  const sanitized = sanitizeHref(attrs.href);
+                  if (sanitized && sanitized.href) {
+                    const legacyLink = {
+                      href: sanitized.href,
+                      title: typeof attrs.title === "string" ? attrs.title : void 0
+                    };
+                    run2.link = migrateLegacyLink(legacyLink);
+                  }
+                } catch (error) {
+                  if (process$1$1.env.NODE_ENV === "development") {
+                    console.warn("[PM-Adapter] Failed to sanitize link href:", error);
+                  }
                 }
               }
             }
@@ -70012,7 +70020,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           console.warn(`[PM-Adapter] Failed to apply mark ${mark2.type}:`, error);
         }
       }
-      if (forwardedDataAttrs) {
+      if (forwardedDataAttrs && !isTabRun2) {
         run2.dataAttrs = { ...run2.dataAttrs ?? {}, ...forwardedDataAttrs };
       }
     });
@@ -70034,14 +70042,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return run2;
   }
-  function tabNodeToRun(node2, positions, tabIndex, paragraph2) {
+  function tabNodeToRun(node2, positions, tabIndex, paragraph2, inheritedMarks = []) {
     const pos = positions.get(node2);
     if (!pos) return null;
     const paragraphAttrs = paragraph2.attrs ?? {};
     const paragraphProps = typeof paragraphAttrs.paragraphProperties === "object" && paragraphAttrs.paragraphProperties !== null ? paragraphAttrs.paragraphProperties : {};
     const tabStops = Array.isArray(paragraphAttrs.tabStops) && paragraphAttrs.tabStops.length ? paragraphAttrs.tabStops : Array.isArray(paragraphProps.tabStops) ? paragraphProps.tabStops : void 0;
     const indent2 = paragraphAttrs.indent ?? paragraphProps.indent ?? void 0;
-    return {
+    const run2 = {
       kind: "tab",
       text: "	",
       pmStart: pos.start,
@@ -70051,6 +70059,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       indent: indent2,
       leader: node2.attrs?.leader ?? null
     };
+    const marks = [...node2.marks ?? [], ...inheritedMarks ?? []];
+    if (marks.length > 0) {
+      applyMarksToRun(run2, marks);
+    }
+    return run2;
   }
   function tokenNodeToRun(node2, positions, defaultFont, defaultSize, inheritedMarks = [], token, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors) {
     const run2 = {
@@ -71877,9 +71890,26 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (isHeadingStyle && (!resolvedIndent || Object.keys(resolvedIndent).length === 0 || onlyFirstLineIndent)) {
       resolvedIndent = { firstLine: 0, hanging: 0, left: resolvedIndent?.left, right: resolvedIndent?.right };
     }
+    let resolvedSpacing = cloneIfObject(resolvedAsRecord.spacing);
+    const tableStyleParagraphProps = context.tableStyleParagraphProps;
+    if (tableStyleParagraphProps?.spacing) {
+      const tableSpacing = tableStyleParagraphProps.spacing;
+      const paragraphHasExplicitSpacing = Boolean(spacing);
+      if (!paragraphHasExplicitSpacing) {
+        resolvedSpacing = {
+          ...resolvedSpacing,
+          ...tableSpacing
+        };
+      } else {
+        resolvedSpacing = {
+          ...tableSpacing,
+          ...resolvedSpacing
+        };
+      }
+    }
     const hydrated = {
       resolved,
-      spacing: cloneIfObject(resolvedAsRecord.spacing),
+      spacing: resolvedSpacing,
       indent: resolvedIndent,
       borders: cloneIfObject(resolvedExtended.borders),
       shading: cloneIfObject(resolvedExtended.shading),
@@ -72778,11 +72808,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
         }
         paragraphAttrs.wordLayout = wordLayout;
-        if (enrichedNumberingProps.resolvedLevelIndent && !hasExplicitIndent) {
+        if (enrichedNumberingProps.resolvedLevelIndent) {
           const resolvedIndentPx = convertIndentTwipsToPx(enrichedNumberingProps.resolvedLevelIndent);
+          const baseIndent = resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent;
           paragraphAttrs.indent = {
-            ...paragraphAttrs.indent,
-            ...resolvedIndentPx ?? enrichedNumberingProps.resolvedLevelIndent
+            ...baseIndent,
+            ...normalizedIndent ?? {}
           };
         }
       }
@@ -73847,7 +73878,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         return;
       }
       if (node2.type === "tab") {
-        const tabRun = tabNodeToRun(node2, positions, tabOrdinal, para);
+        const tabRun = tabNodeToRun(node2, positions, tabOrdinal, para, inheritedMarks);
         tabOrdinal += 1;
         if (tabRun) {
           currentRuns.push(tabRun);
@@ -74542,6 +74573,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           hydration.justification = referenced.justification;
         }
       }
+      const paragraphProps = extractTableStyleParagraphProps(styleId, context.docx);
+      if (paragraphProps) {
+        hydration.paragraphProps = paragraphProps;
+      }
     }
     if (Object.keys(hydration).length > 0) {
       return hydration;
@@ -74592,6 +74627,51 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return { width: raw, type: measurement.type };
   };
+  const extractTableStyleParagraphProps = (styleId, docx) => {
+    try {
+      const stylesXml = docx["word/styles.xml"];
+      if (!stylesXml?.elements?.[0]?.elements) return void 0;
+      const styleElements = stylesXml.elements[0].elements.filter((el) => el.name === "w:style");
+      const styleTag = styleElements.find((el) => el.attributes?.["w:styleId"] === styleId);
+      if (!styleTag?.elements) {
+        return void 0;
+      }
+      const pPr = styleTag.elements.find((el) => el.name === "w:pPr");
+      if (!pPr?.elements) {
+        return void 0;
+      }
+      const spacingEl = pPr.elements.find((el) => el.name === "w:spacing");
+      if (!spacingEl?.attributes) {
+        return void 0;
+      }
+      const attrs = spacingEl.attributes;
+      const spacing = {};
+      const before = parseIntSafe(attrs["w:before"]);
+      const after = parseIntSafe(attrs["w:after"]);
+      const line = parseIntSafe(attrs["w:line"]);
+      const rawLineRule = attrs["w:lineRule"];
+      const lineRule = rawLineRule === "auto" || rawLineRule === "exact" || rawLineRule === "atLeast" ? rawLineRule : void 0;
+      if (before != null) spacing.before = twipsToPx$1(before);
+      if (after != null) spacing.after = twipsToPx$1(after);
+      if (line != null) {
+        if (lineRule === "auto") {
+          spacing.line = line / 240;
+        } else {
+          spacing.line = twipsToPx$1(line);
+        }
+      }
+      if (lineRule) spacing.lineRule = lineRule;
+      const result = Object.keys(spacing).length > 0 ? { spacing } : void 0;
+      return result;
+    } catch (err) {
+      return void 0;
+    }
+  };
+  const parseIntSafe = (value) => {
+    if (value == null) return void 0;
+    const num = typeof value === "number" ? value : parseInt(String(value), 10);
+    return Number.isFinite(num) ? num : void 0;
+  };
   const isTableRowNode = (node2) => node2.type === "tableRow" || node2.type === "table_row";
   const isTableCellNode = (node2) => node2.type === "tableCell" || node2.type === "table_cell" || node2.type === "tableHeader" || node2.type === "table_header";
   const normalizeRowHeight = (rowProps) => {
@@ -74611,11 +74691,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     };
   };
   const parseTableCell = (args) => {
-    const { cellNode, rowIndex, cellIndex, context, defaultCellPadding } = args;
+    const { cellNode, rowIndex, cellIndex, context, defaultCellPadding, tableStyleParagraphProps } = args;
     if (!isTableCellNode(cellNode) || !Array.isArray(cellNode.content)) {
       return null;
     }
     const blocks2 = [];
+    const cellConverterContext = tableStyleParagraphProps ? {
+      ...context.converterContext,
+      tableStyleParagraphProps
+    } : context.converterContext;
     for (const childNode of cellNode.content) {
       if (childNode.type === "paragraph") {
         const paragraphBlocks = context.paragraphToFlowBlocks(
@@ -74626,11 +74710,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           context.defaultSize,
           context.styleContext,
           void 0,
+          // listCounterContext
           context.trackedChanges,
           context.bookmarks,
           context.hyperlinkConfig,
           context.themeColors,
-          context.converterContext
+          cellConverterContext
+          // converterContext at position 12
         );
         const paragraph2 = paragraphBlocks.find((b2) => b2.kind === "paragraph");
         if (paragraph2) {
@@ -74673,7 +74759,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     };
   };
   const parseTableRow = (args) => {
-    const { rowNode, rowIndex, context, defaultCellPadding } = args;
+    const { rowNode, rowIndex, context, defaultCellPadding, tableStyleParagraphProps } = args;
     if (!isTableRowNode(rowNode) || !Array.isArray(rowNode.content)) {
       return null;
     }
@@ -74684,7 +74770,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         rowIndex,
         cellIndex,
         context,
-        defaultCellPadding
+        defaultCellPadding,
+        tableStyleParagraphProps
       });
       if (parsedCell) {
         cells.push(parsedCell);
@@ -74793,13 +74880,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     };
     const hydratedTableStyle = hydrateTableStyleAttrs(node2, converterContext);
     const defaultCellPadding = hydratedTableStyle?.cellPadding;
+    const tableStyleParagraphProps = hydratedTableStyle?.paragraphProps;
     const rows = [];
     node2.content.forEach((rowNode, rowIndex) => {
       const parsedRow = parseTableRow({
         rowNode,
         rowIndex,
         context: parserDeps,
-        defaultCellPadding
+        defaultCellPadding,
+        tableStyleParagraphProps
       });
       if (parsedRow) {
         rows.push(parsedRow);
@@ -75055,7 +75144,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       blocks2.push(sectionBreak);
       recordBlockKind(sectionBreak.kind);
     }
-    const paragraphConverter = (para, nextBlockId2, positions2, defaultFont2, defaultSize2, context, listCounterContext, trackedChanges, bookmarks2, hyperlinkConfig2) => paragraphToFlowBlocks(
+    const paragraphConverter = (para, nextBlockId2, positions2, defaultFont2, defaultSize2, context, listCounterContext, trackedChanges, bookmarks2, hyperlinkConfig2, themeColorsParam, converterCtx) => paragraphToFlowBlocks(
       para,
       nextBlockId2,
       positions2,
@@ -75066,8 +75155,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       trackedChanges,
       bookmarks2,
       hyperlinkConfig2,
-      themeColors,
-      converterContext
+      themeColorsParam ?? themeColors,
+      converterCtx ?? converterContext
     );
     const tableConverter = (node2, nextBlockId2, positions2, defaultFont2, defaultSize2, context, trackedChanges, bookmarks2, hyperlinkConfig2, themeColorsParam, converterCtx) => tableNodeToBlock(
       node2,
@@ -75847,9 +75936,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           odd: section.footerRefs.odd ?? null
         });
       }
-      const hasFirstHeader = Boolean(section.headerRefs?.first);
-      const hasFirstFooter = Boolean(section.footerRefs?.first);
-      if (hasFirstHeader || hasFirstFooter) {
+      if (section.titlePg === true) {
         identifier.sectionTitlePg.set(idx, true);
       }
     }
@@ -77056,14 +77143,35 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const headerHeight = headerCount > 0 ? sumRowHeights(measure.rows, 0, headerCount) : 0;
     let state2 = ensurePage();
     const availableHeight = state2.contentBottom - state2.cursorY;
-    let minRequiredHeight = 0;
-    if (measure.rows.length > 0) {
-      minRequiredHeight = sumRowHeights(measure.rows, 0, 1);
-    } else if (measure.totalHeight > 0) {
-      minRequiredHeight = measure.totalHeight;
-    }
-    if (minRequiredHeight > availableHeight && state2.page.fragments.length > 0) {
-      state2 = advanceColumn(state2);
+    const hasPriorFragments = state2.page.fragments.length > 0;
+    const hasMeasuredRows = measure.rows.length > 0 && block.rows.length > 0;
+    if (hasMeasuredRows && hasPriorFragments) {
+      const firstRowCantSplit = block.rows[0]?.attrs?.tableRowProperties?.cantSplit === true;
+      const firstRowHeight = measure.rows[0]?.height ?? measure.totalHeight ?? 0;
+      if (firstRowCantSplit) {
+        if (firstRowHeight > availableHeight) {
+          state2 = advanceColumn(state2);
+        }
+      } else {
+        const partial = computePartialRow(0, block.rows[0], measure, availableHeight);
+        const madeProgress = partial.toLineByCell.some(
+          (toLine, idx) => toLine > (partial.fromLineByCell[idx] || 0)
+        );
+        const hasRenderableHeight = partial.partialHeight > 0;
+        if (!madeProgress || !hasRenderableHeight) {
+          state2 = advanceColumn(state2);
+        }
+      }
+    } else if (hasPriorFragments) {
+      let minRequiredHeight = 0;
+      if (measure.rows.length > 0) {
+        minRequiredHeight = sumRowHeights(measure.rows, 0, 1);
+      } else if (measure.totalHeight > 0) {
+        minRequiredHeight = measure.totalHeight;
+      }
+      if (minRequiredHeight > availableHeight) {
+        state2 = advanceColumn(state2);
+      }
     }
     let currentRow = 0;
     let isTableContinuation = false;
@@ -77128,7 +77236,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           return fromLine < totalLines;
         });
         const fragmentHeight2 = continuationPartialRow.partialHeight + (repeatHeaderCount > 0 ? headerHeight : 0);
-        if (fragmentHeight2 > 0) {
+        if (fragmentHeight2 > 0 && madeProgress) {
           const fragment2 = {
             kind: "table",
             blockId: block.id,
@@ -85637,9 +85745,16 @@ ${l}
             tabEl.style.width = `${actualTabWidth}px`;
             tabEl.style.height = `${line.lineHeight}px`;
             tabEl.style.display = "inline-block";
-            tabEl.style.visibility = "hidden";
             tabEl.style.pointerEvents = "none";
             tabEl.style.zIndex = "1";
+            if (baseRun.underline) {
+              const underlineStyle = baseRun.underline.style ?? "single";
+              const underlineColor = baseRun.underline.color ?? "#000000";
+              const borderStyle = underlineStyle === "double" ? "double" : "solid";
+              tabEl.style.borderBottom = `1px ${borderStyle} ${underlineColor}`;
+            } else {
+              tabEl.style.visibility = "hidden";
+            }
             if (styleId) {
               tabEl.setAttribute("styleid", styleId);
             }
@@ -85717,6 +85832,28 @@ ${l}
         }
       } else {
         runsForLine.forEach((run2) => {
+          if (run2.kind === "tab") {
+            const tabEl = this.doc.createElement("span");
+            tabEl.classList.add("superdoc-tab");
+            const tabWidth = run2.width ?? 48;
+            tabEl.style.display = "inline-block";
+            tabEl.style.width = `${tabWidth}px`;
+            tabEl.style.height = `${line.lineHeight}px`;
+            tabEl.style.verticalAlign = "bottom";
+            if (run2.underline) {
+              const underlineStyle = run2.underline.style ?? "single";
+              const underlineColor = run2.underline.color ?? "#000000";
+              const borderStyle = underlineStyle === "double" ? "double" : "solid";
+              tabEl.style.borderBottom = `1px ${borderStyle} ${underlineColor}`;
+            }
+            if (styleId) {
+              tabEl.setAttribute("styleid", styleId);
+            }
+            if (run2.pmStart != null) tabEl.dataset.pmStart = String(run2.pmStart);
+            if (run2.pmEnd != null) tabEl.dataset.pmEnd = String(run2.pmEnd);
+            el.appendChild(tabEl);
+            return;
+          }
           const elem = this.renderRun(run2, context, trackedConfig);
           if (elem) {
             if (styleId) {
@@ -86805,8 +86942,10 @@ ${l}
     const indentRight = sanitizePositive(indent2?.right);
     const firstLine = indent2?.firstLine ?? 0;
     const hanging = indent2?.hanging ?? 0;
+    const isWordLayoutList = Boolean(wordLayout?.marker);
     const suppressFirstLine = block.attrs?.suppressFirstLineIndent === true;
-    const firstLineOffset = suppressFirstLine ? 0 : firstLine - hanging;
+    const rawFirstLineOffset = suppressFirstLine ? 0 : firstLine - hanging;
+    const firstLineOffset = isWordLayoutList ? 0 : rawFirstLineOffset;
     const contentWidth = Math.max(1, maxWidth - indentLeft - indentRight);
     const initialAvailableWidth = Math.max(1, contentWidth - firstLineOffset);
     const tabStops = buildTabStopsPx(
@@ -145637,7 +145776,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.28";
+      this.version = "1.0.0-beta.29";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -145985,7 +146124,6 @@ ${style2}
      */
     addCommentsList(element2) {
       if (!this.config?.modules?.comments || this.config.role === "viewer") return;
-      this.#log("🦋 [superdoc] Adding comments list to:", element2);
       if (element2) this.config.modules.comments.element = element2;
       this.commentsList = new SuperComments(this.config.modules?.comments, this);
       if (this.config.onCommentsListChange) this.config.onCommentsListChange({ isRendered: true });
@@ -148082,7 +148220,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexCLV7RJY = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexCFdgXvG = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));