From 2d46cc41d01cdb971c968e9d0175335b79d077d0 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Sat, 3 Aug 2024 01:05:34 +0800
Subject: [PATCH] feat: SiteHeader

---
 demo/src/components/site_header.rs | 16 ++++++++++------
 thaw/src/button/mod.rs             | 22 ++++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/demo/src/components/site_header.rs b/demo/src/components/site_header.rs
index 94c37af..1831fc7 100644
--- a/demo/src/components/site_header.rs
+++ b/demo/src/components/site_header.rs
@@ -203,26 +203,30 @@ pub fn SiteHeader() -> impl IntoView {
                     }
                 </Menu>
                 <Space class="demo-header__right-btn" align=SpaceAlign::Center>
+                    <SwitchVersion/>
                     <Button
-                        appearance=ButtonAppearance::Subtle
+                        icon=Memo::new(move |_| {
+                            theme.with(|theme| {
+                                if theme.name == "light" {
+                                    icondata::BiMoonRegular
+                                } else {
+                                    icondata::BiSunRegular
+                                }
+                            })
+                        })
                         on_click=change_theme
                     >
                         {move || theme_name.get()}
                     </Button>
-                    <SwitchVersion/>
                     <Button
-                        appearance=ButtonAppearance::Subtle
                         icon=icondata::BiDiscordAlt
-                        attr:style="font-size: 22px; padding: 0px 6px;"
                         on_click=move |_| {
                             _ = window().open_with_url("https://discord.gg/YPxuprzu6M");
                         }
                     />
 
                     <Button
-                        appearance=ButtonAppearance::Subtle
                         icon=icondata::AiGithubOutlined
-                        attr:style="font-size: 22px; padding: 0px 6px;"
                         on_click=move |_| {
                             _ = window().open_with_url("http://github.com/thaw-ui/thaw");
                         }
diff --git a/thaw/src/button/mod.rs b/thaw/src/button/mod.rs
index d378fbf..5794505 100644
--- a/thaw/src/button/mod.rs
+++ b/thaw/src/button/mod.rs
@@ -4,7 +4,7 @@ pub use button_group::ButtonGroup;
 
 use crate::icon::Icon;
 use leptos::{either::Either, ev, prelude::*};
-use thaw_utils::{class_list, mount_style, BoxOneCallback, OptionalMaybeSignal};
+use thaw_utils::{class_list, mount_style, BoxOneCallback};
 
 #[derive(Default, PartialEq, Clone, Copy)]
 pub enum ButtonAppearance {
@@ -66,18 +66,24 @@ impl ButtonSize {
 pub fn Button(
     #[prop(optional, into)] class: MaybeProp<String>,
     /// A button can have its content and borders styled for greater emphasis or to be subtle.
-    #[prop(optional, into)] appearance: MaybeSignal<ButtonAppearance>,
+    #[prop(optional, into)]
+    appearance: MaybeSignal<ButtonAppearance>,
     /// A button can be rounded, circular, or square.
-    #[prop(optional, into)] shape: MaybeSignal<ButtonShape>,
+    #[prop(optional, into)]
+    shape: MaybeSignal<ButtonShape>,
     /// A button supports different sizes.
-    #[prop(optional, into)] size: MaybeSignal<ButtonSize>,
+    #[prop(optional, into)]
+    size: MaybeSignal<ButtonSize>,
     /// Whether the button is displayed as block.
-    #[prop(optional, into)] block: MaybeSignal<bool>,
-    #[prop(optional, into)] icon: OptionalMaybeSignal<icondata_core::Icon>,
+    #[prop(optional, into)]
+    block: MaybeSignal<bool>,
+    #[prop(optional, into)] icon: MaybeProp<icondata_core::Icon>,
     /// Whether the button is disabled.
-    #[prop(optional, into)] disabled: MaybeSignal<bool>,
+    #[prop(optional, into)]
+    disabled: MaybeSignal<bool>,
     /// When set, allows the button to be focusable even when it has been disabled.
-    #[prop(optional, into)] disabled_focusable: MaybeSignal<bool>,
+    #[prop(optional, into)]
+    disabled_focusable: MaybeSignal<bool>,
     #[prop(optional, into)] on_click: Option<BoxOneCallback<ev::MouseEvent>>,
     #[prop(optional)] children: Option<Children>,
 ) -> impl IntoView {