From 625feffe518e5d419f7e5da2e5572e69739c5686 Mon Sep 17 00:00:00 2001
From: luoxiao <luoxiaozero@163.com>
Date: Mon, 2 Oct 2023 17:04:03 +0800
Subject: [PATCH] feat: upgrade leptos

---
 Cargo.toml                       | 4 ++--
 gh-pages/Cargo.toml              | 4 ++--
 src/button/mod.rs                | 4 ++--
 src/card/mod.rs                  | 6 +++---
 src/menu/menu_item.rs            | 5 ++++-
 src/mobile/tabbar/tabbar_item.rs | 2 +-
 src/modal/mod.rs                 | 2 +-
 src/select/mod.rs                | 2 +-
 src/tabs/mod.rs                  | 2 +-
 9 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f3bfe51..8b27b9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,10 +13,10 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.5.0-rc2",  features = ["csr"] }
+leptos = { version = "0.5.0",  features = ["csr"] }
 stylers = "0.3.2"
 web-sys = { version = "0.3.62", features = ["DomRect"] }
-leptos_dom = { version = "0.5.0-rc2" }
+leptos_dom = { version = "0.5.0" }
 wasm-bindgen = "0.2.85"
 icondata = { version = "0.0.7", features = [
     "AiCloseOutlined",
diff --git a/gh-pages/Cargo.toml b/gh-pages/Cargo.toml
index 0018052..8c08097 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-rc2", features = ["csr"] }
+leptos = { version = "0.5.0", features = ["csr"] }
 melt-ui = { path = "../" }
 icondata = { version = "0.0.7", features = [
     "AiCloseOutlined",
     "AiCheckOutlined",
 ] }
-leptos_router = { version = "0.5.0-rc2", features = ["csr"] }
+leptos_router = { version = "0.5.0", features = ["csr"] }
 indoc = "2.0.1"
 regex = "1.8.2"
 leptos_devtools = "0.0.1"
diff --git a/src/button/mod.rs b/src/button/mod.rs
index 0ad4853..de4dceb 100644
--- a/src/button/mod.rs
+++ b/src/button/mod.rs
@@ -86,10 +86,10 @@ pub fn Button(
             class=("melt-button--round", move || round.get())
             style=move || format!("{}{}", css_vars.get(), style.get())
             >
-                <OptionComp value=icon bind:icon>
+                <OptionComp value=icon let:icon>
                     <Icon icon=icon style=icon_style/>
                 </OptionComp>
-                <OptionComp value=children bind:children>
+                <OptionComp value=children let:children>
                     { children() }
                 </OptionComp>
         </button>
diff --git a/src/card/mod.rs b/src/card/mod.rs
index 948e665..5f538fd 100644
--- a/src/card/mod.rs
+++ b/src/card/mod.rs
@@ -43,14 +43,14 @@ pub fn Card(
                     <Then slot>
                         <div class="melt-card__header">
                             <div class="melt-card__header-content">
-                                <OptionComp value=header.clone() bind:header>
+                                <OptionComp value=header.clone() let:header>
                                     <Fallback slot>
                                         { title.get() }
                                     </Fallback>
                                     { (header.children)() }
                                 </OptionComp>
                             </div>
-                            <OptionComp value=header_extra.clone() bind:header_extra>
+                            <OptionComp value=header_extra.clone() let:header_extra>
                                 <div class="melt-card__header-extra">
                                     { (header_extra.children)() }
                                 </div>
@@ -61,7 +61,7 @@ pub fn Card(
             <div class="melt-card__content">
                 { children() }
             </div>
-            <OptionComp value=card_footer bind:footer>
+            <OptionComp value=card_footer let:footer>
                 <If cond=footer.if_ >
                     <Then slot>
                         <div class="melt-card__footer">
diff --git a/src/menu/menu_item.rs b/src/menu/menu_item.rs
index 8755763..8f98aa4 100644
--- a/src/menu/menu_item.rs
+++ b/src/menu/menu_item.rs
@@ -22,7 +22,10 @@ pub fn MenuItem(
         css_vars.push_str(&format!("--font-color-active: {font_color};"));
         css_vars.push_str(&format!("--font-color: {};", theme.menu.color));
         css_vars.push_str(&format!("--bg-color: {font_color}1a;"));
-        css_vars.push_str(&format!("--bg-color-hover: {};", theme.menu.item_color_hover));
+        css_vars.push_str(&format!(
+            "--bg-color-hover: {};",
+            theme.menu.item_color_hover
+        ));
         css_vars
     });
     view! { class=class_name,
diff --git a/src/mobile/tabbar/tabbar_item.rs b/src/mobile/tabbar/tabbar_item.rs
index 9bae566..f58f654 100644
--- a/src/mobile/tabbar/tabbar_item.rs
+++ b/src/mobile/tabbar/tabbar_item.rs
@@ -29,7 +29,7 @@ pub fn TabbarItem(
 
     view! { class=class_name,
         <div class="melt-tabbar-item" class=("melt-tabbar-item--selected", move || tabbar.get().value == name.get()) on:click=onclick_select style=move || css_vars.get()>
-            <OptionComp value=icon bind:icon>
+            <OptionComp value=icon let:icon>
                 <Icon icon=icon width="22px" height="22px" class="melt-tabbar-item__icon"/>
             </OptionComp>
             <div class="melt-tabbar-item__content">
diff --git a/src/modal/mod.rs b/src/modal/mod.rs
index d4e5538..c84d009 100644
--- a/src/modal/mod.rs
+++ b/src/modal/mod.rs
@@ -39,7 +39,7 @@ pub fn Modal(
                         </CardHeaderExtra>
                         { children() }
                         <CardFooter slot if_=modal_footer.is_some()>
-                            <OptionComp value=modal_footer.as_ref() bind:footer>
+                            <OptionComp value=modal_footer.as_ref() let:footer>
                                 { (footer.children)() }
                             </OptionComp>
                         </CardFooter>
diff --git a/src/select/mod.rs b/src/select/mod.rs
index 8778e5c..6876b97 100644
--- a/src/select/mod.rs
+++ b/src/select/mod.rs
@@ -90,7 +90,7 @@ where
                 <For
                     each=move || options.get()
                     key=move |item| item.value.clone()
-                    view=move | item| {
+                    children=move | item| {
                         let item = store_value( item);
                         let onclick = move |_| {
                             let SelectOption { value: item_value, label: _ } = item.get_value();
diff --git a/src/tabs/mod.rs b/src/tabs/mod.rs
index 57971dd..ee6ed97 100644
--- a/src/tabs/mod.rs
+++ b/src/tabs/mod.rs
@@ -36,7 +36,7 @@ pub fn Tabs(active_key: RwSignal<&'static str>, children: Children) -> impl Into
     view! {  class=class_name,
         <div class="melt-tabs" style=move || css_vars.get()>
             <div class="melt-tabs__label-list" ref=label_list_ref>
-                <For each=move || tab_options_vec.get() key=move |v| v.key.clone() view=move | options| {
+                <For each=move || tab_options_vec.get() key=move |v| v.key.clone() children=move | options| {
                     let label_ref = create_node_ref::<html::Span>();
                     create_effect( move |_| {
                         let Some(label) = label_ref.get() else {