Adopt component macro 0.5.0: required props, Into setters, composed apply

Cargo.toml

@@ -20,7 +20,7 @@ cssparser = "0.34"
 dominator = "0.5"
 futures = "0.3"
 futures-signals = "0.3"
-futures-signals-component-macro = { version = "0.4.0", features = [
+futures-signals-component-macro = { version = "0.5.0", features = [
     "dominator",
 ] }
 gloo-timers = { version = "0.3.0", features = ["futures"] }
@@ -63,3 +63,8 @@ debug = "line-tables-only"
 
 [profile.test]
 debug = "line-tables-only"
+
+# Temporary while developing futures-signals-component-macro 0.5.0; drop once
+# it is published to crates.io.
+[patch.crates-io]
+futures-signals-component-macro = { path = "../../gui/futures-signals-component-macro" }

crates/dwui/src/components/containers/card.rs

@@ -1,7 +1,7 @@
 use crate::theme::prelude::*;
 use dominator::{html, Dom};
 use dwind::prelude::*;
-use futures_signals::signal::{option, SignalExt};
+use futures_signals::signal::SignalExt;
 use futures_signals_component_macro::component;
 
 /// Dictates the color scheme of the component
@@ -23,6 +23,7 @@ pub enum CardPadding {
 #[component(render_fn = card)]
 struct Card {
     #[signal]
+    #[required]
     content: Dom,
 
     #[signal]
@@ -56,6 +57,6 @@ pub fn card(props: CardProps) -> Dom {
         .dwclass_signal!("p-4", padding.signal().map(|v| v == CardPadding::Medium))
         .dwclass_signal!("p-6", padding.signal().map(|v| v == CardPadding::Large))
         .apply_if(apply.is_some(), |b| b.apply(apply.unwrap()))
-        .child_signal(option(content))
+        .child_signal(content.map(Some))
     })
 }

crates/dwui/src/components/content/avatar.rs

@@ -27,11 +27,13 @@ struct Avatar {
     /// Image URL; when `None`, initials derived from `name` are shown
     #[signal]
     #[default(None)]
+    #[into]
     src: Option<String>,
 
     /// Display name; used for the `alt` text and initials fallback
     #[signal]
     #[default("".to_string())]
+    #[into]
     name: String,
 
     #[signal]

crates/dwui/src/components/content/divider.rs

@@ -9,6 +9,7 @@ use futures_signals_component_macro::component;
 struct Divider {
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 }
 

crates/dwui/src/components/content/heading.rs

@@ -1,7 +1,7 @@
 use crate::theme::prelude::*;
 use dominator::{html, Dom};
 use dwind::prelude::*;
-use futures_signals::signal::{option, SignalExt};
+use futures_signals::signal::SignalExt;
 use futures_signals_component_macro::component;
 
 #[derive(Clone, Copy, Eq, PartialEq)]
@@ -58,6 +58,7 @@ impl HeadingLevel {
 #[component(render_fn = heading)]
 struct Heading {
     #[signal]
+    #[required]
     content: Dom,
 
     #[signal]
@@ -85,6 +86,6 @@ pub fn heading(props: HeadingProps) -> Dom {
         .dwclass!("w-auto font-semibold m-0")
         .dwclass!("dwui-text-on-primary-100 is(.light *):dwui-text-on-primary-900")
         .apply_if(apply.is_some(), |b| b.apply(apply.unwrap()))
-        .child_signal(option(content))
+        .child_signal(content.map(Some))
     })
 }

crates/dwui/src/components/content/list.rs

@@ -15,6 +15,7 @@ struct List {
 
     #[signal]
     #[default(None)]
+    #[into]
     selected_index: Option<usize>,
 
     #[default(Box::new(|_|{}))]

crates/dwui/src/components/content/virtual_scroll.rs

@@ -37,7 +37,7 @@ struct VirtualScroll {
     #[default(400.0)]
     height: f64,
 
-    #[default(Box::new(|_| html!("div")))]
+    #[required]
     render_item: dyn Fn(usize) -> Dom + 'static,
 
     #[default(Box::new(|| {}))]
@@ -50,6 +50,7 @@ struct VirtualScroll {
     /// Accessible name for the list
     #[signal]
     #[default("List".to_string())]
+    #[into]
     aria_label: String,
 }
 
@@ -174,7 +175,7 @@ pub fn virtual_scroll(props: VirtualScrollProps) -> Dom {
                         .child(spinner(
                             SpinnerProps::new()
                                 .size(SpinnerSize::Small)
-                                .label("Loading more".to_string()),
+                                .label("Loading more"),
                         ))
                     })
                 })

crates/dwui/src/components/input/checkbox.rs

@@ -23,6 +23,7 @@ struct Checkbox {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[default(Box::new(|_| {}))]

crates/dwui/src/components/input/date_picker.rs

@@ -25,6 +25,7 @@ struct DatePicker {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/input/number_input.rs

@@ -29,14 +29,17 @@ struct NumberInput {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]
     #[default(None)]
+    #[into]
     min: Option<f64>,
 
     #[signal]
     #[default(None)]
+    #[into]
     max: Option<f64>,
 
     #[signal]

crates/dwui/src/components/input/radio_group.rs

@@ -29,6 +29,7 @@ struct RadioGroup {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     value: String,
 
     #[default(Box::new(|_|{}))]
@@ -37,6 +38,7 @@ struct RadioGroup {
     /// Visible group label
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/input/select.rs

@@ -20,6 +20,7 @@ struct Select {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/input/slider.rs

@@ -30,6 +30,7 @@ struct Slider {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/input/switch.rs

@@ -23,6 +23,7 @@ struct Switch {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[default(Box::new(|_| {}))]

crates/dwui/src/components/input/text_area.rs

@@ -30,6 +30,7 @@ struct TextArea {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/input/text_input.rs

@@ -26,6 +26,7 @@ struct TextInput {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     label: String,
 
     #[signal]

crates/dwui/src/components/widgets/accordion.rs

@@ -24,6 +24,7 @@ struct Accordion {
 
     /// Index of the panel that starts open
     #[default(None)]
+    #[into]
     initial_open: Option<usize>,
 }
 

crates/dwui/src/components/widgets/alert.rs

@@ -40,10 +40,12 @@ struct Alert {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     title: String,
 
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
 
     #[signal]

crates/dwui/src/components/widgets/badge.rs

@@ -17,6 +17,7 @@ pub enum BadgeVariant {
 struct Badge {
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
 
     #[signal]

crates/dwui/src/components/widgets/button.rs

@@ -25,6 +25,7 @@ pub enum ButtonSize {
 struct Button {
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
     #[default(Box::new(| _: events::Click | {}))]
     on_click: dyn Fn(events::Click) -> () + 'static,

crates/dwui/src/components/widgets/drawer.rs

@@ -29,6 +29,7 @@ pub enum DrawerSize {
 struct Drawer {
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
 
     #[signal]
@@ -52,6 +53,7 @@ struct Drawer {
 
     #[signal]
     #[default("Drawer".to_string())]
+    #[into]
     aria_label: String,
 }
 

crates/dwui/src/components/widgets/dropdown_menu.rs

@@ -25,6 +25,7 @@ struct DropdownMenu {
     /// Trigger button text
     #[signal]
     #[default("Menu".to_string())]
+    #[into]
     label: String,
 
     #[default(Box::new(|_|{}))]

crates/dwui/src/components/widgets/modal.rs

@@ -73,6 +73,7 @@ pub enum ModalSize {
 struct Modal {
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
 
     #[signal]
@@ -93,6 +94,7 @@ struct Modal {
     /// Accessible name announced by screen readers when the dialog opens
     #[signal]
     #[default("Dialog".to_string())]
+    #[into]
     aria_label: String,
 }
 

crates/dwui/src/components/widgets/pagination.rs

@@ -72,6 +72,7 @@ struct Pagination {
 
     #[signal]
     #[default("Pagination".to_string())]
+    #[into]
     aria_label: String,
 }
 

crates/dwui/src/components/widgets/popover.rs

@@ -25,10 +25,12 @@ pub enum PopoverPosition {
 struct Popover {
     #[signal]
     #[default(None)]
+    #[into]
     anchor: Option<Dom>,
 
     #[signal]
     #[default(None)]
+    #[into]
     content: Option<Dom>,
 
     #[signal]
@@ -44,6 +46,7 @@ struct Popover {
 
     #[signal]
     #[default("Popover".to_string())]
+    #[into]
     aria_label: String,
 }
 

crates/dwui/src/components/widgets/progress.rs

@@ -24,6 +24,7 @@ struct Progress {
     /// Accessible name for the progress bar
     #[signal]
     #[default("Progress".to_string())]
+    #[into]
     label: String,
 }
 

crates/dwui/src/components/widgets/spinner.rs

@@ -22,6 +22,7 @@ struct Spinner {
     /// Accessible label announced while loading
     #[signal]
     #[default("Loading".to_string())]
+    #[into]
     label: String,
 }
 

crates/dwui/src/components/widgets/tab_list.rs

@@ -26,6 +26,7 @@ struct TabList {
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     selected: String,
 
     #[default(Box::new(|_|{}))]
@@ -34,6 +35,7 @@ struct TabList {
     /// Accessible name for the tab list
     #[signal]
     #[default("Tabs".to_string())]
+    #[into]
     aria_label: String,
 }
 

crates/dwui/src/components/widgets/tooltip.rs

@@ -22,10 +22,12 @@ pub enum TooltipPosition {
 struct Tooltip {
     #[signal]
     #[default(None)]
+    #[into]
     anchor: Option<Dom>,
 
     #[signal]
     #[default("".to_string())]
+    #[into]
     text: String,
 
     #[signal]