adam/thaw
1
0
Fork 0
mirror of https://github.com/adoyle0/thaw.git synced 2025-01-23 06:19:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

🦄 refactor: option_comp

Browse source
This commit is contained in:
luoxiao 2023-05-16 12:54:47 +08:00
parent a6e30e38a0
commit e0c21b5f28
3 changed files with 27 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/button/mod.rs
View file

@ -82,7 +82,7 @@ pub fn Button(
<Icon icon=icon style=icon_style/>
}
}/>
<OptionComp value=children view=move |cx, children| {
<OptionComp value=children view=|cx, children| {
children(cx).into_view(cx)
}/>
</button>

44
src/card/mod.rs
View file

@ -1,11 +1,11 @@
use crate::utils::mount_style::mount_style;
use crate::{components::*, utils::mount_style::mount_style};
use leptos::*;
use stylers::style_sheet_str;
#[component]
pub fn Card(
cx: Scope,
#[prop(default = None)] title: Option<String>,
#[prop(optional)] title: MaybeSignal<String>,
#[prop(default = None)] header: Option<Children>,
#[prop(default = None)] header_extra: Option<Children>,
children: Children,
@ -16,41 +16,25 @@ pub fn Card(
cx, class=class_name,
<div class="melt-card">
{
if header.is_some() || title.is_some() {
if header.is_some() || title.get().is_empty() {
view! {
cx, class=class_name,
<div class="melt-card__header">
<div class="melt-card__header-content">
{
if let Some(header) = header {
view! {
cx,
<>
{ header(cx) }
</>
}
} else {
view! {
cx,
<>
{ title }
</>
}
}
}
<OptionComp value=header view=|cx, header| {
header(cx).into_view(cx)
}>
{ title.get() }
</OptionComp>
</div>
{
if let Some(header_extra) = header_extra {
<OptionComp value=header_extra view=move |cx, header_extra| {
view! {
cx, class=class_name,
<div class="melt-card__header-extra">
{ header_extra(cx)}
</div>
}.into()
} else {
None
}
}
}/>
</div>
}.into()
} else {
@ -60,18 +44,14 @@ pub fn Card(
<div class="melt-card__content">
{ children(cx) }
</div>
{
if let Some(footer) = footer {
<OptionComp value=footer view=move |cx, footer| {
view! {
cx, class=class_name,
<div class="melt-card__footer">
{ footer(cx) }
</div>
}.into()
} else {
None
}
}
}/>
</div>
}
}

9
src/components/option_comp.rs
View file

@ -1,4 +1,3 @@
use super::Fallback;
use leptos::*;
#[component]
@ -6,16 +5,16 @@ pub fn OptionComp<T, VF, IV>(
cx: Scope,
value: Option<T>,
view: VF,
#[prop(optional)] fallback: Option<Fallback>,
#[prop(optional)] children: Option<Children>,
) -> impl IntoView
where
VF: Fn(Scope, T) -> IV + 'static,
VF: FnOnce(Scope, T) -> IV + 'static,
IV: IntoView,
{
if let Some(value) = value {
view(cx, value).into_view(cx)
} else if let Some(fallback) = &fallback {
(fallback.children)(cx).into_view(cx)
} else if let Some(children) = children {
children(cx).into_view(cx)
} else {
().into_view(cx)
}