Use Callback instead of Out when dealing with events

LasseKau · Mar 9, 2024 · cccdb79 · cccdb79
1 parent e3c2622
commit cccdb79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/leptonic/src/atoms/button.rs b/leptonic/src/atoms/button.rs
@@ -10,16 +10,16 @@ use crate::{
         press::{PressEvent, UsePressInput},
     },
     utils::aria::{AriaExpanded, AriaHasPopup},
-    OptMaybeSignal, Out,
+    OptMaybeSignal,
 };
 
 use super::AttributeExt;
 
 #[component]
 pub fn Button(
-    #[prop(into, optional)] on_press: Option<Out<PressEvent>>,
-    #[prop(into, optional)] on_hover_start: Option<Out<HoverStartEvent>>,
-    #[prop(into, optional)] on_hover_end: Option<Out<HoverEndEvent>>,
+    #[prop(into, optional)] on_press: Option<Callback<PressEvent>>,
+    #[prop(into, optional)] on_hover_start: Option<Callback<HoverStartEvent>>,
+    #[prop(into, optional)] on_hover_end: Option<Callback<HoverEndEvent>>,
     #[prop(into, optional)] disabled: OptMaybeSignal<bool>,
     #[prop(into, optional)] id: Option<AttributeValue>,
     #[prop(into, optional)] class: Option<AttributeValue>,
@@ -41,7 +41,7 @@ pub fn Button(
         use_press_input: UsePressInput {
             disabled: disabled.or(false),
             on_press: Callback::new(move |e| match on_press {
-                Some(on_press) => on_press.set(e),
+                Some(on_press) => Callback::call(&on_press, e),
                 None => {}
             }),
             on_press_up: None,

diff --git a/leptonic/src/components/button.rs b/leptonic/src/components/button.rs
@@ -12,9 +12,8 @@ use crate::{
         hover::{HoverEndEvent, HoverStartEvent},
         press::PressEvent,
     },
-    prelude::Consumer,
     utils::aria::{AriaExpanded, AriaHasPopup},
-    OptMaybeSignal, Out,
+    OptMaybeSignal,
 };
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
@@ -97,7 +96,7 @@ impl Display for ButtonSize {
 
 #[component]
 pub fn Button(
-    #[prop(into)] on_press: Out<PressEvent>,
+    #[prop(into)] on_press: Callback<PressEvent>,
     #[prop(into, optional)] variant: OptMaybeSignal<ButtonVariant>,
     #[prop(into, optional)] color: OptMaybeSignal<ButtonColor>,
     #[prop(into, optional)] size: OptMaybeSignal<ButtonSize>,