fix(leptos): some little issues on leptos

Author: SergioRibera

crates/leptos/Cargo.toml

@@ -6,4 +6,7 @@ edition = "2024"
 [dependencies]
 leptos = { version = "0.8.2", default-features = false }
 components-core = { package = "rustlanges-components-core", version = "0.1.0", path = "../core" }
-tailwind_fuse = { version = "0.3", features = ["variant", "tailwind_fuse_macro"] }
+tailwind_fuse = { version = "0.3", features = [
+    "variant",
+    "tailwind_fuse_macro",
+] }

crates/leptos/src/button.rs

@@ -1,36 +1,30 @@
 use components_core::{BASE_CLASS, concat};
 use leptos::prelude::*;
-use tailwind_fuse::{AsTailwindClass, TwVariant};
 
-#[derive(TwVariant, PartialEq)]
+#[derive(Default, Debug, PartialEq)]
 pub enum Variant {
-    #[tw(default, class = "rustlanges-button--primary")]
+    #[default]
     Primary,
-    #[tw(class = "rustlanges-button--secondary")]
     Secondary,
-    #[tw(class = "rustlanges-button--text")]
     Text,
-    #[tw(class = "rustlanges-button--icon")]
     Icon,
 }
 
-#[component]
+#[component(transparent)]
 pub fn Button(
     #[prop(into, optional)] variant: Variant,
     #[prop(into, optional)] label: String,
     #[prop(into, optional)] class: String,
-    #[prop(into)] icon: Option<Children>,
+    attrs: Vec<(&'static str, Attribute)>,
+    icon: View<impl IntoView + Send + Sync>,
 ) -> impl IntoView {
-    let class = crate::tw!(
-        variant,
-        concat!("text-button ", BASE_CLASS, "-button"),
-        class
-    );
+    let var = format!("{}{variant:?}", concat!(BASE_CLASS, "-button", "--"));
+    let class = crate::tw!("text-button", var, concat!(BASE_CLASS, "-button"), class);
 
     view! {
-        <button class={class}>
+        <button class={class} {..attrs}>
             {(variant != Variant::Icon).then_some(label)}
-            {(variant == Variant::Icon).then(|| icon.map(|icon| icon())).flatten()}
+            {(variant == Variant::Icon).then(|| icon.into_view())}
         </button>
     }
 }

crates/leptos/src/card.rs

@@ -3,7 +3,7 @@ use leptos::prelude::*;
 
 #[component]
 pub fn Card(
-    #[prop(into)] child: Children,
+    children: Children,
     #[prop(into, optional)] class: String,
     #[prop(into, optional, default = false)] clickable: bool,
     #[prop(into, optional, default = false)] disabled: bool,
@@ -17,7 +17,7 @@ pub fn Card(
 
     view! {
         <div class={class}>
-            {child()}
+            {children()}
         </div>
     }
 }

crates/leptos/src/input.rs

@@ -28,7 +28,7 @@ pub fn Input(
                 {icon.map(|icon| view! { <span class={concat!(BASE_CLASS, "-input__icon")}>{icon()}</span> })}
                 <input
                     class={concat!(BASE_CLASS, "-input__inner")}
-                    disabled=disabled
+                    disabled=disabled.get()
                 />
             </div>
             {has_error.get().then_some(