Skip to content

Commit 67b75bf

Browse files
luoxiaozeroluoxiaozero
committed
style: fmt
1 parent 153ca84 commit 67b75bf

File tree

40 files changed

+198
-143
lines changed

40 files changed

+198
-143
lines changed

‎thaw/src/auto_complete/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub fn AutoComplete(
130130
view! {
131131
<Binder target_ref=auto_complete_ref>
132132
<div
133-
class=class_list!["thaw-auto-complete", class.map(|c| move || c.get())]
133+
class=class_list!["thaw-auto-complete", class.map(| c | move || c.get())]
134134
ref=auto_complete_ref
135135
on:keydown=on_keydown
136136
>

‎thaw/src/breadcrumb/breadcrumb_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn BreadcrumbItem(
1212
view! {
1313
<li class="thaw-breadcrumb-item">
1414
<span class=class_list![
15-
"thaw-breadcrumb-item__link", class.map(|c| move || c.get())
15+
"thaw-breadcrumb-item__link", class.map(| c | move || c.get())
1616
]>{children()}</span>
1717
<span class="thaw-breadcrumb-item__separator">
1818
{move || breadcrumb_separator.0.get()}

‎thaw/src/breadcrumb/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn Breadcrumb(
4040
view! {
4141
<Provider value=BreadcrumbSeparatorInjection(separator)>
4242
<nav
43-
class=class_list!["thaw-breadcrumb", class.map(|c| move || c.get())]
43+
class=class_list!["thaw-breadcrumb", class.map(| c | move || c.get())]
4444
style=move || css_vars.get()
4545
>
4646
<ul>{children()}</ul>

‎thaw/src/button/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ pub fn Button(
228228
ButtonVariant::Text), ("thaw-button--link", move || variant.get() ==
229229
ButtonVariant::Link), ("thaw-button--round", move || round.get()),
230230
("thaw-button--circle", move || circle.get()), ("thaw-button--disabled", move ||
231-
disabled.get()), class.map(|c| move || c.get())
231+
disabled.get()), class.map(| c | move || c.get())
232232
]
233233

234-
style=move || format!("{}{}", css_vars.get(), style.as_ref().map(|s| s.get()).unwrap_or_default())
234+
style=move || {
235+
format!("{}{}", css_vars.get(), style.as_ref().map(|s| s.get()).unwrap_or_default())
236+
}
235237
disabled=move || disabled.get()
236238
on:click=on_click
237239
>

‎thaw/src/calendar/mod.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,10 @@ pub fn Calendar(
116116
};
117117

118118
view! {
119-
<div class=class_list!["thaw-calendar", class.map(|c| move || c.get())] style=move || css_vars.get()>
119+
<div
120+
class=class_list!["thaw-calendar", class.map(| c | move || c.get())]
121+
style=move || css_vars.get()
122+
>
120123
<div class="thaw-calendar__header">
121124
<span class="thaw-calendar__header-title">
122125

‎thaw/src/card/mod.rs

+27-23
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,35 @@ pub fn Card(
5050
});
5151

5252
view! {
53-
<div class=class_list!["thaw-card", class.map(|c| move || c.get())] style=move || css_vars.get()>
54-
{
55-
if card_header.is_some() || title.is_some() {
56-
view! {
57-
<div class="thaw-card__header">
58-
<div class="thaw-card__header-content">
59-
{
60-
if let Some(header) = card_header {
61-
(header.children)().into_view()
62-
} else if let Some(title) = title.into_option() {
63-
(move || title.get()).into_view()
64-
} else {
65-
unreachable!()
66-
}
67-
}
68-
</div>
69-
<OptionComp value=card_header_extra let:header_extra>
70-
<div class="thaw-card__header-extra">{(header_extra.children)()}</div>
71-
</OptionComp>
53+
<div
54+
class=class_list!["thaw-card", class.map(| c | move || c.get())]
55+
style=move || css_vars.get()
56+
>
57+
58+
{if card_header.is_some() || title.is_some() {
59+
view! {
60+
<div class="thaw-card__header">
61+
<div class="thaw-card__header-content">
62+
63+
{if let Some(header) = card_header {
64+
(header.children)().into_view()
65+
} else if let Some(title) = title.into_option() {
66+
(move || title.get()).into_view()
67+
} else {
68+
unreachable!()
69+
}}
70+
7271
</div>
73-
}.into()
74-
} else {
75-
None
72+
<OptionComp value=card_header_extra let:header_extra>
73+
<div class="thaw-card__header-extra">{(header_extra.children)()}</div>
74+
</OptionComp>
75+
</div>
7676
}
77-
}
77+
.into()
78+
} else {
79+
None
80+
}}
81+
7882
<div class="thaw-card__content">{children()}</div>
7983
<OptionComp value=card_footer let:footer>
8084
<If cond=footer.if_>

‎thaw/src/checkbox/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ pub fn Checkbox(
3535
view! {
3636
<div
3737
class=class_list![
38-
"thaw-checkbox", ("thaw-checkbox--checked", move || value.get()), class.map(|c| move || c.get())
38+
"thaw-checkbox", ("thaw-checkbox--checked", move || value.get()), class.map(| c |
39+
move || c.get())
3940
]
4041

4142
style=move || css_vars.get()

‎thaw/src/code/mod.rs

+12-14
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ pub fn Code(
99
) -> impl IntoView {
1010
mount_style("code", include_str!("./code.css"));
1111
view! {
12-
<code class=class_list!["thaw-code", class.map(|c| move || c.get())]>
13-
{
14-
if let Some(inner_html) = inner_html {
15-
view! {
16-
<pre inner_html=inner_html></pre>
17-
}.into()
18-
} else if let Some(text) = text {
19-
view! {
20-
<pre>{text}</pre>
21-
}.into()
22-
} else {
23-
None
24-
}
25-
}
12+
<code class=class_list![
13+
"thaw-code", class.map(| c | move || c.get())
14+
]>
15+
16+
{if let Some(inner_html) = inner_html {
17+
view! { <pre inner_html=inner_html></pre> }.into()
18+
} else if let Some(text) = text {
19+
view! { <pre>{text}</pre> }.into()
20+
} else {
21+
None
22+
}}
23+
2624
</code>
2725
}
2826
}

‎thaw/src/collapse/collapse_item.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,18 @@ pub fn CollapseItem(
4444
view! {
4545
<div class=class_list![
4646
"thaw-collapse-item", ("thaw-collapse-item--active", move || is_show_content.get()),
47-
class.map(|c| move || c.get())
47+
class.map(| c | move || c.get())
4848
]>
4949
<div class="thaw-collapse-item__header" on:click=on_click>
5050
<Icon icon=icondata::AiRightOutlined class="thaw-collapse-item-arrow"/>
5151
{move || title.get()}
5252
</div>
53-
<CSSTransition node_ref=content_ref show=is_show_content name="thaw-collapse-item" let:display>
53+
<CSSTransition
54+
node_ref=content_ref
55+
show=is_show_content
56+
name="thaw-collapse-item"
57+
let:display
58+
>
5459
<div
5560
class="thaw-collapse-item__content"
5661
ref=content_ref

‎thaw/src/collapse/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn Collapse(
3131
accordion,
3232
}>
3333
<div
34-
class=class_list!["thaw-collapse", class.map(|c| move || c.get())]
34+
class=class_list!["thaw-collapse", class.map(| c | move || c.get())]
3535
style=move || css_vars.get()
3636
>
3737
{children()}

‎thaw/src/color_picker/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn ColorPicker(
100100
view! {
101101
<Binder target_ref=trigger_ref>
102102
<div
103-
class=class_list!["thaw-color-picker-trigger", class.map(|c| move || c.get())]
103+
class=class_list!["thaw-color-picker-trigger", class.map(| c | move || c.get())]
104104
on:click=show_popover
105105
ref=trigger_ref
106106
>

‎thaw/src/divider/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub fn Divider(#[prop(optional, into)] class: OptionalProp<MaybeSignal<String>>)
66
mount_style("divider", include_str!("./divider.css"));
77

88
view! {
9-
<div class=class_list!["thaw-divider", class.map(|c| move || c.get())]>
9+
<div class=class_list!["thaw-divider", class.map(| c | move || c.get())]>
1010
<div class="thaw-divider__line"></div>
1111
</div>
1212
}

‎thaw/src/drawer/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ pub fn Drawer(
3333
<div
3434
class=class_list![
3535
"thaw-drawer", move || format!("thaw-drawer--placement-{}", placement.get()
36-
.as_str()), class.map(|c| move || c.get())
36+
.as_str()), class.map(| c | move || c.get())
3737
]
38+
3839
style=move || css_vars.get()
3940
>
4041
<Card title>{children()}</Card>

‎thaw/src/grid/grid_item.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ pub fn GridItem(
3636
});
3737

3838
view! {
39-
<div class=class_list!["thaw-grid-item", class.map(|c| move || c.get())] style=move || style.get()>
39+
<div
40+
class=class_list!["thaw-grid-item", class.map(| c | move || c.get())]
41+
style=move || style.get()
42+
>
4043
{children()}
4144
</div>
4245
}

‎thaw/src/grid/mod.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ pub fn Grid(
2424

2525
view! {
2626
<Provider value=GridInjection::new(x_gap)>
27-
<div class=class_list!["thaw-grid", class.map(|c| move || c.get())] style=move || style.get()>
27+
<div
28+
class=class_list!["thaw-grid", class.map(| c | move || c.get())]
29+
style=move || style.get()
30+
>
2831
{children()}
2932
</div>
3033
</Provider>

‎thaw/src/input/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub fn Input(
160160
class=class_list![
161161
"thaw-input", ("thaw-input--focus", move || is_focus.get()),
162162
("thaw-input--disabled", move || disabled.get()), ("thaw-input--invalid", move ||
163-
invalid.get()), class.map(|c| move || c.get())
163+
invalid.get()), class.map(| c | move || c.get())
164164
]
165165

166166
style=move || css_vars.get()

‎thaw/src/input/text_area.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ pub fn TextArea(
107107
<div
108108
class=class_list![
109109
"thaw-textarea", ("thaw-textarea--focus", move || is_focus.get()),
110-
("thaw-textarea--disabled", move || disabled.get()), ("thaw-textarea--invalid", move ||
111-
invalid.get()), class.map(|c| move || c.get())
110+
("thaw-textarea--disabled", move || disabled.get()), ("thaw-textarea--invalid", move
111+
|| invalid.get()), class.map(| c | move || c.get())
112112
]
113113

114114
style=move || css_vars.get()
@@ -127,7 +127,7 @@ pub fn TextArea(
127127
disabled=move || disabled.get()
128128
placeholder=placeholder.map(|p| move || p.get())
129129
ref=textarea_ref
130-
/>
130+
></textarea>
131131
</div>
132132
}
133133
}

‎thaw/src/layout/layout_header.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ pub fn LayoutHeader(
88
children: Children,
99
) -> impl IntoView {
1010
view! {
11-
<div class=class_list!["thaw-layout-header", class.map(|c| move || c.get())] style=style.map(|s| move || s.get())>
11+
<div
12+
class=class_list!["thaw-layout-header", class.map(| c | move || c.get())]
13+
style=style.map(|s| move || s.get())
14+
>
1215
{children()}
1316
</div>
1417
}

‎thaw/src/layout/layout_sider.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ pub fn LayoutSider(
99
) -> impl IntoView {
1010
mount_style("layout-sider", include_str!("./layout-sider.css"));
1111
view! {
12-
<div class=class_list!["thaw-layout-sider", class.map(|c| move || c.get())] style=style.map(|s| move || s.get())>
12+
<div
13+
class=class_list!["thaw-layout-sider", class.map(| c | move || c.get())]
14+
style=style.map(|s| move || s.get())
15+
>
1316
{children()}
1417
</div>
1518
}

‎thaw/src/layout/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn Layout(
4747
});
4848
view! {
4949
<div
50-
class=class_list![gen_class(position), class.map(|c| move || c.get())]
50+
class=class_list![gen_class(position), class.map(| c | move || c.get())]
5151
style=move || style.get()
5252
>
5353
{children()}

‎thaw/src/menu/menu_group.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ pub fn MenuGroup(
2222
});
2323

2424
view! {
25-
<div class=class_list!["thaw-menu-group", class.map(|c| move || c.get())] style=move || css_vars.get()>
25+
<div
26+
class=class_list!["thaw-menu-group", class.map(| c | move || c.get())]
27+
style=move || css_vars.get()
28+
>
2629
{label}
2730
</div>
2831
{children()}

‎thaw/src/menu/menu_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub fn MenuItem(
4343
<div
4444
class=class_list![
4545
"thaw-menu-item__content", ("thaw-menu-item__content--selected", move || menu.0
46-
.get() == key.get()), class.map(|c| move || c.get())
46+
.get() == key.get()), class.map(| c | move || c.get())
4747
]
4848

4949
on:click=on_click

‎thaw/src/menu/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn Menu(
1616
) -> impl IntoView {
1717
view! {
1818
<Provider value=MenuInjection(value)>
19-
<div class=class_list!["thaw-menu", class.map(|c| move || c.get())]>{children()}</div>
19+
<div class=class_list!["thaw-menu", class.map(| c | move || c.get())]>{children()}</div>
2020
</Provider>
2121
}
2222
}

‎thaw/src/message/message_provider.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
use std::time::Duration;
22

33
use super::{message_environment::MessageEnvironment, MessageVariant};
4-
use crate::{components::Teleport, utils::{class_list::class_list, mount_style}};
4+
use crate::{
5+
components::Teleport,
6+
utils::{class_list::class_list, mount_style},
7+
};
58
use leptos::*;
69
use uuid::Uuid;
710

@@ -13,7 +16,7 @@ pub enum MessagePlacement {
1316
TopRight,
1417
Bottom,
1518
BottomLeft,
16-
BottomRight
19+
BottomRight,
1720
}
1821

1922
impl MessagePlacement {
@@ -24,7 +27,7 @@ impl MessagePlacement {
2427
MessagePlacement::TopRight => "thaw-message-container--top-right".to_owned(),
2528
MessagePlacement::Bottom => "thaw-message-container--bottom".to_owned(),
2629
MessagePlacement::BottomLeft => "thaw-message-container--bottom-left".to_owned(),
27-
MessagePlacement::BottomRight=> "thaw-message-container--bottom-right".to_owned(),
30+
MessagePlacement::BottomRight => "thaw-message-container--bottom-right".to_owned(),
2831
}
2932
}
3033
}
@@ -111,5 +114,3 @@ impl MessageInjection {
111114
pub fn use_message() -> MessageInjection {
112115
expect_context::<MessageInjection>()
113116
}
114-
115-

‎thaw/src/message/mod.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ mod message_environment;
22
mod message_provider;
33
mod theme;
44

5-
use crate::{theme::use_theme, Icon, Theme, components::{If, Then}};
5+
use crate::{
6+
components::{If, Then},
7+
theme::use_theme,
8+
Icon, Theme,
9+
};
610
use leptos::*;
7-
use uuid::Uuid;
811
pub use message_provider::*;
912
pub use theme::MessageTheme;
13+
use uuid::Uuid;
1014

1115
#[derive(Default, Clone)]
1216
pub enum MessageVariant {
@@ -62,7 +66,7 @@ pub(crate) fn Message(
6266
<div class="thaw-message__content">{content}</div>
6367
<If cond=closable>
6468
<Then slot>
65-
<div class="thaw-message__close" on:click=move |_| on_close.call(id)>
69+
<div class="thaw-message__close" on:click=move |_| on_close.call(id)>
6670
<Icon icon=icondata::AiCloseOutlined/>
6771
</div>
6872
</Then>
@@ -71,5 +75,3 @@ pub(crate) fn Message(
7175
</div>
7276
}
7377
}
74-
75-

0 commit comments

Comments
 (0)