polish: change in cx to cx

packages/web/examples/async_web.rs

@@ -35,8 +35,13 @@ static App: FC<()> = |cx| {
         cx,
         || surf::get(ENDPOINT).recv_json::<DogApi>(),
         |cx, res| match res {
-            Ok(res) => rsx!(in cx, img { src: "{res.message}" }),
-            Err(_err) => rsx!(in cx, div { "No doggos for you :(" }),
+            Ok(res) => rsx!(
+                cx,
+                img {
+                    src: "{res.message}"
+                }
+            ),
+            Err(_err) => rsx!(cx, div { "No doggos for you :(" }),
         },
     );
 

packages/web/examples/basic.rs

@@ -27,7 +27,11 @@ static APP: FC<()> = |cx| {
 
     cx.render(rsx! {
         div {
-            button { onclick: move |_| count += 1, "add"  }
+            button {
+                onclick: move |_| count += 1,
+                "Click to add."
+                "Current count: {count}"
+            }
             ul {
                 {(0..*count).map(|f| rsx!{
                     li { "a - {f}" }

packages/web/src/dom.rs

@@ -93,7 +93,7 @@ impl WebsysDom {
 
     pub fn process_edits(&mut self, edits: &mut Vec<DomEdit>) {
         for edit in edits.drain(..) {
-            log::info!("Handling edit: {:#?}", edit);
+            // log::info!("Handling edit: {:#?}", edit);
             match edit {
                 DomEdit::PushRoot { id: root } => self.push(root),
                 DomEdit::PopRoot => self.pop(),
@@ -530,6 +530,8 @@ fn decode_trigger(event: &web_sys::Event) -> anyhow::Result<UserEvent> {
 
     let typ = event.type_();
 
+    log::debug!("Event type is {:?}", typ);
+
     // let attrs = target.attributes();
     // for x in 0..attrs.length() {
     //     let attr = attrs.item(x).unwrap();
@@ -569,10 +571,6 @@ fn decode_trigger(event: &web_sys::Event) -> anyhow::Result<UserEvent> {
     })
 }
 
-pub fn prepare_websys_dom() -> Element {
-    load_document().get_element_by_id("dioxusroot").unwrap()
-}
-
 pub fn load_document() -> Document {
     web_sys::window()
         .expect("should have access to the Window")

packages/web/src/lib.rs

@@ -117,10 +117,12 @@ pub async fn run_with_props<T: Properties + 'static>(root: FC<T>, root_props: T,
 
     intern_cached_strings();
 
-    let hydrating = cfg.hydrate;
+    let should_hydrate = cfg.hydrate;
 
     let root_el = load_document().get_element_by_id(&cfg.rootname).unwrap();
+
     let tasks = dom.get_event_sender();
+
     let sender_callback = Rc::new(move |event| tasks.unbounded_send(event).unwrap());
 
     let mut websys_dom = dom::WebsysDom::new(root_el, cfg, sender_callback);
@@ -129,8 +131,10 @@ pub async fn run_with_props<T: Properties + 'static>(root: FC<T>, root_props: T,
 
     // hydrating is simply running the dom for a single render. If the page is already written, then the corresponding
     // ElementIds should already line up because the web_sys dom has already loaded elements with the DioxusID into memory
-    if !hydrating {
+    if !should_hydrate {
         websys_dom.process_edits(&mut mutations.edits);
+    } else {
+        // websys dom processed the config and hydrated the dom already
     }
 
     let work_loop = ric_raf::RafLoop::new();
@@ -144,12 +148,14 @@ pub async fn run_with_props<T: Properties + 'static>(root: FC<T>, root_props: T,
         let deadline = work_loop.wait_for_idle_time().await;
 
         // run the virtualdom work phase until the frame deadline is reached
-        let mut mutations = dom.run_with_deadline(deadline).await;
+        let mutations = dom.run_with_deadline(deadline).await;
 
         // wait for the animation frame to fire so we can apply our changes
         work_loop.wait_for_raf().await;
 
-        // actually apply our changes during the animation frame
-        websys_dom.process_edits(&mut mutations[0].edits);
+        for mut edit in mutations {
+            // actually apply our changes during the animation frame
+            websys_dom.process_edits(&mut edit.edits);
+        }
     }
 }