mirror of
https://github.com/zoriya/bubbles.git
synced 2026-08-16 01:43:21 +00:00
refactor: switch to x/ansi for text manipulation (#505)
Need to be consistent with Lipgloss and https://github.com/charmbracelet/lipgloss/pull/279
This commit is contained in:
+4
-4
@@ -8,7 +8,7 @@ import (
|
||||
"github.com/charmbracelet/bubbles/key"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/muesli/reflow/truncate"
|
||||
"github.com/charmbracelet/x/ansi"
|
||||
)
|
||||
|
||||
// DefaultItemStyles defines styling for a default list item.
|
||||
@@ -155,15 +155,15 @@ func (d DefaultDelegate) Render(w io.Writer, m Model, index int, item Item) {
|
||||
}
|
||||
|
||||
// Prevent text from exceeding list width
|
||||
textwidth := uint(m.width - s.NormalTitle.GetPaddingLeft() - s.NormalTitle.GetPaddingRight())
|
||||
title = truncate.StringWithTail(title, textwidth, ellipsis)
|
||||
textwidth := m.width - s.NormalTitle.GetPaddingLeft() - s.NormalTitle.GetPaddingRight()
|
||||
title = ansi.Truncate(title, textwidth, ellipsis)
|
||||
if d.ShowDescription {
|
||||
var lines []string
|
||||
for i, line := range strings.Split(desc, "\n") {
|
||||
if i >= d.height-1 {
|
||||
break
|
||||
}
|
||||
lines = append(lines, truncate.StringWithTail(line, textwidth, ellipsis))
|
||||
lines = append(lines, ansi.Truncate(line, textwidth, ellipsis))
|
||||
}
|
||||
desc = strings.Join(lines, "\n")
|
||||
}
|
||||
|
||||
+4
-5
@@ -17,8 +17,7 @@ import (
|
||||
"github.com/charmbracelet/bubbles/textinput"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/muesli/reflow/ansi"
|
||||
"github.com/muesli/reflow/truncate"
|
||||
"github.com/charmbracelet/x/ansi"
|
||||
"github.com/sahilm/fuzzy"
|
||||
)
|
||||
|
||||
@@ -1075,7 +1074,7 @@ func (m Model) titleView() string {
|
||||
// Status message
|
||||
if m.filterState != Filtering {
|
||||
view += " " + m.statusMessage
|
||||
view = truncate.StringWithTail(view, uint(m.width-spinnerWidth), ellipsis)
|
||||
view = ansi.Truncate(view, m.width-spinnerWidth, ellipsis)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1126,7 +1125,7 @@ func (m Model) statusView() string {
|
||||
|
||||
if filtered {
|
||||
f := strings.TrimSpace(m.FilterInput.Value())
|
||||
f = truncate.StringWithTail(f, 10, "…")
|
||||
f = ansi.Truncate(f, 10, "…")
|
||||
status += fmt.Sprintf("“%s” ", f)
|
||||
}
|
||||
|
||||
@@ -1151,7 +1150,7 @@ func (m Model) paginationView() string {
|
||||
|
||||
// If the dot pagination is wider than the width of the window
|
||||
// use the arabic paginator.
|
||||
if ansi.PrintableRuneWidth(s) > m.width {
|
||||
if ansi.StringWidth(s) > m.width {
|
||||
m.Paginator.Type = paginator.Arabic
|
||||
s = m.Styles.ArabicPagination.Render(m.Paginator.View())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user