superdoc 0.31.0-next.6 → 0.31.0-next.7

package/dist/superdoc.umd.js

@@ -15427,6 +15427,38 @@
     if (element2.className?.split(" ")?.indexOf(classname) >= 0) return true;
     return element2.parentNode && hasSomeParentWithClass(element2.parentNode, classname);
   };
+  function convertSizeToCSS(value, type2) {
+    if (typeof value === "string" && value.endsWith("%")) {
+      type2 = "pct";
+    }
+    if (value === null || value === void 0) {
+      value = 0;
+    }
+    switch (type2) {
+      case "dxa":
+      case null:
+      case void 0:
+        return `${twipsToPixels(value)}px`;
+      case "nil":
+        return "0";
+      case "auto":
+        return null;
+      case "pct":
+        let percent2;
+        if (typeof value === "number") {
+          percent2 = value * 0.02;
+        } else {
+          if (value.endsWith("%")) {
+            percent2 = parseFloat(value.slice(0, -1));
+          } else {
+            percent2 = parseFloat(value) * 0.02;
+          }
+        }
+        return `${percent2}%`;
+      default:
+        return null;
+    }
+  }
   const DEFAULT_DOCX_DEFS = {
     "xmlns:wpc": "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
     "xmlns:cx": "http://schemas.microsoft.com/office/drawing/2014/chartex",
@@ -19239,7 +19271,7 @@
     const finalProps = combineProperties(styleChain, ["fontFamily", "color"]);
     return finalProps;
   };
-  function resolveParagraphProperties(params2, inlineProps, insideTable = false, overrideInlineStyleId = false) {
+  function resolveParagraphProperties(params2, inlineProps, insideTable = false, overrideInlineStyleId = false, tableStyleId = null) {
     const defaultProps2 = getDefaultProperties(params2, translator$12);
     const { properties: normalProps, isDefault: isNormalDefault } = getStyleProperties(params2, "Normal", translator$12);
     let styleId = inlineProps?.styleId;
@@ -19264,13 +19296,14 @@
         }
       }
     }
+    const tableProps = tableStyleId ? resolveStyleChain(params2, tableStyleId, translator$12) : {};
     let defaultsChain;
     if (isNormalDefault) {
       defaultsChain = [defaultProps2, normalProps];
     } else {
       defaultsChain = [normalProps, defaultProps2];
     }
