Merge from main

israelsilvabarbara · israelsilvabarbara · commit 28c156755208 · 2024-12-24T09:55:54.000-03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/book-examples/leptos/Cargo.toml b/book-examples/leptos/Cargo.toml
@@ -18,13 +18,15 @@ lucide-leptos = { version = "1.0.0", optional = true }
 log.workspace = true
 radix-leptos-icons = { workspace = true, optional = true }
 shadcn-ui-leptos-alert = { path = "../../packages/leptos/alert" , optional = true }
+shadcn-ui-leptos-badge = { path = "../../packages/leptos/badge", optional = true }
 shadcn-ui-leptos-breadcrumb = { path = "../../packages/leptos/breadcrumb", optional = true }
 shadcn-ui-leptos-button = { path = "../../packages/leptos/button", optional = true }
 shadcn-ui-leptos-card = { path = "../../packages/leptos/card", optional = true }
 
 [features]
 default = [
     "alert",
+    "badge",
     "breadcrumb",
     "button",
     "card",
@@ -34,6 +36,7 @@ alert = [
     "dep:radix-leptos-icons",
     "dep:shadcn-ui-leptos-alert",
 ]
+badge = ["dep:shadcn-ui-leptos-badge"]
 breadcrumb = [
     "dep:lucide-leptos",
     "dep:radix-leptos-icons",
diff --git a/book-examples/leptos/src/default.rs b/book-examples/leptos/src/default.rs
@@ -3,6 +3,9 @@ mod components;
 #[cfg(feature = "alert")]
 mod alert;
 
+#[cfg(feature = "badge")]
+mod badge;
+
 #[cfg(feature = "breadcrumb")]
 mod breadcrumb;
 
@@ -25,6 +28,10 @@ pub fn Default() -> impl MatchNestedRoutes + Clone {
         {
             component_view(self::alert::AlertRoutes, ())
         },
+        #[cfg(feature = "badge")]
+        {
+            component_view(self::badge::BadgeRoutes, ())
+        },
         #[cfg(feature = "breadcrumb")]
         {
             component_view(self::breadcrumb::BreadcrumbRoutes, ())
diff --git a/book-examples/leptos/src/default/badge.rs b/book-examples/leptos/src/default/badge.rs
@@ -0,0 +1,24 @@
+#[allow(clippy::module_inception)]
+mod badge;
+mod badge_destructive;
+mod badge_outline;
+mod badge_secondary;
+
+use leptos::prelude::*;
+use leptos_router::{
+    components::{Outlet, ParentRoute, Route},
+    path, MatchNestedRoutes,
+};
+
+#[component(transparent)]
+pub fn BadgeRoutes() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <ParentRoute path=path!("/badge") view=Outlet>
+            <Route path=path!("/") view=badge::BadgeDemo />
+            <Route path=path!("/destructive") view=badge_destructive::BadgeDestructive />
+            <Route path=path!("/outline") view=badge_outline::BadgeOutline />
+            <Route path=path!("/secondary") view=badge_secondary::BadgeSecondary />
+        </ParentRoute>
+    }
+    .into_inner()
+}
diff --git a/book-examples/leptos/src/default/badge/badge.rs b/book-examples/leptos/src/default/badge/badge.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::default::components::ui::badge::Badge;
+
+#[component]
+pub fn BadgeDemo() -> impl IntoView {
+    view! {
+        <Badge>{"Badge"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/default/badge/badge_destructive.rs b/book-examples/leptos/src/default/badge/badge_destructive.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::default::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeDestructive() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Destructive}>{"Destructive"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/default/badge/badge_outline.rs b/book-examples/leptos/src/default/badge/badge_outline.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::default::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeOutline() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Outline}>{"Outline"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/default/badge/badge_secondary.rs b/book-examples/leptos/src/default/badge/badge_secondary.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::default::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeSecondary() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Secondary}>{"Secondary"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/default/components/ui.rs b/book-examples/leptos/src/default/components/ui.rs
@@ -3,6 +3,9 @@
 #[cfg(feature = "alert")]
 pub use shadcn_ui_leptos_alert::default as alert;
 
+#[cfg(feature = "badge")]
+pub use shadcn_ui_leptos_badge::default as badge;
+
 #[cfg(feature = "breadcrumb")]
 pub use shadcn_ui_leptos_breadcrumb::default as breadcrumb;
 
diff --git a/book-examples/leptos/src/new_york.rs b/book-examples/leptos/src/new_york.rs
@@ -3,6 +3,9 @@ mod components;
 #[cfg(feature = "alert")]
 mod alert;
 
+#[cfg(feature = "badge")]
+mod badge;
+
 #[cfg(feature = "breadcrumb")]
 mod breadcrumb;
 
@@ -25,6 +28,10 @@ pub fn NewYork() -> impl MatchNestedRoutes + Clone {
         {
             component_view(self::alert::AlertRoutes, ())
         },
+        #[cfg(feature = "badge")]
+        {
+            component_view(self::badge::BadgeRoutes, ())
+        },
         #[cfg(feature = "breadcrumb")]
         {
             component_view(self::breadcrumb::BreadcrumbRoutes, ())
diff --git a/book-examples/leptos/src/new_york/badge.rs b/book-examples/leptos/src/new_york/badge.rs
@@ -0,0 +1,24 @@
+#[allow(clippy::module_inception)]
+mod badge;
+mod badge_destructive;
+mod badge_outline;
+mod badge_secondary;
+
+use leptos::prelude::*;
+use leptos_router::{
+    components::{Outlet, ParentRoute, Route},
+    path, MatchNestedRoutes,
+};
+
+#[component(transparent)]
+pub fn BadgeRoutes() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <ParentRoute path=path!("/badge") view=Outlet>
+            <Route path=path!("/") view=badge::BadgeDemo />
+            <Route path=path!("/destructive") view=badge_destructive::BadgeDestructive />
+            <Route path=path!("/outline") view=badge_outline::BadgeOutline />
+            <Route path=path!("/secondary") view=badge_secondary::BadgeSecondary />
+        </ParentRoute>
+    }
+    .into_inner()
+}
diff --git a/book-examples/leptos/src/new_york/badge/badge.rs b/book-examples/leptos/src/new_york/badge/badge.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::new_york::components::ui::badge::Badge;
+
+#[component]
+pub fn BadgeDemo() -> impl IntoView {
+    view! {
+        <Badge>{"Badge"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/new_york/badge/badge_destructive.rs b/book-examples/leptos/src/new_york/badge/badge_destructive.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::new_york::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeDestructive() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Destructive}>{"Destructive"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/new_york/badge/badge_outline.rs b/book-examples/leptos/src/new_york/badge/badge_outline.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::new_york::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeOutline() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Outline}>{"Outline"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/new_york/badge/badge_secondary.rs b/book-examples/leptos/src/new_york/badge/badge_secondary.rs
@@ -0,0 +1,10 @@
+use leptos::prelude::*;
+
+use crate::new_york::components::ui::badge::{Badge, BadgeVariant};
+
+#[component]
+pub fn BadgeSecondary() -> impl IntoView {
+    view! {
+        <Badge variant={BadgeVariant::Secondary}>{"Secondary"}</Badge>
+    }
+}
diff --git a/book-examples/leptos/src/new_york/components/ui.rs b/book-examples/leptos/src/new_york/components/ui.rs
@@ -3,6 +3,9 @@
 #[cfg(feature = "alert")]
 pub use shadcn_ui_leptos_alert::new_york as alert;
 
+#[cfg(feature = "badge")]
+pub use shadcn_ui_leptos_badge::new_york as badge;
+
 #[cfg(feature = "breadcrumb")]
 pub use shadcn_ui_leptos_breadcrumb::new_york as breadcrumb;
 
diff --git a/packages/leptos/badge/Cargo.toml b/packages/leptos/badge/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "shadcn-ui-leptos-badge"
+description = "Leptos port of shadcn/ui Badge."
+homepage = "https://shadcn-ui.rustforweb.org/components/badge.html"
+publish = false
+
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+version.workspace = true
+
+[dependencies]
+tailwind_fuse.workspace = true
+leptos.workspace = true
+leptos-node-ref.workspace = true
+leptos-style.workspace = true
diff --git a/packages/leptos/badge/README.md b/packages/leptos/badge/README.md
@@ -0,0 +1,21 @@
+<p align="center">
+    <a href="../../../logo.svg">
+        <img src="../../../logo.svg" width="300" height="200" alt="Rust shadcn/ui Logo">
+    </a>
+</p>
+
+<h1 align="center">shadcn-ui-leptos-badge</h1>
+
+Displays a badge or a component that looks like a badge.
+
+[Rust shadcn/ui](https://github.com/RustForWeb/shadcn-ui) is a Rust port of [shadcn/ui](https://ui.shadcn.com/).
+
+## Documentation
+
+See [the Rust shadcn/ui book](https://shadcn-ui.rustforweb.org/) for documentation.
+
+## Rust For Web
+
+The Rust shadcn/ui project is part of the [Rust For Web](https://github.com/RustForWeb).
+
+[Rust For Web](https://github.com/RustForWeb) creates and ports web UI libraries for Rust. All projects are free and open source.
diff --git a/packages/leptos/badge/src/default.rs b/packages/leptos/badge/src/default.rs
@@ -0,0 +1,61 @@
+use leptos::prelude::*;
+use leptos_node_ref::AnyNodeRef;
+use leptos_style::Style;
+use tailwind_fuse::*;
+
+#[derive(TwClass)]
+#[tw(
+    class = "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"
+)]
+pub struct BadgeClass {
+    pub variant: BadgeVariant,
+}
+
+#[derive(PartialEq, TwVariant)]
+pub enum BadgeVariant {
+    #[tw(
+        default,
+        class = "border-transparent bg-primary text-primary-foreground hover:bg-primary/80"
+    )]
+    Default,
+    #[tw(
+        class = "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80"
+    )]
+    Secondary,
+    #[tw(
+        class = "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80"
+    )]
+    Destructive,
+    #[tw(class = "text-foreground")]
+    Outline,
+}
+
+#[component]
+pub fn Badge(
+    #[prop(into, optional)] variant: Signal<BadgeVariant>,
+    // Global attributes
+    #[prop(into, optional)] class: MaybeProp<String>,
+    #[prop(into, optional)] id: MaybeProp<String>,
+    #[prop(into, optional)] style: Signal<Style>,
+
+    #[prop(into, optional)] node_ref: AnyNodeRef,
+    children: Children,
+) -> impl IntoView {
+    let class = Memo::new(move |_| {
+        BadgeClass {
+            variant: variant.get(),
+        }
+        .with_class(class.get().unwrap_or_default())
+    });
+
+    view! {
+        <div
+            node_ref=node_ref
+            class=class
+            id=move || id.get()
+            style=style
+        >
+            {children()}
+        </div>
+    }
+}
diff --git a/packages/leptos/badge/src/lib.rs b/packages/leptos/badge/src/lib.rs
@@ -0,0 +1,8 @@
+//! Leptos port of [shadcn/ui Badge](https://ui.shadcn.com/docs/components/badge).
+//!
+//! Displays a badge or a component that looks like a badge.
+//!
+//! See [the Rust shadcn/ui book](https://shadcn-ui.rustforweb.org/components/badge.html) for more documenation.
+
+pub mod default;
+pub mod new_york;
diff --git a/packages/leptos/badge/src/new_york.rs b/packages/leptos/badge/src/new_york.rs
