@harbour-enterprises/superdoc 1.3.0-next.7 → 1.3.0-next.9

package/dist/superdoc.umd.js

@@ -14552,6 +14552,9 @@
     columnIndex,
     columnWidth = null,
     allColumnWidths = [],
+    rowIndex = 0,
+    totalRows = 1,
+    totalColumns,
     _referencedStyles
   }) {
     const { nodeListHandler } = params2;
@@ -14560,19 +14563,46 @@
     const tcPr = node2.elements.find((el) => el.name === "w:tcPr");
     const tableCellProperties = tcPr ? translator$J.encode({ ...params2, nodes: [tcPr] }) ?? {} : {};
     attributes["tableCellProperties"] = tableCellProperties;
-    if (rowBorders?.insideH) {
-      rowBorders["bottom"] = rowBorders.insideH;
-      delete rowBorders.insideH;
-    }
-    if (rowBorders?.insideV) {
-      rowBorders["right"] = rowBorders.insideV;
-      delete rowBorders?.insideV;
-    }
-    if (rowBorders) attributes["borders"] = { ...rowBorders };
-    const inlineBorders = processInlineCellBorders(tableCellProperties.borders, rowBorders);
-    if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"] || {}, inlineBorders);
-    const colspan = tableCellProperties.gridSpan;
-    if (colspan && !isNaN(parseInt(colspan, 10))) attributes["colspan"] = parseInt(colspan, 10);
+    const effectiveTotalColumns = totalColumns ?? (allColumnWidths.length || 1);
+    const effectiveTotalRows = totalRows ?? (table2?.elements?.filter((el) => el.name === "w:tr").length || 1);
+    const colspan = parseInt(tableCellProperties.gridSpan || 1, 10);
+    const isFirstRow = rowIndex === 0;
+    const isLastRow = rowIndex === effectiveTotalRows - 1;
+    const isFirstColumn = columnIndex === 0;
+    const isLastColumn = columnIndex + colspan >= effectiveTotalColumns;
+    const cellBorders = {};
+    if (rowBorders) {
+      if (rowBorders.top?.val === "none") {
+        cellBorders.top = rowBorders.top;
+      } else if (isFirstRow && rowBorders.top) {
+        cellBorders.top = rowBorders.top;
+      }
+      if (rowBorders.bottom?.val === "none") {
+        cellBorders.bottom = rowBorders.bottom;
+      } else if (isLastRow && rowBorders.bottom) {
+        cellBorders.bottom = rowBorders.bottom;
+      }
+      if (rowBorders.left?.val === "none") {
+        cellBorders.left = rowBorders.left;
+      } else if (isFirstColumn && rowBorders.left) {
+        cellBorders.left = rowBorders.left;
+      }
+      if (rowBorders.right?.val === "none") {
+        cellBorders.right = rowBorders.right;
+      } else if (isLastColumn && rowBorders.right) {
+        cellBorders.right = rowBorders.right;
+      }
+      if (!isLastRow && rowBorders.insideH) {
+        cellBorders.bottom = rowBorders.insideH;
+      }
+      if (!isLastColumn && rowBorders.insideV) {
+        cellBorders.right = rowBorders.insideV;
+      }
+    }
+    attributes["borders"] = cellBorders;
+    const inlineBorders = processInlineCellBorders(tableCellProperties.borders, cellBorders);
+    if (inlineBorders) attributes["borders"] = Object.assign(attributes["borders"], inlineBorders);
+    if (colspan > 1) attributes["colspan"] = colspan;
     let width = tableCellProperties.cellWidth?.value ? twipsToPixels$2(tableCellProperties.cellWidth?.value) : null;
     const widthType = tableCellProperties.cellWidth?.type;
     if (widthType) attributes["widthType"] = widthType;
@@ -14582,10 +14612,9 @@
       attributes["widthUnit"] = "px";
       const defaultColWidths = allColumnWidths;
       const hasDefaultColWidths = allColumnWidths && allColumnWidths.length > 0;
-      const colspanNum = parseInt(colspan || 1, 10);
-      if (colspanNum && colspanNum > 1 && hasDefaultColWidths) {
+      if (colspan > 1 && hasDefaultColWidths) {
         let colwidth = [];
-        for (let i2 = 0; i2 < colspanNum; i2++) {
+        for (let i2 = 0; i2 < colspan; i2++) {
           let colwidthValue = defaultColWidths[columnIndex + i2];
           let defaultColwidth = 100;
           if (typeof colwidthValue !== "undefined") {
@@ -14735,22 +14764,18 @@
     return ["bottom", "top", "left", "right"].reduce((acc, direction) => {
       const borderAttrs = borders[direction];
       const rowBorderAttrs = rowBorders[direction];
-      if (borderAttrs && borderAttrs["val"] !== "nil") {
+      if (borderAttrs && borderAttrs["val"] !== "none") {
         const color2 = borderAttrs["color"];
         let size2 = borderAttrs["size"];
         if (size2) size2 = eighthPointsToPixels(size2);
         acc[direction] = { color: color2, size: size2, val: borderAttrs["val"] };
         return acc;
       }
-      if (borderAttrs && borderAttrs["val"] === "nil") {
+      if (borderAttrs && borderAttrs["val"] === "none") {
         const border = Object.assign({}, rowBorderAttrs || {});
-        if (!Object.keys(border).length) {
-          return acc;
-        } else {
-          border["val"] = "none";
-          acc[direction] = border;
-          return acc;
-        }
+        border["val"] = "none";
+        acc[direction] = border;
+        return acc;
       }
       return acc;
     }, {});
@@ -14886,6 +14911,9 @@
       columnIndex,
       columnWidth,
       columnWidths: allColumnWidths,
+      rowIndex,
+      totalRows,
+      totalColumns,
       _referencedStyles
     } = params2.extraParams;
     const schemaNode = handleTableCellNode({
@@ -14897,6 +14925,9 @@
       columnIndex,
       columnWidth,
       allColumnWidths,
+      rowIndex,
+      totalRows,
+      totalColumns,
       _referencedStyles
     });
     if (encodedAttrs && Object.keys(encodedAttrs).length) {
@@ -14920,13 +14951,26 @@
     attributes: validXmlAttributes$a
   };
   const translator$I = NodeTranslator.from(config$i);
-  const translator$H = NodeTranslator.from({
+  const propertyTranslators$3 = [
+    translator$1q,
+    translator$Z,
+    translator$X,
+    translator$W,
+    translator$1o,
+    translator$1m,
+    translator$V,
+    translator$1k
+  ];
+  const translator$H = NodeTranslator.from(
+    createNestedPropertiesTranslator("w:tblBorders", "borders", propertyTranslators$3)
+  );
+  const translator$G = NodeTranslator.from({
     xmlName: "w:cantSplit",
     sdNodeOrKeyName: "cantSplit",
     encode: ({ nodes }) => ["1", "true"].includes(nodes[0].attributes?.["w:val"] ?? "1"),
     decode: ({ node: node2 }) => node2.attrs?.cantSplit ? { attributes: {} } : void 0
   });
-  const translator$G = NodeTranslator.from(
+  const translator$F = NodeTranslator.from(
     createSingleAttrPropertyHandler(
       "w:gridAfter",
       null,
@@ -14935,7 +14979,7 @@
       (v2) => integerToString(v2)
     )
   );
-  const translator$F = NodeTranslator.from(
+  const translator$E = NodeTranslator.from(
     createSingleAttrPropertyHandler(
       "w:gridBefore",
       null,
@@ -14944,20 +14988,20 @@
       (v2) => integerToString(v2)
     )
   );
-  const translator$E = NodeTranslator.from({
+  const translator$D = NodeTranslator.from({
     xmlName: "w:hidden",
     sdNodeOrKeyName: "hidden",
     encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
     decode: ({ node: node2 }) => node2.attrs.hidden ? { attributes: {} } : void 0
   });
-  const translator$D = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
-  const translator$C = NodeTranslator.from({
+  const translator$C = NodeTranslator.from(createMeasurementPropertyHandler("w:tblCellSpacing", "tableCellSpacing"));
+  const translator$B = NodeTranslator.from({
     xmlName: "w:tblHeader",
     sdNodeOrKeyName: "repeatHeader",
     encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
     decode: ({ node: node2 }) => node2.attrs.repeatHeader ? { attributes: {} } : void 0
   });
-  const translator$B = NodeTranslator.from({
+  const translator$A = NodeTranslator.from({
     xmlName: "w:trHeight",
     sdNodeOrKeyName: "rowHeight",
     encode: ({ nodes }) => {
@@ -14984,24 +15028,24 @@
       return Object.keys(heightAttrs).length > 0 ? { attributes: heightAttrs } : void 0;
     }
   });
-  const translator$A = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
-  const translator$z = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
-  const propertyTranslators$3 = [
-    translator$H,
+  const translator$z = NodeTranslator.from(createMeasurementPropertyHandler("w:wAfter"));
+  const translator$y = NodeTranslator.from(createMeasurementPropertyHandler("w:wBefore"));
+  const propertyTranslators$2 = [
+    translator$G,
     translator$1I,
     translator$1G,
-    translator$G,
     translator$F,
     translator$E,
-    translator$1D,
     translator$D,
+    translator$1D,
     translator$C,
     translator$B,
     translator$A,
-    translator$z
+    translator$z,
+    translator$y
   ];
-  const translator$y = NodeTranslator.from(
-    createNestedPropertiesTranslator("w:trPr", "tableRowProperties", propertyTranslators$3, {
+  const translator$x = NodeTranslator.from(
+    createNestedPropertiesTranslator("w:trPr", "tableRowProperties", propertyTranslators$2, {
       cantSplit: false,
       hidden: false,
       repeatHeader: false
@@ -15079,7 +15123,7 @@
     let tableRowProperties = {};
     const tPr = row2.elements.find((el) => el.name === "w:trPr");
     if (tPr) {
-      tableRowProperties = translator$y.encode({
+      tableRowProperties = translator$x.encode({
         ...params2,
         nodes: [tPr]
       });
@@ -15089,6 +15133,12 @@
     encodedAttrs["tableRowProperties"] = Object.freeze(tableRowProperties);
     encodedAttrs["rowHeight"] = twipsToPixels$2(tableRowProperties["rowHeight"]?.value);
     encodedAttrs["cantSplit"] = tableRowProperties["cantSplit"];
+    const baseBorders = params2.extraParams?.rowBorders;
+    const rowTableBorders = getRowTableBorders({
+      params: params2,
+      row: row2,
+      baseBorders
+    });
     const { columnWidths: gridColumnWidths, activeRowSpans = [] } = params2.extraParams;
     const totalColumns = Array.isArray(gridColumnWidths) ? gridColumnWidths.length : 0;
     const pendingRowSpans = Array.isArray(activeRowSpans) ? activeRowSpans.slice() : [];
@@ -15121,6 +15171,10 @@
         path: [...params2.path || [], node2],
         extraParams: {
           ...params2.extraParams,
+          rowBorders: {
+            ...baseBorders,
+            ...rowTableBorders
+          },
           node: node2,
           columnIndex: startColumn,
           columnWidth
@@ -15150,6 +15204,33 @@
     };
     return newNode;
   };
+  function getRowTableBorders({ params: params2, row: row2, baseBorders }) {
+    const tblPrEx = row2?.elements?.find?.((el) => el.name === "w:tblPrEx");
+    const tblBorders = tblPrEx?.elements?.find?.((el) => el.name === "w:tblBorders");
+    if (!tblBorders) {
+      return baseBorders;
+    }
+    const rawOverrides = translator$H.encode({ ...params2, nodes: [tblBorders] }) || {};
+    const overrides = processRawTableBorders(rawOverrides);
+    if (!Object.keys(overrides).length) {
+      return baseBorders;
+    }
+    return { ...baseBorders || {}, ...overrides };
+  }
+  function processRawTableBorders(rawBorders) {
+    const borders = {};
+    Object.entries(rawBorders || {}).forEach(([name, attributes]) => {
+      const attrs = {};
+      const color2 = attributes?.color;
+      const size2 = attributes?.size;
+      const val = attributes?.val;
+      if (color2 && color2 !== "auto") attrs.color = color2.startsWith("#") ? color2 : `#${color2}`;
+      if (size2 != null && size2 !== "auto") attrs.size = eighthPointsToPixels(size2);
+      if (val) attrs.val = val;
+      borders[name] = attrs;
+    });
+    return borders;
+  }
   const decode$y = (params2, decodedAttrs) => {
     const { node: node2 } = params2;
     const cells = node2.content || [];
@@ -15190,7 +15271,7 @@
         }
       }
       tableRowProperties["cantSplit"] = node2.attrs["cantSplit"];
-      const trPr = translator$y.decode({
+      const trPr = translator$x.decode({
         ...params2,
         node: { ...node2, attrs: { ...node2.attrs, tableRowProperties } }
       });
@@ -15210,7 +15291,7 @@
     decode: decode$y,
     attributes: validXmlAttributes$9
   };
-  const translator$x = NodeTranslator.from(config$h);
+  const translator$w = NodeTranslator.from(config$h);
   function parseTagValueJSON(json) {
     if (typeof json !== "string") {
       return {};
@@ -30436,7 +30517,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     decode: decode$x,
     attributes: validXmlAttributes$8
   };
-  const translator$w = NodeTranslator.from(config$g);
+  const translator$v = NodeTranslator.from(config$g);
   function handleInlineNode(params2) {
     const { node: node2 } = params2.extraParams;
     if (node2.name !== "wp:inline") {
@@ -30490,7 +30571,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     decode: decode$w,
     attributes: validXmlAttributes$7
   };
-  const translator$v = NodeTranslator.from(config$f);
+  const translator$u = NodeTranslator.from(config$f);
   const XML_NODE_NAME$f = "w:drawing";
   const SD_NODE_NAME$d = [];
   const validXmlAttributes$6 = [];
@@ -30498,8 +30579,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const nodes = params2.nodes;
     const node2 = nodes[0];
     const translatorByChildName = {
-      "wp:anchor": translator$w,
-      "wp:inline": translator$v
+      "wp:anchor": translator$v,
+      "wp:inline": translator$u
     };
     const result = (node2.elements || []).reduce((acc, child) => {
       if (acc) return acc;
@@ -30522,7 +30603,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (!node2 || !node2.type) {
       return null;
     }
-    const childTranslator = node2.attrs.isAnchor ? translator$w : translator$v;
+    const childTranslator = node2.attrs.isAnchor ? translator$v : translator$u;
     const resultNode = childTranslator.decode(params2);
     return wrapTextInRun(
       {
@@ -30540,7 +30621,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     decode: decode$v,
     attributes: validXmlAttributes$6
   };
-  const translator$u = NodeTranslator.from(config$e);
+  const translator$t = NodeTranslator.from(config$e);
   function getTextNodeForExport(text2, marks, params2) {
     const hasLeadingOrTrailingSpace = /^\s|\s$/.test(text2);
     const space = hasLeadingOrTrailingSpace ? "preserve" : null;
@@ -30948,7 +31029,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     return getTextNodeForExport(attrs.displayLabel, [...marks, ...marksFromAttrs], params2);
   }
   function prepareImageAnnotation(params2, imageSize) {
-    return translator$u.decode({
+    return translator$t.decode({
       ...params2,
       imageSize
     });
@@ -31410,7 +31491,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     decode: decode$u,
     attributes: validXmlAttributes$5
   };
-  const translator$t = NodeTranslator.from(config$d);
+  const translator$s = NodeTranslator.from(config$d);
   function preProcessVerticalMergeCells(table2, { editorSchema }) {
     if (!table2 || !Array.isArray(table2.content)) {
       return table2;
@@ -31451,17 +31532,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     return table2;
   }
-  const translator$s = NodeTranslator.from({
+  const translator$r = NodeTranslator.from({
     xmlName: "w:bidiVisual",
     sdNodeOrKeyName: "rightToLeft",
     encode: ({ nodes }) => parseBoolean(nodes[0].attributes?.["w:val"] ?? "1"),
     decode: ({ node: node2 }) => node2.attrs.rightToLeft ? { attributes: {} } : void 0
   });
-  const translator$r = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
-  const translator$q = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
-  const translator$p = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
-  const translator$o = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
-  const translator$n = NodeTranslator.from({
+  const translator$q = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblCaption", "caption"));
+  const translator$p = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblDescription", "description"));
+  const translator$o = NodeTranslator.from(createMeasurementPropertyHandler("w:tblInd", "tableIndent"));
+  const translator$n = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblLayout", "tableLayout", "w:type"));
+  const translator$m = NodeTranslator.from({
     xmlName: "w:tblLook",
     sdNodeOrKeyName: "tblLook",
     attributes: ["w:firstColumn", "w:firstRow", "w:lastColumn", "w:lastRow", "w:noHBand", "w:noVBand"].map((attr) => createAttributeHandler(attr, null, parseBoolean, booleanToString)).concat([createAttributeHandler("w:val")]),
@@ -31473,16 +31554,16 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
     }
   });
-  const translator$m = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
-  const translator$l = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
-  const translator$k = NodeTranslator.from(
+  const translator$l = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblOverlap", "overlap"));
+  const translator$k = NodeTranslator.from(createSingleAttrPropertyHandler("w:tblStyle", "tableStyleId"));
+  const translator$j = NodeTranslator.from(
     createSingleAttrPropertyHandler("w:tblStyleColBandSize", "tableStyleColBandSize")
   );
-  const translator$j = NodeTranslator.from(
+  const translator$i = NodeTranslator.from(
     createSingleAttrPropertyHandler("w:tblStyleRowBandSize", "tableStyleRowBandSize")
   );
-  const translator$i = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
-  const translator$h = NodeTranslator.from({
+  const translator$h = NodeTranslator.from(createMeasurementPropertyHandler("w:tblW", "tableWidth"));
+  const translator$g = NodeTranslator.from({
     xmlName: "w:tblpPr",
     sdNodeOrKeyName: "floatingTableProperties",
     attributes: ["w:leftFromText", "w:rightFromText", "w:topFromText", "w:bottomFromText", "w:tblpX", "w:tblpY"].map((attr) => createAttributeHandler(attr, null, parseInteger, integerToString)).concat(["w:horzAnchor", "w:vertAnchor", "w:tblpXSpec", "w:tblpYSpec"].map((attr) => createAttributeHandler(attr))),
@@ -31494,19 +31575,6 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return Object.keys(decodedAttrs).length > 0 ? { attributes: decodedAttrs } : void 0;
     }
   });
-  const propertyTranslators$2 = [
-    translator$1q,
-    translator$Z,
-    translator$X,
-    translator$W,
-    translator$1o,
-    translator$1m,
-    translator$V,
-    translator$1k
-  ];
-  const translator$g = NodeTranslator.from(
-    createNestedPropertiesTranslator("w:tblBorders", "borders", propertyTranslators$2)
-  );
   const propertyTranslators$1 = [
     translator$1p,
     translator$Y,
@@ -31519,12 +31587,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     createNestedPropertiesTranslator("w:tblCellMar", "cellMargins", propertyTranslators$1)
   );
   const propertyTranslators = [
-    translator$s,
+    translator$r,
     translator$1D,
     translator$2b,
-    translator$r,
-    translator$D,
     translator$q,
+    translator$C,
     translator$p,
     translator$o,
     translator$n,
@@ -31535,6 +31602,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     translator$i,
     translator$h,
     translator$g,
+    translator$H,
     translator$f
   ];
   const translator$e = NodeTranslator.from(
@@ -31794,8 +31862,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     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.borders = { ...referencedStyles.borders, ...borderProps };
     encodedAttrs.tableProperties.cellMargins = referencedStyles.cellMargins = {
       ...referencedStyles.cellMargins,
       ...encodedAttrs.tableProperties.cellMargins
@@ -31816,19 +31883,22 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     const content2 = [];
     const totalColumns = columnWidths.length;
+    const totalRows = rows.length;
     const activeRowSpans = totalColumns > 0 ? new Array(totalColumns).fill(0) : [];
     rows.forEach((row2, rowIndex) => {
-      const result = translator$x.encode({
+      const result = translator$w.encode({
         ...params2,
         path: [...params2.path || [], node2],
         nodes: [row2],
         extraParams: {
           row: row2,
           table: node2,
-          rowBorders,
+          rowBorders: encodedAttrs.borders,
           columnWidths,
           activeRowSpans: activeRowSpans.slice(),
           rowIndex,
+          totalRows,
+          totalColumns,
           _referencedStyles: referencedStyles
         }
       });
@@ -31903,21 +31973,17 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   };
   function _processTableBorders(rawBorders) {
     const borders = {};
-    const rowBorders = {};
     Object.entries(rawBorders).forEach(([name, attributes]) => {
       const attrs = {};
       const color2 = attributes.color;
       const size2 = attributes.size;
+      const val = attributes.val;
       if (color2 && color2 !== "auto") attrs["color"] = color2.startsWith("#") ? color2 : `#${color2}`;
       if (size2 && size2 !== "auto") attrs["size"] = eighthPointsToPixels(size2);
-      const rowBorderNames = ["insideH", "insideV"];
-      if (rowBorderNames.includes(name)) rowBorders[name] = attrs;
+      if (val) attrs["val"] = val;
       borders[name] = attrs;
     });
-    return {
-      borders,
-      rowBorders
-    };
+    return borders;
   }
   function _getReferencedTableStyles(tableStyleReference, params2) {
     if (!tableStyleReference) return null;
@@ -31957,9 +32023,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       const tableProperties = translator$e.encode({ ...params2, nodes: [tblPr] });
       if (tableProperties) {
-        const { borders, rowBorders } = _processTableBorders(tableProperties.borders || {});
-        if (borders) stylesToReturn.borders = borders;
-        if (rowBorders) stylesToReturn.rowBorders = rowBorders;
+        const borders = _processTableBorders(tableProperties.borders || {});
+        if (borders || Object.keys(borders).length) stylesToReturn.borders = borders;
         const cellMargins = {};
         Object.entries(tableProperties.cellMargins || {}).forEach(([key2, attrs]) => {
           if (attrs?.value != null) {
@@ -32808,7 +32873,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return { nodes: [], consumed: 0 };
     }
     const translatorParams = { ...params2, nodes: [node2] };
-    const schemaNode = translator$u.encode(translatorParams);
+    const schemaNode = translator$t.encode(translatorParams);
     const newNodes = schemaNode ? [schemaNode] : [];
     return { nodes: newNodes, consumed: 1 };
   };
@@ -33051,7 +33116,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     if (nodes.length === 0 || nodes[0].name !== "w:sdt") {
       return { nodes: [], consumed: 0 };
     }
-    const result = translator$t.encode(params2);
+    const result = translator$s.encode(params2);
     if (!result) {
       return { nodes: [], consumed: 0 };
     }
@@ -33079,12 +33144,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$1s,
       translator$2n,
       translator$2m,
-      translator$s,
+      translator$r,
       translator$9,
       translator$a,
       translator$1q,
       translator$2r,
-      translator$H,
+      translator$G,
       translator$2c,
       translator$1I,
       translator$2h,
@@ -33092,7 +33157,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$1R,
       translator$2,
       translator$1G,
-      translator$u,
+      translator$t,
       translator$2i,
       translator$1T,
       translator$1Z,
@@ -33101,13 +33166,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$Z,
       translator$1U,
       translator$1F,
-      translator$G,
       translator$F,
+      translator$E,
       translator$d,
       translator$$,
       translator$L,
       translator$K,
-      translator$E,
+      translator$D,
       translator$M,
       translator$2q,
       translator$12,
@@ -33149,7 +33214,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$2f,
       translator$1S,
       translator$1m,
-      translator$t,
+      translator$s,
       translator$20,
       translator$2b,
       translator$27,
@@ -33167,23 +33232,23 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$2p,
       translator$1b,
       translator$b,
-      translator$g,
-      translator$r,
-      translator$f,
-      translator$D,
+      translator$H,
       translator$q,
-      translator$c,
+      translator$f,
       translator$C,
       translator$p,
+      translator$c,
+      translator$B,
       translator$o,
       translator$n,
       translator$m,
-      translator$e,
       translator$l,
+      translator$e,
       translator$k,
       translator$j,
       translator$i,
       translator$h,
+      translator$g,
       translator$I,
       translator$R,
       translator$O,
@@ -33192,10 +33257,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$10,
       translator$19,
       translator$T,
-      translator$x,
+      translator$w,
       translator$S,
-      translator$B,
-      translator$y,
+      translator$A,
+      translator$x,
       translator$1a,
       translator$18,
       translator$17,
@@ -33206,13 +33271,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       translator$28,
       translator$_,
       translator$1X,
-      translator$A,
       translator$z,
+      translator$y,
       translator$1P,
       translator$16,
       translator$15,
-      translator$w,
       translator$v,
+      translator$u,
       commentRangeStartTranslator,
       commentRangeEndTranslator
     ])
@@ -33551,8 +33616,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         converter,
         path: [el]
       });
-      const { attrs } = parsedElements[0];
-      const paraId = attrs["w14:paraId"];
+      const lastElement = parsedElements[parsedElements.length - 1];
+      const paraId = lastElement?.attrs?.["w14:paraId"];
       return {
         commentId: internalId || v4(),
         importedId,
@@ -33595,7 +33660,11 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       if (!extendedDef) return { ...comment2, isDone: comment2.isDone ?? false };
       const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
       let parentComment;
-      if (paraIdParent) parentComment = comments.find((c2) => c2.paraId === paraIdParent);
+      if (paraIdParent) {
+        parentComment = comments.find(
+          (c2) => c2.paraId === paraIdParent || c2.elements?.some((el) => el.attrs?.["w14:paraId"] === paraIdParent)
+        );
+      }
       const newComment = {
         ...comment2,
         isDone: isDone ?? false,
@@ -35335,13 +35404,13 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       text: translator$1,
       lineBreak: translator$2r,
       table: translator$b,
-      tableRow: translator$x,
+      tableRow: translator$w,
       tableCell: translator$I,
       bookmarkStart: translator$a,
       bookmarkEnd: translator$9,
-      fieldAnnotation: translator$t,
+      fieldAnnotation: translator$s,
       tab: translator$2p,
-      image: translator$u,
+      image: translator$t,
       hardBreak: translator$2r,
       commentRangeStart: commentRangeStartTranslator,
       commentRangeEnd: commentRangeEndTranslator,
@@ -35353,10 +35422,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       contentBlock: translator,
       vectorShape: translateVectorShape,
       shapeGroup: translateShapeGroup,
-      structuredContent: translator$t,
-      structuredContentBlock: translator$t,
-      documentPartObject: translator$t,
-      documentSection: translator$t,
+      structuredContent: translator$s,
+      structuredContentBlock: translator$s,
+      documentPartObject: translator$s,
+      documentSection: translator$s,
       "page-number": translator$4,
       "total-page-number": translator$3,
       pageReference: translator$6,
@@ -36366,7 +36435,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.7") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.9") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -49479,8 +49548,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               }
               if (!onlyActiveThreadChanged) {
                 const positionsChanged = hasPositionsChanged(prevAllCommentPositions, allCommentPositions);
-                const hasComments = Object.keys(allCommentPositions).length > 0;
-                const shouldEmitPositions = positionsChanged || !hasEverEmitted && hasComments;
+                const hasComments2 = Object.keys(allCommentPositions).length > 0;
+                const shouldEmitPositions = positionsChanged || !hasEverEmitted && hasComments2;
                 if (shouldEmitPositions) {
                   prevAllCommentPositions = allCommentPositions;
                   hasEverEmitted = true;
@@ -52788,7 +52857,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       const xmlJson = JSON.parse(libExports.xml2json(contentTypesXml, null, 2));
       const types2 = xmlJson.elements?.find((el) => el.name === "Types") || {};
-      const hasComments = types2.elements?.some(
+      const hasComments2 = types2.elements?.some(
         (el) => el.name === "Override" && el.attributes.PartName === "/word/comments.xml"
       );
       const hasCommentsExtended = types2.elements?.some(
@@ -52808,7 +52877,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       };
       if (hasFile("word/comments.xml")) {
         const commentsDef = `<Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" />`;
-        if (!hasComments) typesString += commentsDef;
+        if (!hasComments2) typesString += commentsDef;
       }
       if (hasFile("word/commentsExtended.xml")) {
         const commentsExtendedDef = `<Override PartName="/word/commentsExtended.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml" />`;
@@ -62076,7 +62145,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.0-next.7";
+  const summaryVersion = "1.3.0-next.9";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64710,7 +64779,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.7");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.9");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -74943,7 +75012,9 @@ ${l}
           textRun.pmEnd ?? "",
           textRun.token ?? "",
           // Tracked changes - force re-render when added or removed tracked change
-          textRun.trackedChange ? 1 : 0
+          textRun.trackedChange ? 1 : 0,
+          // Comment annotations - force re-render when comments are enabled/disabled
+          textRun.comments?.length ?? 0
         ].join(",");
       }).join("|");
       const attrs = block.attrs;
@@ -80814,6 +80885,9 @@ ${l}
     if (borders.left) parts.push(`l:[${hashBorderSpec(borders.left)}]`);
     return parts.join(";");
   };
+  function hasComments$1(run2) {
+    return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
+  }
   const MAX_CACHE_SIZE$1 = 1e4;
   const BYTES_PER_ENTRY_ESTIMATE = 5e3;
   const hashParagraphFrame = (frame) => {
@@ -80881,6 +80955,7 @@ ${l}
                 fontFamily2 ? `ff:${fontFamily2}` : "",
                 highlight ? `hl:${highlight}` : ""
               ].join("");
+              const commentHash = hasComments$1(run2) ? run2.comments.map((c2) => `${c2.commentId ?? ""}:${c2.internal ? "1" : "0"}`).join("|") : "";
               let trackedKey = "";
               if (hasTrackedChange(run2)) {
                 const tc = run2.trackedChange;
@@ -80888,7 +80963,8 @@ ${l}
                 const afterHash = tc.after ? JSON.stringify(tc.after) : "";
                 trackedKey = `|tc:${tc.kind ?? ""}:${tc.id ?? ""}:${tc.author ?? ""}:${tc.date ?? ""}:${beforeHash}:${afterHash}`;
               }
-              cellHashes.push(`${text2}:${marks}${trackedKey}`);
+              const commentKey = commentHash ? `|cm:${commentHash}` : "";
+              cellHashes.push(`${text2}:${marks}${trackedKey}${commentKey}`);
             }
             if (paragraphBlock.attrs) {
               const attrs = paragraphBlock.attrs;
@@ -82020,6 +82096,9 @@ ${l}
     const totalHeight = lines.reduce((s2, l) => s2 + l.lineHeight, 0);
     return { kind: "paragraph", lines, totalHeight };
   }
+  function hasComments(run2) {
+    return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
+  }
   const computeDirtyRegions = (previous2, next2) => {
     const prevMap = new Map(previous2.map((block, index2) => [block.id, { block, index: index2 }]));
     const nextMap = new Map(next2.map((block, index2) => [block.id, { block, index: index2 }]));
@@ -82080,6 +82159,10 @@ ${l}
     }
     return "";
   };
+  const getCommentKey = (run2) => {
+    if (!hasComments(run2)) return "";
+    return run2.comments.map((c2) => `${c2.commentId ?? ""}:${c2.internal ? "1" : "0"}`).join("|");
+  };
   const paragraphSpacingEqual = (a2, b2) => {
     if (a2 === b2) return true;
     if (!a2 || !b2) return !a2 && !b2;
@@ -82161,7 +82244,7 @@ ${l}
     for (let i2 = 0; i2 < a2.runs.length; i2 += 1) {
       const runA = a2.runs[i2];
       const runB = b2.runs[i2];
-      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
+      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB)) {
         return false;
       }
     }
@@ -86903,7 +86986,7 @@ ${l}
     delete run2.link;
     delete run2.letterSpacing;
   };
-  const applyFormatChangeMarks = (run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors) => {
+  const applyFormatChangeMarks = (run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments = true) => {
     const tracked = run2.trackedChange;
     if (!tracked || tracked.kind !== "format") {
       return;
@@ -86925,12 +87008,12 @@ ${l}
     }
     resetRunFormatting(run2);
     try {
-      applyMarksToRun2(run2, beforeMarks, hyperlinkConfig, themeColors);
+      applyMarksToRun2(run2, beforeMarks, hyperlinkConfig, themeColors, void 0, enableComments);
     } catch (error) {
       resetRunFormatting(run2);
     }
   };
-  const applyTrackedChangesModeToRuns = (runs2, config2, hyperlinkConfig, applyMarksToRun2, themeColors) => {
+  const applyTrackedChangesModeToRuns = (runs2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments = true) => {
     if (!config2) {
       return runs2;
     }
@@ -86943,7 +87026,7 @@ ${l}
       } else {
         runs2.forEach((run2) => {
           if (isTextRun$1(run2)) {
-            applyFormatChangeMarks(run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors);
+            applyFormatChangeMarks(run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments);
           }
         });
       }
@@ -86973,7 +87056,14 @@ ${l}
     } else {
       filtered.forEach((run2) => {
         if (isTextRun$1(run2)) {
-          applyFormatChangeMarks(run2, config2, hyperlinkConfig || DEFAULT_HYPERLINK_CONFIG$1, applyMarksToRun2, themeColors);
+          applyFormatChangeMarks(
+            run2,
+            config2,
+            hyperlinkConfig || DEFAULT_HYPERLINK_CONFIG$1,
+            applyMarksToRun2,
+            themeColors,
+            enableComments
+          );
         }
       });
     }
@@ -87884,7 +87974,10 @@ ${l}
   const DEFAULT_HYPERLINK_CONFIG = {
     enableRichHyperlinks: false
   };
-  const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, backgroundColor) => {
+  const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, backgroundColor, enableComments = true) => {
+    if (!enableComments && "comments" in run2 && run2.comments) {
+      delete run2.comments;
+    }
     const isTabRun2 = run2.kind === "tab";
     let markSetColor = false;
     marks.forEach((mark2) => {
@@ -87931,7 +88024,7 @@ ${l}
             break;
           case "commentMark":
           case "comment": {
-            if (!isTabRun2) {
+            if (!isTabRun2 && enableComments) {
               pushCommentAnnotation(run2, mark2.attrs ?? {});
             }
             break;
@@ -91544,7 +91637,13 @@ ${l}
       run2.letterSpacing = defaults2.letterSpacing;
     }
   };
-  function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext) {
+  const applyInlineRunProperties = (run2, runProperties) => {
+    if (!runProperties) return;
+    if (runProperties?.letterSpacing != null) {
+      run2.letterSpacing = twipsToPx$1(runProperties.letterSpacing);
+    }
+  };
+  function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext, enableComments = true) {
     const baseBlockId = nextBlockId("paragraph");
     const paragraphProps = typeof para.attrs?.paragraphProperties === "object" && para.attrs.paragraphProperties !== null ? para.attrs.paragraphProperties : {};
     const paragraphStyleId = typeof para.attrs?.styleId === "string" && para.attrs.styleId.trim() ? para.attrs.styleId : typeof paragraphProps.styleId === "string" && paragraphProps.styleId.trim() ? paragraphProps.styleId : null;
@@ -91696,7 +91795,7 @@ ${l}
         runStyleId
       });
     };
-    const visitNode = (node2, inheritedMarks = [], activeSdt, activeRunStyleId = null) => {
+    const visitNode = (node2, inheritedMarks = [], activeSdt, activeRunStyleId = null, activeRunProperties) => {
       if (node2.type === "text" && node2.text) {
         const run2 = textNodeToRun(
           node2,
@@ -91712,26 +91811,30 @@ ${l}
         const inlineStyleId = getInlineStyleId(inheritedMarks);
         applyRunStyles2(run2, inlineStyleId, activeRunStyleId);
         applyBaseRunDefaults(run2, baseRunDefaults, defaultFont, defaultSize);
+        applyInlineRunProperties(run2, activeRunProperties);
         applyMarksToRun(
           run2,
           [...node2.marks ?? [], ...inheritedMarks ?? []],
           hyperlinkConfig,
           themeColors,
-          converterContext?.backgroundColor
+          converterContext?.backgroundColor,
+          enableComments
         );
         currentRuns.push(run2);
         return;
       }
       if (node2.type === "run" && Array.isArray(node2.content)) {
         const mergedMarks = [...node2.marks ?? [], ...inheritedMarks ?? []];
-        const nextRunStyleId = extractRunStyleId(node2.attrs?.runProperties) ?? activeRunStyleId;
-        node2.content.forEach((child) => visitNode(child, mergedMarks, activeSdt, nextRunStyleId));
+        const runProperties = typeof node2.attrs?.runProperties === "object" && node2.attrs.runProperties !== null ? node2.attrs.runProperties : null;
+        const nextRunStyleId = extractRunStyleId(runProperties) ?? activeRunStyleId;
+        const nextRunProperties = runProperties ?? activeRunProperties;
+        node2.content.forEach((child) => visitNode(child, mergedMarks, activeSdt, nextRunStyleId, nextRunProperties));
         return;
       }
       if (node2.type === "structuredContent" && Array.isArray(node2.content)) {
         const inlineMetadata = resolveNodeSdtMetadata(node2, "structuredContent");
         const nextSdt = inlineMetadata ?? activeSdt;
-        node2.content.forEach((child) => visitNode(child, inheritedMarks, nextSdt, activeRunStyleId));
+        node2.content.forEach((child) => visitNode(child, inheritedMarks, nextSdt, activeRunStyleId, activeRunProperties));
         return;
       }
       if (node2.type === "fieldAnnotation") {
@@ -91777,7 +91880,8 @@ ${l}
             positions,
             defaultFont,
             defaultSize,
-            mergedMarks,
+            [],
+            // Empty marks - will be applied after linked styles
             activeSdt,
             hyperlinkConfig,
             themeColors
@@ -91785,6 +91889,15 @@ ${l}
           const inlineStyleId = getInlineStyleId(mergedMarks);
           applyRunStyles2(tokenRun, inlineStyleId, activeRunStyleId);
           applyBaseRunDefaults(tokenRun, baseRunDefaults, defaultFont, defaultSize);
+          applyInlineRunProperties(tokenRun, activeRunProperties);
+          applyMarksToRun(
+            tokenRun,
+            mergedMarks,
+            hyperlinkConfig,
+            themeColors,
+            converterContext?.backgroundColor,
+            enableComments
+          );
           if (pageRefPos) {
             tokenRun.pmStart = pageRefPos.start;
             tokenRun.pmEnd = pageRefPos.end;
@@ -91799,7 +91912,9 @@ ${l}
           }
           currentRuns.push(tokenRun);
         } else if (Array.isArray(node2.content)) {
-          node2.content.forEach((child) => visitNode(child, mergedMarks, activeSdt));
+          node2.content.forEach(
+            (child) => visitNode(child, mergedMarks, activeSdt, activeRunStyleId, activeRunProperties)
+          );
         }
         return;
       }
@@ -91813,7 +91928,9 @@ ${l}
           }
         }
         if (Array.isArray(node2.content)) {
-          node2.content.forEach((child) => visitNode(child, inheritedMarks, activeSdt));
+          node2.content.forEach(
+            (child) => visitNode(child, inheritedMarks, activeSdt, activeRunStyleId, activeRunProperties)
+          );
         }
         return;
       }
@@ -91854,7 +91971,8 @@ ${l}
               mergedMarks,
               hyperlinkConfig,
               themeColors,
-              converterContext?.backgroundColor
+              converterContext?.backgroundColor,
+              enableComments
             );
           }
           console.debug("[token-debug] paragraph-token-run", {
@@ -91865,6 +91983,7 @@ ${l}
             runStyleId: activeRunStyleId,
             mergedMarksCount: mergedMarks.length
           });
+          applyInlineRunProperties(tokenRun, activeRunProperties);
           currentRuns.push(tokenRun);
         }
         return;
@@ -92052,7 +92171,8 @@ ${l}
         trackedChanges,
         hyperlinkConfig,
         applyMarksToRun,
-        themeColors
+        themeColors,
+        enableComments
       );
       if (trackedChanges.enabled && filteredRuns.length === 0) {
         return;
@@ -92951,6 +93071,7 @@ ${l}
     const hyperlinkConfig = {
       enableRichHyperlinks: options?.enableRichHyperlinks ?? false
     };
+    const enableComments = options?.enableComments ?? true;
     const themeColors = options?.themeColors;
     const converterContext = options?.converterContext;
     if (!doc2.content) {
@@ -93000,7 +93121,8 @@ ${l}
       bookmarks2,
       hyperlinkConfig2,
       themeColorsParam ?? themeColors,
-      converterCtx ?? converterContext
+      converterCtx ?? converterContext,
+      enableComments
     );
     const tableConverter = (node2, nextBlockId2, positions2, defaultFont2, defaultSize2, context, trackedChanges, bookmarks2, hyperlinkConfig2, themeColorsParam, converterCtx) => tableNodeToBlock(
       node2,
@@ -93039,6 +93161,7 @@ ${l}
       listCounterContext: { getListCounter, incrementListCounter, resetListCounter },
       trackedChangesConfig,
       hyperlinkConfig,
+      enableComments,
       bookmarks,
       sectionState: {
         ranges: sectionRanges,
@@ -93107,7 +93230,7 @@ ${l}
     }
     return result;
   }
-  function paragraphToFlowBlocks(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converterContext) {
+  function paragraphToFlowBlocks(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converterContext, enableComments = true) {
     return paragraphToFlowBlocks$1(
       para,
       nextBlockId,
@@ -93154,7 +93277,8 @@ ${l}
           }
         )
       },
-      converterContext
+      converterContext,
+      enableComments
     );
   }
   function tableNodeToBlock(node2, nextBlockId, positions, defaultFont, defaultSize, styleContext, trackedChanges, bookmarks, hyperlinkConfig, themeColors, _paragraphToFlowBlocksParam, converterContext, options) {
@@ -95041,6 +95165,7 @@ ${l}
     let lastFontSize = 12;
     let tabStopCursor = 0;
     let pendingTabAlignment = null;
+    let pendingRunSpacing = 0;
     let lastAppliedTabAlign = null;
     const warnedTabVals = /* @__PURE__ */ new Set();
     let activeTabGroup = null;
@@ -95051,6 +95176,10 @@ ${l}
       }
       return true;
     };
+    const resolveBoundarySpacing = (lineWidth, isRunStart, run2) => {
+      if (lineWidth <= 0) return 0;
+      return isRunStart ? pendingRunSpacing : run2.letterSpacing ?? 0;
+    };
     const alignPendingTabForWidth = (segmentWidth, beforeDecimalWidth) => {
       if (!pendingTabAlignment || !currentLine) return void 0;
       if (segmentWidth < 0) {
@@ -95178,6 +95307,7 @@ ${l}
         tabStopCursor = 0;
         pendingTabAlignment = null;
         lastAppliedTabAlign = null;
+        pendingRunSpacing = 0;
         continue;
       }
       if (isLineBreakRun(run2)) {
@@ -95220,6 +95350,7 @@ ${l}
         tabStopCursor = 0;
         pendingTabAlignment = null;
         lastAppliedTabAlign = null;
+        pendingRunSpacing = 0;
         continue;
       }
       if (isTabRun(run2)) {
@@ -95285,6 +95416,7 @@ ${l}
         } else {
           pendingTabAlignment = null;
         }
+        pendingRunSpacing = 0;
         continue;
       }
       if (isImageRun(run2)) {
@@ -95323,6 +95455,7 @@ ${l}
               }
             ]
           };
+          pendingRunSpacing = 0;
           if (activeTabGroup && runIndex + 1 >= activeTabGroup.measure.endRunIndex) {
             activeTabGroup = null;
           }
@@ -95384,6 +95517,7 @@ ${l}
           currentLine.width = roundValue(tabAlign.target);
         }
         lastAppliedTabAlign = null;
+        pendingRunSpacing = 0;
         continue;
       }
       if (isFieldAnnotationRun(run2)) {
@@ -95423,6 +95557,7 @@ ${l}
               }
             ]
           };
+          pendingRunSpacing = 0;
           continue;
         }
         if (currentLine.width + annotationWidth > currentLine.maxWidth && currentLine.width > 0) {
@@ -95475,9 +95610,11 @@ ${l}
           currentLine.width = roundValue(tabAlign.target);
         }
         lastAppliedTabAlign = null;
+        pendingRunSpacing = 0;
         continue;
       }
       if (!("text" in run2) || !("fontSize" in run2)) {
+        pendingRunSpacing = 0;
         continue;
       }
       lastFontSize = run2.fontSize;
@@ -95488,6 +95625,7 @@ ${l}
         const segment = tabSegments[segmentIndex];
         const isLastSegment = segmentIndex === tabSegments.length - 1;
         if (/^[ ]+$/.test(segment)) {
+          const isRunStart = charPosInRun === 0 && segmentIndex === 0;
           const spacesLength = segment.length;
           const spacesStartChar = charPosInRun;
           const spacesEndChar = charPosInRun + spacesLength;
@@ -95506,7 +95644,7 @@ ${l}
               spaceCount: spacesLength
             };
           } else {
-            const boundarySpacing = currentLine.width > 0 ? run2.letterSpacing ?? 0 : 0;
+            const boundarySpacing = resolveBoundarySpacing(currentLine.width, isRunStart, run2);
             if (currentLine.width + boundarySpacing + spacesWidth > currentLine.maxWidth - WIDTH_FUDGE_PX2 && currentLine.width > 0) {
               trimTrailingWrapSpaces(currentLine);
               const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
@@ -95570,6 +95708,7 @@ ${l}
             const spaceStartChar = charPosInRun;
             const spaceEndChar = charPosInRun + 1;
             const singleSpaceWidth = measureRunWidth(" ", font, ctx2, run2, spaceStartChar);
+            const isRunStart2 = charPosInRun === 0 && segmentIndex === 0 && wordIndex === 0;
             if (!currentLine) {
               currentLine = {
                 fromRun: runIndex,
@@ -95584,7 +95723,7 @@ ${l}
                 spaceCount: 1
               };
             } else {
-              const boundarySpacing2 = currentLine.width > 0 ? run2.letterSpacing ?? 0 : 0;
+              const boundarySpacing2 = resolveBoundarySpacing(currentLine.width, isRunStart2, run2);
               if (currentLine.width + boundarySpacing2 + singleSpaceWidth > currentLine.maxWidth - WIDTH_FUDGE_PX2 && currentLine.width > 0) {
                 trimTrailingWrapSpaces(currentLine);
                 const metrics = calculateTypographyMetrics(currentLine.maxFontSize, spacing, currentLine.maxFontInfo);
@@ -95769,7 +95908,8 @@ ${l}
             continue;
           }
           const isTocEntry = block.attrs?.isTocEntry;
-          const boundarySpacing = currentLine.width > 0 ? run2.letterSpacing ?? 0 : 0;
+          const isRunStart = charPosInRun === 0 && segmentIndex === 0 && wordIndex === 0;
+          const boundarySpacing = resolveBoundarySpacing(currentLine.width, isRunStart, run2);
           const justifyAlignment = block.attrs?.alignment === "justify";
           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);
@@ -95937,6 +96077,7 @@ ${l}
           }
         }
       }
+      pendingRunSpacing = run2.letterSpacing ?? 0;
     }
     if (!currentLine && lines.length === 0) {
       const uiDisplayFallbackFontSize = (block.runs[0]?.kind === "text" ? block.runs[0].fontSize : void 0) ?? 12;
@@ -96740,6 +96881,7 @@ ${l}
     #dragLastPointer = null;
     #dragLastRawHit = null;
     #dragUsedPageNotMountedFallback = false;
+    #suppressFocusInFromDraggable = false;
     // Cell selection drag state
     // Tracks cell-specific context when drag starts in a table for multi-cell selection
     #cellAnchor = null;
@@ -97345,12 +97487,13 @@ ${l}
       if (!validModes.includes(mode)) {
         throw new TypeError(`[PresentationEditor] Invalid mode "${mode}". Must be one of: ${validModes.join(", ")}`);
       }
+      const modeChanged = this.#documentMode !== mode;
       this.#documentMode = mode;
       this.#editor.setDocumentMode(mode);
       this.#syncDocumentModeClass();
       this.#syncHiddenEditorA11yAttributes();
       const trackedChangesChanged = this.#syncTrackedChangesPreferences();
-      if (trackedChangesChanged) {
+      if (modeChanged || trackedChangesChanged) {
         this.#pendingDocChange = true;
         this.#scheduleRerender();
       }
@@ -98720,6 +98863,7 @@ ${l}
         return;
       }
       const isDraggableAnnotation = target?.closest?.('[data-draggable="true"]') != null;
+      this.#suppressFocusInFromDraggable = isDraggableAnnotation;
       if (!this.#layoutState.layout) {
         if (!isDraggableAnnotation) {
           event.preventDefault();
@@ -99450,6 +99594,10 @@ ${l}
       if (isInRegisteredSurface(event)) {
         return;
       }
+      if (this.#suppressFocusInFromDraggable) {
+        this.#suppressFocusInFromDraggable = false;
+        return;
+      }
       const target = event.target;
       const activeTarget = this.#getActiveDomTarget();
       if (!activeTarget) {
@@ -99476,6 +99624,7 @@ ${l}
       }
     };
     #handlePointerUp = (event) => {
+      this.#suppressFocusInFromDraggable = false;
       if (!this.#isDragging) return;
       if (typeof this.#viewportHost.hasPointerCapture === "function" && typeof this.#viewportHost.releasePointerCapture === "function" && this.#viewportHost.hasPointerCapture(event.pointerId)) {
         this.#viewportHost.releasePointerCapture(event.pointerId);
@@ -99720,12 +99869,14 @@ ${l}
           } : void 0;
           const atomNodeTypes = getAtomNodeTypes(this.#editor?.schema ?? null);
           const positionMap2 = this.#editor?.state?.doc && docJson ? buildPositionMapFromPmDoc(this.#editor.state.doc, docJson) : null;
+          const commentsEnabled = this.#documentMode !== "viewing";
           const result = toFlowBlocks(docJson, {
             mediaFiles: this.#editor?.storage?.image?.media,
             emitSectionBreaks: true,
             sectionMetadata,
             trackedChangesMode: this.#trackedChangesMode,
             enableTrackedChanges: this.#trackedChangesEnabled,
+            enableComments: commentsEnabled,
             enableRichHyperlinks: true,
             themeColors: this.#editor?.converter?.themeColors ?? void 0,
             converterContext,
@@ -99856,10 +100007,12 @@ ${l}
         const payload = { layout, blocks: blocks2, measures, metrics };
         this.emit("layoutUpdated", payload);
         this.emit("paginationUpdate", payload);
-        const commentPositions = this.#collectCommentPositions();
-        const positionKeys = Object.keys(commentPositions);
-        if (positionKeys.length > 0) {
-          this.emit("commentPositions", { positions: commentPositions });
+        if (this.#documentMode !== "viewing") {
+          const commentPositions = this.#collectCommentPositions();
+          const positionKeys = Object.keys(commentPositions);
+          if (positionKeys.length > 0) {
+            this.emit("commentPositions", { positions: commentPositions });
+          }
         }
         if (this.#telemetryEmitter && metrics) {
           this.#telemetryEmitter({ type: "layout", data: { layout, blocks: blocks2, measures, metrics } });
@@ -107205,16 +107358,7 @@ ${l}
          * @param {import("./tableHelpers/createTableBorders.js").TableBorders} [borders] - Border styling for this table
          */
         borders: {
-          default: {},
-          renderDOM({ borders }) {
-            if (!borders) return {};
-            const style2 = Object.entries(borders).reduce((acc, [key2, { size: size2, color: color2 }]) => {
-              return `${acc}border-${key2}: ${Math.ceil(size2)}px solid ${color2 || "black"};`;
-            }, "");
-            return {
-              style: style2
-            };
-          }
+          default: {}
         },
         /**
          * @category Attribute
@@ -141158,6 +141302,9 @@ ${reason}`);
     const handleEditorLocationsUpdate = (allCommentPositions) => {
       editorCommentPositions.value = allCommentPositions || {};
     };
+    const clearEditorCommentPositions = () => {
+      editorCommentPositions.value = {};
+    };
     const getFloatingComments = computed(() => {
       const comments = getGroupedComments.value?.parentComments.filter((c2) => !c2.resolvedTime).filter((c2) => {
         const keys2 = Object.keys(editorCommentPositions.value);
@@ -141260,6 +141407,7 @@ ${reason}`);
       processLoadedDocxComments,
       translateCommentsForExport,
       handleEditorLocationsUpdate,
+      clearEditorCommentPositions,
       handleTrackedChangeUpdate
     };
   });
@@ -144030,7 +144178,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0-next.7";
+      this.version = "1.3.0-next.9";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -144547,7 +144695,8 @@ ${reason}`);
     }
     #setModeViewing() {
       this.toolbar.activeEditor = null;
-      this.setTrackedChangesPreferences({ mode: "original", enabled: false });
+      this.setTrackedChangesPreferences({ mode: "original", enabled: true });
+      this.commentsStore?.clearEditorCommentPositions?.();
       this.superdocStore.documents.forEach((doc2) => {
         doc2.removeComments();
         this.#applyDocumentMode(doc2, "viewing");