Fix extension list scrolling and add loading and empty states (#7782)

This PR fixes the scrolling of the extension list, as well as adds
various empty and loading states.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-02-14 12:47:58 -05:00 committed by GitHub
parent b47aff4c14
commit b14fbd4ddc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3,9 +3,10 @@ use editor::{Editor, EditorElement, EditorStyle};
use extension::{Extension, ExtensionStatus, ExtensionStore}; use extension::{Extension, ExtensionStatus, ExtensionStore};
use fs::Fs; use fs::Fs;
use gpui::{ use gpui::{
actions, uniform_list, AnyElement, AppContext, EventEmitter, FocusableView, FontStyle, actions, canvas, uniform_list, AnyElement, AppContext, AvailableSpace, EventEmitter,
FontWeight, InteractiveElement, KeyContext, ParentElement, Render, Styled, Task, TextStyle, FocusableView, FontStyle, FontWeight, InteractiveElement, KeyContext, ParentElement, Render,
UniformListScrollHandle, View, ViewContext, VisualContext, WeakView, WhiteSpace, WindowContext, Styled, Task, TextStyle, UniformListScrollHandle, View, ViewContext, VisualContext, WeakView,
WhiteSpace, WindowContext,
}; };
use settings::Settings; use settings::Settings;
use std::time::Duration; use std::time::Duration;
@ -35,6 +36,7 @@ pub struct ExtensionsPage {
fs: Arc<dyn Fs>, fs: Arc<dyn Fs>,
list: UniformListScrollHandle, list: UniformListScrollHandle,
telemetry: Arc<Telemetry>, telemetry: Arc<Telemetry>,
is_fetching_extensions: bool,
extensions_entries: Vec<Extension>, extensions_entries: Vec<Extension>,
query_editor: View<Editor>, query_editor: View<Editor>,
query_contains_error: bool, query_contains_error: bool,
@ -56,6 +58,7 @@ impl ExtensionsPage {
workspace: workspace.weak_handle(), workspace: workspace.weak_handle(),
list: UniformListScrollHandle::new(), list: UniformListScrollHandle::new(),
telemetry: workspace.client().telemetry().clone(), telemetry: workspace.client().telemetry().clone(),
is_fetching_extensions: false,
extensions_entries: Vec::new(), extensions_entries: Vec::new(),
query_contains_error: false, query_contains_error: false,
extension_fetch_task: None, extension_fetch_task: None,
@ -87,15 +90,30 @@ impl ExtensionsPage {
} }
fn fetch_extensions(&mut self, search: Option<&str>, cx: &mut ViewContext<Self>) { fn fetch_extensions(&mut self, search: Option<&str>, cx: &mut ViewContext<Self>) {
self.is_fetching_extensions = true;
cx.notify();
let extensions = let extensions =
ExtensionStore::global(cx).update(cx, |store, cx| store.fetch_extensions(search, cx)); ExtensionStore::global(cx).update(cx, |store, cx| store.fetch_extensions(search, cx));
cx.spawn(move |this, mut cx| async move { cx.spawn(move |this, mut cx| async move {
let extensions = extensions.await?; let fetch_result = extensions.await;
this.update(&mut cx, |this, cx| { match fetch_result {
Ok(extensions) => this.update(&mut cx, |this, cx| {
this.extensions_entries = extensions; this.extensions_entries = extensions;
this.is_fetching_extensions = false;
cx.notify();
}),
Err(err) => {
this.update(&mut cx, |this, cx| {
this.is_fetching_extensions = false;
cx.notify(); cx.notify();
}) })
.ok();
Err(err)
}
}
}) })
.detach_and_log_err(cx); .detach_and_log_err(cx);
} }
@ -314,11 +332,25 @@ impl ExtensionsPage {
if let editor::EditorEvent::Edited = event { if let editor::EditorEvent::Edited = event {
self.query_contains_error = false; self.query_contains_error = false;
self.extension_fetch_task = Some(cx.spawn(|this, mut cx| async move { self.extension_fetch_task = Some(cx.spawn(|this, mut cx| async move {
let search = this
.update(&mut cx, |this, cx| this.search_query(cx))
.ok()
.flatten();
// Only debounce the fetching of extensions if we have a search
// query.
//
// If the search was just cleared then we can just reload the list
// of extensions without a debounce, which allows us to avoid seeing
// an intermittent flash of a "no extensions" state.
if let Some(_) = search {
cx.background_executor() cx.background_executor()
.timer(Duration::from_millis(250)) .timer(Duration::from_millis(250))
.await; .await;
};
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.fetch_extensions(this.search_query(cx).as_deref(), cx); this.fetch_extensions(search.as_deref(), cx);
}) })
.ok(); .ok();
})); }));
@ -337,33 +369,56 @@ impl ExtensionsPage {
impl Render for ExtensionsPage { impl Render for ExtensionsPage {
fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
h_flex()
.full()
.bg(cx.theme().colors().editor_background)
.child(
v_flex() v_flex()
.full() .size_full()
.p_4() .p_4()
.gap_4()
.bg(cx.theme().colors().editor_background)
.child( .child(
h_flex() h_flex()
.w_full() .w_full()
.child(Headline::new("Extensions").size(HeadlineSize::XLarge)), .child(Headline::new("Extensions").size(HeadlineSize::XLarge)),
) )
.child(h_flex().w_56().my_4().child(self.render_search(cx))) .child(h_flex().w_56().child(self.render_search(cx)))
.child( .child(v_flex().size_full().overflow_y_hidden().map(|this| {
h_flex().flex_col().items_start().full().child( if self.extensions_entries.is_empty() {
let message = if self.is_fetching_extensions {
"Loading extensions..."
} else if self.search_query(cx).is_some() {
"No extensions that match your search."
} else {
"No extensions."
};
return this.child(Label::new(message));
}
this.child(
canvas({
let view = cx.view().clone();
let scroll_handle = self.list.clone();
let item_count = self.extensions_entries.len();
move |bounds, cx| {
uniform_list::<_, Div, _>( uniform_list::<_, Div, _>(
cx.view().clone(), view,
"entries", "entries",
self.extensions_entries.len(), item_count,
Self::render_extensions, Self::render_extensions,
) )
.size_full() .size_full()
.track_scroll(self.list.clone()), .track_scroll(scroll_handle)
), .into_any_element()
), .draw(
bounds.origin,
bounds.size.map(AvailableSpace::Definite),
cx,
) )
} }
})
.size_full(),
)
}))
}
} }
impl EventEmitter<ItemEvent> for ExtensionsPage {} impl EventEmitter<ItemEvent> for ExtensionsPage {}
@ -409,6 +464,7 @@ impl Item for ExtensionsPage {
workspace: self.workspace.clone(), workspace: self.workspace.clone(),
list: UniformListScrollHandle::new(), list: UniformListScrollHandle::new(),
telemetry: self.telemetry.clone(), telemetry: self.telemetry.clone(),
is_fetching_extensions: false,
extensions_entries: Default::default(), extensions_entries: Default::default(),
query_editor: self.query_editor.clone(), query_editor: self.query_editor.clone(),
_subscription: subscription, _subscription: subscription,