Skip to content

Commit f540b67

Browse files
ipsavitskyipsavitsky
committed
Update to bubbletea v2, lipgloss v2 and bubbles v2
Signed-off-by: Ilya Savitsky <[email protected]>
1 parent 2b63d2f commit f540b67

File tree

14 files changed

+73
-67
lines changed

14 files changed

+73
-67
lines changed

‎bubble/bubble.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"clx/favorites"
1111
"clx/settings"
1212

13-
tea "github.com/charmbracelet/bubbletea"
14-
"github.com/charmbracelet/lipgloss"
13+
tea "github.com/charmbracelet/bubbletea/v2"
14+
"github.com/charmbracelet/lipgloss/v2"
1515
)
1616

1717
var docStyle = lipgloss.NewStyle()
@@ -20,8 +20,8 @@ type model struct {
2020
list *list.Model
2121
}
2222

23-
func (m model) Init() tea.Cmd {
24-
return nil
23+
func (m model) Init() (tea.Model, tea.Cmd) {
24+
return m, nil
2525
}
2626

2727
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

‎bubble/list/defaultitem.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
"github.com/nleeper/goment"
1515

16-
"github.com/charmbracelet/bubbles/key"
17-
tea "github.com/charmbracelet/bubbletea"
18-
"github.com/charmbracelet/lipgloss"
16+
"github.com/charmbracelet/bubbles/v2/key"
17+
tea "github.com/charmbracelet/bubbletea/v2"
18+
"github.com/charmbracelet/lipgloss/v2"
1919
"github.com/muesli/reflow/truncate"
2020
)
2121

‎bubble/list/list.go

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"clx/app"
1313

14-
"github.com/charmbracelet/bubbles/viewport"
14+
"github.com/charmbracelet/bubbles/v2/viewport"
1515

1616
"clx/reader"
1717

@@ -33,10 +33,10 @@ import (
3333
"clx/tree"
3434
"clx/validator"
3535

36-
"github.com/charmbracelet/bubbles/paginator"
37-
"github.com/charmbracelet/bubbles/spinner"
38-
tea "github.com/charmbracelet/bubbletea"
39-
"github.com/charmbracelet/lipgloss"
36+
"github.com/charmbracelet/bubbles/v2/paginator"
37+
"github.com/charmbracelet/bubbles/v2/spinner"
38+
tea "github.com/charmbracelet/bubbletea/v2"
39+
"github.com/charmbracelet/lipgloss/v2"
4040
)
4141

