git.iko.soy/crush
on main help sign in
fix(ui): model dialog: skip non-model items when navigating selection
5df4696Ayman Bagabas
internal/ui/dialog/models_list.go+72−1
compare with main
unifiedsplit
@@ -55,6 +55,28 @@ func (f *ModelsList) SetFilter(q string) {
55 f.query = q
55 f.query = q
56}
56}
57
57
58+// SetSelected sets the selected item index. It overrides the base method to
59+// skip non-model items.
60+func (f *ModelsList) SetSelected(index int) {
61+ if index < 0 || index >= f.Len() {
62+ f.List.SetSelected(index)
63+ return
64+ }
65+
66+ f.List.SetSelected(index)
67+ for {
68+ selectedItem := f.List.SelectedItem()
69+ if _, ok := selectedItem.(*ModelItem); ok {
70+ return
71+ }
72+ f.List.SetSelected(index + 1)
73+ index++
74+ if index >= f.Len() {
75+ return
76+ }
77+ }
78+}
79+
58// SetSelectedItem sets the selected item in the list by item ID.
80// SetSelectedItem sets the selected item in the list by item ID.
59func (f *ModelsList) SetSelectedItem(itemID string) {
81func (f *ModelsList) SetSelectedItem(itemID string) {
60 if itemID == "" {
82 if itemID == "" {
@@ -74,14 +96,63 @@ func (f *ModelsList) SetSelectedItem(itemID string) {
74 }
96 }
75}
97}
76
98
99+// SelectNext selects the next model item, skipping any non-focusable items
100+// like group headers and spacers.
101+func (f *ModelsList) SelectNext() (v bool) {
102+ for {
103+ v = f.List.SelectNext()
104+ selectedItem := f.List.SelectedItem()
105+ if _, ok := selectedItem.(*ModelItem); ok {
106+ return v
107+ }
108+ }
109+}
110+
111+// SelectPrev selects the previous model item, skipping any non-focusable items
112+// like group headers and spacers.
113+func (f *ModelsList) SelectPrev() (v bool) {
114+ for {
115+ v = f.List.SelectPrev()
116+ selectedItem := f.List.SelectedItem()
117+ if _, ok := selectedItem.(*ModelItem); ok {
118+ return v
119+ }
120+ }
121+}
122+
123+// SelectFirst selects the first model item in the list.
124+func (f *ModelsList) SelectFirst() (v bool) {
125+ v = f.List.SelectFirst()
126+ for {
127+ selectedItem := f.List.SelectedItem()
128+ if _, ok := selectedItem.(*ModelItem); ok {
129+ return v
130+ }
131+ v = f.List.SelectNext()
132+ }
133+}
134+
135+// SelectLast selects the last model item in the list.
136+func (f *ModelsList) SelectLast() (v bool) {
137+ v = f.List.SelectLast()
138+ for {
139+ selectedItem := f.List.SelectedItem()
140+ if _, ok := selectedItem.(*ModelItem); ok {
141+ return v
142+ }
143+ v = f.List.SelectPrev()
144+ }
145+}
146+
77// VisibleItems returns the visible items after filtering.
147// VisibleItems returns the visible items after filtering.
78func (f *ModelsList) VisibleItems() []list.Item {
148func (f *ModelsList) VisibleItems() []list.Item {
79− if len(f.query) == 0 {
149+ if f.query == "" {
80 // No filter, return all items with group headers
150 // No filter, return all items with group headers
81 items := []list.Item{}
151 items := []list.Item{}
82 for _, g := range f.groups {
152 for _, g := range f.groups {
83 items = append(items, &g)
153 items = append(items, &g)
84 for _, item := range g.Items {
154 for _, item := range g.Items {
155+ item.SetMatch(fuzzy.Match{})
85 items = append(items, item)
156 items = append(items, item)
86 }
157 }
87 // Add a space separator after each provider section
158 // Add a space separator after each provider section
internal/ui/model/ui.go+1−1
@@ -728,7 +728,7 @@ func (m *UI) handleKeyPressMsg(msg tea.KeyPressMsg) tea.Cmd {
728 return tea.Batch(cmds...)
728 return tea.Batch(cmds...)
729}
729}
730
730
731−// Draw implements [tea.Layer] and draws the UI model.
731+// Draw implements [uv.Drawable] and draws the UI model.
732func (m *UI) Draw(scr uv.Screen, area uv.Rectangle) {
732func (m *UI) Draw(scr uv.Screen, area uv.Rectangle) {
733 layout := m.generateLayout(area.Dx(), area.Dy())
733 layout := m.generateLayout(area.Dx(), area.Dy())
734
734