@examind/block-sdk 0.1.5 → 0.1.6

package/dist/index.js

@@ -629,9 +629,10 @@ var TableCellNodeHandler = class extends NodeHandler {
         }
       }
     }
-    if (metadata?.colWidthPixels && cellIndex >= 0 && cellIndex < metadata.colWidthPixels.length) {
+    const hasColspan = tableCellNode.colSpan && tableCellNode.colSpan > 1;
+    if (!hasColspan && metadata?.colWidthPixels && cellIndex >= 0 && cellIndex < metadata.colWidthPixels.length) {
       styles.push(`width: ${metadata.colWidthPixels[cellIndex]}px;`);
-    } else if (tableCellNode.width) {
+    } else if (!hasColspan && tableCellNode.width) {
       styles.push(`width: ${tableCellNode.width}px;`);
     }
     if (tableCellNode.backgroundColor) {
@@ -644,7 +645,8 @@ var TableCellNodeHandler = class extends NodeHandler {
     }
     const styleAttr = styles.length > 0 ? ` style="${styles.join(" ")}"` : "";
     const tag = tableCellNode.headerState > 0 ? "th" : "td";
-    return `<${tag}${styleAttr}>${createHtmlFromNestedNodes(tableCellNode.children, { parentNode: tableCellNode })}</${tag}>`;
+    const colspanAttr = tableCellNode.colSpan && tableCellNode.colSpan > 1 ? ` colspan="${tableCellNode.colSpan}"` : "";
+    return `<${tag}${styleAttr}${colspanAttr}>${createHtmlFromNestedNodes(tableCellNode.children, { parentNode: tableCellNode })}</${tag}>`;
   }
 };
 
@@ -1823,6 +1825,13 @@ var TableCellNodeHandler2 = class extends NodeHandler2 {
     const isHeader = node.tagName === "TH";
     const cellNode = createEmptyTableCellNode(isHeader);
     cellNode.headerState = node.tagName === "TH" ? 1 : 0;
+    const colspan = node.getAttribute("colspan");
+    if (colspan) {
+      const colSpanValue = parseInt(colspan, 10);
+      if (!isNaN(colSpanValue) && colSpanValue > 1) {
+        cellNode.colSpan = colSpanValue;
+      }
+    }
     const styleAttr = node.getAttribute("style") || "";
     const width = extractStyleValue(styleAttr, "width", true, "%");
     if (width !== null) {
@@ -1907,8 +1916,20 @@ var TableNodeHandler2 = class extends NodeHandler2 {
       tableNode.children.push(...processedRows);
     });
   }
+  hasColspan(row) {
+    const cells = row.querySelectorAll("th, td");
+    return Array.from(cells).some((cell) => {
+      const colspan = cell.getAttribute("colspan");
+      return colspan && parseInt(colspan, 10) > 1;
+    });
+  }
   findTargetRowForWidths(node) {
-    return node.querySelector("thead tr") || node.querySelector("tbody tr") || node.querySelector("tr");
+    const rows = node.querySelectorAll("tr");
+    if (rows.length === 0) return null;
+    for (const row of rows) {
+      if (!this.hasColspan(row)) return row;
+    }
+    return rows[0];
   }
   extractColumnWidths(targetRow, effectiveReferenceWidth) {
     const cells = targetRow.querySelectorAll("th, td");
@@ -1921,11 +1942,28 @@ var TableNodeHandler2 = class extends NodeHandler2 {
         cell,
         effectiveReferenceWidth
       );
-      colWidths.push(result.width);
-      if (result.width > 0) {
-        totalSpecifiedPercent += result.percentEquivalent;
+      const colspan = parseInt(
+        cell.getAttribute("colspan") || "1",
+        10
+      );
+      if (colspan > 1) {
+        const widthPerColumn = result.width / colspan;
+        const percentPerColumn = result.percentEquivalent / colspan;
+        for (let i = 0; i < colspan; i++) {
+          colWidths.push(Math.round(widthPerColumn));
+          if (result.width > 0) {
+            totalSpecifiedPercent += percentPerColumn;
+          } else {
+            unspecifiedColumns++;
+          }
+        }
       } else {
-        unspecifiedColumns++;
+        colWidths.push(result.width);
+        if (result.width > 0) {
+          totalSpecifiedPercent += result.percentEquivalent;
+        } else {
+          unspecifiedColumns++;
+        }
       }
     });
     if (unspecifiedColumns > 0 && totalSpecifiedPercent < 100) {

package/dist/index.mjs

@@ -602,9 +602,10 @@ var TableCellNodeHandler = class extends NodeHandler {
         }
       }
     }
