Switch to owned listener type (#4289)
* Switch to owned listener type * remove html event workaround * fix event conversion * keep track of the origin scope * fix clippy * fix docs * Use "ListenerCallback" instead of "ListenerCb" * Add a small example --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
This commit is contained in:
1 parent
3bf8f09c65
commit
af6fc3a542
5 files changed
+143
-270
No files matched your search
@@ -25,18 +25,15 @@ macro_rules! impl_event {
|
||||
#[doc(alias = $js_name)]
|
||||
)?
|
||||
#[inline]
|
||||
pub fn $name<__Marker>(mut _f: impl ::dioxus_core::prelude::SuperInto<::dioxus_core::prelude::EventHandler<::dioxus_core::Event<$data>>, __Marker>) -> ::dioxus_core::Attribute {
|
||||
// super into will make a closure that is owned by the current owner (either the child component or the parent component).
|
||||
// We can't change that behavior in a minor version because it would cause issues with Components that accept event handlers.
|
||||
// Instead we run super into with an owner that is moved into the listener closure so it will be dropped when the closure is dropped.
|
||||
let owner = <::generational_box::UnsyncStorage as ::generational_box::AnyStorage>::owner();
|
||||
let event_handler = ::dioxus_core::prelude::with_owner(owner.clone(), || _f.super_into());
|
||||
pub fn $name<__Marker>(mut _f: impl ::dioxus_core::prelude::SuperInto<::dioxus_core::ListenerCallback<$data>, __Marker>) -> ::dioxus_core::Attribute {
|
||||
let event_handler = _f.super_into();
|
||||
::dioxus_core::Attribute::new(
|
||||
impl_event!(@name $name $($js_name)?),
|
||||
::dioxus_core::AttributeValue::listener(move |e: ::dioxus_core::Event<crate::PlatformEventData>| {
|
||||
// Force the owner to be moved into the event handler
|
||||
_ = &owner;
|
||||
event_handler.call(e.map(|e| e.into()));
|
||||
let event: ::dioxus_core::Event<$data> = e.map(|data| {
|
||||
data.into()
|
||||
});
|
||||
event_handler.call(event.into_any());
|
||||
}),
|
||||
None,
|
||||
false,
|
||||
|
||||
Reference in new issue
Block a user