重构优化

src/components/ui/aspect_ratio.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn AspectRatio(
     #[props(default = 1.0f32)] ratio: f32,

src/components/ui/calendar.rs

@@ -1,14 +1,6 @@
 use chrono::{Datelike, Duration, NaiveDate};
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 const WEEKDAY_LABELS: [&str; 7] = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
 
 fn first_day_of_month(date: NaiveDate) -> NaiveDate {

src/components/ui/card.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Card(#[props(into, default)] class: Option<String>, children: Element) -> Element {
     let classes = merge_class("ui-card", class);

src/components/ui/checkbox.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Checkbox(
     #[props(default)] checked: bool,

src/components/ui/collapsible.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone)]
 struct CollapsibleContext {
     open: Signal<bool>,

src/components/ui/combobox.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone, PartialEq)]
 pub struct ComboboxOption {
     pub label: String,

src/components/ui/date_range_picker.rs

@@ -1,18 +1,10 @@
 use super::button::{Button, ButtonSize, ButtonVariant};
 use chrono::{Datelike, Duration, NaiveDate};
 use dioxus::prelude::*;
-#[cfg(not(target_arch = "wasm32"))]
+use super::utils::merge_class;#[cfg(not(target_arch = "wasm32"))]
 use std::time::SystemTime;
 use crate::components::ui::PopoverHandle;
 
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct DateRange {
     pub start: NaiveDate,

src/components/ui/file_drop_zone.rs

@@ -1,15 +1,7 @@
 use dioxus::html::events::{DragEvent, FormEvent};
 use dioxus::html::{FileData, HasFileData};
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct FileMetadata {
     pub name: String,

src/components/ui/form_field.rs

@@ -1,14 +1,6 @@
 use crate::components::ui::Label;
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum FormMessageVariant {
     Helper,

src/components/ui/input.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Input(
     #[props(into, default)] class: Option<String>,

src/components/ui/label.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Label(
     #[props(into, default)] class: Option<String>,

src/components/ui/mod.rs

@@ -2,6 +2,8 @@
 //! Each component mirrors the styling and API conventions of the upstream React components while
 //! remaining idiomatic to Rust and Dioxus.
 
+mod utils;
+
 mod accordion;
 mod alert;
 mod aspect_ratio;

src/components/ui/progress.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Progress(
     #[props(default = 0.0f32)] value: f32,

src/components/ui/radio_group.rs

@@ -1,15 +1,7 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 static RADIO_GROUP_IDS: AtomicUsize = AtomicUsize::new(0);
 
 fn next_radio_group_name() -> String {

src/components/ui/scroll_area.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn ScrollArea(
     #[props(into, default)] class: Option<String>,

src/components/ui/separator.rs

@@ -1,5 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum SeparatorOrientation {
     Horizontal,
@@ -21,14 +21,6 @@ impl Default for SeparatorOrientation {
     }
 }
 
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Separator(
     #[props(default)] orientation: SeparatorOrientation,

src/components/ui/sidebar.rs

@@ -1,21 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::{merge_class, data_bool};
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
-fn data_bool(value: bool) -> &'static str {
-    if value {
-        "true"
-    } else {
-        "false"
-    }
-}
-
 #[component]
 pub fn Sidebar(
     #[props(default)] collapsed: bool,

src/components/ui/skeleton.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Skeleton(
     #[props(into, default)] class: Option<String>,

src/components/ui/slider.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Slider(
     #[props(default = 0.0f32)] value: f32,

src/components/ui/switch.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Switch(
     #[props(default)] checked: bool,

src/components/ui/table.rs

@@ -6,15 +6,7 @@ use std::{
 
 use crate::components::ui::Checkbox;
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Table(#[props(into, default)] class: Option<String>, children: Element) -> Element {
     let classes = merge_class("ui-table", class);

src/components/ui/tabs.rs

@@ -1,6 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-#[allow(dead_code)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum TabsOrientation {
     Horizontal,
@@ -28,14 +27,6 @@ struct TabsContext {
     on_change: Option<EventHandler<String>>,
 }
 
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Tabs(
     #[props(into)] default_value: String,

src/components/ui/textarea.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Textarea(
     #[props(into, default)] class: Option<String>,

src/components/ui/toggle.rs

@@ -1,13 +1,5 @@
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[component]
 pub fn Toggle(
     #[props(default)] pressed: bool,

src/components/ui/toggle_group.rs

@@ -1,14 +1,6 @@
 use crate::components::ui::Toggle;
 use dioxus::prelude::*;
-
+use super::utils::merge_class;
-fn merge_class(base: &str, extra: Option<String>) -> String {
-    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
-        format!("{base} {}", extra.trim())
-    } else {
-        base.to_string()
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ToggleGroupMode {
     Single,

src/components/ui/utils.rs

@@ -0,0 +1,48 @@
+/// Merge a base CSS class with an optional extra class string.
+/// If the extra string is empty or only whitespace, returns just the base class.
+pub fn merge_class(base: &str, extra: Option<String>) -> String {
+    if let Some(extra) = extra.filter(|extra| !extra.trim().is_empty()) {
+        format!("{base} {}", extra.trim())
+    } else {
+        base.to_string()
+    }
+}
+
+/// Convert a boolean to "true" or "false" string for data attributes.
+pub fn data_bool(value: bool) -> &'static str {
+    if value {
+        "true"
+    } else {
+        "false"
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_merge_class_with_extra() {
+        assert_eq!(
+            merge_class("base", Some("extra".to_string())),
+            "base extra"
+        );
+    }
+
+    #[test]
+    fn test_merge_class_without_extra() {
+        assert_eq!(merge_class("base", None), "base");
+    }
+
+    #[test]
+    fn test_merge_class_with_empty_extra() {
+        assert_eq!(merge_class("base", Some("".to_string())), "base");
+        assert_eq!(merge_class("base", Some("   ".to_string())), "base");
+    }
+
+    #[test]
+    fn test_data_bool() {
+        assert_eq!(data_bool(true), "true");
+        assert_eq!(data_bool(false), "false");
+    }
+}