4242
const (
@@ -153,11 +153,6 @@ func New(delegate ItemDelegate, config *settings.Config, cat *categories.Categor
153153
p.Type = paginator.Dots
154154
p.ActiveDot = styles.ActivePaginationDot.String()
155155
p.InactiveDot = styles.InactivePaginationDot.String()
156-
p.UseHLKeys = false
157-
p.UseJKKeys = false
158-
p.UseLeftRightKeys = false
159-
p.UsePgUpPgDownKeys = false
160-
p.UseUpDownKeys = false
161156

162157
bufferCategory := 1
163158
items := make([][]*item.Item, numberOfCategories+bufferCategory)
@@ -449,9 +444,7 @@ func (m *Model) Update(msg tea.Msg) (*Model, tea.Cmd) {
449444

450445
heightOfHeaderAndStatusLine := 4
451446

452-
m.viewport = viewport.New(windowSizeMsg.Width, windowSizeMsg.Height-heightOfHeaderAndStatusLine)
453-
m.viewport.YPosition = 2
454-
m.viewport.HighPerformanceRendering = false
447+
m.viewport = viewport.New(viewport.WithWidth(windowSizeMsg.Width), viewport.WithHeight(windowSizeMsg.Height-heightOfHeaderAndStatusLine))
455448

456449
content := lipgloss.NewStyle().
457450
Width(windowSizeMsg.Width).
@@ -502,8 +495,8 @@ func (m *Model) Update(msg tea.Msg) (*Model, tea.Cmd) {
502495
footerHeight := 2
503496
verticalMarginHeight := headerHeight + footerHeight
504497

505-
m.viewport.Width = msg.Width
506-
m.viewport.Height = msg.Height - verticalMarginHeight
498+
m.viewport.SetWidth(msg.Width)
499+
m.viewport.SetHeight(msg.Height - verticalMarginHeight)
507500

508501
m.width = msg.Width
509502
m.height = msg.Height
@@ -648,8 +641,8 @@ func (m *Model) updateHelpScreen(msg tea.Msg) (*Model, tea.Cmd) {
648641
footerHeight := lipgloss.Height("")
649642
verticalMarginHeight := headerHeight + footerHeight
650643

651-
m.viewport.Width = msg.Width
652-
m.viewport.Height = msg.Height - verticalMarginHeight
644+
m.viewport.SetWidth(msg.Width)
645+
m.viewport.SetHeight(msg.Height - verticalMarginHeight)
653646

654647
m.width = msg.Width
655648
m.height = msg.Height
@@ -661,7 +654,7 @@ func (m *Model) updateHelpScreen(msg tea.Msg) (*Model, tea.Cmd) {
661654

662655
m.viewport.SetContent(content.String())
663656

664-
return m, viewport.Sync(m.viewport)
657+
return m, nil
665658

666659
}
667660

‎bubble/list/style.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package list
33
import (
44
"time"
55

6-
"github.com/charmbracelet/bubbles/spinner"
7-
"github.com/charmbracelet/lipgloss"
6+
"github.com/charmbracelet/bubbles/v2/spinner"
7+
"github.com/charmbracelet/lipgloss/v2"
8+
"github.com/charmbracelet/lipgloss/v2/compat"
89
)
910

1011
const (
@@ -61,10 +62,10 @@ func DefaultStyles() (s Styles) {
6162
// Faint(true)
6263

6364
s.FilterPrompt = lipgloss.NewStyle().
64-
Foreground(lipgloss.AdaptiveColor{Light: "#04B575", Dark: "#ECFD65"})
65+
Foreground(compat.AdaptiveColor{Light: "#04B575", Dark: "#ECFD65"})
6566

6667
s.FilterCursor = lipgloss.NewStyle().
67-
Foreground(lipgloss.AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"})
68+
Foreground(compat.AdaptiveColor{Light: "#EE6FF8", Dark: "#EE6FF8"})
6869

6970
s.DefaultFilterCharacterMatch = lipgloss.NewStyle().Underline(true)
7071

@@ -75,12 +76,12 @@ func DefaultStyles() (s Styles) {
7576
s.StatusEmpty = lipgloss.NewStyle()
7677

7778
s.StatusBarActiveFilter = lipgloss.NewStyle().
78-
Foreground(lipgloss.AdaptiveColor{Light: "#1a1a1a", Dark: "#dddddd"})
79+
Foreground(compat.AdaptiveColor{Light: "#1a1a1a", Dark: "#dddddd"})
7980

8081
s.StatusBarFilterCount = lipgloss.NewStyle()
8182

8283
s.NoItems = lipgloss.NewStyle().
83-
Foreground(lipgloss.AdaptiveColor{Light: "#909090", Dark: "#626262"})
84+
Foreground(compat.AdaptiveColor{Light: "#909090", Dark: "#626262"})
8485

8586
s.ArabicPagination = lipgloss.NewStyle()
8687

‎bubble/ranking/ranking.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"strconv"
55
"strings"
66

7-
"github.com/charmbracelet/lipgloss"
7+
"github.com/charmbracelet/lipgloss/v2"
88
"github.com/logrusorgru/aurora/v3"
99
)
1010

‎go.mod

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require (
77
github.com/MichaelMure/go-term-text v0.3.1
88
github.com/PuerkitoBio/goquery v1.10.0
99
github.com/bobesa/go-domain-util v0.0.0-20190911083921-4033b5f7dd89
10-
github.com/charmbracelet/bubbles v0.20.0
11-
github.com/charmbracelet/bubbletea v1.2.4
10+
github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2
11+
github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2
1212
github.com/charmbracelet/glamour v0.8.0
13-
github.com/charmbracelet/lipgloss v1.0.0
14-
github.com/go-resty/resty/v2 v2.16.2
13+
github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2
14+
github.com/go-resty/resty/v2 v2.16.0
1515
github.com/go-shiori/go-readability v0.0.0-20241012063810-92284fa8a71f
1616
github.com/jedib0t/go-pretty/v6 v6.6.3
1717
github.com/logrusorgru/aurora/v3 v3.0.0
@@ -29,26 +29,29 @@ require (
2929
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
3030
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3131
github.com/aymerick/douceur v0.2.0 // indirect
32+
github.com/charmbracelet/colorprofile v0.1.6 // indirect
33+
github.com/charmbracelet/lipgloss v1.0.0 // indirect
3234
github.com/charmbracelet/x/ansi v0.4.5 // indirect
35+
github.com/charmbracelet/x/cellbuf v0.0.3 // indirect
3336
github.com/charmbracelet/x/term v0.2.1 // indirect
37+
github.com/charmbracelet/x/wcwidth v0.0.0-20241011142426-46044092ad91 // indirect
38+
github.com/charmbracelet/x/windows v0.2.0 // indirect
3439
github.com/davecgh/go-spew v1.1.1 // indirect
3540
github.com/dlclark/regexp2 v1.11.4 // indirect
36-
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
3741
github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c // indirect
3842
github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f // indirect
3943
github.com/gorilla/css v1.0.1 // indirect
4044
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4145
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
4246
github.com/mattn/go-isatty v0.0.20 // indirect
43-
github.com/mattn/go-localereader v0.0.1 // indirect
4447
github.com/mattn/go-runewidth v0.0.16 // indirect
4548
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
46-
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
4749
github.com/muesli/cancelreader v0.2.2 // indirect
4850
github.com/pmezard/go-difflib v1.0.0 // indirect
4951
github.com/rivo/uniseg v0.4.7 // indirect
5052
github.com/spf13/pflag v1.0.5 // indirect
5153
github.com/tkuchiki/go-timezone v0.2.3 // indirect
54+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
5255
github.com/yuin/goldmark v1.7.6 // indirect
5356
github.com/yuin/goldmark-emoji v1.0.4 // indirect
5457
golang.org/x/net v0.30.0 // indirect

‎go.sum

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,38 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
2323
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
2424
github.com/bobesa/go-domain-util v0.0.0-20190911083921-4033b5f7dd89 h1:2pkAuIM8OF1fy4ToFpMnI4oE+VeUNRbGrpSLKshK0oQ=
2525
github.com/bobesa/go-domain-util v0.0.0-20190911083921-4033b5f7dd89/go.mod h1:/09nEjna1UMoasyyQDhOrIn8hi2v2kiJglPWed1idck=
26-
github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
27-
github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
28-
github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
29-
github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
26+
github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2 h1:Oevn3XNNcccbI8m6cOI6rAMsY1niKsDMv55qtejWRXE=
27+
github.com/charmbracelet/bubbles/v2 v2.0.0-alpha.2/go.mod h1:BWGE1i9NQA60C720gn2FYOyRyJp2BVtQNVfai7wcMoM=
28+
github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2 h1:NkQFWhCii9NtL7Q0L/4mNKtZFgrDpfPSVZAzTwEJdGg=
29+
github.com/charmbracelet/bubbletea/v2 v2.0.0-alpha.2/go.mod h1:24niqT9RbtXhWg8zLRU/v/xTixlo1+DUsHQZ3+kez5Y=
30+
github.com/charmbracelet/colorprofile v0.1.6 h1:nMMqCns0c0DfCwNGdagBh6SxutFqkltSxxKk5S9kt+Y=
31+
github.com/charmbracelet/colorprofile v0.1.6/go.mod h1:3EMXDxwRDJl0c17eJ1jX99MhtlP9OxE/9Qw0C5lvyUg=
3032
github.com/charmbracelet/glamour v0.8.0 h1:tPrjL3aRcQbn++7t18wOpgLyl8wrOHUEDS7IZ68QtZs=
3133
github.com/charmbracelet/glamour v0.8.0/go.mod h1:ViRgmKkf3u5S7uakt2czJ272WSg2ZenlYEZXT2x7Bjw=
3234
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
3335
github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
36+
github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2 h1:Gp+S9hMymU6HmxD1dihbnoMOGwt6wDMMvf0jyw3gEc0=
37+
github.com/charmbracelet/lipgloss/v2 v2.0.0-alpha.2/go.mod h1:72/7KVsLdRldv/CeBjZx6igXIZ9CFtBzQUmDEbhXZ3w=
3438
github.com/charmbracelet/x/ansi v0.4.5 h1:LqK4vwBNaXw2AyGIICa5/29Sbdq58GbGdFngSexTdRM=
3539
github.com/charmbracelet/x/ansi v0.4.5/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
36-
github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAMdlwSltxJyULnrYbkZpp4k58Co7Tah3ciKhSNo0Q=
37-
github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
40+
github.com/charmbracelet/x/cellbuf v0.0.3 h1:HapUUjlo0pZ7iGijrTer1f4X8Uvq17l0zR+80Oh+iJg=
41+
github.com/charmbracelet/x/cellbuf v0.0.3/go.mod h1:SF8R3AqchNzYKKJCFT7co8wt1HgQDfAitQ+SBoxWLNc=
42+
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
43+
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
3844
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
3945
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
46+
github.com/charmbracelet/x/wcwidth v0.0.0-20241011142426-46044092ad91 h1:D5OO0lVavz7A+Swdhp62F9gbkibxmz9B2hZ/jVdMPf0=
47+
github.com/charmbracelet/x/wcwidth v0.0.0-20241011142426-46044092ad91/go.mod h1:Ey8PFmYwH+/td9bpiEx07Fdx9ZVkxfIjWXxBluxF4Nw=
48+
github.com/charmbracelet/x/windows v0.2.0 h1:ilXA1GJjTNkgOm94CLPeSz7rar54jtFatdmoiONPuEw=
49+
github.com/charmbracelet/x/windows v0.2.0/go.mod h1:ZibNFR49ZFqCXgP76sYanisxRyC+EYrBE7TTknD8s1s=
4050
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4151
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4252
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4353
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4454
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
4555
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
46-
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
47-
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
48-
github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg=
49-
github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU=
56+
github.com/go-resty/resty/v2 v2.16.0 h1:qpKalHWI2bpp9BIKlyT8TYWEJXOk1NuKbfiT3RRnzWc=
57+
github.com/go-resty/resty/v2 v2.16.0/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU=
5058
github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c h1:wpkoddUomPfHiOziHZixGO5ZBS73cKqVzZipfrLmO1w=
5159
github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c/go.mod h1:oVDCh3qjJMLVUSILBRwrm+Bc6RNXGZYtoh9xdvf1ffM=
5260
github.com/go-shiori/go-readability v0.0.0-20241012063810-92284fa8a71f h1:cypj7SJh+47G9J3VCPdMzT3uWcXWAWDJA54ErTfOigI=
@@ -72,16 +80,12 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
7280
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
7381
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
7482
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
75-
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
76-
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
7783
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
7884
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
7985
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
8086
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
8187
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
8288
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
83-
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
84-
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
8589
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
8690
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
8791
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
@@ -120,6 +124,8 @@ github.com/tkuchiki/go-timezone v0.2.3 h1:D3TVdIPrFsu9lxGxqNX2wsZwn1MZtTqTW0mdev
120124
github.com/tkuchiki/go-timezone v0.2.3/go.mod h1:oFweWxYl35C/s7HMVZXiA19Jr9Y0qJHMaG/J2TES4LY=
121125
github.com/wayneashleyberry/terminal-dimensions v1.1.0 h1:EB7cIzBdsOzAgmhTUtTTQXBByuPheP/Zv1zL2BRPY6g=
122126
github.com/wayneashleyberry/terminal-dimensions v1.1.0/go.mod h1:2lc/0eWCObmhRczn2SdGSQtgBooLUzIotkkEGXqghyg=
127+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
128+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
123129
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
124130
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
125131
github.com/yuin/goldmark v1.7.6 h1:cZgJxVh5mL5cu8KOnwxvFJy5TFB0BHUskZZyq7TYbDg=
@@ -131,6 +137,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
131137
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
132138
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
133139
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
140+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
141+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
134142
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
135143
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
136144
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -153,7 +161,6 @@ golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
153161
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
154162
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
155163
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
156-
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
157164
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
158165
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
159166
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎header/header.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"clx/categories"
55
"fmt"
66
"strings"
7+
"image/color"
78

8-
"github.com/charmbracelet/lipgloss"
9+
"github.com/charmbracelet/lipgloss/v2"
910
)
1011

1112
func GetHeader(allCategories []int, hasFavorites bool, selectedSubHeader int, width int) string {
@@ -94,15 +95,15 @@ func removeFirstElement(list []string) []string {
9495
return list[1:]
9596
}
9697

97-
func getColor(i int, selectedSubHeader int, numCategories int, hasFavorites bool) (color lipgloss.TerminalColor, isSelected bool) {
98+
func getColor(i int, selectedSubHeader int, numCategories int, hasFavorites bool) (color color.Color, isSelected bool) {
9899
if i+1 == selectedSubHeader {
99100
return getSelectedCategoryColor(i+1, numCategories, hasFavorites)
100101
}
101102

102103
return lipgloss.NoColor{}, false
103104
}
104105

105-
func getSelectedCategoryColor(selectedSubHeader int, numCategories int, hasFavorites bool) (color lipgloss.TerminalColor,
106+
func getSelectedCategoryColor(selectedSubHeader int, numCategories int, hasFavorites bool) (color color.Color,
106107
isSelected bool) {
107108
magenta := lipgloss.Color("5")
108109
yellow := lipgloss.Color("3")

‎help/help.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"clx/constants/unicode"
77
"clx/info"
8-
"github.com/charmbracelet/lipgloss"
8+
"github.com/charmbracelet/lipgloss/v2"
99
)
1010

1111
const (

‎keymaps/keymaps.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package keymaps
33
import (
44
"strings"
55

6-
"github.com/charmbracelet/lipgloss"
6+
"github.com/charmbracelet/lipgloss/v2"
77

88
termText "github.com/MichaelMure/go-term-text"
99
"github.com/jedib0t/go-pretty/v6/text"

‎meta/meta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
. "github.com/logrusorgru/aurora/v3"
1818

19-
"github.com/charmbracelet/lipgloss"
19+
"github.com/charmbracelet/lipgloss/v2"
2020
)
2121

2222
const (

0 commit comments

Comments
 (0)