@@ -57,6 +57,7 @@ func (f *ModelsList) SetGroups(groups ...ModelGroup) {
5757// SetFilter sets the filter query and updates the list items.
5858func (f *ModelsList) SetFilter(q string) {
5959 f.query = q
60+ f.SetItems(f.VisibleItems()...)
6061}
6162
6263// SetSelected sets the selected item index. It overrides the base method to
@@ -103,49 +104,56 @@ func (f *ModelsList) SetSelectedItem(itemID string) {
103104// SelectNext selects the next model item, skipping any non-focusable items
104105// like group headers and spacers.
105106func (f *ModelsList) SelectNext() (v bool) {
106− for {
107− v = f.List.SelectNext()
107+ v = f.List.SelectNext()
108+ for v {
108109 selectedItem := f.SelectedItem()
109110 if _, ok := selectedItem.(*ModelItem); ok {
110111 return v
111112 }
113+ v = f.List.SelectNext()
112114 }
115+ return v
113116}
114117
115118// SelectPrev selects the previous model item, skipping any non-focusable items
116119// like group headers and spacers.
117120func (f *ModelsList) SelectPrev() (v bool) {
118− for {
119− v = f.List.SelectPrev()
121+ v = f.List.SelectPrev()
122+ for v {
120123 selectedItem := f.SelectedItem()
121124 if _, ok := selectedItem.(*ModelItem); ok {
122125 return v
123126 }
127+ v = f.List.SelectPrev()
124128 }
129+ return v
125130}
126131
127132// SelectFirst selects the first model item in the list.
128133func (f *ModelsList) SelectFirst() (v bool) {
129134 v = f.List.SelectFirst()
130− for {
135+ for v {
131136 selectedItem := f.SelectedItem()
132− if _, ok := selectedItem.(*ModelItem); ok {
137+ _, ok := selectedItem.(*ModelItem)
138+ if ok {
133139 return v
134140 }
135141 v = f.List.SelectNext()
136142 }
143+ return v
137144}
138145
139146// SelectLast selects the last model item in the list.
140147func (f *ModelsList) SelectLast() (v bool) {
141148 v = f.List.SelectLast()
142− for {
149+ for v {
143150 selectedItem := f.SelectedItem()
144151 if _, ok := selectedItem.(*ModelItem); ok {
145152 return v
146153 }
147154 v = f.List.SelectPrev()
148155 }
156+ return v
149157}
150158
151159// IsSelectedFirst checks if the selected item is the first model item.