git.iko.soy/crush
on main help sign in
fix(tui): completions: keep track of the popup position
6f1f7a2Ayman Bagabas
internal/tui/components/completions/completions.go+28−10
compare with main
unifiedsplit
@@ -51,18 +51,22 @@ type Completions interface {
51}
51}
52
52
53type completionsCmp struct {
53type completionsCmp struct {
54− width int
54+ wWidth int // The window width
55+ width int
55− height int // Height of the completions component`
56+ height int // Height of the completions component`
56− x int // X position for the completions popup
57+ x, xorig int // X position for the completions popup
57− y int // Y position for the completions popup
58+ y int // Y position for the completions popup
58− open bool // Indicates if the completions are open
59+ open bool // Indicates if the completions are open
59− keyMap KeyMap
60+ keyMap KeyMap
60
61
61 list list.ListModel
62 list list.ListModel
62 query string // The current filter query
63 query string // The current filter query
63}
64}
64
65
66+const (
65−const maxCompletionsWidth = 80 // Maximum width for the completions popup
67+ maxCompletionsWidth = 80 // Maximum width for the completions popup
68+ minCompletionsWidth = 20 // Minimum width for the completions popup
69+)
66
70
67func New() Completions {
71func New() Completions {
68 completionsKeyMap := DefaultKeyMap()
72 completionsKeyMap := DefaultKeyMap()
@@ -102,6 +106,7 @@ func (c *completionsCmp) Init() tea.Cmd {
102func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
106func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
103 switch msg := msg.(type) {
107 switch msg := msg.(type) {
104 case tea.WindowSizeMsg:
108 case tea.WindowSizeMsg:
109+ c.wWidth = msg.Width
105 c.width = min(listWidth(c.list.Items()), maxCompletionsWidth)
110 c.width = min(listWidth(c.list.Items()), maxCompletionsWidth)
106 c.height = min(msg.Height-c.y, 15)
111 c.height = min(msg.Height-c.y, 15)
107 return c, nil
112 return c, nil
@@ -160,7 +165,7 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
160 case OpenCompletionsMsg:
165 case OpenCompletionsMsg:
161 c.open = true
166 c.open = true
162 c.query = ""
167 c.query = ""
163− c.x = msg.X
168+ c.x, c.xorig = msg.X, msg.X
164 c.y = msg.Y
169 c.y = msg.Y
165 items := []util.Model{}
170 items := []util.Model{}
166 t := styles.CurrentTheme()
171 t := styles.CurrentTheme()
@@ -168,7 +173,14 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
168 item := NewCompletionItem(completion.Title, completion.Value, WithBackgroundColor(t.BgSubtle))
173 item := NewCompletionItem(completion.Title, completion.Value, WithBackgroundColor(t.BgSubtle))
169 items = append(items, item)
174 items = append(items, item)
170 }
175 }
171− c.width = listWidth(msg.Completions)
176+ width := listWidth(items)
177+ if len(items) == 0 {
178+ width = listWidth(c.list.Items())
179+ }
180+ if c.x+width >= c.wWidth {
181+ c.x = c.wWidth - width - 1
182+ }
183+ c.width = max(width, c.wWidth-minCompletionsWidth-1)
172 c.height = max(min(c.height, len(items)), 1) // Ensure at least 1 item height
184 c.height = max(min(c.height, len(items)), 1) // Ensure at least 1 item height
173 return c, tea.Batch(
185 return c, tea.Batch(
174 c.list.SetItems(items),
186 c.list.SetItems(items),
@@ -198,7 +210,13 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
198 cmds = append(cmds, c.list.Filter(msg.Query))
210 cmds = append(cmds, c.list.Filter(msg.Query))
199 items := c.list.Items()
211 items := c.list.Items()
200 itemsLen := len(items)
212 itemsLen := len(items)
201− c.width = listWidth(items)
213+ width := listWidth(items)
214+ if c.x < 0 {
215+ c.x = c.xorig
216+ } else if c.x+width >= c.wWidth {
217+ c.x = c.wWidth - width - 1
218+ }
219+ c.width = width
202 c.height = max(min(maxCompletionsHeight, itemsLen), 1)
220 c.height = max(min(maxCompletionsHeight, itemsLen), 1)
203 cmds = append(cmds, c.list.SetSize(c.width, c.height))
221 cmds = append(cmds, c.list.SetSize(c.width, c.height))
204 if itemsLen == 0 {
222 if itemsLen == 0 {
internal/tui/tui.go−10
@@ -119,16 +119,6 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
119 case completions.OpenCompletionsMsg, completions.FilterCompletionsMsg, completions.CloseCompletionsMsg:
119 case completions.OpenCompletionsMsg, completions.FilterCompletionsMsg, completions.CloseCompletionsMsg:
120 u, completionCmd := a.completions.Update(msg)
120 u, completionCmd := a.completions.Update(msg)
121 a.completions = u.(completions.Completions)
121 a.completions = u.(completions.Completions)
122− switch msg := msg.(type) {
123− case completions.OpenCompletionsMsg:
124− x, _ := a.completions.Position()
125− if a.completions.Width()+x >= a.wWidth {
126− // Adjust X position to fit in the window.
127− msg.X = a.wWidth - a.completions.Width() - 1
128− u, completionCmd = a.completions.Update(msg)
129− a.completions = u.(completions.Completions)
130− }
131− }
132 return a, completionCmd
122 return a, completionCmd
133
123
134 // Dialog messages
124 // Dialog messages