Feat: yeet, synthetic somewhat wired up

packages/core-macro/src/rsxt.rs

@@ -342,6 +342,7 @@ impl Parse for Attr {
 impl ToTokens for ToToksCtx<&Attr> {
     fn to_tokens(&self, tokens: &mut TokenStream2) {
         let name = self.inner.name.to_string();
+        let nameident = &self.inner.name;
         let mut attr_stream = TokenStream2::new();
         match &self.inner.ty {
             AttrType::Value(value) => {
@@ -352,13 +353,15 @@ impl ToTokens for ToToksCtx<&Attr> {
             }
             AttrType::Event(event) => {
                 tokens.append_all(quote! {
-                    .on(#name, #event)
+                    .add_listener(dioxus::events::on::#nameident(ctx, #event))
                 });
+                // .on(#name, #event)
             }
             AttrType::Tok(exp) => {
                 tokens.append_all(quote! {
-                    .on(#name, #exp)
+                    .add_listener(dioxus::events::on::#nameident(ctx, #exp))
                 });
+                // .on(#name, #exp)
             }
         }
     }

packages/core/src/events.rs

@@ -93,7 +93,7 @@ pub mod on {
             };
         }
 
-    struct GetModifierKey(Box<dyn Fn(usize) -> bool>);
+    pub struct GetModifierKey(pub Box<dyn Fn(usize) -> bool>);
     impl std::fmt::Debug for GetModifierKey {
         fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
             // just skip for now
@@ -159,7 +159,7 @@ pub mod on {
     }
 
     #[derive(Debug)]
-    pub struct MouseEvent(Box<RawMouseEvent>);
+    pub struct MouseEvent(pub Box<RawMouseEvent>);
     impl Deref for MouseEvent {
         type Target = RawMouseEvent;
         fn deref(&self) -> &Self::Target {
@@ -168,19 +168,19 @@ pub mod on {
     }
     #[derive(Debug)]
     pub struct RawMouseEvent {
-        alt_key: bool,
-        button: usize,
-        buttons: usize,
-        client_x: i32,
-        client_y: i32,
-        ctrl_key: bool,
-        meta_key: bool,
-        page_x: i32,
-        page_y: i32,
-        screen_x: i32,
-        screen_y: i32,
-        shift_key: bool,
-        get_modifier_state: GetModifierKey,
+        pub alt_key: bool,
+        pub button: i32,
+        pub buttons: i32,
+        pub client_x: i32,
+        pub client_y: i32,
+        pub ctrl_key: bool,
+        pub meta_key: bool,
+        pub page_x: i32,
+        pub page_y: i32,
+        pub screen_x: i32,
+        pub screen_y: i32,
+        pub shift_key: bool,
+        pub get_modifier_state: GetModifierKey,
         // relatedTarget: DOMEventTarget,
     }
     event_builder! {

packages/core/src/hooks.rs

@@ -178,7 +178,6 @@ mod use_reducer_def {
         use super::*;
         use crate::prelude::*;
         use bumpalo::Bump;
-
         enum Actions {
             Incr,
             Decr,

packages/core/src/nodebuilder.rs

@@ -339,18 +339,18 @@ where
     ///     })
     ///     .finish();
     /// ```
-    #[inline]
     pub fn on(mut self, event: &'static str, callback: impl Fn(VirtualEvent) + 'a) -> Self {
-        // todo:
-        // increment listner id from nodectx ref
-        // add listener attrs here instead of later?
-
-        self.listeners.push(Listener {
+        let listener = Listener {
             event,
             callback: self.ctx.bump.alloc(callback),
             id: *self.ctx.idx.borrow(),
             scope: self.ctx.scope,
-        });
+        };
+        self.add_listener(listener)
+    }
+
+    pub fn add_listener(mut self, listener: Listener<'a>) -> Self {
+        self.listeners.push(listener);
 
         // bump the context id forward
         *self.ctx.idx.borrow_mut() += 1;

packages/web/examples/infer.rs

@@ -0,0 +1,25 @@
+use dioxus_core::{events::on::MouseEvent, prelude::*};
+use dioxus_web::WebsysRenderer;
+
+fn main() {
+    // Setup logging
+    wasm_logger::init(wasm_logger::Config::new(log::Level::Debug));
+    console_error_panic_hook::set_once();
+
+    wasm_bindgen_futures::spawn_local(WebsysRenderer::start(Example));
+}
+
+static Example: FC<()> = |ctx, _props| {
+    let handler = move |evt: MouseEvent| {
+        // Awesome!
+        // We get type inference with events
+        dbg!(evt.alt_key);
+    };
+
+    ctx.render(rsx! {
+        button {
+            "Hello"
+            onclick: {handler}
+        }
+    })
+};

packages/web/examples/rsxt.rs

@@ -16,6 +16,7 @@ fn main() {
 static Example: FC<()> = |ctx, props| {
     let (name, set_name) = use_state(&ctx, || "...?");
 
+    
 
     ctx.render(rsx! {
         div { 

packages/web/src/interpreter.rs

@@ -1,7 +1,7 @@
-use std::{borrow::Borrow, fmt::Debug, sync::Arc};
+use std::{borrow::Borrow, convert::TryInto, fmt::Debug, sync::Arc};
 
 use dioxus_core::{
-    events::{EventTrigger, MouseEvent, VirtualEvent},
+    events::{EventTrigger, VirtualEvent},
     patch::Edit,
     prelude::ScopeIdx,
 };
@@ -481,30 +481,34 @@ impl PatchMachine {
             Edit::RemoveKnown => {}
         }
     }
-
-    // // 24
-    // pub fn save_template(&mut self, id: CacheId) {
-    //     let template = self.stack.top();
-    //     let t = template.clone_node_with_deep(true).unwrap();
-    //     // self.templates.insert(id, t);
-    // }
-
-    // // 25
-    // pub fn push_template(&mut self, id: CacheId) {
-    //     let template = self.get_template(id).unwrap();
-    //     let t = template.clone_node_with_deep(true).unwrap();
-    //     self.stack.push(t);
-    // }
-
-    // pub fn has_template(&self, id: CacheId) -> bool {
-    //     todo!()
-    //     // self.templates.contains_key(&id)
-    // }
 }
 
 fn virtual_event_from_websys_event(event: &web_sys::Event) -> VirtualEvent {
+    use dioxus_core::events::on::*;
     match event.type_().as_str() {
-        "click" => VirtualEvent::MouseEvent(MouseEvent {}),
+        "click" | "contextmenu" | "doubleclick" | "drag" | "dragend" | "dragenter" | "dragexit"
+        | "dragleave" | "dragover" | "dragstart" | "drop" | "mousedown" | "mouseenter"
+        | "mouseleave" | "mousemove" | "mouseout" | "mouseover" | "mouseup" => {
+            let evt: web_sys::MouseEvent = event.clone().dyn_into().unwrap();
+            VirtualEvent::MouseEvent(MouseEvent(Box::new(RawMouseEvent {
+                alt_key: evt.alt_key(),
+                button: evt.button() as i32,
+                buttons: evt.buttons() as i32,
+                client_x: evt.client_x(),
+                client_y: evt.client_y(),
+                ctrl_key: evt.ctrl_key(),
+                meta_key: evt.meta_key(),
+                page_x: evt.page_x(),
+                page_y: evt.page_y(),
+                screen_x: evt.screen_x(),
+                screen_y: evt.screen_y(),
+                shift_key: evt.shift_key(),
+                get_modifier_state: GetModifierKey(Box::new(|f| {
+                    // evt.get_modifier_state(f)
+                    todo!("This is not yet implemented properly, sorry :(");
+                })),
+            })))
+        }
         _ => VirtualEvent::OtherEvent,
     }
 }