From bfec51713cd74430a4ecc544d378eaa17997ead5 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Mon, 9 Oct 2023 20:56:30 +0800
Subject: [PATCH] fix: NavBar click

---
 src/mobile/nav_bar/mod.rs | 17 +++++++++--------
 src/slider/mod.rs         |  5 +++--
 src/tabs/mod.rs           | 10 ++++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/mobile/nav_bar/mod.rs b/src/mobile/nav_bar/mod.rs
index dd60b4e..40ea785 100644
--- a/src/mobile/nav_bar/mod.rs
+++ b/src/mobile/nav_bar/mod.rs
@@ -12,22 +12,23 @@ pub fn NavBar(
 ) -> impl IntoView {
     mount_style("nav-bar", include_str!("./nav-bar.css"));
 
-    let on_click_left = move |ev| {
-        if let Some(click_left) = click_left {
+    let on_click_left = SignalSetter::map(move |ev| {
+        if let Some(click_left) = click_left.as_ref() {
             click_left.call(ev);
         }
-    };
-    let on_click_right = move |ev| {
-        if let Some(click_right) = click_right {
+    });
+
+    let on_click_right = SignalSetter::map(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=on_click_left>
+                    <div class="melt-nav-bar__left" on:click=move |ev| on_click_left.set(ev)>
                         <If cond=left_arrow>
                             <Then slot>
                                 <Icon icon=Icon::from(AiIcon::AiLeftOutlined)/>
@@ -40,7 +41,7 @@ pub fn NavBar(
             <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=on_click_right>
+                    <div class="melt-nav-bar__right" on:click=move |ev| on_click_right.set(ev)>
                         {right_text.get()}
                     </div>
                 </Then>
diff --git a/src/slider/mod.rs b/src/slider/mod.rs
index 56d14dc..89da2e4 100644
--- a/src/slider/mod.rs
+++ b/src/slider/mod.rs
@@ -78,8 +78,9 @@ pub fn Slider(
                 class="melt-slider-handle"
                 style=move || {
                     format!(
-                        "left: {}%; transform: translateX(-{}%)", percentage.get(), percentage
-                        .get(),
+                        "left: {}%; transform: translateX(-{}%)",
+                        percentage.get(),
+                        percentage.get(),
                     )
                 }
             >
diff --git a/src/tabs/mod.rs b/src/tabs/mod.rs
index 2a6af9b..6a7abde 100644
--- a/src/tabs/mod.rs
+++ b/src/tabs/mod.rs
@@ -42,10 +42,12 @@ pub fn Tabs(active_key: RwSignal<&'static str>, children: Children) -> impl Into
                     children=move |options| {
                         let label_ref = create_node_ref::<html::Span>();
                         create_effect(move |_| {
-                            let Some(label) = label_ref.get() else { return;
-                        };
-                            let Some(label_list) = label_list_ref.get() else { return;
-                        };
+                            let Some(label) = label_ref.get() else {
+                                return;
+                            };
+                            let Some(label_list) = label_list_ref.get() else {
+                                return;
+                            };
                             if options.key == active_key.get() {
                                 request_animation_frame(move || {
                                     let list_rect = label_list.get_bounding_client_rect();