table: html row automerge support (#319)

jedib0t · May 4, 2024 · 5395a20 · 5395a20
1 parent 027182a
commit 5395a20
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 3 deletions.
diff --git a/table/render_html.go b/table/render_html.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"html"
 	"strings"
+
+	"github.com/jedib0t/go-pretty/v6/text"
 )
 
 const (
@@ -113,9 +115,9 @@ func (t *Table) htmlRenderColumn(out *strings.Builder, colStr string) {
 	out.WriteString(colStr)
 }
 
-func (t *Table) htmlRenderColumnAttributes(out *strings.Builder, colIdx int, hint renderHint) {
+func (t *Table) htmlRenderColumnAttributes(out *strings.Builder, colIdx int, hint renderHint, alignOverride text.Align) {
 	// determine the HTML "align"/"valign" property values
-	align := t.getAlign(colIdx, hint).HTMLProperty()
+	align := alignOverride.HTMLProperty()
 	vAlign := t.getVAlign(colIdx, hint).HTMLProperty()
 	// determine the HTML "class" property values for the colors
 	class := t.getColumnColors(colIdx, hint).HTMLProperty()
@@ -158,11 +160,31 @@ func (t *Table) htmlRenderRow(out *strings.Builder, row rowStr, hint renderHint)
 			t.htmlRenderColumnAutoIndex(out, hint)
 		}
 
+		align := t.getAlign(colIdx, hint)
+		rowConfig := t.getRowConfig(hint)
+		extraColumnsRendered := 0
+		if rowConfig.AutoMerge && !hint.isSeparatorRow {
+			// get the real row to consider all lines in each column instead of just
+			// looking at the current "line"
+			rowUnwrapped := t.getRow(hint.rowNumber-1, hint)
+			for idx := colIdx + 1; idx < len(rowUnwrapped); idx++ {
+				if rowUnwrapped[colIdx] != rowUnwrapped[idx] {
+					break
+				}
+				align = rowConfig.getAutoMergeAlign()
+				extraColumnsRendered++
+			}
+		}
+
 		colStr, colTagName := t.htmlGetColStrAndTag(row, colIdx, hint)
 		// write the row
 		out.WriteString("    <")
 		out.WriteString(colTagName)
-		t.htmlRenderColumnAttributes(out, colIdx, hint)
+		t.htmlRenderColumnAttributes(out, colIdx, hint, align)
+		if extraColumnsRendered > 0 {
+			out.WriteString(" colspan=")
+			out.WriteString(fmt.Sprint(extraColumnsRendered + 1))
+		}
 		out.WriteString(">")
 		if len(colStr) == 0 {
 			out.WriteString(t.style.HTML.EmptyColumn)
@@ -172,6 +194,7 @@ func (t *Table) htmlRenderRow(out *strings.Builder, row rowStr, hint renderHint)
 		out.WriteString("</")
 		out.WriteString(colTagName)
 		out.WriteString(">\n")
+		colIdx += extraColumnsRendered
 	}
 	out.WriteString("  </tr>\n")
 }

diff --git a/table/render_html_test.go b/table/render_html_test.go
@@ -517,3 +517,88 @@ func TestTable_RenderHTML_Sorted(t *testing.T) {
   </tfoot>
 </table>`)
 }
+
+func TestTable_RenderHTML_RowAutoMerge(t *testing.T) {
+	t.Run("simple", func(t *testing.T) {
+		rcAutoMerge := RowConfig{AutoMerge: true}
+		tw := NewWriter()
+		tw.AppendHeader(Row{"A", "B"})
+		tw.AppendRow(Row{"Y", "Y"}, rcAutoMerge)
+		tw.AppendRow(Row{"Y", "N"}, rcAutoMerge)
+		compareOutput(t, tw.RenderHTML(), `
+<table class="go-pretty-table">
+  <thead>
+  <tr>
+    <th>A</th>
+    <th>B</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td align="center" colspan=2>Y</td>
+  </tr>
+  <tr>
+    <td>Y</td>
+    <td>N</td>
+  </tr>
+  </tbody>
+</table>`)
+	})
+	t.Run("merged and unmerged entries", func(t *testing.T) {
+		rcAutoMerge := RowConfig{AutoMerge: true}
+		tw := NewWriter()
+		tw.AppendHeader(Row{"A", "B", "C", "D"})
+		tw.AppendRow(Row{"Y", "Y", "0", "1"}, rcAutoMerge)
+		tw.AppendRow(Row{"0", "Y", "Y", "1"}, rcAutoMerge)
+		tw.AppendRow(Row{"0", "1", "Y", "Y"}, rcAutoMerge)
+		tw.AppendRow(Row{"Y", "Y", "Y", "0"}, rcAutoMerge)
+		tw.AppendRow(Row{"0", "Y", "Y", "Y"}, rcAutoMerge)
+		tw.AppendRow(Row{"Y", "Y", "Y", "Y"}, rcAutoMerge)
+		tw.AppendRow(Row{"0", "1", "2", "3"}, rcAutoMerge)
+		compareOutput(t, tw.RenderHTML(), `
+<table class="go-pretty-table">
+  <thead>
+  <tr>
+    <th>A</th>
+    <th>B</th>
+    <th>C</th>
+    <th>D</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td align="center" colspan=2>Y</td>
+    <td>0</td>
+    <td>1</td>
+  </tr>
+  <tr>
+    <td>0</td>
+    <td align="center" colspan=2>Y</td>
+    <td>1</td>
+  </tr>
+  <tr>
+    <td>0</td>
+    <td>1</td>
+    <td align="center" colspan=2>Y</td>
+  </tr>
+  <tr>
+    <td align="center" colspan=3>Y</td>
+    <td>0</td>
+  </tr>
+  <tr>
+    <td>0</td>
+    <td align="center" colspan=3>Y</td>
+  </tr>
+  <tr>
+    <td align="center" colspan=4>Y</td>
+  </tr>
+  <tr>
+    <td>0</td>
+    <td>1</td>
+    <td>2</td>
+    <td>3</td>
+  </tr>
+  </tbody>
+</table>`)
+	})
+}