Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Never call set_selected_index with an invalid index

Browse source
This commit is contained in:
Mikayla Maki 2023-03-17 09:32:01 -07:00
parent 3464961aa4
commit f7f9b8cffe
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/picker/src/picker.rs
View file

@ -257,9 +257,13 @@ impl<D: PickerDelegate> Picker<D> {
pub fn select_first(&mut self, _: &SelectFirst, cx: &mut ViewContext<Self>) { pub fn select_first(&mut self, _: &SelectFirst, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let index = 0; delegate.update(cx, |delegate, cx| {
delegate.update(cx, |delegate, cx| delegate.set_selected_index(0, cx)); if delegate.match_count() > 0 {
self.list_state.scroll_to(ScrollTarget::Show(index)); delegate.set_selected_index(0, cx);
self.list_state.scroll_to(ScrollTarget::Show(0));
}
});
cx.notify(); cx.notify();
} }
} }
@ -267,53 +271,56 @@ impl<D: PickerDelegate> Picker<D> {
pub fn select_index(&mut self, action: &SelectIndex, cx: &mut ViewContext<Self>) { pub fn select_index(&mut self, action: &SelectIndex, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let index = action.0; let index = action.0;
self.confirmed = true;
delegate.update(cx, |delegate, cx| { delegate.update(cx, |delegate, cx| {
delegate.set_selected_index(index, cx); if delegate.match_count() > 0 {
delegate.confirm(cx); self.confirmed = true;
delegate.set_selected_index(index, cx);
delegate.confirm(cx);
}
}); });
} }
} }
pub fn select_last(&mut self, _: &SelectLast, cx: &mut ViewContext<Self>) { pub fn select_last(&mut self, _: &SelectLast, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let index = delegate.update(cx, |delegate, cx| { delegate.update(cx, |delegate, cx| {
let match_count = delegate.match_count(); let match_count = delegate.match_count();
let index = if match_count > 0 { match_count - 1 } else { 0 }; if match_count > 0 {
delegate.set_selected_index(index, cx); let index = match_count - 1;
index delegate.set_selected_index(index, cx);
self.list_state.scroll_to(ScrollTarget::Show(index));
}
}); });
self.list_state.scroll_to(ScrollTarget::Show(index));
cx.notify(); cx.notify();
} }
} }
pub fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) { pub fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let index = delegate.update(cx, |delegate, cx| { delegate.update(cx, |delegate, cx| {
let mut selected_index = delegate.selected_index(); let next_index = delegate.selected_index() + 1;
if selected_index + 1 < delegate.match_count() { if next_index < delegate.match_count() {
selected_index += 1; delegate.set_selected_index(next_index, cx);
delegate.set_selected_index(selected_index, cx); self.list_state.scroll_to(ScrollTarget::Show(next_index));
} }
selected_index
}); });
self.list_state.scroll_to(ScrollTarget::Show(index));
cx.notify(); cx.notify();
} }
} }
pub fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) { pub fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let index = delegate.update(cx, |delegate, cx| { delegate.update(cx, |delegate, cx| {
let mut selected_index = delegate.selected_index(); let mut selected_index = delegate.selected_index();
if selected_index > 0 { if selected_index > 0 {
selected_index -= 1; selected_index -= 1;
delegate.set_selected_index(selected_index, cx); delegate.set_selected_index(selected_index, cx);
self.list_state
.scroll_to(ScrollTarget::Show(selected_index));
} }
selected_index
}); });
self.list_state.scroll_to(ScrollTarget::Show(index));
cx.notify(); cx.notify();
} }
} }