From 7ac738fb2ed9feee22793cb5c80cb873fd22c9e6 Mon Sep 17 00:00:00 2001
From: luoxiaozero <48741584+luoxiaozero@users.noreply.github.com>
Date: Tue, 19 Dec 2023 16:26:51 +0800
Subject: [PATCH] Pref/231219 (#54)

* demo: AutoComplete add Prefix and Suffix

* pref: cargo clippy

* pref: fmt
---
 demo/src/pages/auto_complete/mod.rs | 62 +++++++++++++++++++++++++++++
 demo/src/pages/slider/mod.rs        |  2 +-
 src/alert/mod.rs                    |  3 +-
 src/auto_complete/mod.rs            | 36 ++++++++++-------
 src/avatar/mod.rs                   |  7 +++-
 src/button/mod.rs                   |  2 +-
 src/input/mod.rs                    |  4 +-
 src/slider/mod.rs                   | 13 ++----
 src/slider/slider_label.rs          | 13 +++---
 src/utils/dyn_classes.rs            |  8 ++--
 10 files changed, 106 insertions(+), 44 deletions(-)

diff --git a/demo/src/pages/auto_complete/mod.rs b/demo/src/pages/auto_complete/mod.rs
index 33c6d80..444169c 100644
--- a/demo/src/pages/auto_complete/mod.rs
+++ b/demo/src/pages/auto_complete/mod.rs
@@ -78,6 +78,42 @@ pub fn AutoCompletePage() -> impl IntoView {
 
                 </DemoCode>
             </Demo>
+            <h2>"Prefix & Suffix"</h2>
+            <Demo>
+                <Space vertical=true>
+                    <AutoComplete value options>
+                        <AutoCompletePrefix slot>
+                            <Icon icon=icondata::Icon::from(icondata::AiIcon::AiUserOutlined)/>
+                        </AutoCompletePrefix>
+                    </AutoComplete>
+                    <AutoComplete value options>
+                        <AutoCompleteSuffix slot>
+                            <Icon icon=icondata::Icon::from(icondata::AiIcon::AiGithubOutlined)/>
+                        </AutoCompleteSuffix>
+                    </AutoComplete>
+                </Space>
+                <DemoCode slot>
+
+                    {highlight_str!(
+                        r#"
+                        <Space vertical=true>
+                            <AutoComplete value options>
+                                <AutoCompletePrefix slot>
+                                    <Icon icon=icondata::Icon::from(icondata::AiIcon::AiUserOutlined)/>
+                                </AutoCompletePrefix>
+                            </AutoComplete>
+                            <AutoComplete value options>
+                                <AutoCompleteSuffix slot>
+                                    <Icon icon=icondata::Icon::from(icondata::AiIcon::AiGithubOutlined)/>
+                                </AutoCompleteSuffix>
+                            </AutoComplete>
+                        </Space>
+                        "#,
+                        "rust"
+                    )}
+
+                </DemoCode>
+            </Demo>
             <h3>"AutoComplete Props"</h3>
             <Table single_column=true>
                 <thead>
@@ -161,6 +197,32 @@ pub fn AutoCompletePage() -> impl IntoView {
                     </tr>
                 </tbody>
             </Table>
+            <h3>"AutoComplete Slots"</h3>
+            <Table single_column=true>
+                <thead>
+                    <tr>
+                        <th>"Name"</th>
+                        <th>"Default"</th>
+                        <th>"Description"</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>"AutoCompletePrefix"</td>
+                        <td>
+                            <Text code=true>"None"</Text>
+                        </td>
+                        <td>"AutoCompletePrefix content."</td>
+                    </tr>
+                    <tr>
+                        <td>"AutoCompleteSuffix"</td>
+                        <td>
+                            <Text code=true>"None"</Text>
+                        </td>
+                        <td>"AutoCompleteSuffix content."</td>
+                    </tr>
+                </tbody>
+            </Table>
             <h3>"AutoComplete Ref"</h3>
             <Table single_column=true>
                 <thead>
diff --git a/demo/src/pages/slider/mod.rs b/demo/src/pages/slider/mod.rs
index 007dc0c..493beb6 100644
--- a/demo/src/pages/slider/mod.rs
+++ b/demo/src/pages/slider/mod.rs
@@ -8,7 +8,7 @@ pub fn SliderPage() -> impl IntoView {
     let value = create_rw_signal(0.0);
     let stepped_value = create_rw_signal(0.0);
     let labeled_value = create_rw_signal(0.0);
-    
+
     view! {
         <div style="width: 896px; margin: 0 auto;">
             <h1>"Slider"</h1>
diff --git a/src/alert/mod.rs b/src/alert/mod.rs
index 4052d0c..de5cacc 100644
--- a/src/alert/mod.rs
+++ b/src/alert/mod.rs
@@ -92,7 +92,8 @@ pub fn Alert(
             class=ssr_class
             use:dyn_classes=class
             class:thaw-alert=true
-            style=move || css_vars.get()>
+            style=move || css_vars.get()
+        >
             <Icon icon class="thaw-alert__icon"/>
             <div>
 
diff --git a/src/auto_complete/mod.rs b/src/auto_complete/mod.rs
index 50cf334..27dec76 100644
--- a/src/auto_complete/mod.rs
+++ b/src/auto_complete/mod.rs
@@ -129,7 +129,13 @@ pub fn AutoComplete(
     let ssr_class = ssr_class(&class);
     view! {
         <Binder target_ref=auto_complete_ref>
-            <div class=ssr_class use:dyn_classes=class class:thaw-auto-complete=true ref=auto_complete_ref on:keydown=on_keydown>
+            <div
+                class=ssr_class
+                use:dyn_classes=class
+                class:thaw-auto-complete=true
+                ref=auto_complete_ref
+                on:keydown=on_keydown
+            >
                 <Input
                     value
                     placeholder
@@ -141,22 +147,22 @@ pub fn AutoComplete(
                     comp_ref=input_ref
                 >
                     <InputPrefix if_=auto_complete_prefix.is_some() slot>
-                        {
-                            if let Some(auto_complete_prefix) = auto_complete_prefix {
-                                Some((auto_complete_prefix.children)())
-                            } else {
-                                None
-                            }
-                        }
+
+                        {if let Some(auto_complete_prefix) = auto_complete_prefix {
+                            Some((auto_complete_prefix.children)())
+                        } else {
+                            None
+                        }}
+
                     </InputPrefix>
                     <InputSuffix if_=auto_complete_suffix.is_some() slot>
-                        {
-                            if let Some(auto_complete_suffix) = auto_complete_suffix {
-                                Some((auto_complete_suffix.children)())
-                            } else {
-                                None
-                            }
-                        }
+
+                        {if let Some(auto_complete_suffix) = auto_complete_suffix {
+                            Some((auto_complete_suffix.children)())
+                        } else {
+                            None
+                        }}
+
                     </InputSuffix>
                 </Input>
             </div>
diff --git a/src/avatar/mod.rs b/src/avatar/mod.rs
index aa18973..1c58b48 100644
--- a/src/avatar/mod.rs
+++ b/src/avatar/mod.rs
@@ -37,7 +37,12 @@ pub fn Avatar(
 
     let ssr_class = ssr_class(&class);
     view! {
-        <span class=ssr_class use:dyn_classes=class class:thaw-avatar=true style=move || css_vars.get()>
+        <span
+            class=ssr_class
+            use:dyn_classes=class
+            class:thaw-avatar=true
+            style=move || css_vars.get()
+        >
             {move || {
                 let src = src.get();
                 (!src.is_empty()).then(|| view! { <img src=src/> })
diff --git a/src/button/mod.rs b/src/button/mod.rs
index c1c763b..0549463 100644
--- a/src/button/mod.rs
+++ b/src/button/mod.rs
@@ -221,7 +221,7 @@ pub fn Button(
         };
         callback.call(event);
     };
-    
+
     let ssr_class = ssr_class(&class);
     view! {
         <button
diff --git a/src/input/mod.rs b/src/input/mod.rs
index ac0fd1a..2d37cdf 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -131,7 +131,7 @@ pub fn Input(
             class=("thaw-input--invalid", move || invalid.get())
             style=move || css_vars.get()
         >
-            {if let Some(prefix) = input_prefix.map(|prefix| prefix.if_.then(|| prefix)).flatten() {
+            {if let Some(prefix) = input_prefix.and_then(|prefix| prefix.if_.then_some(prefix)) {
                 view! { <div class="thaw-input__prefix">{(prefix.children)()}</div> }.into()
             } else {
                 None
@@ -153,7 +153,7 @@ pub fn Input(
                 ref=input_ref
             />
 
-            {if let Some(suffix) = input_suffix.map(|suffix| suffix.if_.then(|| suffix)).flatten() {
+            {if let Some(suffix) = input_suffix.and_then(|suffix| suffix.if_.then_some(suffix)) {
                 view! { <div class="thaw-input__suffix">{(suffix.children)()}</div> }.into()
             } else {
                 None
diff --git a/src/slider/mod.rs b/src/slider/mod.rs
index b43ab39..17f8ba3 100644
--- a/src/slider/mod.rs
+++ b/src/slider/mod.rs
@@ -111,11 +111,7 @@ pub fn Slider(
     on_cleanup(move || on_mouse_move.remove());
 
     view! {
-        <div
-            class="thaw-slider"
-            style=move || css_vars.get()
-            on:click=on_mouse_click
-            >
+        <div class="thaw-slider" style=move || css_vars.get() on:click=on_mouse_click>
             <div class="thaw-slider-rail" ref=rail_ref>
                 <div
                     class="thaw-slider-rail__fill"
@@ -128,11 +124,8 @@ pub fn Slider(
             <div
                 on:mousedown=on_mouse_down
                 class="thaw-slider-handle"
-                style=move || {
-                    format!("left: {}%", percentage.get())
-                }
-            >
-            </div>
+                style=move || { format!("left: {}%", percentage.get()) }
+            ></div>
         </div>
     }
 }
diff --git a/src/slider/slider_label.rs b/src/slider/slider_label.rs
index 89b8f1f..b82c852 100644
--- a/src/slider/slider_label.rs
+++ b/src/slider/slider_label.rs
@@ -3,21 +3,18 @@ use leptos::*;
 use crate::utils::mount_style;
 
 #[component]
-pub fn SliderLabel(
-    #[prop(into)] value: MaybeSignal<f64>,
-    children: Children,
-) -> impl IntoView {
-
+pub fn SliderLabel(#[prop(into)] value: MaybeSignal<f64>, children: Children) -> impl IntoView {
     mount_style("slider-label", include_str!("./slider_label.css"));
 
     view! {
         <div
             class:thaw-slider-label=true
             style=move || {
-            format!("left: calc(calc({} / var(--thaw-slider-max)) * 100%)", value.get())
-        }>
+                format!("left: calc(calc({} / var(--thaw-slider-max)) * 100%)", value.get())
+            }
+        >
+
             {children()}
         </div>
     }
 }
-
diff --git a/src/utils/dyn_classes.rs b/src/utils/dyn_classes.rs
index c76b7a7..4e19ef9 100644
--- a/src/utils/dyn_classes.rs
+++ b/src/utils/dyn_classes.rs
@@ -23,15 +23,13 @@ pub fn dyn_classes(el: HtmlElement<AnyElement>, classes_signal: MaybeSignal<Stri
 }
 
 pub fn ssr_class(class: &MaybeSignal<String>) -> String {
-    let ssr_class;
     cfg_if! {
         if #[cfg(feature = "ssr")] {
             use leptos::SignalGetUntracked;
-            ssr_class = class.get_untracked();
+            class.get_untracked()
         } else {
             let _ = class;
-            ssr_class = String::new();
+            String::new()
         }
-    };
-    ssr_class
+    }
 }