git.iko.soy/crush
on main help sign in
Merge pull request #111 from charmbracelet/perf-filter
55a3756Raphael Amorim
cmd/root.go+2
compare with main
unifiedsplit
@@ -120,6 +120,8 @@ to assist developers in writing, debugging, and understanding code directly from
120 tea.WithAltScreen(),
120 tea.WithAltScreen(),
121 tea.WithKeyReleases(),
121 tea.WithKeyReleases(),
122 tea.WithUniformKeyLayout(),
122 tea.WithUniformKeyLayout(),
123+ tea.WithMouseCellMotion(), // Use cell motion instead of all motion to reduce event flooding
124+ tea.WithFilter(tui.MouseEventFilter), // Filter mouse events based on focus state
123 )
125 )
124
126
125 // Setup the subscriptions, this will send services events to the TUI
127 // Setup the subscriptions, this will send services events to the TUI
internal/tui/components/chat/editor/editor.go+1
@@ -258,6 +258,7 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
258 }
258 }
259 }
259 }
260 }
260 }
261+
261 m.textarea, cmd = m.textarea.Update(msg)
262 m.textarea, cmd = m.textarea.Update(msg)
262 cmds = append(cmds, cmd)
263 cmds = append(cmds, cmd)
263 return m, tea.Batch(cmds...)
264 return m, tea.Batch(cmds...)
internal/tui/page/chat/chat.go+6
@@ -39,6 +39,7 @@ type (
39type ChatPage interface {
39type ChatPage interface {
40 util.Model
40 util.Model
41 layout.Help
41 layout.Help
42+ IsChatFocused() bool
42}
43}
43
44
44type chatPage struct {
45type chatPage struct {
@@ -415,3 +416,8 @@ func NewChatPage(app *app.App) ChatPage {
415 header: header.New(app.LSPClients),
416 header: header.New(app.LSPClients),
416 }
417 }
417}
418}
419+
420+// IsChatFocused returns whether the chat messages are focused (true) or editor is focused (false)
421+func (p *chatPage) IsChatFocused() bool {
422+ return p.chatFocused
423+}
internal/tui/tui.go+23−3
@@ -31,6 +31,29 @@ import (
31 "github.com/charmbracelet/lipgloss/v2"
31 "github.com/charmbracelet/lipgloss/v2"
32)
32)
33
33
34+// MouseEventFilter filters mouse events based on the current focus state
35+// This is used with tea.WithFilter to prevent mouse scroll events from
36+// interfering with typing performance in the editor
37+func MouseEventFilter(m tea.Model, msg tea.Msg) tea.Msg {
38+ // Only filter mouse events
39+ switch msg.(type) {
40+ case tea.MouseWheelMsg, tea.MouseMotionMsg:
41+ // Check if we have an appModel and if editor is focused
42+ if appModel, ok := m.(*appModel); ok {
43+ if appModel.currentPage == chat.ChatPageID {
44+ if chatPage, ok := appModel.pages[appModel.currentPage].(chat.ChatPage); ok {
45+ // If editor is focused (not chatFocused), filter out mouse wheel/motion events
46+ if !chatPage.IsChatFocused() {
47+ return nil // Filter out the event
48+ }
49+ }
50+ }
51+ }
52+ }
53+ // Allow all other events to pass through
54+ return msg
55+}
56+
34// appModel represents the main application model that manages pages, dialogs, and UI state.
57// appModel represents the main application model that manages pages, dialogs, and UI state.
35type appModel struct {
58type appModel struct {
36 wWidth, wHeight int // Window dimensions
59 wWidth, wHeight int // Window dimensions
@@ -82,9 +105,6 @@ func (a appModel) Init() tea.Cmd {
82 return nil
105 return nil
83 })
106 })
84
107
85− // Enable mouse support.
86− cmds = append(cmds, tea.EnableMouseAllMotion)
87−
88 return tea.Batch(cmds...)
108 return tea.Batch(cmds...)
89}
109}
90
110