Render missing data for columns with format string (#155)

table/row.go

@@ -61,22 +61,22 @@ func (m Model) renderRowColumnData(row Row, column Column, rowStyle lipgloss.Sty
 	} else if column.key == columnKeyOverflowLeft {
 		str = "<"
 	} else {
+		fmtString := "%v"
+
 		var data interface{}
 
 		if entry, exists := row.Data[column.key]; exists {
 			data = entry
+
+			if column.fmtString != "" {
+				fmtString = column.fmtString
+			}
 		} else if m.missingDataIndicator != nil {
 			data = m.missingDataIndicator
 		} else {
 			data = ""
 		}
 
-		fmtString := "%v"
-
-		if column.fmtString != "" {
-			fmtString = column.fmtString
-		}
-
 		switch entry := data.(type) {
 		case StyledCell:
 			str = fmt.Sprintf(fmtString, entry.Data)

table/view_test.go

@@ -454,6 +454,49 @@ func TestSimple3x3WithMissingData(t *testing.T) {
 	assert.Equal(t, expectedTable, rendered)
 }
 
+func TestFmtStringWithMissingData(t *testing.T) {
+	model := New([]Column{
+		NewColumn("1", "1", 4),
+		NewColumn("2", "2", 4).WithFormatString("%.1f"),
+		NewColumn("3", "3", 4),
+	})
+
+	rows := []Row{}
+
+	for rowIndex := 1; rowIndex <= 3; rowIndex++ {
+		rowData := RowData{}
+
+		for columnIndex := 1; columnIndex <= 3; columnIndex++ {
+			// Take out the center
+			if rowIndex == 2 && columnIndex == 2 {
+				continue
+			}
+
+			id := fmt.Sprintf("%d", columnIndex)
+
+			rowData[id] = float64(columnIndex) + float64(rowIndex)/10.0
+		}
+
+		rows = append(rows, NewRow(rowData))
+	}
+
+	model = model.WithRows(rows).WithStaticFooter("Footer")
+
+	const expectedTable = `┏━━━━┳━━━━┳━━━━┓
+┃   1┃   2┃   3┃
+┣━━━━╋━━━━╋━━━━┫
+┃ 1.1┃ 2.1┃ 3.1┃
+┃ 1.2┃    ┃ 3.2┃
+┃ 1.3┃ 2.3┃ 3.3┃
+┣━━━━┻━━━━┻━━━━┫
+┃        Footer┃
+┗━━━━━━━━━━━━━━┛`
+
+	rendered := model.View()
+
+	assert.Equal(t, expectedTable, rendered)
+}
+
 func TestSimple3x3WithMissingIndicator(t *testing.T) {
 	model := New([]Column{
 		NewColumn("1", "1", 4),
@@ -504,6 +547,49 @@ func TestSimple3x3WithMissingIndicator(t *testing.T) {
 	assert.Equal(t, expectedTable, rendered)
 }
 
+func TestFmtStringWithMissingIndicator(t *testing.T) {
+	model := New([]Column{
+		NewColumn("1", "1", 4),
+		NewColumn("2", "2", 4).WithFormatString("%.1f"),
+		NewColumn("3", "3", 4),
+	}).WithMissingDataIndicator("XX")
+
+	rows := []Row{}
+
+	for rowIndex := 1; rowIndex <= 3; rowIndex++ {
+		rowData := RowData{}
+
+		for columnIndex := 1; columnIndex <= 3; columnIndex++ {
+			// Take out the center
+			if rowIndex == 2 && columnIndex == 2 {
+				continue
+			}
+
+			id := fmt.Sprintf("%d", columnIndex)
+
+			rowData[id] = float64(columnIndex) + float64(rowIndex)/10.0
+		}
+
+		rows = append(rows, NewRow(rowData))
+	}
+
+	model = model.WithRows(rows).WithStaticFooter("Footer")
+
+	const expectedTable = `┏━━━━┳━━━━┳━━━━┓
+┃   1┃   2┃   3┃
+┣━━━━╋━━━━╋━━━━┫
+┃ 1.1┃ 2.1┃ 3.1┃
+┃ 1.2┃  XX┃ 3.2┃
+┃ 1.3┃ 2.3┃ 3.3┃
+┣━━━━┻━━━━┻━━━━┫
+┃        Footer┃
+┗━━━━━━━━━━━━━━┛`
+
+	rendered := model.View()
+
+	assert.Equal(t, expectedTable, rendered)
+}
+
 func TestSimple3x3WithMissingIndicatorStyled(t *testing.T) {
 	model := New([]Column{
 		NewColumn("1", "1", 4),
@@ -550,6 +636,52 @@ func TestSimple3x3WithMissingIndicatorStyled(t *testing.T) {
 	assert.Equal(t, expectedTable, rendered)
 }
 
+func TestFmtStringWithMissingIndicatorStyled(t *testing.T) {
+	model := New([]Column{
+		NewColumn("1", "1", 4),
+		NewColumn("2", "2", 4).WithFormatString("%.1f"),
+		NewColumn("3", "3", 4),
+	}).WithMissingDataIndicatorStyled(StyledCell{
+		Style: lipgloss.NewStyle().Align(lipgloss.Left),
+		Data:  "XX",
+	})
+
+	rows := []Row{}
+
+	for rowIndex := 1; rowIndex <= 3; rowIndex++ {
+		rowData := RowData{}
+
+		for columnIndex := 1; columnIndex <= 3; columnIndex++ {
+			// Take out the center
+			if rowIndex == 2 && columnIndex == 2 {
+				continue
+			}
+
+			id := fmt.Sprintf("%d", columnIndex)
+
+			rowData[id] = float64(columnIndex) + float64(rowIndex)/10.0
+		}
+
+		rows = append(rows, NewRow(rowData))
+	}
+
+	model = model.WithRows(rows).WithStaticFooter("Footer")
+
+	const expectedTable = `┏━━━━┳━━━━┳━━━━┓
+┃   1┃   2┃   3┃
+┣━━━━╋━━━━╋━━━━┫
+┃ 1.1┃ 2.1┃ 3.1┃
+┃ 1.2┃XX  ┃ 3.2┃
+┃ 1.3┃ 2.3┃ 3.3┃
+┣━━━━┻━━━━┻━━━━┫
+┃        Footer┃
+┗━━━━━━━━━━━━━━┛`
+
+	rendered := model.View()
+
+	assert.Equal(t, expectedTable, rendered)
+}
+
 func TestPaged3x3WithNoSpecifiedFooter(t *testing.T) {
 	model := New([]Column{
 		NewColumn("1", "1", 4),