@harbour-enterprises/superdoc 1.5.0-next.5 → 1.5.0-next.6

package/dist/superdoc.umd.js

@@ -15124,6 +15124,11 @@
   const validXmlAttributes$9 = ["w:rsidDel", "w:rsidR", "w:rsidRPr", "w:rsidTr", "w14:paraId", "w14:textId"].map(
     (xmlName) => createAttributeHandler(xmlName)
   );
+  const getColspan$1 = (cell2) => {
+    const rawColspan = cell2?.attrs?.colspan;
+    const numericColspan = typeof rawColspan === "string" ? parseInt(rawColspan, 10) : rawColspan;
+    return Number.isFinite(numericColspan) && numericColspan > 0 ? numericColspan : 1;
+  };
   const encode$w = (params2, encodedAttrs) => {
     const { row: row2 } = params2.extraParams;
     let tableRowProperties = {};
@@ -15256,7 +15261,27 @@
       }
       return cell2;
     });
-    const trimmedContent = sanitizedCells.filter((_2, index2) => !isPlaceholderCell(trimmedSlice[index2]));
+    let trimmedContent = sanitizedCells.filter((_2, index2) => !isPlaceholderCell(trimmedSlice[index2]));
+    const preferTableGrid = params2.extraParams?.preferTableGrid === true;
+    const totalColumns = params2.extraParams?.totalColumns;
+    if (preferTableGrid && typeof totalColumns === "number" && Number.isFinite(totalColumns) && totalColumns > 0) {
+      const rawGridBefore = node2.attrs?.tableRowProperties?.gridBefore;
+      const numericGridBefore = typeof rawGridBefore === "string" ? parseInt(rawGridBefore, 10) : rawGridBefore;
+      const safeGridBefore = Number.isFinite(numericGridBefore) && numericGridBefore > 0 ? numericGridBefore : 0;
+      const effectiveGridBefore = leadingPlaceholders > 0 ? leadingPlaceholders : safeGridBefore;
+      const availableColumns = Math.max(totalColumns - effectiveGridBefore, 0);
+      let usedColumns = 0;
+      const constrainedCells = [];
+      for (const cell2 of trimmedContent) {
+        const colspan = getColspan$1(cell2);
+        if (usedColumns + colspan > availableColumns) {
+          break;
+        }
+        constrainedCells.push(cell2);
+        usedColumns += colspan;
+      }
+      trimmedContent = constrainedCells;
+    }
     const translateParams = {
       ...params2,
       node: { ...node2, content: trimmedContent }
@@ -31536,6 +31561,53 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     attributes: validXmlAttributes$5
   };
   const translator$s = NodeTranslator.from(config$d);
+  const getColspan = (cell2) => {
+    const rawColspan = cell2?.attrs?.colspan;
+    const numericColspan = typeof rawColspan === "string" ? parseInt(rawColspan, 10) : rawColspan;
+    return Number.isFinite(numericColspan) && numericColspan > 0 ? numericColspan : 1;
+  };
+  const resolveGridBefore = (row2) => {
+    const rawGridBefore = row2?.attrs?.tableRowProperties?.gridBefore ?? row2?.attrs?.gridBefore;
+    const numericGridBefore = typeof rawGridBefore === "string" ? parseInt(rawGridBefore, 10) : rawGridBefore;
+    if (!Number.isFinite(numericGridBefore) || numericGridBefore <= 0) return 0;
+    const cells = Array.isArray(row2.content) ? row2.content : [];
+    let leadingGridBefore = 0;
+    while (leadingGridBefore < cells.length && cells[leadingGridBefore]?.attrs?.__placeholder === "gridBefore") {
+      leadingGridBefore += 1;
+    }
+    return leadingGridBefore > 0 ? 0 : numericGridBefore;
+  };
+  const advanceColumnsForCell = (columnIndex, cell2) => columnIndex + getColspan(cell2);
+  const getCellStartColumn = (row2, targetCell) => {
+    const cells = Array.isArray(row2.content) ? row2.content : [];
+    let columnIndex = resolveGridBefore(row2);
+    for (const cell2 of cells) {
+      if (cell2 === targetCell) return columnIndex;
+      columnIndex = advanceColumnsForCell(columnIndex, cell2);
+    }
+    return columnIndex;
+  };
+  const findCellCoveringColumn = (row2, targetColumn) => {
+    const cells = Array.isArray(row2.content) ? row2.content : [];
+    let columnIndex = resolveGridBefore(row2);
+    for (const cell2 of cells) {
+      const colspan = getColspan(cell2);
+      if (targetColumn >= columnIndex && targetColumn < columnIndex + colspan) {
+        return cell2;
+      }
+      columnIndex = advanceColumnsForCell(columnIndex, cell2);
+    }
+    return null;
+  };
+  const findInsertionIndexForColumn = (row2, targetColumn) => {
+    const cells = Array.isArray(row2.content) ? row2.content : [];
+    let columnIndex = resolveGridBefore(row2);
+    for (let index2 = 0; index2 < cells.length; index2++) {
+      if (columnIndex >= targetColumn) return index2;
+      columnIndex = advanceColumnsForCell(columnIndex, cells[index2]);
+    }
+    return cells.length;
+  };
   function preProcessVerticalMergeCells(table2, { editorSchema }) {
     if (!table2 || !Array.isArray(table2.content)) {
       return table2;
@@ -31551,15 +31623,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         const cell2 = row2.content[cellIndex];
         if (!cell2) continue;
         const attrs = cell2.attrs || {};
-        if (!attrs.rowspan || attrs.rowspan <= 1) continue;
-        const maxRowspan = Math.min(attrs.rowspan, rows.length - rowIndex);
+        const rawRowspan = typeof attrs.rowspan === "string" ? parseInt(attrs.rowspan, 10) : attrs.rowspan;
+        if (!Number.isFinite(rawRowspan) || rawRowspan <= 1) continue;
+        const maxRowspan = Math.min(rawRowspan, rows.length - rowIndex);
+        const startColumn = getCellStartColumn(row2, cell2);
         for (let offset2 = 1; offset2 < maxRowspan; offset2++) {
           const rowToChange = rows[rowIndex + offset2];
           if (!rowToChange) continue;
           if (!Array.isArray(rowToChange.content)) {
             rowToChange.content = [];
           }
-          const existingCell = rowToChange.content[cellIndex];
+          const existingCell = findCellCoveringColumn(rowToChange, startColumn);
           if (existingCell?.attrs?.continueMerge) continue;
           const mergedCell = {
             type: cell2.type,
@@ -31570,7 +31644,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               continueMerge: true
             }
           };
-          rowToChange.content.splice(cellIndex, 0, mergedCell);
+          const insertionIndex = findInsertionIndexForColumn(rowToChange, startColumn);
+          rowToChange.content.splice(insertionIndex, 0, mergedCell);
         }
       }
     }
