feat: upgrade syntax

packages/web/src/dom.rs

@@ -7,17 +7,12 @@
 //! - tests to ensure dyn_into works for various event types.
 //! - Partial delegation?>
 
-use dioxus_core::{
-    events::{KeyCode, UserEvent},
-    mutations::NodeRefMutation,
-    scheduler::SchedulerMsg,
-    DomEdit, ElementId, ScopeId,
-};
+use dioxus_core::{DomEdit, ElementId, SchedulerMsg, ScopeId, UserEvent};
 use fxhash::FxHashMap;
-use std::{any::Any, fmt::Debug, rc::Rc, sync::Arc};
+use std::{any::Any, fmt::Debug, rc::Rc};
 use wasm_bindgen::{closure::Closure, JsCast};
 use web_sys::{
-    Attr, CssStyleDeclaration, Document, Element, Event, HtmlElement, HtmlInputElement,
+    CssStyleDeclaration, Document, Element, Event, HtmlElement, HtmlInputElement,
     HtmlOptionElement, HtmlTextAreaElement, Node, NodeList,
 };
 
@@ -55,7 +50,7 @@ impl WebsysDom {
         let document = load_document();
 
         let mut nodes = NodeSlab::new(2000);
-        let mut listeners = FxHashMap::default();
+        let listeners = FxHashMap::default();
 
         // re-hydrate the page - only supports one virtualdom per page
         if cfg.hydrate {
@@ -90,17 +85,17 @@ impl WebsysDom {
         }
     }
 
-    pub fn apply_refs(&mut self, refs: &[NodeRefMutation]) {
-        for item in refs {
-            if let Some(bla) = &item.element {
-                let node = self.nodes[item.element_id.as_u64() as usize]
-                    .as_ref()
-                    .unwrap()
-                    .clone();
-                bla.set(Box::new(node)).unwrap();
-            }
-        }
-    }
+    // pub fn apply_refs(&mut self, refs: &[NodeRefMutation]) {
+    //     for item in refs {
+    //         if let Some(bla) = &item.element {
+    //             let node = self.nodes[item.element_id.as_u64() as usize]
+    //                 .as_ref()
+    //                 .unwrap()
+    //                 .clone();
+    //             bla.set(Box::new(node)).unwrap();
+    //         }
+    //     }
+    // }
 
     pub fn process_edits(&mut self, edits: &mut Vec<DomEdit>) {
         for edit in edits.drain(..) {
@@ -309,8 +304,8 @@ impl WebsysDom {
         }
     }
 
-    fn remove_event_listener(&mut self, event: &str, root: u64) {
-        // todo!()
+    fn remove_event_listener(&mut self, _event: &str, _root: u64) {
+        todo!()
     }
 
     fn set_text(&mut self, text: &str, root: u64) {
@@ -489,8 +484,9 @@ unsafe impl Sync for DioxusWebsysEvent {}
 // todo: some of these events are being casted to the wrong event type.
 // We need tests that simulate clicks/etc and make sure every event type works.
 fn virtual_event_from_websys_event(event: web_sys::Event) -> Box<dyn Any + Send> {
-    use crate::events::*;
-    use dioxus_core::events::on::*;
+    use dioxus_html::on::*;
+    use dioxus_html::KeyCode;
+    // use dioxus_core::events::on::*;
     match event.type_().as_str() {
         "copy" | "cut" | "paste" => Box::new(ClipboardEvent {}),
         "compositionend" | "compositionstart" | "compositionupdate" => {
@@ -682,15 +678,6 @@ fn decode_trigger(event: &web_sys::Event) -> anyhow::Result<UserEvent> {
 
     let typ = event.type_();
 
-    // TODO: clean this up
-    if cfg!(debug_assertions) {
-        let attrs = target.attributes();
-        for x in 0..attrs.length() {
-            let attr: Attr = attrs.item(x).unwrap();
-            // log::debug!("attrs include: {:#?}, {:#?}", attr.name(), attr.value());
-        }
-    }
-
     use anyhow::Context;
 
     // The error handling here is not very descriptive and needs to be replaced with a zero-cost error system
@@ -716,7 +703,8 @@ fn decode_trigger(event: &web_sys::Event) -> anyhow::Result<UserEvent> {
         name: event_name_from_typ(&typ),
         event: virtual_event_from_websys_event(event.clone()),
         mounted_dom_id: Some(ElementId(real_id as usize)),
-        scope: ScopeId(triggered_scope as usize),
+        scope_id: ScopeId(triggered_scope as usize),
+        priority: dioxus_core::EventPriority::Medium,
     })
 }
 

packages/web/src/events.rs

@@ -1,5 +0,0 @@
-//! Ported events into Dioxus Synthetic Event system
-
-use dioxus_core::events::on::*;
-use wasm_bindgen::JsCast;
-use web_sys::{Event, UiEvent};

packages/web/src/lib.rs

@@ -57,8 +57,8 @@ use std::rc::Rc;
 pub use crate::cfg::WebConfig;
 use crate::dom::load_document;
 use cache::intern_cached_strings;
-use dioxus::prelude::Properties;
-use dioxus::virtual_dom::VirtualDom;
+use dioxus::SchedulerMsg;
+use dioxus::VirtualDom;
 pub use dioxus_core as dioxus;
 use dioxus_core::prelude::FC;
 use futures_util::FutureExt;
@@ -66,7 +66,6 @@ use futures_util::FutureExt;
 mod cache;
 mod cfg;
 mod dom;
-mod events;
 mod nodeslab;
 mod ric_raf;
 
@@ -144,9 +143,10 @@ pub async fn run_with_props<T: 'static + Send>(root: FC<T>, root_props: T, cfg:
 
     let root_el = load_document().get_element_by_id(&cfg.rootname).unwrap();
 
-    let tasks = dom.get_event_sender();
+    let tasks = dom.get_scheduler_channel();
 
-    let sender_callback = Rc::new(move |event| tasks.unbounded_send(event).unwrap());
+    let sender_callback: Rc<dyn Fn(SchedulerMsg)> =
+        Rc::new(move |event| tasks.unbounded_send(event).unwrap());
 
     let mut websys_dom = dom::WebsysDom::new(root_el, cfg, sender_callback);
 
@@ -170,13 +170,12 @@ pub async fn run_with_props<T: 'static + Send>(root: FC<T>, root_props: T, cfg:
         let mut deadline = work_loop.wait_for_idle_time().await;
 
         // run the virtualdom work phase until the frame deadline is reached
-        let mutations = dom.run_with_deadline(|| (&mut deadline).now_or_never().is_some());
+        let mutations = dom.work_with_deadline(|| (&mut deadline).now_or_never().is_some());
 
         // wait for the animation frame to fire so we can apply our changes
         work_loop.wait_for_raf().await;
 
         for mut edit in mutations {
-            // log::debug!("edits are {:#?}", edit);
             // actually apply our changes during the animation frame
             websys_dom.process_edits(&mut edit.edits);
         }