git.iko.soy/crush
on main help sign in
fix(ui): list highlight selection scrolling (#1575)
2d43901Ayman Bagabas
internal/tui/components/chat/chat.go+7−6
compare with main
unifiedsplit
@@ -756,11 +756,7 @@ func (m *messageListCmp) CopySelectedText(clear bool) tea.Cmd {
756 return util.ReportInfo("No text selected")
756 return util.ReportInfo("No text selected")
757 }
757 }
758
758
759− if clear {
759+ cmds := []tea.Cmd{
760− defer func() { m.SelectionClear() }()
761− }
762−
763− return tea.Sequence(
764 // We use both OSC 52 and native clipboard for compatibility with different
760 // We use both OSC 52 and native clipboard for compatibility with different
765 // terminal emulators and environments.
761 // terminal emulators and environments.
766 tea.SetClipboard(selectedText),
762 tea.SetClipboard(selectedText),
@@ -769,7 +765,12 @@ func (m *messageListCmp) CopySelectedText(clear bool) tea.Cmd {
769 return nil
765 return nil
770 },
766 },
771 util.ReportInfo("Selected text copied to clipboard"),
767 util.ReportInfo("Selected text copied to clipboard"),
772− )
768+ }
769+ if clear {
770+ cmds = append(cmds, m.SelectionClear())
771+ }
772+
773+ return tea.Sequence(cmds...)
773}
774}
774
775
775// abs returns the absolute value of an integer.
776// abs returns the absolute value of an integer.
internal/tui/exp/list/list.go+75−16
@@ -350,13 +350,12 @@ func (l *list[T]) selectionView(view string, textOnly bool) string {
350 scr := uv.NewScreenBuffer(area.Dx(), area.Dy())
350 scr := uv.NewScreenBuffer(area.Dx(), area.Dy())
351 uv.NewStyledString(view).Draw(scr, area)
351 uv.NewStyledString(view).Draw(scr, area)
352
352
353− selArea := uv.Rectangle{
353+ selArea := l.selectionArea(false)
354− Min: uv.Pos(l.selectionStartCol, l.selectionStartLine),
355− Max: uv.Pos(l.selectionEndCol, l.selectionEndLine),
356− }
357− selArea = selArea.Canon()
358−
359 specialChars := getSpecialCharsMap()
354 specialChars := getSpecialCharsMap()
355+ selStyle := uv.Style{
356+ Bg: t.TextSelection.GetBackground(),
357+ Fg: t.TextSelection.GetForeground(),
358+ }
360
359
361 isNonWhitespace := func(r rune) bool {
360 isNonWhitespace := func(r rune) bool {
362 return r != ' ' && r != '\t' && r != 0 && r != '\n' && r != '\r'
361 return r != ' ' && r != '\t' && r != 0 && r != '\n' && r != '\r'
@@ -371,9 +370,9 @@ func (l *list[T]) selectionView(view string, textOnly bool) string {
371 for y := range scr.Height() {
370 for y := range scr.Height() {
372 bounds := selectionBounds{startX: -1, endX: -1, inSelection: false}
371 bounds := selectionBounds{startX: -1, endX: -1, inSelection: false}
373
372
374− if y >= selArea.Min.Y && y <= selArea.Max.Y {
373+ if y >= selArea.Min.Y && y < selArea.Max.Y {
375 bounds.inSelection = true
374 bounds.inSelection = true
376− if selArea.Min.Y == selArea.Max.Y {
375+ if selArea.Min.Y == selArea.Max.Y-1 {
377 // Single line selection
376 // Single line selection
378 bounds.startX = selArea.Min.X
377 bounds.startX = selArea.Min.X
379 bounds.endX = selArea.Max.X
378 bounds.endX = selArea.Max.X
@@ -381,7 +380,7 @@ func (l *list[T]) selectionView(view string, textOnly bool) string {
381 // First line of multi-line selection
380 // First line of multi-line selection
382 bounds.startX = selArea.Min.X
381 bounds.startX = selArea.Min.X
383 bounds.endX = scr.Width()
382 bounds.endX = scr.Width()
384− } else if y == selArea.Max.Y {
383+ } else if y == selArea.Max.Y-1 {
385 // Last line of multi-line selection
384 // Last line of multi-line selection
386 bounds.startX = 0
385 bounds.startX = 0
387 bounds.endX = selArea.Max.X
386 bounds.endX = selArea.Max.X
@@ -470,13 +469,9 @@ func (l *list[T]) selectionView(view string, textOnly bool) string {
470 continue
469 continue
471 }
470 }
472
471
473− // Text selection styling, which is a Lip Gloss style. We must
474− // extract the values to use in a UV style, below.
475− ts := t.TextSelection
476−
477 cell = cell.Clone()
472 cell = cell.Clone()
478− cell.Style.Bg = ts.GetBackground()
473+ cell.Style.Bg = selStyle.Bg
479− cell.Style.Fg = ts.GetForeground()
474+ cell.Style.Fg = selStyle.Fg
480 scr.SetCell(x, y, cell)
475 scr.SetCell(x, y, cell)
481 }
476 }
482 }
477 }
@@ -1706,11 +1701,75 @@ func (l *list[T]) HasSelection() bool {
1706 return l.hasSelection()
1701 return l.hasSelection()
1707}
1702}
1708
1703
1704+func (l *list[T]) selectionArea(absolute bool) uv.Rectangle {
1705+ var startY int
1706+ if absolute {
1707+ startY, _ = l.viewPosition()
1708+ }
1709+ selArea := uv.Rectangle{
1710+ Min: uv.Pos(l.selectionStartCol, l.selectionStartLine+startY),
1711+ Max: uv.Pos(l.selectionEndCol, l.selectionEndLine+startY),
1712+ }
1713+ selArea = selArea.Canon()
1714+ selArea.Max.Y++ // make max Y exclusive
1715+ return selArea
1716+}
1717+
1709// GetSelectedText returns the currently selected text.
1718// GetSelectedText returns the currently selected text.
1710func (l *list[T]) GetSelectedText(paddingLeft int) string {
1719func (l *list[T]) GetSelectedText(paddingLeft int) string {
1711 if !l.hasSelection() {
1720 if !l.hasSelection() {
1712 return ""
1721 return ""
1713 }
1722 }
1714
1723
1715− return l.selectionView(l.View(), true)
1724+ selArea := l.selectionArea(true)
1725+ if selArea.Empty() {
1726+ return ""
1727+ }
1728+
1729+ selectionHeight := selArea.Dy()
1730+
1731+ tempBuf := uv.NewScreenBuffer(l.width, selectionHeight)
1732+ tempBufArea := tempBuf.Bounds()
1733+ renderedLines := l.getLines(selArea.Min.Y, selArea.Max.Y)
1734+ styled := uv.NewStyledString(renderedLines)
1735+ styled.Draw(tempBuf, tempBufArea)
1736+
1737+ // XXX: Left padding assumes the list component is rendered with absolute
1738+ // positioning. The chat component has a left margin of 1 and items in the
1739+ // list have a border of 1 plus a padding of 1. The paddingLeft parameter
1740+ // assumes this total left padding of 3 and we should fix that.
1741+ leftBorder := paddingLeft - 1
1742+
1743+ var b strings.Builder
1744+ for y := tempBufArea.Min.Y; y < tempBufArea.Max.Y; y++ {
1745+ var pending strings.Builder
1746+ for x := tempBufArea.Min.X + leftBorder; x < tempBufArea.Max.X; {
1747+ cell := tempBuf.CellAt(x, y)
1748+ if cell == nil || cell.IsZero() {
1749+ x++
1750+ continue
1751+ }
1752+ if y == 0 && x < selArea.Min.X {
1753+ x++
1754+ continue
1755+ }
1756+ if y == selectionHeight-1 && x > selArea.Max.X-1 {
1757+ break
1758+ }
1759+ if cell.Width == 1 && cell.Content == " " {
1760+ pending.WriteString(cell.Content)
1761+ x++
1762+ continue
1763+ }
1764+ b.WriteString(pending.String())
1765+ pending.Reset()
1766+ b.WriteString(cell.Content)
1767+ x += cell.Width
1768+ }
1769+ if y < tempBufArea.Max.Y-1 {
1770+ b.WriteByte('\n')
1771+ }
1772+ }
1773+
1774+ return b.String()
1716}
1775}