feat: more suspended nodes!

packages/web/examples/async_web.rs

@@ -32,34 +32,33 @@ struct DogApi {
 const ENDPOINT: &str = "https://dog.ceo/api/breeds/image/random/";
 
 static App: FC<()> = |cx| {
-    // let mut count = use_state(cx, || 0);
     let state = use_state(cx, || 0);
-    let set_val = state.setter();
 
-    let (tas, g) = cx.use_task(|| async move {
-        set_val(10);
-        surf::get(ENDPOINT).recv_json::<DogApi>().await
-    });
+    let request = cx.use_task(|| surf::get(ENDPOINT).recv_json::<DogApi>()).1;
 
-    let dog_node = match g.as_ref().and_then(|f| f.as_ref().ok()) {
-        Some(res) => rsx!(in cx, img { src: "{res.message}" }),
-        None => rsx!(in cx, div { "No doggos for you :(" }),
+    let dog_node = if let Some(Ok(res)) = request {
+        rsx!(in cx, img { src: "{res.message}" })
+    } else {
+        rsx!(in cx, div { "No doggos for you :(" })
     };
 
     cx.render(rsx! {
         div {
+            style: {
+                align_items: "center"
+            }
             section { class: "py-12 px-4 text-center"
                 div { class: "w-full max-w-2xl mx-auto"
                     span { class: "text-sm font-semibold"
                         "count: {state}"
                     }
+                    br {}
                     div {
                         button {
                             onclick: move |_| state.set(state + 1)
                             "incr"
                         }
                         br {}
-                        br {}
                         button {
                             onclick: move |_| state.set(state - 1)
                             "decr"

packages/web/examples/blah.rs

@@ -28,6 +28,9 @@ static App: FC<()> = |cx| {
     let mut state = use_state(cx, || 0);
     cx.render(rsx! {
         div {
+            style: {
+                align_items: "center"
+            }
             section { class: "py-12 px-4 text-center"
                 div { class: "w-full max-w-2xl mx-auto"
                     span { class: "text-sm font-semibold"

packages/web/src/lib.rs

@@ -99,8 +99,6 @@ impl WebsysRenderer {
 
             if let Some(real_trigger) = trigger {
                 log::info!("event received");
-                // let root_node = body_element.first_child().unwrap();
-                // websys_dom.stack.push(root_node.clone());
 
                 self.internal_dom.queue_event(real_trigger)?;
 
@@ -110,23 +108,10 @@ impl WebsysRenderer {
                     .await?;
                 websys_dom.process_edits(&mut edits);
             }
-
-            // let t2 = self.internal_dom.tasks.next();
-            // futures::select! {
-            //     trigger = t1 => {
-            //         log::info!("event received");
-            //         let root_node = body_element.first_child().unwrap();
-            //         websys_dom.stack.push(root_node.clone());
-            //         self.internal_dom
-            //             .progress_with_event(&mut websys_dom, trigger)?;
-            //     },
-            //     () = t2 => {}
-            // };
         }
-        // while let Some(trigger) = websys_dom.wait_for_event().await {
-        // }
 
-        Ok(()) // should actually never return from this, should be an error, rustc just cant see it
+        // should actually never return from this, should be an error, rustc just cant see it
+        Ok(())
     }
 }
 

packages/web/src/new.rs

@@ -74,7 +74,7 @@ impl WebsysDom {
         for edit in edits.drain(..) {
             log::info!("Handling edit: {:#?}", edit);
             match edit {
-                DomEdit::PushRoot { root } => self.push(root),
+                DomEdit::PushRoot { id: root } => self.push(root),
                 DomEdit::PopRoot => self.pop(),
                 DomEdit::AppendChildren { many } => self.append_children(many),
                 DomEdit::ReplaceWith { many } => self.replace_with(many),
@@ -97,8 +97,8 @@ impl WebsysDom {
             }
         }
     }
-    fn push(&mut self, root: RealDomNode) {
-        let key = root.0;
+    fn push(&mut self, root: u64) {
+        let key = DefaultKey::from(KeyData::from_ffi(root));
         let domnode = self.nodes.get_mut(key);
 
         let domnode = domnode.unwrap().as_mut().unwrap();
@@ -186,10 +186,10 @@ impl WebsysDom {
         todo!()
     }
 
-    fn create_placeholder(&mut self, id: RealDomNode) {
+    fn create_placeholder(&mut self, id: u64) {
         self.create_element("pre", None, id)
     }
-    fn create_text_node(&mut self, text: &str, id: RealDomNode) {
+    fn create_text_node(&mut self, text: &str, id: u64) {
         // let nid = self.node_counter.next();
 
         let textnode = self
@@ -199,18 +199,13 @@ impl WebsysDom {
             .unwrap();
 
         self.stack.push(textnode.clone());
-        let mut slot = self.nodes.get_mut(id.0).unwrap();
-        *slot = Some(textnode);
-
-        // let nid = self.nodes.insert(textnode);
-        // let nid = nid.data().as_ffi();
-
-        // log::debug!("Called [`create_text_node`]: {}, {}", text, nid);
-
-        // RealDomNode::new(nid)
+        *self
+            .nodes
+            .get_mut(DefaultKey::from(KeyData::from_ffi(id)))
+            .unwrap() = Some(textnode);
     }
 
-    fn create_element(&mut self, tag: &str, ns: Option<&'static str>, id: RealDomNode) {
+    fn create_element(&mut self, tag: &str, ns: Option<&'static str>, id: u64) {
         let tag = wasm_bindgen::intern(tag);
         let el = match ns {
             Some(ns) => self
@@ -226,10 +221,10 @@ impl WebsysDom {
                 .dyn_into::<Node>()
                 .unwrap(),
         };
+        let id = DefaultKey::from(KeyData::from_ffi(id));
 
         self.stack.push(el.clone());
-        let mut slot = self.nodes.get_mut(id.0).unwrap();
-        *slot = Some(el);
+        *self.nodes.get_mut(id).unwrap() = Some(el);
         // let nid = self.node_counter.?next();
         // let nid = self.nodes.insert(el).data().as_ffi();
         // log::debug!("Called [`create_element`]: {}, {:?}", tag, nid);
@@ -241,7 +236,7 @@ impl WebsysDom {
         event: &'static str,
         scope: ScopeIdx,
         _element_id: usize,
-        real_id: RealDomNode,
+        real_id: u64,
     ) {
         let (_on, event) = event.split_at(2);
         let event = wasm_bindgen::intern(event);
@@ -260,7 +255,7 @@ impl WebsysDom {
         let scope_id = scope.data().as_ffi();
         el.set_attribute(
             &format!("dioxus-event-{}", event),
-            &format!("{}.{}", scope_id, real_id.0.data().as_ffi()),
+            &format!("{}.{}", scope_id, real_id),
         )
         .unwrap();