feat(table): remove StyleFunc + add tests for table alignment (#586)

* Revert "Add support fo style func to table bubble"

This reverts commit 04658fed8e.

* test(table): add tests for table alignment

table/table.go

@@ -14,12 +14,11 @@ import (
 type Model struct {
 	KeyMap KeyMap
 
-	cols      []Column
-	rows      []Row
-	cursor    int
-	focus     bool
-	styles    Styles
-	styleFunc StyleFunc
+	cols   []Column
+	rows   []Row
+	cursor int
+	focus  bool
+	styles Styles
 
 	viewport viewport.Model
 	start    int
@@ -189,13 +188,6 @@ func WithStyles(s Styles) Option {
 	}
 }
 
-// WithStyleFunc sets the table style func which can determine a cell style per column, row, and selected state.
-func WithStyleFunc(f StyleFunc) Option {
-	return func(m *Model) {
-		m.styleFunc = f
-	}
-}
-
 // WithKeyMap sets the key map.
 func WithKeyMap(km KeyMap) Option {
 	return func(m *Model) {
@@ -405,9 +397,6 @@ func (m *Model) FromValues(value, separator string) {
 	m.SetRows(rows)
 }
 
-// StyleFunc is a function that can be used to customize the style of a table cell based on the row and column index.
-type StyleFunc func(row, col int, value string) lipgloss.Style
-
 func (m Model) headersView() string {
 	s := make([]string, 0, len(m.cols))
 	for _, col := range m.cols {
@@ -427,18 +416,8 @@ func (m *Model) renderRow(r int) string {
 		if m.cols[i].Width <= 0 {
 			continue
 		}
-		var cellStyle lipgloss.Style
-		if m.styleFunc != nil {
-			cellStyle = m.styleFunc(r, i, value)
-			if r == m.cursor {
-				cellStyle = cellStyle.Inherit(m.styles.Selected)
-			}
-		} else {
-			cellStyle = m.styles.Cell
-		}
-
 		style := lipgloss.NewStyle().Width(m.cols[i].Width).MaxWidth(m.cols[i].Width).Inline(true)
-		renderedCell := cellStyle.Render(style.Render(runewidth.Truncate(value, m.cols[i].Width, "…")))
+		renderedCell := m.styles.Cell.Render(style.Render(runewidth.Truncate(value, m.cols[i].Width, "…")))
 		s = append(s, renderedCell)
 	}
 

table/table_test.go

@@ -1,10 +1,11 @@
 package table
 
 import (
-	"strings"
 	"testing"
 
 	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/x/ansi"
+	"github.com/charmbracelet/x/exp/golden"
 )
 
 func TestFromValues(t *testing.T) {
@@ -58,13 +59,11 @@ func deepEqual(a, b []Row) bool {
 	return true
 }
 
-var (
-	cols = []Column{
-		{Title: "col1", Width: 10},
-		{Title: "col2", Width: 10},
-		{Title: "col3", Width: 10},
-	}
-)
+var cols = []Column{
+	{Title: "col1", Width: 10},
+	{Title: "col2", Width: 10},
+	{Title: "col3", Width: 10},
+}
 
 func TestRenderRow(t *testing.T) {
 	tests := []struct {
@@ -109,33 +108,52 @@ func TestRenderRow(t *testing.T) {
 		})
 	}
 }
-func TestRenderRowStyleFunc(t *testing.T) {
-	tests := []struct {
-		name     string
-		table    *Model
-		expected string
-	}{
-		{
-			name: "simple row",
-			table: &Model{
-				rows: []Row{{"Foooooo", "Baaaaar", "Baaaaaz"}},
-				cols: cols,
-				styleFunc: func(row, col int, value string) lipgloss.Style {
-					if strings.HasSuffix(value, "z") {
-						return lipgloss.NewStyle().Transform(strings.ToLower)
-					}
-					return lipgloss.NewStyle().Transform(strings.ToUpper)
-				},
-			},
-			expected: "FOOOOOO   BAAAAAR   baaaaaz   ",
-		},
-	}
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			row := tc.table.renderRow(0)
-			if row != tc.expected {
-				t.Fatalf("\n\nWant: \n%s\n\nGot:  \n%s\n", tc.expected, row)
-			}
-		})
-	}
+
+func TestTableAlignment(t *testing.T) {
+	t.Run("No border", func(t *testing.T) {
+		biscuits := New(
+			WithHeight(5),
+			WithColumns([]Column{
+				{Title: "Name", Width: 25},
+				{Title: "Country of Origin", Width: 16},
+				{Title: "Dunk-able", Width: 12},
+			}),
+			WithRows([]Row{
+				{"Chocolate Digestives", "UK", "Yes"},
+				{"Tim Tams", "Australia", "No"},
+				{"Hobnobs", "UK", "Yes"},
+			}),
+		)
+		got := ansi.Strip(biscuits.View())
+		golden.RequireEqual(t, []byte(got))
+	})
+	t.Run("With border", func(t *testing.T) {
+		baseStyle := lipgloss.NewStyle().
+			BorderStyle(lipgloss.NormalBorder()).
+			BorderForeground(lipgloss.Color("240"))
+
+		s := DefaultStyles()
+		s.Header = s.Header.
+			BorderStyle(lipgloss.NormalBorder()).
+			BorderForeground(lipgloss.Color("240")).
+			BorderBottom(true).
+			Bold(false)
+
+		biscuits := New(
+			WithHeight(5),
+			WithColumns([]Column{
+				{Title: "Name", Width: 25},
+				{Title: "Country of Origin", Width: 16},
+				{Title: "Dunk-able", Width: 12},
+			}),
+			WithRows([]Row{
+				{"Chocolate Digestives", "UK", "Yes"},
+				{"Tim Tams", "Australia", "No"},
+				{"Hobnobs", "UK", "Yes"},
+			}),
+			WithStyles(s),
+		)
+		got := ansi.Strip(baseStyle.Render(biscuits.View()))
+		golden.RequireEqual(t, []byte(got))
+	})
 }

table/testdata/TestTableAlignment/No_border.golden

@@ -0,0 +1,5 @@
+ Name                       Country of Orig…  Dunk-able    
+ Chocolate Digestives       UK                Yes          
+ Tim Tams                   Australia         No           
+ Hobnobs                    UK                Yes          
+                                                           

table/testdata/TestTableAlignment/With_border.golden

@@ -0,0 +1,8 @@
+┌───────────────────────────────────────────────────────────┐
+│ Name                       Country of Orig…  Dunk-able    │
+│───────────────────────────────────────────────────────────│
+│ Chocolate Digestives       UK                Yes          │
+│ Tim Tams                   Australia         No           │
+│ Hobnobs                    UK                Yes          │
+│                                                           │
+└───────────────────────────────────────────────────────────┘