on main help sign in
chore: bump lipgloss to the latest v2 version
commitd8f8889faaae63484cdf33464447ac65c071032a authorAyman Bagabas <ayman.bagabas@gmail.com> dateWed 10 Dec 2025, 14:25 (1 year ago) parent6219de7
4 files changed+18−26
go.mod+2−2 go.sum+4 internal/tui/page/chat/chat.go+1−3 internal/tui/tui.go+11−21
go.mod+2−2
@@ -6,7 +6,7 @@ require (
66 charm.land/bubbles/v2 v2.0.0-rc.1
77 charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251202162339-5fa38b798f16
88 charm.land/fantasy v0.5.1
9− charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca
9+ charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971
1010 charm.land/x/vcr v0.1.1
1111 github.com/JohannesKaufmann/html-to-markdown v1.6.0
1212 github.com/MakeNowJust/heredoc v1.0.0
@@ -21,7 +21,7 @@ require (
2121 github.com/charmbracelet/fang v0.4.4
2222 github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930
2323 github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0
24− github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b
24+ github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318
2525 github.com/charmbracelet/x/ansi v0.11.2
2626 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
2727 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f
go.sum+4
@@ -6,6 +6,8 @@ charm.land/fantasy v0.5.1 h1:Svi/UpI4/DwVjTqNYceDXoJJYn6SVEM5dnLH92UBiEs=
66charm.land/fantasy v0.5.1/go.mod h1:SPOsnIlkBKnhw2Wnasv+wZ82EmCMIGesx0je3tgR6+M=
77charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca h1:6bVc8OFotCS4sS7HKqxTudP7yn8Y0ODR6df2pdlY/+s=
88charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca/go.mod h1:XSJjv7DaH4zd1Y27kZis295RkEj9OFR9zh2WffQQsKQ=
9+charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971 h1:xZFcNsJMiIDbFtWRyDmkKNk1sjojfaom4Zoe0cyH/8c=
10+charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971/go.mod h1:i61Y3FmdbcBNSKa+pKB3DaE4uVQmBLMs/xlvRyHcXAE=
911charm.land/x/vcr v0.1.1 h1:PXCFMUG0rPtyk35rhfzYCJEduOzWXCIbrXTFq4OF/9Q=
1012charm.land/x/vcr v0.1.1/go.mod h1:eByq2gqzWvcct/8XE2XO5KznoWEBiXH56+y2gphbltM=
1113cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
@@ -100,6 +102,8 @@ github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 h1:lxHzxsHd4P
100102github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=
101103github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b h1:jY1J0PcfetoB1uJ+w8rd86gUFSpKpJJI35gnfpKF5hg=
102104github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b/go.mod h1:Y6kE2GzHfkyQQVCSL9r2hwokSrIlHGzZG+71+wDYSZI=
105+github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318 h1:OqDqxQZliC7C8adA7KjelW3OjtAxREfeHkNcd66wpeI=
106+github.com/charmbracelet/ultraviolet v0.0.0-20251205161215-1948445e3318/go.mod h1:Y6kE2GzHfkyQQVCSL9r2hwokSrIlHGzZG+71+wDYSZI=
103107github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=
104108github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=
105109github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 h1:1xwHZg6eMZ9Wv5TE1UGub6ARubyOd1Lo5kPUI/6VL50=
internal/tui/page/chat/chat.go+1−3
@@ -525,9 +525,7 @@ func (p *chatPage) View() string {
525525 )
526526 layers = append(layers, lipgloss.NewLayer(details).X(1).Y(1))
527527 }
528− canvas := lipgloss.NewCanvas(
529− layers...,
530− )
528+ canvas := lipgloss.NewCompositor(layers...)
531529 return canvas.Render()
532530}
533531
internal/tui/tui.go+11−21
@@ -593,22 +593,15 @@ func (a *appModel) View() tea.View {
593593 view.MouseMode = tea.MouseModeCellMotion
594594 view.BackgroundColor = t.BgBase
595595 if a.wWidth < 25 || a.wHeight < 15 {
596− view.SetContent(
597− lipgloss.NewCanvas(
598− lipgloss.NewLayer(
599− t.S().Base.Width(a.wWidth).Height(a.wHeight).
600− Align(lipgloss.Center, lipgloss.Center).
601− Render(
602− t.S().Base.
603− Padding(1, 4).
604− Foreground(t.White).
605− BorderStyle(lipgloss.RoundedBorder()).
606− BorderForeground(t.Primary).
607− Render("Window too small!"),
608− ),
609− ),
610− ).Render(),
611− )
596+ view.Content = t.S().Base.Width(a.wWidth).Height(a.wHeight).
597+ Align(lipgloss.Center, lipgloss.Center).
598+ Render(t.S().Base.
599+ Padding(1, 4).
600+ Foreground(t.White).
601+ BorderStyle(lipgloss.RoundedBorder()).
602+ BorderForeground(t.Primary).
603+ Render("Window too small!"),
604+ )
612605 return view
613606 }
614607
@@ -659,11 +652,8 @@ func (a *appModel) View() tea.View {
659652 )
660653 }
661654
662− canvas := lipgloss.NewCanvas(
663− layers...,
664− )
665−
666− view.Content = canvas.Render()
655+ comp := lipgloss.NewCompositor(layers...)
656+ view.Content = comp.Render()
667657 view.Cursor = cursor
668658
669659 if a.sendProgressBar && a.app != nil && a.app.AgentCoordinator != nil && a.app.AgentCoordinator.IsBusy() {