-    const propsChain = [...defaultsChain, numberingProps, styleProps, inlineProps];
+    const propsChain = [...defaultsChain, tableProps, numberingProps, styleProps, inlineProps];
     let indentChain;
     if (isList2) {
       if (numberingDefinedInline) {
@@ -20021,6 +20054,21 @@
     if (value === "0" || value === "false" || value === "off") return "0";
     return "1";
   }
+  function getTableStyleId(path2) {
+    const tbl = path2.find((ancestor) => ancestor.name === "w:tbl");
+    if (!tbl) {
+      return;
+    }
+    const tblPr = tbl.elements?.find((child) => child.name === "w:tblPr");
+    if (!tblPr) {
+      return;
+    }
+    const tblStyle = tblPr.elements?.find((child) => child.name === "w:tblStyle");
+    if (!tblStyle) {
+      return;
+    }
+    return tblStyle.attributes?.["w:val"];
+  }
   const handleParagraphNode$1 = (params2) => {
     const { nodes, nodeListHandler, filename } = params2;
     const node2 = carbonCopy(nodes[0]);
@@ -20031,7 +20079,14 @@
       inlineParagraphProperties = translator$12.encode({ ...params2, nodes: [pPr] }) || {};
     }
     const insideTable = (params2.path || []).some((ancestor) => ancestor.name === "w:tc");
-    const resolvedParagraphProperties = resolveParagraphProperties(params2, inlineParagraphProperties, insideTable);
+    const tableStyleId = getTableStyleId(params2.path || []);
+    const resolvedParagraphProperties = resolveParagraphProperties(
+      params2,
+      inlineParagraphProperties,
+      insideTable,
+      false,
+      tableStyleId
+    );
     const handleStandardNode2 = nodeListHandler.handlerEntities.find(
       (e) => e.handlerName === "standardNodeHandler"
     )?.handler;
@@ -21386,6 +21441,7 @@
       const columnWidth = gridColumnWidths?.[startColumn] || null;
       const result = translator$G.encode({
         ...params2,
+        path: [...params2.path || [], node2],
         extraParams: {
           ...params2.extraParams,
           node: node2,
@@ -31556,14 +31612,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const grid = Array.isArray(rawGrid) ? rawGrid : [];
     const { firstRow = {} } = params2.extraParams || {};
     const cellNodes = firstRow.content?.filter((n) => n.type === "tableCell") ?? [];
-    const columnCountFromCells = cellNodes.reduce((count, cell2) => {
+    const colWidthsFromCellNodes = cellNodes.flatMap((cell2) => {
       const spanCount = Math.max(1, cell2?.attrs?.colspan ?? 1);
-      return count + spanCount;
-    }, 0);
+      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 fallbackColumnWidthTwips = resolveFallbackColumnWidthTwips(params2, totalColumns, cellMinWidth);
     const elements = [];
-    let columnIndex = 0;
     const pushColumn = (widthTwips, { enforceMinimum = false } = {}) => {
       let numericWidth = typeof widthTwips === "string" ? parseInt(widthTwips, 10) : widthTwips;
       let shouldEnforceMinimum = enforceMinimum;
@@ -31582,39 +31639,29 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       });
       if (decoded) elements.push(decoded);
     };
-    cellNodes.forEach((cell2) => {
-      const { colspan = 1, colwidth } = cell2?.attrs || {};
-      const spanCount = Math.max(1, colspan);
-      for (let span = 0; span < spanCount; span++) {
-        const rawWidth = Array.isArray(colwidth) ? colwidth[span] : void 0;
-        const cellWidthPixels = typeof rawWidth === "number" && Number.isFinite(rawWidth) ? rawWidth : Number(rawWidth);
-        const hasCellWidth = Number.isFinite(cellWidthPixels) && cellWidthPixels > 0;
-        const colGridAttrs = grid?.[columnIndex] || {};
-        const gridWidthTwips = normalizeTwipWidth(colGridAttrs.col);
-        const gridWidthPixels = gridWidthTwips != null ? twipsToPixels(gridWidthTwips) : null;
-        let cellWidthTwips;
-        let enforceMinimum = false;
-        if (hasCellWidth) {
-          const tolerance = 0.5;
-          if (gridWidthTwips != null && gridWidthPixels != null && Math.abs(gridWidthPixels - cellWidthPixels) <= tolerance) {
-            cellWidthTwips = gridWidthTwips;
-          } else {
-            cellWidthTwips = pixelsToTwips(cellWidthPixels);
-          }
-        } else if (gridWidthTwips != null) {
+    for (let columnIndex = 0; columnIndex < totalColumns; ++columnIndex) {
+      const rawWidth = colWidthsFromCellNodes[columnIndex];
+      const cellWidthPixels = typeof rawWidth === "number" && Number.isFinite(rawWidth) ? rawWidth : Number(rawWidth);
+      const hasCellWidth = Number.isFinite(cellWidthPixels) && cellWidthPixels > 0;
+      const colGridAttrs = grid?.[columnIndex] || {};
+      const gridWidthTwips = normalizeTwipWidth(colGridAttrs.col);
+      const gridWidthPixels = gridWidthTwips != null ? twipsToPixels(gridWidthTwips) : null;
+      let cellWidthTwips;
+      let enforceMinimum = false;
+      if (gridWidthTwips != null) {
+        cellWidthTwips = gridWidthTwips;
+      } else if (hasCellWidth) {
+        const tolerance = 0.5;
+        if (gridWidthTwips != null && gridWidthPixels != null && Math.abs(gridWidthPixels - cellWidthPixels) <= tolerance) {
           cellWidthTwips = gridWidthTwips;
         } else {
-          cellWidthTwips = fallbackColumnWidthTwips;
-          enforceMinimum = true;
+          cellWidthTwips = pixelsToTwips(cellWidthPixels);
         }
-        pushColumn(cellWidthTwips, { enforceMinimum });
-        columnIndex++;
+      } else {
+        cellWidthTwips = fallbackColumnWidthTwips;
+        enforceMinimum = true;
       }
-    });
-    while (columnIndex < grid.length) {
-      const gridWidthTwips = normalizeTwipWidth(grid[columnIndex]?.col);
-      pushColumn(gridWidthTwips);
-      columnIndex++;
+      pushColumn(cellWidthTwips, { enforceMinimum });
     }
     const newNode = {
       name: XML_NODE_NAME$b,
@@ -31701,6 +31748,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (tblPr) {
       const encodedProperties = translator$c.encode({ ...params2, nodes: [tblPr] });
       encodedAttrs["tableProperties"] = encodedProperties || {};
+    } else {
+      encodedAttrs["tableProperties"] || (encodedAttrs["tableProperties"] = {});
     }
     const tblGrid = node2.elements.find((el) => el.name === "w:tblGrid");
     if (tblGrid) {
@@ -31721,14 +31770,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         key2 = prop;
         transform = (v2) => v2;
       }
-      if (encodedAttrs.tableProperties && encodedAttrs.tableProperties[key2]) {
+      if (encodedAttrs.tableProperties[key2]) {
         encodedAttrs[key2] = transform(encodedAttrs.tableProperties[key2]);
       }
     });
     if (encodedAttrs.tableCellSpacing) {
       encodedAttrs["borderCollapse"] = "separate";
     }
-    if (encodedAttrs.tableProperties?.tableWidth) {
+    if (encodedAttrs.tableProperties.tableWidth) {
       const tableWidthMeasurement = encodedAttrs.tableProperties.tableWidth;
       const widthPx = twipsToPixels(tableWidthMeasurement.value);
       if (widthPx != null) {
@@ -31743,25 +31792,22 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         };
       }
     }
-    const { borders, rowBorders } = _processTableBorders(encodedAttrs.tableProperties?.borders || {});
-    const referencedStyles = _getReferencedTableStyles(encodedAttrs.tableStyleId, params2);
-    if (referencedStyles?.cellMargins && !encodedAttrs.tableProperties?.cellMargins) {
-      encodedAttrs.tableProperties = {
-        ...encodedAttrs.tableProperties || {},
-        cellMargins: referencedStyles.cellMargins
-      };
-    }
+    const borderProps = _processTableBorders(encodedAttrs.tableProperties.borders || {});
+    const referencedStyles = _getReferencedTableStyles(encodedAttrs.tableStyleId, params2) || {};
+    const rowBorders = { ...referencedStyles.rowBorders, ...borderProps.rowBorders };
+    encodedAttrs.borders = { ...referencedStyles.borders, ...borderProps.borders };
+    encodedAttrs.tableProperties.cellMargins = referencedStyles.cellMargins = {
+      ...referencedStyles.cellMargins,
+      ...encodedAttrs.tableProperties.cellMargins
+    };
     const rows = node2.elements.filter((el) => el.name === "w:tr");
-    const borderData = Object.assign({}, referencedStyles?.borders || {}, borders || {});
-    const borderRowData = Object.assign({}, referencedStyles?.rowBorders || {}, rowBorders || {});
-    encodedAttrs["borders"] = borderData;
     let columnWidths = Array.isArray(encodedAttrs["grid"]) ? encodedAttrs["grid"].map((item) => twipsToPixels(item.col)) : [];
     if (!columnWidths.length) {
       const fallback = buildFallbackGridForTable({
         params: params2,
         rows,
         tableWidth: encodedAttrs.tableWidth,
-        tableWidthMeasurement: encodedAttrs.tableProperties?.tableWidth
+        tableWidthMeasurement: encodedAttrs.tableProperties.tableWidth
       });
       if (fallback) {
         encodedAttrs.grid = fallback.grid;
@@ -31774,11 +31820,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     rows.forEach((row2, rowIndex) => {
       const result = translator$v.encode({
         ...params2,
+        path: [...params2.path || [], node2],
         nodes: [row2],
         extraParams: {
           row: row2,
           table: node2,
-          rowBorders: borderRowData,
+          rowBorders,
           columnWidths,
           activeRowSpans: activeRowSpans.slice(),
           rowIndex,
@@ -35303,7 +35350,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 = "0.31.0-next.6") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.31.0-next.7") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -60304,7 +60351,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexDAES86tg),
+        Promise.resolve().then(() => indexBJ6cOegF),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -60505,7 +60552,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.31.0-next.6");
+      console.debug("[checkVersionMigrations] Current editor version", "0.31.0-next.7");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -62914,6 +62961,46 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     });
     return result;
   }
+  function createTagObject(tagData) {
+    if (!tagData || typeof tagData !== "object") {
+      return null;
+    }
+    return JSON.stringify(tagData);
+  }
+  function parseTagObject(tag) {
+    if (typeof tag !== "string" || !tag.startsWith("{")) {
+      return null;
+    }
+    try {
+      const parsed = JSON.parse(tag);
+      return parsed && typeof parsed === "object" ? parsed : null;
+    } catch {
+      return null;
+    }
+  }
+  function hasGroup(tag) {
+    const parsed = parseTagObject(tag);
+    return parsed !== null && typeof parsed.group === "string";
+  }
+  function getGroup(tag) {
+    const parsed = parseTagObject(tag);
+    return parsed && typeof parsed.group === "string" ? parsed.group : null;
+  }
+  function getStructuredContentByGroup(groupOrGroups, state2) {
+    const searchGroups = Array.isArray(groupOrGroups) ? groupOrGroups : [groupOrGroups];
+    const result = findChildren$5(state2.doc, (node2) => {
+      const isStructuredContent = ["structuredContent", "structuredContentBlock"].includes(node2.type.name);
+      if (!isStructuredContent) {
+        return false;
+      }
+      const nodeGroup = getGroup(node2.attrs.tag);
+      if (!nodeGroup) {
+        return false;
+      }
+      return searchGroups.includes(nodeGroup);
+    });
+    return result;
+  }
   function getStructuredContentTags(state2) {
     const result = findChildren$5(state2.doc, (node2) => {
       return node2.type.name === "structuredContent" || node2.type.name === "structuredContentBlock";
@@ -62946,11 +63033,16 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   }
   const structuredContentHelpers = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
+    createTagObject,
+    getGroup,
     getStructuredContentBlockTags,
+    getStructuredContentByGroup,
     getStructuredContentInlineTags,
     getStructuredContentTablesById,
     getStructuredContentTags,
-    getStructuredContentTagsById
+    getStructuredContentTagsById,
+    hasGroup,
+    parseTagObject
   }, Symbol.toStringTag, { value: "Module" }));
   const STRUCTURED_CONTENT_NAMES = ["structuredContent", "structuredContentBlock"];
   const StructuredContentCommands = Extension.create({
@@ -62962,6 +63054,16 @@ Please report this to https://github.com/markedjs/marked.`, e) {
          * @category Command
          * @param {StructuredContentInlineInsert} options
          * @example
+         * // With group for linking multiple fields
+         * editor.commands.insertStructuredContentInline({
+         *  attrs: {
+         *   group: 'customer-info',
+         *   alias: 'Customer Name',
+         *  },
+         *  text: 'John Doe',
+         * });
+         *
+         * // No group
          * editor.commands.insertStructuredContentInline({
          *  attrs: {
          *   id: '123',
@@ -62990,12 +63092,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             if (!content2) {
               content2 = schema.text(" ");
             }
+            let tag = options.attrs?.tag || "inline_text_sdt";
+            if (options.attrs?.group) {
+              tag = createTagObject({ group: options.attrs.group });
+            }
             const attrs = {
-              ...options.attrs,
               id: options.attrs?.id || generateRandomSigned32BitIntStrId(),
-              tag: "inline_text_sdt",
-              alias: options.attrs?.alias || "Structured content"
+              tag,
+              alias: options.attrs?.alias || "Structured content",
+              ...options.attrs
             };
+            delete attrs.group;
             const node2 = schema.nodes.structuredContent.create(attrs, content2, null);
             const parent = findParentNode((node22) => node22.type.name === "structuredContent")(state2.selection);
             if (parent) {
@@ -63011,14 +63118,22 @@ Please report this to https://github.com/markedjs/marked.`, e) {
          * @category Command
          * @param {StructuredContentBlockInsert} options
          * @example
+         * // With group for linking multiple fields
+         * editor.commands.insertStructuredContentBlock({
+         *  attrs: {
+         *    group: 'terms-section',
+         *    alias: 'Terms & Conditions',
+         *  },
+         *  html: '<p>Legal content...</p>',
+         * });
+         *
+         * // No group
          * editor.commands.insertStructuredContentBlock({
          *  attrs: {
          *    id: '456',
          *    alias: 'Terms & Conditions',
          *  },
          *  json: { type: 'paragraph', content: [{ type: 'text', text: 'Legal content...' }] }
-         *  // or
-         *  html: '<p>Legal content...</p>',
          * });
          */
         insertStructuredContentBlock: (options = {}) => ({ editor, dispatch, state: state2, tr }) => {
@@ -63041,12 +63156,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             if (!content2) {
               content2 = schema.nodeFromJSON({ type: "paragraph", content: [] });
             }
+            let tag = options.attrs?.tag || "block_table_sdt";
+            if (options.attrs?.group) {
+              tag = createTagObject({ group: options.attrs.group });
+            }
             const attrs = {
-              ...options.attrs,
               id: options.attrs?.id || generateRandomSigned32BitIntStrId(),
-              tag: "block_table_sdt",
-              alias: options.attrs?.alias || "Structured content"
+              tag,
+              alias: options.attrs?.alias || "Structured content",
+              ...options.attrs
             };
+            delete attrs.group;
             const node2 = schema.nodes.structuredContentBlock.create(attrs, content2, null);
             const parent = findParentNode((node22) => node22.type.name === "structuredContentBlock")(state2.selection);
             if (parent) {
@@ -63176,6 +63296,85 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
           return true;
         },
+        /**
+         * Updates all structured content fields that share the same group identifier.
+         * Groups allow linking multiple fields together for batch operations.
+         * @category Command
+         * @param {string} group - Group identifier shared by multiple fields
+         * @param {StructuredContentUpdate} options
+         * @example
+         * // Update all fields in the customer-info group
+         * editor.commands.updateStructuredContentByGroup('customer-info', { text: 'Jane Doe' });
+         *
+         * // Update block content in a group
+         * editor.commands.updateStructuredContentByGroup('terms-section', {
+         *  html: '<p>Updated terms...</p>'
+         * });
+         */
+        updateStructuredContentByGroup: (group, options = {}) => ({ editor, dispatch, state: state2, tr }) => {
+          const structuredContentTags = getStructuredContentByGroup(group, state2);
+          if (!structuredContentTags.length) {
+            return true;
+          }
+          const { schema } = editor;
+          if (dispatch) {
+            structuredContentTags.forEach((structuredContent) => {
+              const { pos, node: node2 } = structuredContent;
+              const posFrom = tr.mapping.map(pos);
+              const posTo = tr.mapping.map(pos + node2.nodeSize);
+              let content2 = null;
+              if (options.text) {
+                content2 = schema.text(options.text);
+              }
+              if (options.html) {
+                const html2 = htmlHandler(options.html, editor);
+                const doc2 = DOMParser$1.fromSchema(schema).parse(html2);
+                content2 = doc2.content;
+              }
+              if (options.json) {
+                content2 = schema.nodeFromJSON(options.json);
+              }
+              if (!content2) {
+                content2 = node2.content;
+              }
+              const updatedNode = node2.type.create({ ...node2.attrs, ...options.attrs }, content2, node2.marks);
+              const currentNode = tr.doc.nodeAt(posFrom);
+              if (currentNode && node2.eq(currentNode)) {
+                tr.replaceWith(posFrom, posTo, updatedNode);
+              }
+            });
+          }
+          return true;
+        },
+        /**
+         * Removes all structured content fields that share the same group identifier.
+         * @category Command
+         * @param {string | string[]} groupOrGroups - Single group or array of groups
+         * @example
+         * // Delete all fields in a group
+         * editor.commands.deleteStructuredContentByGroup('customer-info');
+         *
+         * // Delete multiple groups
+         * editor.commands.deleteStructuredContentByGroup(['header', 'footer']);
+         */
+        deleteStructuredContentByGroup: (groupOrGroups) => ({ dispatch, state: state2, tr }) => {
+          const structuredContentTags = getStructuredContentByGroup(groupOrGroups, state2);
+          if (!structuredContentTags.length) {
+            return true;
+          }
+          if (dispatch) {
+            structuredContentTags.forEach((structuredContent) => {
+              const { pos, node: node2 } = structuredContent;
+              const posFrom = tr.mapping.map(pos);
+              const posTo = tr.mapping.map(pos + node2.nodeSize);
+              const currentNode = tr.doc.nodeAt(posFrom);
+              if (currentNode && node2.eq(currentNode)) {
+                tr.delete(posFrom, posTo);
+              }
+            });
+          }
+          return true;
+        },
         /**
          * Append multiple rows to the end of a table inside a structured content block.
          * Each inner array represents the cell values for one new row.
@@ -66570,15 +66769,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       };
     }
   });
-  const getColStyleDeclaration = (minWidth, width) => {
-    if (width != null) {
-      const numericWidth = Number(width);
-      if (Number.isFinite(numericWidth) && numericWidth >= 0) {
-        return ["width", `${numericWidth}px`];
-      }
-    }
-    return ["min-width", `${minWidth}px`];
-  };
   const createTableView = ({ editor }) => {
     return class TableView {
       constructor(node2, cellMinWidth2) {
@@ -66597,7 +66787,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         this.table = this.dom.appendChild(document.createElement("table"));
         this.colgroup = this.table.appendChild(document.createElement("colgroup"));
         updateTable(this.editor, this.node, this.table);
-        updateColumns(node2, this.colgroup, this.table, cellMinWidth2, void 0, void 0, this.editor);
+        updateColumns(node2, this.colgroup, this.table);
         this.contentDOM = this.table.appendChild(document.createElement("tbody"));
         setTimeout(() => {
           updateTableWrapper(this.dom, this.table);
@@ -66609,7 +66799,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         }
         this.node = node2;
         updateTable(this.editor, node2, this.table);
-        updateColumns(node2, this.colgroup, this.table, this.cellMinWidth, void 0, void 0, this.editor);
+        updateColumns(node2, this.colgroup, this.table, this.cellMinWidth);
         updateTableWrapper(this.dom, this.table);
         return true;
       }
@@ -66622,43 +66812,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
     };
   };
-  function updateColumns(node2, colgroup, table2, cellMinWidth2, overrideCol, overrideValue, editor) {
+  function updateColumns(node2, colgroup, table2, cellMinWidth2) {
     const gridColumns = Array.isArray(node2.attrs?.grid) && node2.attrs.grid.length ? node2.attrs.grid.map((col) => twipsToPixels(col.col)) : null;
     const totalColumns = gridColumns?.length ?? null;
-    const pageBody = table2.closest(".page__body");
-    const wrapper = table2.parentElement;
-    let availableWidth = pageBody?.getBoundingClientRect?.().width;
-    if (!availableWidth && wrapper) {
-      availableWidth = wrapper.getBoundingClientRect().width;
-    }
-    if (typeof availableWidth === "number" && !Number.isNaN(availableWidth)) {
-      availableWidth = Math.max(availableWidth - 2, 0);
-    } else {
-      availableWidth = null;
-    }
-    const pageStyles = editor?.converter?.pageStyles;
-    if (pageStyles?.pageSize?.width) {
-      const toNumber2 = (v2) => typeof v2 === "number" ? v2 : parseFloat(v2) || 0;
-      const pageWidth = toNumber2(pageStyles.pageSize.width);
-      const marginLeft = toNumber2(pageStyles.pageMargins?.left);
-      const marginRight = toNumber2(pageStyles.pageMargins?.right);
-      const pageAvailableWidthPx = Math.max((pageWidth - marginLeft - marginRight) * PIXELS_PER_INCH, 0);
-      if (pageAvailableWidthPx > 0) {
-        availableWidth = availableWidth ? Math.min(availableWidth, pageAvailableWidthPx) : pageAvailableWidthPx;
-      }
-    }
     const resolveColumnWidth = (colIndex2, colwidthValue) => {
-      if (overrideCol === colIndex2) return overrideValue;
       if (colwidthValue != null) return colwidthValue;
       if (gridColumns && gridColumns[colIndex2] != null) return gridColumns[colIndex2];
       return null;
     };
     const widths = [];
-    const row2 = node2.firstChild;
+    const firstRow = node2.firstChild;
     let colIndex = 0;
-    if (row2 !== null) {
-      for (let i2 = 0; i2 < row2.childCount; i2++) {
-        const child = row2.child(i2);
+    if (firstRow !== null) {
+      for (let i2 = 0; i2 < firstRow.childCount; i2++) {
+        const child = firstRow.child(i2);
         const { colspan, colwidth } = child.attrs;
         for (let span = 0; span < colspan; span += 1, colIndex += 1) {
           widths.push(resolveColumnWidth(colIndex, colwidth && colwidth[span]));
@@ -66678,49 +66845,41 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (numericWidth < 1) return 0;
       return numericWidth;
     });
-    const rawTotalWidth = normalizedWidths.reduce((sum, width) => sum + (width != null ? width : cellMinWidth2), 0);
-    let scale = 1;
-    if (availableWidth && rawTotalWidth > 0 && rawTotalWidth > availableWidth) {
-      scale = availableWidth / rawTotalWidth;
-    }
-    let totalWidth = 0;
-    let hasUndefinedWidth = false;
-    let dom = colgroup.firstChild;
+    const tableWidthCSS = convertSizeToCSS(
+      // TODO: why is tableWidth undefined in src/tests/import-export/font-default-styles.test.js?
+      node2.attrs.tableProperties.tableWidth?.value ?? null,
+      node2.attrs.tableProperties.tableWidth?.type ?? "auto"
+    );
+    let colElement = colgroup.firstChild;
     normalizedWidths.forEach((width) => {
-      let scaledWidth = width;
-      if (scaledWidth != null) {
-        scaledWidth = scaledWidth * scale;
-      }
-      const [propKey, propVal] = getColStyleDeclaration(cellMinWidth2, scaledWidth);
-      if (scaledWidth == null) {
-        totalWidth += cellMinWidth2;
-        hasUndefinedWidth = true;
-      } else {
-        totalWidth += scaledWidth;
-      }
-      if (!dom) {
-        const colElement = document.createElement("col");
-        colElement.style.setProperty(propKey, propVal);
+      if (!colElement) {
+        colElement = document.createElement("col");
         colgroup.appendChild(colElement);
-      } else {
-        dom.style.setProperty(propKey, propVal);
-        dom = dom.nextSibling;
       }
+      colElement.style.width = width !== null && width !== void 0 ? `${width}px` : null;
+      colElement = colElement.nextSibling;
     });
-    while (dom) {
-      const next2 = dom.nextSibling;
-      dom.parentNode?.removeChild(dom);
-      dom = next2;
+    while (colElement) {
+      const next2 = colElement.nextSibling;
+      colElement.parentNode?.removeChild(colElement);
+      colElement = next2;
     }
-    if (scale < 1 || !hasUndefinedWidth) {
-      const clampedWidth = Math.min(totalWidth, availableWidth || totalWidth);
-      table2.style.width = `${clampedWidth}px`;
-      table2.style.minWidth = "";
+    const tableIndent = convertSizeToCSS(
+      node2.attrs.tableProperties.tableIndent?.value ?? 0,
+      node2.attrs.tableProperties.tableIndent?.type ?? "dxa"
+    );
+    const firstRowFirstCellPaddingLeftPx = firstRow?.firstChild?.attrs?.cellMargins?.left ?? 0;
+    const firstRowLastCellPaddingRightPx = firstRow?.lastChild?.attrs?.cellMargins?.right ?? 0;
+    table2.style.marginLeft = `${-firstRowFirstCellPaddingLeftPx}px`;
+    if (tableIndent !== null) {
+      table2.style.marginLeft = tableIndent;
+    }
+    if (node2.attrs.tableProperties.tableWidth?.type === "pct") {
+      const padding = firstRowFirstCellPaddingLeftPx + firstRowLastCellPaddingRightPx;
+      table2.style.maxWidth = table2.style.width = `calc(${tableWidthCSS} + ${padding}px)`;
     } else {
-      table2.style.width = "";
-      table2.style.minWidth = `${totalWidth}px`;
+      table2.style.maxWidth = table2.style.width = tableWidthCSS;
     }
-    table2.style.maxWidth = "100%";
   }
   function updateTable(editor, node2, table2) {
     const allExtensionsAttrs = editor.extensionService.attributes;
@@ -66798,6 +66957,15 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const tableBorders = createTableBorders();
     return types2.table.createChecked({ borders: tableBorders }, rows);
   };
+  const getColStyleDeclaration = (minWidth, width) => {
+    if (width != null) {
+      const numericWidth = Number(width);
+      if (Number.isFinite(numericWidth) && numericWidth >= 0) {
+        return ["width", `${numericWidth}px`];
+      }
+    }
+    return ["min-width", `${minWidth}px`];
+  };
   const MIN_MEANINGFUL_WIDTH_PX = 1;
   const createColGroup = (node2, cellMinWidth2, overrideCol, overrideValue) => {
     let totalWidth = 0;
@@ -69164,15 +69332,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     },
     addAttributes() {
       return {
-        /* tableWidth: {
-          renderDOM: ({ tableWidth }) => {
-            if (!tableWidth) return {};
-            const { width, type = 'auto' } = tableWidth;
-            return { 
-              style: `width: ${width}px` 
-            };
-          },
-        }, */
         /**
          * @private
          * @category Attribute
@@ -69276,7 +69435,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
          * @see {@link https://ecma-international.org/publications-and-standards/standards/ecma-376/} "Fundamentals And Markup Language Reference", page 371-483
          */
         tableProperties: {
-          default: null,
+          default: {
+            tableWidth: {
+              value: null,
+              type: "auto"
+            }
+          },
           rendered: false
         },
         /**
@@ -70044,12 +70208,14 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
         },
         cellMargins: {
-          renderDOM({ cellMargins }) {
+          renderDOM({ cellMargins, borders }) {
             if (!cellMargins) return {};
             const sides2 = ["top", "right", "bottom", "left"];
             const style2 = sides2.map((side) => {
-              const margin = cellMargins?.[side];
-              if (margin) return `padding-${side}: ${margin}px;`;
+              const margin = cellMargins?.[side] ?? 0;
+              const border = borders?.[side];
+              const borderSize = border && border.val !== "none" ? Math.ceil(border.size) : 0;
+              if (margin) return `padding-${side}: ${Math.max(0, margin - borderSize)}px;`;
               return "";
             }).join(" ");
             return { style: style2 };
@@ -99244,7 +99410,7 @@ ${style2}
       };
     }
   };
-  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-cd3558fe"]]);
+  const SuperEditor = /* @__PURE__ */ _export_sfc$1(_sfc_main$1$1, [["__scopeId", "data-v-4615ea7d"]]);
   const _hoisted_1$h = ["innerHTML"];
   const _sfc_main$i = {
     __name: "SuperInput",
@@ -116660,7 +116826,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.31.0-next.6";
+      this.version = "0.31.0-next.7";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -119060,7 +119226,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexDAES86tg = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexBJ6cOegF = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));