fix: colspans for all cells

hlxsites · Oct 11, 2023 · 9ef9180 · 9ef9180
1 parent 820ed12
commit 9ef9180
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/worker/src/util/adoc2html.ts b/worker/src/util/adoc2html.ts
@@ -338,13 +338,15 @@ class FranklinConverter implements AdocTypes.Converter {
   }
 
   tableToTableBlock(node: AdocTypes.Table): string {
-    let colSpans = (
-      node.getHeadRows()[0]
-      ?? node.getBodyRows()[0]
-      ?? []
-    ).map((col) => col.getColumnSpan() || '1');
-
-    if (!colSpans.some((c) => c !== '1')) {
+    const { head, body, foot } = node.getRows();
+    // 2D array of cell colspans
+    let colSpans: number[][] = ([
+      ...head,
+      ...body,
+      ...foot,
+    ]).map((row) => row.map((col) => col.getColumnSpan() || 1));
+
+    if (!colSpans.some((row) => row.some((col) => col !== 1))) {
       colSpans = undefined;
     }
 
@@ -360,7 +362,7 @@ class FranklinConverter implements AdocTypes.Converter {
 
     return this.tableToBlock('table', node, {
       preRows: `${colSpans
-        ? /* html */`<div><div>col-spans</div><div>${colSpans.join(',')}</div></div>`
+        ? /* html */`<div><div>col-spans</div><div>${colSpans.map((row) => row.join(',')).join(';')}</div></div>`
         : ''}`
         + `${colWidths
           ? /* html */`<div><div>col-widths</div><div>${colWidths.join(',')}</div></div>`