@@ -31722,15 +31797,24 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const decode$t = (params2) => {
     const { grid: rawGrid } = params2.node.attrs || {};
     const grid = Array.isArray(rawGrid) ? rawGrid : [];
-    const { firstRow = {} } = params2.extraParams || {};
+    const { firstRow = {}, preferTableGrid = false, totalColumns: requestedColumns } = params2.extraParams || {};
     const cellNodes = firstRow.content?.filter((n) => n.type === "tableCell") ?? [];
-    const colWidthsFromCellNodes = cellNodes.flatMap((cell2) => {
+    let colWidthsFromCellNodes = cellNodes.flatMap((cell2) => {
       const spanCount = Math.max(1, cell2?.attrs?.colspan ?? 1);
       const colwidth = cell2.attrs?.colwidth;
       return Array.from({ length: spanCount }).map((_2, span) => Array.isArray(colwidth) ? colwidth[span] : void 0);
     });
     const columnCountFromCells = colWidthsFromCellNodes.length;
-    const totalColumns = Math.max(columnCountFromCells, grid.length);
+    const gridColumnCount = grid.length;
+    let totalColumns = Math.max(columnCountFromCells, gridColumnCount);
+    if (typeof requestedColumns === "number" && Number.isFinite(requestedColumns) && requestedColumns > 0) {
+      totalColumns = requestedColumns;
+    } else if (preferTableGrid && gridColumnCount > 0) {
+      totalColumns = gridColumnCount;
+    }
+    if (colWidthsFromCellNodes.length > totalColumns) {
+      colWidthsFromCellNodes = colWidthsFromCellNodes.slice(0, totalColumns);
+    }
     const fallbackColumnWidthTwips = resolveFallbackColumnWidthTwips(params2, totalColumns, cellMinWidth);
     const elements = [];
     const pushColumn = (widthTwips, { enforceMinimum = false } = {}) => {
@@ -31990,22 +32074,31 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const decode$s = (params2, decodedAttrs) => {
     params2.node = preProcessVerticalMergeCells(params2.node, params2);
     const { node: node2 } = params2;
-    const elements = translateChildNodes(params2);
+    const rawGrid = node2.attrs?.grid;
+    const grid = Array.isArray(rawGrid) ? rawGrid : [];
+    const preferTableGrid = node2.attrs?.userEdited !== true && grid.length > 0;
+    const totalColumns = preferTableGrid ? grid.length : void 0;
+    const extraParams = {
+      ...params2.extraParams || {},
+      preferTableGrid,
+      totalColumns
+    };
+    const elements = translateChildNodes({ ...params2, extraParams });
     const firstRow = node2.content?.find((n) => n.type === "tableRow");
-    const properties = node2.attrs.grid;
     const element2 = translator$c.decode({
       ...params2,
-      node: { ...node2, attrs: { ...node2.attrs, grid: properties } },
+      node: { ...node2, attrs: { ...node2.attrs, grid } },
       extraParams: {
+        ...extraParams,
         firstRow
       }
     });
     if (element2) elements.unshift(element2);
     if (node2.attrs?.tableProperties) {
-      const properties2 = { ...node2.attrs.tableProperties };
+      const properties = { ...node2.attrs.tableProperties };
       const element22 = translator$e.decode({
         ...params2,
-        node: { ...node2, attrs: { ...node2.attrs, tableProperties: properties2 } }
+        node: { ...node2, attrs: { ...node2.attrs, tableProperties: properties } }
       });
       if (element22) elements.unshift(element22);
     }
@@ -36992,7 +37085,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.5.0-next.5") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.5.0-next.6") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -62875,7 +62968,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.5.0-next.5";
+  const summaryVersion = "1.5.0-next.6";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -65533,7 +65626,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.5.0-next.5");
+      console.debug("[checkVersionMigrations] Current editor version", "1.5.0-next.6");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -146937,7 +147030,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.5.0-next.5";
+      this.version = "1.5.0-next.6";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;