-    if (metadata?.colWidthPixels && cellIndex >= 0 && cellIndex < metadata.colWidthPixels.length) {
+    const hasColspan = tableCellNode.colSpan && tableCellNode.colSpan > 1;
+    if (!hasColspan && metadata?.colWidthPixels && cellIndex >= 0 && cellIndex < metadata.colWidthPixels.length) {
       styles.push(`width: ${metadata.colWidthPixels[cellIndex]}px;`);
-    } else if (tableCellNode.width) {
+    } else if (!hasColspan && tableCellNode.width) {
       styles.push(`width: ${tableCellNode.width}px;`);
     }
     if (tableCellNode.backgroundColor) {
@@ -617,7 +618,8 @@ var TableCellNodeHandler = class extends NodeHandler {
     }
     const styleAttr = styles.length > 0 ? ` style="${styles.join(" ")}"` : "";
     const tag = tableCellNode.headerState > 0 ? "th" : "td";
-    return `<${tag}${styleAttr}>${createHtmlFromNestedNodes(tableCellNode.children, { parentNode: tableCellNode })}</${tag}>`;
+    const colspanAttr = tableCellNode.colSpan && tableCellNode.colSpan > 1 ? ` colspan="${tableCellNode.colSpan}"` : "";
+    return `<${tag}${styleAttr}${colspanAttr}>${createHtmlFromNestedNodes(tableCellNode.children, { parentNode: tableCellNode })}</${tag}>`;
   }
 };
 
@@ -1796,6 +1798,13 @@ var TableCellNodeHandler2 = class extends NodeHandler2 {
     const isHeader = node.tagName === "TH";
     const cellNode = createEmptyTableCellNode(isHeader);
     cellNode.headerState = node.tagName === "TH" ? 1 : 0;
+    const colspan = node.getAttribute("colspan");
+    if (colspan) {
+      const colSpanValue = parseInt(colspan, 10);
+      if (!isNaN(colSpanValue) && colSpanValue > 1) {
+        cellNode.colSpan = colSpanValue;
+      }
+    }
     const styleAttr = node.getAttribute("style") || "";
     const width = extractStyleValue(styleAttr, "width", true, "%");
     if (width !== null) {
@@ -1880,8 +1889,20 @@ var TableNodeHandler2 = class extends NodeHandler2 {
       tableNode.children.push(...processedRows);
     });
   }
+  hasColspan(row) {
+    const cells = row.querySelectorAll("th, td");
+    return Array.from(cells).some((cell) => {
+      const colspan = cell.getAttribute("colspan");
+      return colspan && parseInt(colspan, 10) > 1;
+    });
+  }
   findTargetRowForWidths(node) {
-    return node.querySelector("thead tr") || node.querySelector("tbody tr") || node.querySelector("tr");
+    const rows = node.querySelectorAll("tr");
+    if (rows.length === 0) return null;
+    for (const row of rows) {
+      if (!this.hasColspan(row)) return row;
+    }
+    return rows[0];
   }
   extractColumnWidths(targetRow, effectiveReferenceWidth) {
     const cells = targetRow.querySelectorAll("th, td");
@@ -1894,11 +1915,28 @@ var TableNodeHandler2 = class extends NodeHandler2 {
         cell,
         effectiveReferenceWidth
       );
-      colWidths.push(result.width);
-      if (result.width > 0) {
-        totalSpecifiedPercent += result.percentEquivalent;
+      const colspan = parseInt(
+        cell.getAttribute("colspan") || "1",
+        10
+      );
+      if (colspan > 1) {
+        const widthPerColumn = result.width / colspan;
+        const percentPerColumn = result.percentEquivalent / colspan;
+        for (let i = 0; i < colspan; i++) {
+          colWidths.push(Math.round(widthPerColumn));
+          if (result.width > 0) {
+            totalSpecifiedPercent += percentPerColumn;
+          } else {
+            unspecifiedColumns++;
+          }
+        }
       } else {
-        unspecifiedColumns++;
+        colWidths.push(result.width);
+        if (result.width > 0) {
+          totalSpecifiedPercent += result.percentEquivalent;
+        } else {
+          unspecifiedColumns++;
+        }
       }
     });
     if (unspecifiedColumns > 0 && totalSpecifiedPercent < 100) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examind/block-sdk",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "@comment version": [
     "Don't specify package version here. It will be injected by publish workflow."
   ],