chore(examples): update to bubbletea v2 onMouse callback

This commit is contained in:
Ayman Bagabas 2025-11-24 10:58:40 -05:00
parent 46b608f152
commit e02ba76901
No known key found for this signature in database
GPG key ID: C8D51D2157C919AC
4 changed files with 25 additions and 31 deletions

View file

@ -21,10 +21,6 @@ func (m model) Init() tea.Cmd {
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tea.LayerHitMsg:
if mouse, ok := msg.Mouse.(tea.MouseClickMsg); ok {
return m, tea.Printf("Layer hit at %d, %d", mouse.X, mouse.Y)
}
case tea.WindowSizeMsg:
m.width = msg.Width
return m, nil
@ -59,12 +55,12 @@ func (m model) View() tea.View {
cardA := newCard("Hello").Z(z[0])
cardB := newCard("Goodbye").Z(z[1])
view.MouseMode = tea.MouseModeCellMotion
view.SetContent(lipgloss.NewCanvas(
comp := lipgloss.NewCompositor(
lipgloss.NewLayer(footer),
cardA,
cardB.X(10).Y(2),
))
)
view.SetContent(comp.Render())
return view
}

View file

@ -231,33 +231,29 @@ func (m model) View() tea.View {
bgWhitespace...,
)
layers := lipgloss.NewLayer("bg", bg)
root := lipgloss.NewLayer(bg).ID("bg")
for i, d := range m.dialogs {
layers.AddLayers(d.view().Z(i + 1))
root.AddLayers(d.view().Z(i + 1))
}
canvas := lipgloss.NewCanvas(m.width, m.height)
canvas.Compose(layers)
comp := lipgloss.NewCompositor(root)
v.MouseMode = tea.MouseModeAllMotion
v.AltScreen = true
v.Callback = func(m tea.Msg) tea.Cmd {
v.OnMouse = func(msg tea.MouseMsg) tea.Cmd {
return func() tea.Msg {
switch msg := m.(type) {
case tea.MouseMsg:
mouse := msg.Mouse()
x, y := mouse.X, mouse.Y
if id := layers.Hit(x, y); id != "" {
return LayerHitMsg{
ID: id,
Mouse: msg,
}
mouse := msg.Mouse()
x, y := mouse.X, mouse.Y
if id := comp.Hit(x, y); id != "" {
return LayerHitMsg{
ID: id,
Mouse: msg,
}
}
return nil
}
}
v.SetContent(canvas.Render())
v.SetContent(comp.Render())
return v
}
@ -329,11 +325,13 @@ func (d dialog) view() *lipgloss.Layer {
buttonX := lipgloss.Width(window) - lipgloss.Width(button) - 1 - hGap
buttonY := lipgloss.Height(window) - lipgloss.Height(button) - 1 - vGap
buttonLayer := lipgloss.NewLayer(d.buttonID, button).
buttonLayer := lipgloss.NewLayer(button).
ID(d.buttonID).
X(buttonX).
Y(buttonY)
return lipgloss.NewLayer(d.id, window).
return lipgloss.NewLayer(window).
ID(d.id).
X(d.x).
Y(d.y).
AddLayers(buttonLayer)

View file

@ -1,13 +1,15 @@
module examples
go 1.24.3
go 1.25.2
replace charm.land/bubbletea/v2 => ../
replace charm.land/lipgloss/v2 => ../../lipgloss
require (
charm.land/bubbles/v2 v2.0.0-beta.1.0.20251110211018-84a82dfeeed8
charm.land/bubbletea/v2 v2.0.0-rc.1.0.20251106192006-06c0cda318b3
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251114160003-3248589b24c9
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251124152919-5387b9dbf261
github.com/charmbracelet/colorprofile v0.3.3
github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930
github.com/charmbracelet/harmonica v0.2.0
@ -23,7 +25,7 @@ require (
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20251120225753-26363bddd922 // indirect
github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
github.com/charmbracelet/x/term v0.2.2 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect

View file

@ -1,7 +1,5 @@
charm.land/bubbles/v2 v2.0.0-beta.1.0.20251110211018-84a82dfeeed8 h1:2bzaNBvZHgpLjxlQTDjoeY0YGjQtMflWiDZMEbviiRE=
charm.land/bubbles/v2 v2.0.0-beta.1.0.20251110211018-84a82dfeeed8/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251114160003-3248589b24c9 h1:FSmPSuQzHfyzens1NukU5wP76ttNcEa8MZQIZM77RbQ=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251114160003-3248589b24c9/go.mod h1:1qZyvvVCenJO2M1ac2mX0yyiIZJoZmDM4DG4s0udJkU=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
@ -22,8 +20,8 @@ github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930 h1:+47Z2j
github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930/go.mod h1:izs11tnkYaT3DTEH2E0V/lCb18VGZ7k9HLYEGuvgXGA=
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38 h1:7Rs87fbKJoIIxsQS8YKJYGYa0tlsDwwb0twQjV1KB+g=
github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38/go.mod h1:6lfcr3MNP+kZR25sF1nQwJFuQnNYBlFy3PGX5rvslXc=
github.com/charmbracelet/ultraviolet v0.0.0-20251120225753-26363bddd922 h1:xT8rVR6RTBTx90ViTIrB766UNC9wnGzgkrfO6UCsiZ0=
github.com/charmbracelet/ultraviolet v0.0.0-20251120225753-26363bddd922/go.mod h1:6lfcr3MNP+kZR25sF1nQwJFuQnNYBlFy3PGX5rvslXc=
github.com/charmbracelet/x/ansi v0.11.1 h1:iXAC8SyMQDJgtcz9Jnw+HU8WMEctHzoTAETIeA3JXMk=
github.com/charmbracelet/x/ansi v0.11.1/go.mod h1:M49wjzpIujwPceJ+t5w3qh2i87+HRtHohgb5iTyepL0=
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250602192518-9e722df69bbb h1:oTM8tZxV7FY0ehvYjFuICouuhzE08UZYNqUIp/lDQdY=