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

Implement list scroll tracking

Browse source 
Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-11-07 10:45:38 -08:00
parent 1d34b7b9fe
commit 742180a3a8
3 changed files with 75 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

45
crates/picker2/src/picker2.rs
View file

@ -1,28 +1,8 @@
// use editor::Editor;
// use gpui::{
// elements::*,
// geometry::vector::{vec2f, Vector2F},
// keymap_matcher::KeymapContext,
// platform::{CursorStyle, MouseButton},
// AnyElement, AnyViewHandle, AppContext, Axis, Entity, MouseState, Task, View, ViewContext,
// ViewHandle,
// };
// use menu::{Cancel, Confirm, SecondaryConfirm, SelectFirst, SelectLast, SelectNext, SelectPrev};
// use parking_lot::Mutex;
// use std::{cmp, sync::Arc};
// use util::ResultExt;
// use workspace::Modal;
// #[derive(Clone, Copy)]
// pub enum PickerEvent {
// Dismiss,
// }
use std::cmp;
use gpui::{
div, list, Component, ElementId, FocusHandle, Focusable, ParentElement, StatelessInteractive,
Styled, ViewContext,
div, list, Component, ElementId, FocusHandle, Focusable, ListScrollHandle, ParentElement,
StatelessInteractive, Styled, ViewContext,
};
// pub struct Picker<D> {
@ -99,6 +79,7 @@ impl<V: PickerDelegate> Picker<V> {
impl<V: 'static + PickerDelegate> Picker<V> {
pub fn render(self, view: &mut V, _cx: &mut ViewContext<V>) -> impl Component<V> {
let id = self.id.clone();
let scroll_handle = ListScrollHandle::new();
div()
.size_full()
.id(self.id.clone())
@ -112,36 +93,49 @@ impl<V: 'static + PickerDelegate> Picker<V> {
})
.on_action({
let id = id.clone();
let scroll_handle = scroll_handle.clone();
move |view: &mut V, _: &menu::SelectNext, cx| {
let count = view.match_count(id.clone());
if count > 0 {
let index = view.selected_index(id.clone());
view.set_selected_index(cmp::min(index + 1, count - 1), id.clone(), cx);
let ix = cmp::min(index + 1, count - 1);
view.set_selected_index(ix, id.clone(), cx);
scroll_handle.scroll_to_item(ix);
}
}
})
.on_action({
let id = id.clone();
let scroll_handle = scroll_handle.clone();
move |view, _: &menu::SelectPrev, cx| {
let count = view.match_count(id.clone());
if count > 0 {
let index = view.selected_index(id.clone());
view.set_selected_index(index.saturating_sub(1), id.clone(), cx);
let ix = index.saturating_sub(1);
view.set_selected_index(ix, id.clone(), cx);
scroll_handle.scroll_to_item(ix);
}
}
})
.on_action({
let id = id.clone();
let scroll_handle = scroll_handle.clone();
move |view: &mut V, _: &menu::SelectFirst, cx| {
view.set_selected_index(0, id.clone(), cx);
let count = view.match_count(id.clone());
if count > 0 {
view.set_selected_index(0, id.clone(), cx);
scroll_handle.scroll_to_item(0);
}
}
})
.on_action({
let id = id.clone();
let scroll_handle = scroll_handle.clone();
move |view: &mut V, _: &menu::SelectLast, cx| {
let count = view.match_count(id.clone());
if count > 0 {
view.set_selected_index(count - 1, id.clone(), cx);
scroll_handle.scroll_to_item(count - 1);
}
}
})
@ -174,6 +168,7 @@ impl<V: 'static + PickerDelegate> Picker<V> {
.collect()
},
)
.track_scroll(scroll_handle.clone())
.size_full(),
)
}