feat(react): allow unsized WrapFn in html common props

frender-rs · Feb 28, 2022 · 44a5cce · 44a5cce
1 parent 62b7b25
commit 44a5cce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crates/react-html/src/macros/props.rs b/crates/react-html/src/macros/props.rs
@@ -13,7 +13,7 @@ macro_rules! __impl_prop_default {
         { event_handler }
     ) => {
         $($attr)*
-        fn $k <F, A> (mut self, event_handler: Option<react::WrapFn<F, A>>) -> Self
+        fn $k <F: ?Sized, A> (mut self, event_handler: Option<react::WrapFn<F, A>>) -> Self
             where react::WrapFn<F, A>: react::event::IntoJsEventHandler<$v_ty>
         {
             if let Some(event_handler) = event_handler {

diff --git a/crates/react/src/event/handlers.rs b/crates/react/src/event/handlers.rs
@@ -57,14 +57,14 @@ pub trait IntoJsEventHandler<TEvent> {
 }
 
 /// `Fn()` can be handlers for any event
-impl<F: 'static + Fn(), TEvent> IntoJsEventHandler<TEvent> for crate::WrapFn<F, ()> {
+impl<F: 'static + ?Sized + Fn(), TEvent> IntoJsEventHandler<TEvent> for crate::WrapFn<F, ()> {
     fn into_js_event_handler(self) -> crate::PassedToJsRuntime {
         self.safe_into_js_runtime()
     }
 }
 
 /// `Fn(TEvent)` can be handlers for `TEvent`
-impl<F: 'static + Fn(TEvent), TEvent: FromJs> IntoJsEventHandler<TEvent>
+impl<F: 'static + ?Sized + Fn(TEvent), TEvent: FromJs> IntoJsEventHandler<TEvent>
     for crate::WrapFn<F, (TEvent,)>
 where
     TEvent::Error: std::fmt::Debug,

diff --git a/crates/react/src/safe_into_js/closure.rs b/crates/react/src/safe_into_js/closure.rs
@@ -107,7 +107,7 @@ macro_rules! doit {
         ($($var:ident)*)
     )*) => ($(
         #[doc = concat!("WrapFn<TFunc: Fn(", $(stringify!($var), ", ",)* ") -> TR>")]
-        impl<TFunc, $($var,)* R> SafeIntoJsRuntime for WrapFn<TFunc, ($($var,)*)>
+        impl<TFunc: ?Sized, $($var,)* R> SafeIntoJsRuntime for WrapFn<TFunc, ($($var,)*)>
             where $($var: 'static,)*
                   R: 'static,
                   TFunc: Fn($($var),*) -> R + 'static,