mirror of
https://github.com/zoriya/bubbles.git
synced 2026-08-05 04:36:07 +00:00
fix(table): use ansi.Truncate instead of runewidth.Truncate (#884)
`runewidth.Truncate` does not consider terminal escape characters - this means that if a table cell contains funky characters, then it will be incorrectly truncated. Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
+3
-3
@@ -9,7 +9,7 @@ import (
|
||||
"charm.land/bubbles/v2/viewport"
|
||||
tea "charm.land/bubbletea/v2"
|
||||
"charm.land/lipgloss/v2"
|
||||
"github.com/mattn/go-runewidth"
|
||||
"github.com/charmbracelet/x/ansi"
|
||||
)
|
||||
|
||||
// Model defines a state for the table widget.
|
||||
@@ -422,7 +422,7 @@ func (m Model) headersView() string {
|
||||
continue
|
||||
}
|
||||
style := lipgloss.NewStyle().Width(col.Width).MaxWidth(col.Width).Inline(true)
|
||||
renderedCell := style.Render(runewidth.Truncate(col.Title, col.Width, "…"))
|
||||
renderedCell := style.Render(ansi.Truncate(col.Title, col.Width, "…"))
|
||||
s = append(s, m.styles.Header.Render(renderedCell))
|
||||
}
|
||||
return lipgloss.JoinHorizontal(lipgloss.Top, s...)
|
||||
@@ -435,7 +435,7 @@ func (m *Model) renderRow(r int) string {
|
||||
continue
|
||||
}
|
||||
style := lipgloss.NewStyle().Width(m.cols[i].Width).MaxWidth(m.cols[i].Width).Inline(true)
|
||||
renderedCell := m.styles.Cell.Render(style.Render(runewidth.Truncate(value, m.cols[i].Width, "…")))
|
||||
renderedCell := m.styles.Cell.Render(style.Render(ansi.Truncate(value, m.cols[i].Width, "…")))
|
||||
s = append(s, renderedCell)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user