From b286397202466eb519bccf4c6e60bc6e45d8d6a3 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Wed, 11 Oct 2023 09:28:44 +0800
Subject: [PATCH] feat: NavBar component text show

---
 Cargo.toml                         |  2 +-
 gh-pages/Cargo.toml                |  4 ++--
 gh-pages/src/pages/checkbox/mod.rs |  4 ++--
 src/mobile/nav_bar/mod.rs          | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 56212f9..e993f21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.5.0", features = ["csr"] }
+leptos = { version = "0.5.1", features = ["csr"] }
 web-sys = { version = "0.3.62", features = ["DomRect"] }
 wasm-bindgen = "0.2.85"
 icondata = { version = "0.0.7", features = [
diff --git a/gh-pages/Cargo.toml b/gh-pages/Cargo.toml
index 33ec338..e7164e6 100644
--- a/gh-pages/Cargo.toml
+++ b/gh-pages/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.5.0", features = ["csr"] }
+leptos = { version = "0.5.1", features = ["csr"] }
 melt-ui = { path = "../" }
 icondata = { version = "0.0.7", features = [
     "AiCloseOutlined",
     "AiCheckOutlined",
 ] }
-leptos_router = { version = "0.5.0", features = ["csr"] }
+leptos_router = { version = "0.5.1", features = ["csr"] }
 regex = "1.8.2"
 leptos_devtools = "0.0.1"
 prisms = { git = "https://github.com/luoxiaozero/prisms" }
diff --git a/gh-pages/src/pages/checkbox/mod.rs b/gh-pages/src/pages/checkbox/mod.rs
index 0a232b9..ed56034 100644
--- a/gh-pages/src/pages/checkbox/mod.rs
+++ b/gh-pages/src/pages/checkbox/mod.rs
@@ -7,13 +7,13 @@ use prisms::highlight_str;
 
 #[component]
 pub fn CheckboxPage() -> impl IntoView {
-    let value = create_rw_signal(false);
+    let checked = create_rw_signal(false);
     let value = create_rw_signal(HashSet::new());
     view! {
         <div style="width: 896px; margin: 0 auto;">
             <h1>"Checkbox"</h1>
             <Demo>
-                <Checkbox value>"Click"</Checkbox>
+                <Checkbox value=checked>"Click"</Checkbox>
                 <DemoCode
                     slot
                     html=highlight_str!(
diff --git a/src/mobile/nav_bar/mod.rs b/src/mobile/nav_bar/mod.rs
index 40ea785..9a8b8bf 100644
--- a/src/mobile/nav_bar/mod.rs
+++ b/src/mobile/nav_bar/mod.rs
@@ -12,37 +12,37 @@ pub fn NavBar(
 ) -> impl IntoView {
     mount_style("nav-bar", include_str!("./nav-bar.css"));
 
-    let on_click_left = SignalSetter::map(move |ev| {
+    let on_click_left = move |ev| {
         if let Some(click_left) = click_left.as_ref() {
             click_left.call(ev);
         }
-    });
+    };
 
-    let on_click_right = SignalSetter::map(move |ev| {
+    let on_click_right = move |ev| {
         if let Some(click_right) = click_right.as_ref() {
             click_right.call(ev);
         }
-    });
+    };
 
     view! {
         <div class="melt-nav-bar">
             <If cond=MaybeSignal::derive(move || left_arrow.get() || !left_text.get().is_empty())>
                 <Then slot>
-                    <div class="melt-nav-bar__left" on:click=move |ev| on_click_left.set(ev)>
+                    <div class="melt-nav-bar__left" on:click=on_click_left>
                         <If cond=left_arrow>
                             <Then slot>
                                 <Icon icon=Icon::from(AiIcon::AiLeftOutlined)/>
                             </Then>
                         </If>
-                        {left_text.get()}
+                        {move || left_text.get()}
                     </div>
                 </Then>
             </If>
             <div class="melt-nav-bar__center">{move || title.get()}</div>
             <If cond=MaybeSignal::derive(move || !right_text.get().is_empty())>
                 <Then slot>
-                    <div class="melt-nav-bar__right" on:click=move |ev| on_click_right.set(ev)>
-                        {right_text.get()}
+                    <div class="melt-nav-bar__right" on:click=on_click_right>
+                        {move || right_text.get()}
                     </div>
                 </Then>
             </If>