zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use a ListItem as the empty state for Pickers

Browse Source
This commit is contained in:
Marshall Bowers 2023-12-21 16:17:04 -05:00
parent a773a3cb92
commit dc09dbc98c
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/picker2/src/picker2.rs
View File

@ -1,11 +1,11 @@
use editor::Editor;
use gpui::{
div, prelude::*, rems, uniform_list, AppContext, DismissEvent, Div, EventEmitter, FocusHandle,
div, prelude::*, uniform_list, AppContext, DismissEvent, Div, EventEmitter, FocusHandle,
FocusableView, Length, MouseButton, MouseDownEvent, Render, Task, UniformListScrollHandle,
View, ViewContext, WindowContext,
};
use std::{cmp, sync::Arc};
use ui::{prelude::*, v_stack, Color, Divider, Label};
use ui::{prelude::*, v_stack, Color, Divider, Label, ListItem};
use workspace::ModalView;
pub struct Picker<D: PickerDelegate> {
@ -229,21 +229,10 @@ impl<D: PickerDelegate> Render for Picker<D> {
.px_3()
.child(self.editor.clone());
let empty_state = div().p_1().child(
h_stack()
// TODO: This number matches the height of the uniform list items.
// Align these two with a less magic number.
.h(rems(1.4375))
.px_2()
.child(Label::new("No matches").color(Color::Muted)),
);
div()
.key_context("Picker")
.size_full()
.when_some(self.width, |el, width| {
el.w(width)
})
.when_some(self.width, |el, width| el.w(width))
.overflow_hidden()
// This is a bit of a hack to remove the modal styling when we're rendering the `Picker`
// as a part of a modal rather than the entire modal.
@ -257,9 +246,7 @@ impl<D: PickerDelegate> Render for Picker<D> {
.on_action(cx.listener(Self::cancel))
.on_action(cx.listener(Self::confirm))
.on_action(cx.listener(Self::secondary_confirm))
.child(
picker_editor
)
.child(picker_editor)
.child(Divider::horizontal())
.when(self.delegate.match_count() > 0, |el| {
el.child(
@ -272,7 +259,6 @@ impl<D: PickerDelegate> Render for Picker<D> {
self.delegate.match_count(),
{
let selected_index = self.delegate.selected_index();
move |picker, visible_range, cx| {
visible_range
.map(|ix| {
@ -305,7 +291,10 @@ impl<D: PickerDelegate> Render for Picker<D> {
})
.when(self.delegate.match_count() == 0, |el| {
el.child(
empty_state
ListItem::new("empty_state")
.inset(true)
.disabled(true)
.child(Label::new("No matches").color(Color::Muted)),
)
})
}

11
crates/ui2/src/components/list/list_item.rs
View File

@ -8,6 +8,7 @@ use crate::{prelude::*, Disclosure};
#[derive(IntoElement)]
pub struct ListItem {
id: ElementId,
disabled: bool,
selected: bool,
indent_level: usize,
indent_step_size: Pixels,
@ -32,6 +33,7 @@ impl ListItem {
pub fn new(id: impl Into<ElementId>) -> Self {
Self {
id: id.into(),
disabled: false,
selected: false,
indent_level: 0,
indent_step_size: px(12.),
@ -110,6 +112,13 @@ impl ListItem {
}
}
impl Disableable for ListItem {
fn disabled(mut self, disabled: bool) -> Self {
self.disabled = disabled;
self
}
}
impl Selectable for ListItem {
fn selected(mut self, selected: bool) -> Self {
self.selected = selected;
@ -157,7 +166,7 @@ impl RenderOnce for ListItem {
.gap_1()
.px_2()
.group("list_item")
.when(self.inset, |this| {
.when(self.inset && !self.disabled, |this| {
this
// TODO: Add focus state
// .when(self.state == InteractionState::Focused, |this| {