From b0dd9830ad278754699406aff3c44b97d01fb8be Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Thu, 18 Dec 2025 17:30:55 +0100 Subject: [PATCH] chore(chat): rename funcs --- internal/ui/model/chat.go | 16 +++++++------- internal/ui/model/ui.go | 44 +++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/ui/model/chat.go b/internal/ui/model/chat.go index 2844cb81619e99956ba5895686d82e65eef92ce7..7d6ad220d27426dc44fb3d3a277390b1e2f8b24a 100644 --- a/internal/ui/model/chat.go +++ b/internal/ui/model/chat.go @@ -169,30 +169,30 @@ func (m *Chat) Blur() { m.list.Blur() } -// ScrollToTop scrolls the chat view to the top and returns a command to restart +// ScrollToTopAndAnimate scrolls the chat view to the top and returns a command to restart // any paused animations that are now visible. -func (m *Chat) ScrollToTop() tea.Cmd { +func (m *Chat) ScrollToTopAndAnimate() tea.Cmd { m.list.ScrollToTop() return m.RestartPausedVisibleAnimations() } -// ScrollToBottom scrolls the chat view to the bottom and returns a command to +// ScrollToBottomAndAnimate scrolls the chat view to the bottom and returns a command to // restart any paused animations that are now visible. -func (m *Chat) ScrollToBottom() tea.Cmd { +func (m *Chat) ScrollToBottomAndAnimate() tea.Cmd { m.list.ScrollToBottom() return m.RestartPausedVisibleAnimations() } -// ScrollBy scrolls the chat view by the given number of line deltas and returns +// ScrollByAndAnimate scrolls the chat view by the given number of line deltas and returns // a command to restart any paused animations that are now visible. -func (m *Chat) ScrollBy(lines int) tea.Cmd { +func (m *Chat) ScrollByAndAnimate(lines int) tea.Cmd { m.list.ScrollBy(lines) return m.RestartPausedVisibleAnimations() } -// ScrollToSelected scrolls the chat view to the selected item and returns a +// ScrollToSelectedAndAnimate scrolls the chat view to the selected item and returns a // command to restart any paused animations that are now visible. -func (m *Chat) ScrollToSelected() tea.Cmd { +func (m *Chat) ScrollToSelectedAndAnimate() tea.Cmd { m.list.ScrollToSelected() return m.RestartPausedVisibleAnimations() } diff --git a/internal/ui/model/ui.go b/internal/ui/model/ui.go index 57a7113ae5b432436f23ec79e0d6d5cacdbb94f0..b5e4a9b53dd90a685329174fe497e22ab04700f2 100644 --- a/internal/ui/model/ui.go +++ b/internal/ui/model/ui.go @@ -268,22 +268,22 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) { switch m.state { case uiChat: if msg.Y <= 0 { - if cmd := m.chat.ScrollBy(-1); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(-1); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectPrev() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } } else if msg.Y >= m.chat.Height()-1 { - if cmd := m.chat.ScrollBy(1); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(1); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectNext() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } @@ -310,22 +310,22 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) { case uiChat: switch msg.Button { case tea.MouseWheelUp: - if cmd := m.chat.ScrollBy(-5); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(-5); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectPrev() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } case tea.MouseWheelDown: - if cmd := m.chat.ScrollBy(5); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(5); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectNext() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } @@ -395,7 +395,7 @@ func (m *UI) setSessionMessages(msgs []message.Message) tea.Cmd { } m.chat.SetMessages(items...) - if cmd := m.chat.ScrollToBottom(); cmd != nil { + if cmd := m.chat.ScrollToBottomAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectLast() @@ -414,7 +414,7 @@ func (m *UI) appendSessionMessage(msg message.Message) tea.Cmd { } } m.chat.AppendMessages(items...) - if cmd := m.chat.ScrollToBottom(); cmd != nil { + if cmd := m.chat.ScrollToBottomAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } return tea.Batch(cmds...) @@ -580,62 +580,62 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd { case key.Matches(msg, m.keyMap.Chat.Expand): m.chat.ToggleExpandedSelectedItem() case key.Matches(msg, m.keyMap.Chat.Up): - if cmd := m.chat.ScrollBy(-1); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(-1); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectPrev() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } case key.Matches(msg, m.keyMap.Chat.Down): - if cmd := m.chat.ScrollBy(1); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(1); cmd != nil { cmds = append(cmds, cmd) } if !m.chat.SelectedItemInView() { m.chat.SelectNext() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } } case key.Matches(msg, m.keyMap.Chat.UpOneItem): m.chat.SelectPrev() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } case key.Matches(msg, m.keyMap.Chat.DownOneItem): m.chat.SelectNext() - if cmd := m.chat.ScrollToSelected(); cmd != nil { + if cmd := m.chat.ScrollToSelectedAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } case key.Matches(msg, m.keyMap.Chat.HalfPageUp): - if cmd := m.chat.ScrollBy(-m.chat.Height() / 2); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(-m.chat.Height() / 2); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectFirstInView() case key.Matches(msg, m.keyMap.Chat.HalfPageDown): - if cmd := m.chat.ScrollBy(m.chat.Height() / 2); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(m.chat.Height() / 2); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectLastInView() case key.Matches(msg, m.keyMap.Chat.PageUp): - if cmd := m.chat.ScrollBy(-m.chat.Height()); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(-m.chat.Height()); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectFirstInView() case key.Matches(msg, m.keyMap.Chat.PageDown): - if cmd := m.chat.ScrollBy(m.chat.Height()); cmd != nil { + if cmd := m.chat.ScrollByAndAnimate(m.chat.Height()); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectLastInView() case key.Matches(msg, m.keyMap.Chat.Home): - if cmd := m.chat.ScrollToTop(); cmd != nil { + if cmd := m.chat.ScrollToTopAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectFirst() case key.Matches(msg, m.keyMap.Chat.End): - if cmd := m.chat.ScrollToBottom(); cmd != nil { + if cmd := m.chat.ScrollToBottomAndAnimate(); cmd != nil { cmds = append(cmds, cmd) } m.chat.SelectLast()