@harbour-enterprises/superdoc 1.3.0-next.6 → 1.3.0-next.8

package/dist/chunks/{SuperConverter-S9b1fFw5.es.js → SuperConverter-DwLhA2mM.es.js}

@@ -9514,6 +9514,9 @@ function handleTableCellNode({
   columnIndex,
   columnWidth = null,
   allColumnWidths = [],
+  rowIndex = 0,
+  totalRows = 1,
+  totalColumns,
   _referencedStyles
 }) {
   const { nodeListHandler } = params;
@@ -9522,19 +9525,46 @@ function handleTableCellNode({
   const tcPr = node.elements.find((el) => el.name === "w:tcPr");
   const tableCellProperties = tcPr ? translator$J.encode({ ...params, 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 ?? (table?.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(tableCellProperties.cellWidth?.value) : null;
   const widthType = tableCellProperties.cellWidth?.type;
   if (widthType) attributes["widthType"] = widthType;
@@ -9544,10 +9574,9 @@ function handleTableCellNode({
     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 i = 0; i < colspanNum; i++) {
+      for (let i = 0; i < colspan; i++) {
         let colwidthValue = defaultColWidths[columnIndex + i];
         let defaultColwidth = 100;
         if (typeof colwidthValue !== "undefined") {
@@ -9697,22 +9726,18 @@ const processInlineCellBorders = (borders, rowBorders) => {
   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 color = borderAttrs["color"];
       let size = borderAttrs["size"];
       if (size) size = eighthPointsToPixels(size);
       acc[direction] = { color, size, 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;
   }, {});
@@ -9848,6 +9873,9 @@ function encode$w(params, encodedAttrs) {
     columnIndex,
     columnWidth,
     columnWidths: allColumnWidths,
+    rowIndex,
+    totalRows,
+    totalColumns,
     _referencedStyles
   } = params.extraParams;
   const schemaNode = handleTableCellNode({
@@ -9859,6 +9887,9 @@ function encode$w(params, encodedAttrs) {
     columnIndex,
     columnWidth,
     allColumnWidths,
+    rowIndex,
+    totalRows,
+    totalColumns,
     _referencedStyles
   });
   if (encodedAttrs && Object.keys(encodedAttrs).length) {
@@ -9882,13 +9913,26 @@ const config$i = {
   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 }) => node.attrs?.cantSplit ? { attributes: {} } : void 0
 });
-const translator$G = NodeTranslator.from(
+const translator$F = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridAfter",
     null,
@@ -9897,7 +9941,7 @@ const translator$G = NodeTranslator.from(
     (v2) => integerToString(v2)
   )
 );
-const translator$F = NodeTranslator.from(
+const translator$E = NodeTranslator.from(
   createSingleAttrPropertyHandler(
     "w:gridBefore",
     null,
@@ -9906,20 +9950,20 @@ const translator$F = NodeTranslator.from(
     (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 }) => node.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 }) => node.attrs.repeatHeader ? { attributes: {} } : void 0
 });
-const translator$B = NodeTranslator.from({
+const translator$A = NodeTranslator.from({
   xmlName: "w:trHeight",
   sdNodeOrKeyName: "rowHeight",
   encode: ({ nodes }) => {
@@ -9946,24 +9990,24 @@ const translator$B = NodeTranslator.from({
     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
@@ -10041,7 +10085,7 @@ const encode$v = (params, encodedAttrs) => {
   let tableRowProperties = {};
   const tPr = row.elements.find((el) => el.name === "w:trPr");
   if (tPr) {
-    tableRowProperties = translator$y.encode({
+    tableRowProperties = translator$x.encode({
       ...params,
       nodes: [tPr]
     });
@@ -10051,6 +10095,12 @@ const encode$v = (params, encodedAttrs) => {
   encodedAttrs["tableRowProperties"] = Object.freeze(tableRowProperties);
   encodedAttrs["rowHeight"] = twipsToPixels(tableRowProperties["rowHeight"]?.value);
   encodedAttrs["cantSplit"] = tableRowProperties["cantSplit"];
+  const baseBorders = params.extraParams?.rowBorders;
+  const rowTableBorders = getRowTableBorders({
+    params,
+    row,
+    baseBorders
+  });
   const { columnWidths: gridColumnWidths, activeRowSpans = [] } = params.extraParams;
   const totalColumns = Array.isArray(gridColumnWidths) ? gridColumnWidths.length : 0;
   const pendingRowSpans = Array.isArray(activeRowSpans) ? activeRowSpans.slice() : [];
@@ -10083,6 +10133,10 @@ const encode$v = (params, encodedAttrs) => {
       path: [...params.path || [], node],
       extraParams: {
         ...params.extraParams,
+        rowBorders: {
+          ...baseBorders,
+          ...rowTableBorders
+        },
         node,
         columnIndex: startColumn,
         columnWidth
@@ -10112,6 +10166,33 @@ const encode$v = (params, encodedAttrs) => {
   };
   return newNode;
 };
+function getRowTableBorders({ params, row, baseBorders }) {
+  const tblPrEx = row?.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({ ...params, 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 color = attributes?.color;
+    const size = attributes?.size;
+    const val = attributes?.val;
+    if (color && color !== "auto") attrs.color = color.startsWith("#") ? color : `#${color}`;
+    if (size != null && size !== "auto") attrs.size = eighthPointsToPixels(size);
+    if (val) attrs.val = val;
+    borders[name] = attrs;
+  });
+  return borders;
+}
 const decode$x = (params, decodedAttrs) => {
   const { node } = params;
   const cells = node.content || [];
@@ -10152,7 +10233,7 @@ const decode$x = (params, decodedAttrs) => {
       }
     }
     tableRowProperties["cantSplit"] = node.attrs["cantSplit"];
-    const trPr = translator$y.decode({
+    const trPr = translator$x.decode({
       ...params,
       node: { ...node, attrs: { ...node.attrs, tableRowProperties } }
     });
@@ -10172,7 +10253,7 @@ const config$h = {
   decode: decode$x,
   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 {};
@@ -24863,7 +24944,7 @@ const config$g = {
   decode: decode$w,
   attributes: validXmlAttributes$8
 };
-const translator$w = NodeTranslator.from(config$g);
+const translator$v = NodeTranslator.from(config$g);
 function handleInlineNode(params) {
   const { node } = params.extraParams;
   if (node.name !== "wp:inline") {
@@ -24917,7 +24998,7 @@ const config$f = {
   decode: decode$v,
   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 = [];
@@ -24925,8 +25006,8 @@ function encode$s(params) {
   const nodes = params.nodes;
   const node = nodes[0];
   const translatorByChildName = {
-    "wp:anchor": translator$w,
-    "wp:inline": translator$v
+    "wp:anchor": translator$v,
+    "wp:inline": translator$u
   };
   const result = (node.elements || []).reduce((acc, child) => {
     if (acc) return acc;
@@ -24949,7 +25030,7 @@ function decode$u(params) {
   if (!node || !node.type) {
     return null;
   }
-  const childTranslator = node.attrs.isAnchor ? translator$w : translator$v;
+  const childTranslator = node.attrs.isAnchor ? translator$v : translator$u;
   const resultNode = childTranslator.decode(params);
   return wrapTextInRun(
     {
@@ -24967,7 +25048,7 @@ const config$e = {
   decode: decode$u,
   attributes: validXmlAttributes$6
 };
-const translator$u = NodeTranslator.from(config$e);
+const translator$t = NodeTranslator.from(config$e);
 function getTextNodeForExport(text, marks, params) {
   const hasLeadingOrTrailingSpace = /^\s|\s$/.test(text);
   const space = hasLeadingOrTrailingSpace ? "preserve" : null;
@@ -25375,7 +25456,7 @@ function prepareTextAnnotation(params) {
   return getTextNodeForExport(attrs.displayLabel, [...marks, ...marksFromAttrs], params);
 }
 function prepareImageAnnotation(params, imageSize) {
-  return translator$u.decode({
+  return translator$t.decode({
     ...params,
     imageSize
   });
@@ -25837,7 +25918,7 @@ const config$d = {
   decode: decode$t,
   attributes: validXmlAttributes$5
 };
-const translator$t = NodeTranslator.from(config$d);
+const translator$s = NodeTranslator.from(config$d);
 function preProcessVerticalMergeCells(table, { editorSchema }) {
   if (!table || !Array.isArray(table.content)) {
     return table;
@@ -25878,17 +25959,17 @@ function preProcessVerticalMergeCells(table, { editorSchema }) {
   }
   return table;
 }
-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 }) => node.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")]),
@@ -25900,16 +25981,16 @@ const translator$n = NodeTranslator.from({
     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))),
@@ -25921,19 +26002,6 @@ const translator$h = NodeTranslator.from({
     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,
@@ -25946,12 +26014,11 @@ const translator$f = NodeTranslator.from(
   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,
@@ -25962,6 +26029,7 @@ const propertyTranslators = [
   translator$i,
   translator$h,
   translator$g,
+  translator$H,
   translator$f
 ];
 const translator$e = NodeTranslator.from(
@@ -26221,8 +26289,7 @@ const encode$p = (params, encodedAttrs) => {
   }
   const borderProps = _processTableBorders(encodedAttrs.tableProperties.borders || {});
   const referencedStyles = _getReferencedTableStyles(encodedAttrs.tableStyleId, params) || {};
-  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
@@ -26243,19 +26310,22 @@ const encode$p = (params, encodedAttrs) => {
   }
   const content = [];
   const totalColumns = columnWidths.length;
+  const totalRows = rows.length;
   const activeRowSpans = totalColumns > 0 ? new Array(totalColumns).fill(0) : [];
   rows.forEach((row, rowIndex) => {
-    const result = translator$x.encode({
+    const result = translator$w.encode({
       ...params,
       path: [...params.path || [], node],
       nodes: [row],
       extraParams: {
         row,
         table: node,
-        rowBorders,
+        rowBorders: encodedAttrs.borders,
         columnWidths,
         activeRowSpans: activeRowSpans.slice(),
         rowIndex,
+        totalRows,
+        totalColumns,
         _referencedStyles: referencedStyles
       }
     });
@@ -26330,21 +26400,17 @@ const decode$r = (params, decodedAttrs) => {
 };
 function _processTableBorders(rawBorders) {
   const borders = {};
-  const rowBorders = {};
   Object.entries(rawBorders).forEach(([name, attributes]) => {
     const attrs = {};
     const color = attributes.color;
     const size = attributes.size;
+    const val = attributes.val;
     if (color && color !== "auto") attrs["color"] = color.startsWith("#") ? color : `#${color}`;
     if (size && size !== "auto") attrs["size"] = eighthPointsToPixels(size);
-    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, params) {
   if (!tableStyleReference) return null;
@@ -26384,9 +26450,8 @@ function _getReferencedTableStyles(tableStyleReference, params) {
     }
     const tableProperties = translator$e.encode({ ...params, 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(([key, attrs]) => {
         if (attrs?.value != null) {
@@ -27235,7 +27300,7 @@ const handleDrawingNode = (params) => {
     return { nodes: [], consumed: 0 };
   }
   const translatorParams = { ...params, nodes: [node] };
-  const schemaNode = translator$u.encode(translatorParams);
+  const schemaNode = translator$t.encode(translatorParams);
   const newNodes = schemaNode ? [schemaNode] : [];
   return { nodes: newNodes, consumed: 1 };
 };
@@ -27478,7 +27543,7 @@ const handleSdtNode = (params) => {
   if (nodes.length === 0 || nodes[0].name !== "w:sdt") {
     return { nodes: [], consumed: 0 };
   }
-  const result = translator$t.encode(params);
+  const result = translator$s.encode(params);
   if (!result) {
     return { nodes: [], consumed: 0 };
   }
@@ -27506,12 +27571,12 @@ const translatorList = Array.from(
     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,
@@ -27519,7 +27584,7 @@ const translatorList = Array.from(
     translator$1R,
     translator$2,
     translator$1G,
-    translator$u,
+    translator$t,
     translator$2i,
     translator$1T,
     translator$1Z,
@@ -27528,13 +27593,13 @@ const translatorList = Array.from(
     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,
@@ -27576,7 +27641,7 @@ const translatorList = Array.from(
     translator$2f,
     translator$1S,
     translator$1m,
-    translator$t,
+    translator$s,
     translator$20,
     translator$2b,
     translator$27,
@@ -27594,23 +27659,23 @@ const translatorList = Array.from(
     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,
@@ -27619,10 +27684,10 @@ const translatorList = Array.from(
     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,
@@ -27633,13 +27698,13 @@ const translatorList = Array.from(
     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
   ])
@@ -27978,8 +28043,8 @@ function importCommentData({ docx, editor, converter }) {
       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,
@@ -28022,7 +28087,11 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
     if (!extendedDef) return { ...comment, isDone: comment.isDone ?? false };
     const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
     let parentComment;
-    if (paraIdParent) parentComment = comments.find((c) => c.paraId === paraIdParent);
+    if (paraIdParent) {
+      parentComment = comments.find(
+        (c) => c.paraId === paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === paraIdParent)
+      );
+    }
     const newComment = {
       ...comment,
       isDone: isDone ?? false,
@@ -29907,13 +29976,13 @@ function exportSchemaToJson(params) {
     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,
@@ -29925,10 +29994,10 @@ function exportSchemaToJson(params) {
     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,
@@ -30938,7 +31007,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.6") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.3.0-next.8") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**