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

Remove unneeded wrapping divs in ListItem left content

Browse source
This commit is contained in:
Marshall Bowers 2023-11-29 12:29:48 -05:00
parent a62c4845a9
commit 97e6fd295a
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ui2/src/components/list.rs
View file

@ -265,19 +265,6 @@ impl RenderOnce for ListItem {
type Rendered = Stateful<Div>; type Rendered = Stateful<Div>;
fn render(self, cx: &mut WindowContext) -> Self::Rendered { fn render(self, cx: &mut WindowContext) -> Self::Rendered {
let left_content = match self.left_slot.clone() {
Some(GraphicSlot::Icon(i)) => Some(
h_stack().child(
IconElement::new(i)
.size(IconSize::Small)
.color(Color::Muted),
),
),
Some(GraphicSlot::Avatar(src)) => Some(h_stack().child(Avatar::source(src))),
Some(GraphicSlot::PublicActor(src)) => Some(h_stack().child(Avatar::uri(src))),
None => None,
};
div() div()
.id(self.id) .id(self.id)
.relative() .relative()
@ -315,7 +302,16 @@ impl RenderOnce for ListItem {
.items_center() .items_center()
.relative() .relative()
.child(disclosure_control(self.toggle, self.on_toggle)) .child(disclosure_control(self.toggle, self.on_toggle))
.children(left_content) .map(|this| match self.left_slot.clone() {
Some(GraphicSlot::Icon(i)) => this.child(
IconElement::new(i)
.size(IconSize::Small)
.color(Color::Muted),
),
Some(GraphicSlot::Avatar(src)) => this.child(Avatar::source(src)),
Some(GraphicSlot::PublicActor(src)) => this.child(Avatar::uri(src)),
None => this,
})
.children(self.children), .children(self.children),
) )
} }

16
crates/ui2/src/components/stories/list_item.rs
View file

@ -2,7 +2,7 @@ use gpui::{Div, Render};
use story::Story; use story::Story;
use crate::prelude::*; use crate::prelude::*;
use crate::ListItem; use crate::{Icon, ListItem};
pub struct ListItemStory; pub struct ListItemStory;
@ -14,6 +14,20 @@ impl Render for ListItemStory {
.child(Story::title_for::<ListItem>()) .child(Story::title_for::<ListItem>())
.child(Story::label("Default")) .child(Story::label("Default"))
.child(ListItem::new("hello_world").child("Hello, world!")) .child(ListItem::new("hello_world").child("Hello, world!"))
.child(Story::label("With left icon"))
.child(
ListItem::new("with_left_icon")
.child("Hello, world!")
.left_icon(Icon::Bell),
)
.child(Story::label("With left avatar"))
.child(
ListItem::new("with_left_avatar")
.child("Hello, world!")
.left_avatar(SharedString::from(
"https://avatars.githubusercontent.com/u/1714999?v=4",
)),
)
.child(Story::label("With `on_click`")) .child(Story::label("With `on_click`"))
.child( .child(
ListItem::new("with_on_click") ListItem::new("with_on_click")