Merge pull request #654 from DioxusLabs/jk/fix-scope-rollover

fix: scope rollover bug and router specifics

.github/workflows/docs.yml

@@ -13,7 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     environment: docs
     steps:
-      - uses: actions/checkout@v3
 
       # NOTE: Comment out when https://github.com/rust-lang/mdBook/pull/1306 is merged and released
       # - name: Setup mdBook
@@ -25,6 +24,7 @@ jobs:
       - name: Setup mdBook
         run: |
           cargo install mdbook --git https://github.com/Ruin0x11/mdBook.git --branch localization --rev e74fdb1
+      - uses: actions/checkout@v3
 
       - name: Build
         run: cd docs &&

.github/workflows/macos.yml

@@ -30,13 +30,13 @@ jobs:
     name: Test Suite
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
       - uses: Swatinem/rust-cache@v2
+      - uses: actions/checkout@v3
       - uses: actions-rs/cargo@v1
         with:
           command: test

.github/workflows/main.yml

@@ -32,7 +32,6 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -41,6 +40,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev
+      - uses: actions/checkout@v3
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -51,7 +51,6 @@ jobs:
     name: Test Suite
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -63,6 +62,7 @@ jobs:
       - uses: davidB/rust-cargo-make@v1
       - uses: browser-actions/setup-firefox@latest
       - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: actions/checkout@v3
       - uses: actions-rs/cargo@v1
         with:
           command: make
@@ -73,7 +73,6 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -81,6 +80,7 @@ jobs:
           override: true
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
+      - uses: actions/checkout@v3
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -91,7 +91,6 @@ jobs:
     name: Clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -101,6 +100,7 @@ jobs:
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev
       - run: rustup component add clippy
+      - uses: actions/checkout@v3
       - uses: actions-rs/cargo@v1
         with:
           command: clippy

.github/workflows/windows.yml

@@ -47,8 +47,6 @@ jobs:
       # which causes failures for some of rustfmt's line-ending sensitive tests
       - name: disable git eol translation
         run: git config --global core.autocrlf false
-      - name: checkout
-        uses: actions/checkout@v3
 
         # Run build
       - name: Install Rustup using win.rustup.rs
@@ -66,6 +64,9 @@ jobs:
         if: matrix.target == 'x86_64-pc-windows-gnu' && matrix.channel == 'nightly'
         shell: bash
 
+      - name: checkout
+        uses: actions/checkout@v3
+
       - name: test
         run: |
           rustc -Vv

Cargo.toml

@@ -57,6 +57,7 @@ reqwest = { version = "0.11.9", features = ["json"] }
 fern = { version = "0.6.0", features = ["colored"] }
 thiserror = "1.0.30"
 env_logger = "0.9.0"
+simple_logger = "4.0.0"
 
 [profile.release]
 opt-level = 3

examples/custom_element.rs

@@ -16,6 +16,12 @@ fn main() {
 }
 
 fn app(cx: Scope) -> Element {
+    let g = cx.component(component, (), "component");
+    let c = cx.make_node(g);
+    cx.render(rsx! {
+        div { c }
+    })
+
     // let nf = NodeFactory::new(cx);
 
     // let mut attrs = dioxus::core::exports::bumpalo::collections::Vec::new_in(nf.bump());
@@ -27,6 +33,8 @@ fn app(cx: Scope) -> Element {
     // attrs.push(nf.attr("age", format_args!("47"), None, false));
 
     // Some(nf.raw_element("my-element", None, &[], attrs.into_bump_slice(), &[], None))
+}
 
+fn component(cx: Scope) -> Element {
     todo!()
 }

examples/simple_desktop.rs

@@ -0,0 +1,60 @@
+use dioxus::prelude::*;
+use dioxus_router::*;
+
+fn main() {
+    simple_logger::SimpleLogger::new()
+        .with_level(log::LevelFilter::Debug)
+        .with_module_level("dioxus_router", log::LevelFilter::Trace)
+        .with_module_level("dioxus", log::LevelFilter::Trace)
+        .init()
+        .unwrap();
+    dioxus_desktop::launch(app);
+}
+
+fn app(cx: Scope) -> Element {
+    cx.render(rsx! {
+        Router {
+            h1 { "Your app here" }
+            ul {
+                Link { to: "/", li { "home" } }
+                Link { to: "/blog", li { "blog" } }
+                Link { to: "/blog/tim", li { "tims' blog" } }
+                Link { to: "/blog/bill", li { "bills' blog" } }
+                Link { to: "/blog/james",
+                        li { "james amazing' blog" }
+                }
+                Link { to: "/apples", li { "go to apples" } }
+            }
+            Route { to: "/", Home {} }
+            Route { to: "/blog/", BlogList {} }
+            Route { to: "/blog/:id/", BlogPost {} }
+            Route { to: "/oranges", "Oranges are not apples!" }
+            Redirect { from: "/apples", to: "/oranges" }
+        }
+    })
+}
+
+fn Home(cx: Scope) -> Element {
+    log::debug!("rendering home {:?}", cx.scope_id());
+    cx.render(rsx! { h1 { "Home" } })
+}
+
+fn BlogList(cx: Scope) -> Element {
+    log::debug!("rendering blog list {:?}", cx.scope_id());
+    cx.render(rsx! { div { "Blog List" } })
+}
+
+fn BlogPost(cx: Scope) -> Element {
+    let Some(id) = use_route(cx).segment("id") else {
+        return cx.render(rsx! { div { "No blog post id" } })
+    };
+
+    log::debug!("rendering blog post {}", id);
+
+    cx.render(rsx! {
+        div {
+            h3 { "blog post: {id:?}"  }
+            Link { to: "/blog/", "back to blog list" }
+        }
+    })
+}

packages/core/Cargo.toml

@@ -36,6 +36,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 anyhow = "1.0.66"
 
 smallbox = "0.8.1"
+log = "0.4.17"
 
 [dev-dependencies]
 tokio = { version = "*", features = ["full"] }

packages/core/src/arena.rs

@@ -34,14 +34,14 @@ impl ElementRef {
 
 impl VirtualDom {
     pub(crate) fn next_element(&mut self, template: &VNode, path: &'static [u8]) -> ElementId {
-        self.next(template, ElementPath::Deep(path))
+        self.next_reference(template, ElementPath::Deep(path))
     }
 
     pub(crate) fn next_root(&mut self, template: &VNode, path: usize) -> ElementId {
-        self.next(template, ElementPath::Root(path))
+        self.next_reference(template, ElementPath::Root(path))
     }
 
-    fn next(&mut self, template: &VNode, path: ElementPath) -> ElementId {
+    fn next_reference(&mut self, template: &VNode, path: ElementPath) -> ElementId {
         let entry = self.elements.vacant_entry();
         let id = entry.key();
 
@@ -100,17 +100,18 @@ impl VirtualDom {
                 nodes.iter().for_each(|node| self.drop_scope_inner(node))
             }
             DynamicNode::Placeholder(t) => {
-                self.try_reclaim(t.get());
+                self.try_reclaim(t.id.get().unwrap());
             }
             DynamicNode::Text(t) => {
-                self.try_reclaim(t.id.get());
+                self.try_reclaim(t.id.get().unwrap());
             }
         });
 
         for root in node.root_ids {
-            let id = root.get();
+            if let Some(id) = root.get() {
-            if id.0 != 0 {
+                if id.0 != 0 {
-                self.try_reclaim(id);
+                    self.try_reclaim(id);
+                }
             }
         }
     }
@@ -131,8 +132,10 @@ impl VirtualDom {
         node.dynamic_nodes.iter().for_each(|child| match child {
             // Only descend if the props are borrowed
             DynamicNode::Component(c) if !c.static_props => {
-                self.ensure_drop_safety(c.scope.get().unwrap());
+                if let Some(scope) = c.scope.get() {
-                c.props.set(None);
+                    self.ensure_drop_safety(scope);
+                }
+                c.props.take();
             }
 
             DynamicNode::Fragment(f) => f

packages/core/src/create.rs

@@ -1,13 +1,15 @@
-use std::cell::Cell;
+use crate::innerlude::{VComponent, VPlaceholder, VText};
-use std::rc::Rc;
-
-use crate::innerlude::{VComponent, VText};
 use crate::mutations::Mutation;
 use crate::mutations::Mutation::*;
 use crate::nodes::VNode;
 use crate::nodes::{DynamicNode, TemplateNode};
 use crate::virtual_dom::VirtualDom;
 use crate::{AttributeValue, ElementId, RenderReturn, ScopeId, SuspenseContext};
+use std::cell::Cell;
+use std::iter::{Enumerate, Peekable};
+use std::rc::Rc;
+use std::slice;
+use TemplateNode::*;
 
 impl<'b> VirtualDom {
     /// Create a new template [`VNode`] and write it to the [`Mutations`] buffer.
@@ -17,190 +19,232 @@ impl<'b> VirtualDom {
         self.scope_stack.push(scope);
         let out = self.create(template);
         self.scope_stack.pop();
-
         out
     }
 
     /// Create this template and write its mutations
-    pub(crate) fn create(&mut self, template: &'b VNode<'b>) -> usize {
+    pub(crate) fn create(&mut self, node: &'b VNode<'b>) -> usize {
         // The best renderers will have templates prehydrated and registered
         // Just in case, let's create the template using instructions anyways
-        if !self.templates.contains_key(&template.template.name) {
+        if !self.templates.contains_key(&node.template.name) {
-            self.register_template(template);
+            self.register_template(node);
         }
 
+        // we know that this will generate at least one mutation per node
+        self.mutations.edits.reserve(node.template.roots.len());
+
         // Walk the roots, creating nodes and assigning IDs
         // todo: adjust dynamic nodes to be in the order of roots and then leaves (ie BFS)
-        let mut dynamic_attrs = template.template.attr_paths.iter().enumerate().peekable();
+        let mut attrs = node.template.attr_paths.iter().enumerate().peekable();
-        let mut dynamic_nodes = template.template.node_paths.iter().enumerate().peekable();
+        let mut nodes = node.template.node_paths.iter().enumerate().peekable();
 
-        let cur_scope = self.scope_stack.last().copied().unwrap();
+        node.template
+            .roots
+            .iter()
+            .enumerate()
+            .map(|(idx, root)| match root {
+                DynamicText { id } | Dynamic { id } => self.write_dynamic_root(node, *id),
+                Element { .. } => self.write_element_root(node, idx, &mut attrs, &mut nodes),
+                Text { .. } => self.write_static_text_root(node, idx),
+            })
+            .sum()
+    }
 
-        // we know that this will generate at least one mutation per node
+    fn write_static_text_root(&mut self, node: &VNode, idx: usize) -> usize {
-        self.mutations.edits.reserve(template.template.roots.len());
+        // Simply just load the template root, no modifications needed
+        self.load_template_root(node, idx);
 
-        let mut on_stack = 0;
+        // Text producs just one node on the stack
-        for (root_idx, root) in template.template.roots.iter().enumerate() {
+        1
-            // We might need to generate an ID for the root node
+    }
-            on_stack += match root {
-                TemplateNode::DynamicText { id } | TemplateNode::Dynamic { id } => {
-                    match &template.dynamic_nodes[*id] {
-                        // a dynamic text node doesn't replace a template node, instead we create it on the fly
-                        DynamicNode::Text(VText { id: slot, value }) => {
-                            let id = self.next_element(template, template.template.node_paths[*id]);
-                            slot.set(id);
 
-                            // Safety: we promise not to re-alias this text later on after committing it to the mutation
+    fn write_dynamic_root(&mut self, template: &'b VNode<'b>, idx: usize) -> usize {
-                            let unbounded_text = unsafe { std::mem::transmute(*value) };
+        use DynamicNode::*;
-                            self.mutations.push(CreateTextNode {
+        match &template.dynamic_nodes[idx] {
-                                value: unbounded_text,
+            node @ Fragment(_) => self.create_dynamic_node(template, node, idx),
-                                id,
+            node @ Component { .. } => self.create_dynamic_node(template, node, idx),
-                            });
+            Placeholder(VPlaceholder { id }) => {
+                let id = self.set_slot(template, id, idx);
+                self.mutations.push(CreatePlaceholder { id });
+                1
+            }
+            Text(VText { id, value }) => {
+                let id = self.set_slot(template, id, idx);
+                self.create_static_text(value, id);
+                1
+            }
+        }
+    }
 
-                            1
+    fn create_static_text(&mut self, value: &str, id: ElementId) {
-                        }
+        // Safety: we promise not to re-alias this text later on after committing it to the mutation
+        let unbounded_text: &str = unsafe { std::mem::transmute(value) };
+        self.mutations.push(CreateTextNode {
+            value: unbounded_text,
+            id,
+        });
+    }
 
-                        DynamicNode::Placeholder(slot) => {
+    /// We write all the descndent data for this element
-                            let id = self.next_element(template, template.template.node_paths[*id]);
+    ///
-                            slot.set(id);
+    /// Elements can contain other nodes - and those nodes can be dynamic or static
-                            self.mutations.push(CreatePlaceholder { id });
+    ///
-                            1
+    /// We want to make sure we write these nodes while on top of the root
-                        }
+    fn write_element_root(
+        &mut self,
+        template: &'b VNode<'b>,
+        root_idx: usize,
+        dynamic_attrs: &mut Peekable<Enumerate<slice::Iter<&'static [u8]>>>,
+        dynamic_nodes: &mut Peekable<Enumerate<slice::Iter<&'static [u8]>>>,
+    ) -> usize {
+        // Load the template root and get the ID for the node on the stack
+        let root_on_stack = self.load_template_root(template, root_idx);
 
-                        DynamicNode::Fragment(_) | DynamicNode::Component { .. } => {
+        // Write all the attributes below this root
-                            self.create_dynamic_node(template, &template.dynamic_nodes[*id], *id)
+        self.write_attrs_on_root(dynamic_attrs, root_idx, root_on_stack, template);
-                        }
+
-                    }
+        // Load in all of the placeholder or dynamic content under this root too
+        self.load_placeholders(dynamic_nodes, root_idx, template);
+
+        1
+    }
+
+    /// Load all of the placeholder nodes for descendents of this root node
+    ///
+    /// ```rust, ignore
+    /// rsx! {
+    ///     div {
+    ///         // This is a placeholder
+    ///         some_value,
+    ///
+    ///         // Load this too
+    ///         "{some_text}"
+    ///     }
+    /// }
+    /// ```
+    fn load_placeholders(
+        &mut self,
+        dynamic_nodes: &mut Peekable<Enumerate<slice::Iter<&'static [u8]>>>,
+        root_idx: usize,
+        template: &'b VNode<'b>,
+    ) {
+        let (start, end) = match collect_dyn_node_range(dynamic_nodes, root_idx) {
+            Some((a, b)) => (a, b),
+            None => return,
+        };
+
+        for idx in start..=end {
+            let m = self.create_dynamic_node(template, &template.dynamic_nodes[idx], idx);
+            if m > 0 {
+                // The path is one shorter because the top node is the root
+                let path = &template.template.node_paths[idx][1..];
+                self.mutations.push(ReplacePlaceholder { m, path });
+            }
+        }
+    }
+
+    fn write_attrs_on_root(
+        &mut self,
+        attrs: &mut Peekable<Enumerate<slice::Iter<&'static [u8]>>>,
+        root_idx: usize,
+        root: ElementId,
+        node: &VNode,
+    ) {
+        while let Some((mut attr_id, path)) = attrs.next_if(|(_, p)| p[0] == root_idx as u8) {
+            let id = self.assign_static_node_as_dynamic(path, root, node, attr_id);
+
+            loop {
+                self.write_attribute(&node.dynamic_attrs[attr_id], id);
+
+                // Only push the dynamic attributes forward if they match the current path (same element)
+                match attrs.next_if(|(_, p)| *p == path) {
+                    Some((next_attr_id, _)) => attr_id = next_attr_id,
+                    None => break,
                 }
+            }
+        }
+    }
 
-                TemplateNode::Element { .. } | TemplateNode::Text { .. } => {
+    fn write_attribute(&mut self, attribute: &crate::Attribute, id: ElementId) {
-                    let this_id = self.next_root(template, root_idx);
+        // Make sure we set the attribute's associated id
+        attribute.mounted_element.set(id);
 
-                    template.root_ids[root_idx].set(this_id);
+        // Safety: we promise not to re-alias this text later on after committing it to the mutation
-                    self.mutations.push(LoadTemplate {
+        let unbounded_name = unsafe { std::mem::transmute(attribute.name) };
-                        name: template.template.name,
-                        index: root_idx,
-                        id: this_id,
-                    });
 
-                    // we're on top of a node that has a dynamic attribute for a descendant
+        match &attribute.value {
-                    // Set that attribute now before the stack gets in a weird state
+            AttributeValue::Text(value) => {
-                    while let Some((mut attr_id, path)) =
+                // Safety: we promise not to re-alias this text later on after committing it to the mutation
-                        dynamic_attrs.next_if(|(_, p)| p[0] == root_idx as u8)
+                let unbounded_value = unsafe { std::mem::transmute(*value) };
-                    {
-                        // if attribute is on a root node, then we've already created the element
-                        // Else, it's deep in the template and we should create a new id for it
-                        let id = match path.len() {
-                            1 => this_id,
-                            _ => {
-                                let id = self
-                                    .next_element(template, template.template.attr_paths[attr_id]);
-                                self.mutations.push(Mutation::AssignId {
-                                    path: &path[1..],
-                                    id,
-                                });
-                                id
-                            }
-                        };
 
-                        loop {
+                self.mutations.push(SetAttribute {
-                            let attribute = template.dynamic_attrs.get(attr_id).unwrap();
+                    name: unbounded_name,
-                            attribute.mounted_element.set(id);
+                    value: unbounded_value,
+                    ns: attribute.namespace,
+                    id,
+                })
+            }
+            AttributeValue::Bool(value) => self.mutations.push(SetBoolAttribute {
+                name: unbounded_name,
+                value: *value,
+                id,
+            }),
+            AttributeValue::Listener(_) => {
+                self.mutations.push(NewEventListener {
+                    // all listeners start with "on"
+                    name: &unbounded_name[2..],
+                    id,
+                })
+            }
+            AttributeValue::Float(_) => todo!(),
+            AttributeValue::Int(_) => todo!(),
+            AttributeValue::Any(_) => todo!(),
+            AttributeValue::None => todo!(),
+        }
+    }
 
-                            // Safety: we promise not to re-alias this text later on after committing it to the mutation
+    fn load_template_root(&mut self, template: &VNode, root_idx: usize) -> ElementId {
-                            let unbounded_name = unsafe { std::mem::transmute(attribute.name) };
+        // Get an ID for this root since it's a real root
+        let this_id = self.next_root(template, root_idx);
+        template.root_ids[root_idx].set(Some(this_id));
 
-                            match &attribute.value {
+        self.mutations.push(LoadTemplate {
-                                AttributeValue::Text(value) => {
+            name: template.template.name,
-                                    // Safety: we promise not to re-alias this text later on after committing it to the mutation
+            index: root_idx,
-                                    let unbounded_value = unsafe { std::mem::transmute(*value) };
+            id: this_id,
+        });
 
-                                    self.mutations.push(SetAttribute {
+        this_id
-                                        name: unbounded_name,
+    }
-                                        value: unbounded_value,
-                                        ns: attribute.namespace,
-                                        id,
-                                    })
-                                }
-                                AttributeValue::Bool(value) => {
-                                    self.mutations.push(SetBoolAttribute {
-                                        name: unbounded_name,
-                                        value: *value,
-                                        id,
-                                    })
-                                }
-                                AttributeValue::Listener(_) => {
-                                    self.mutations.push(NewEventListener {
-                                        // all listeners start with "on"
-                                        name: &unbounded_name[2..],
-                                        scope: cur_scope,
-                                        id,
-                                    })
-                                }
-                                AttributeValue::Float(_) => todo!(),
-                                AttributeValue::Int(_) => todo!(),
-                                AttributeValue::Any(_) => todo!(),
-                                AttributeValue::None => todo!(),
-                            }
 
-                            // Only push the dynamic attributes forward if they match the current path (same element)
+    /// We have some dynamic attributes attached to a some node
-                            match dynamic_attrs.next_if(|(_, p)| *p == path) {
+    ///
-                                Some((next_attr_id, _)) => attr_id = next_attr_id,
+    /// That node needs to be loaded at runtime, so we need to give it an ID
-                                None => break,
+    ///
-                            }
+    /// If the node in question is on the stack, we just return that ID
-                        }
+    ///
-                    }
+    /// If the node is not on the stack, we create a new ID for it and assign it
-
+    fn assign_static_node_as_dynamic(
-                    // We're on top of a node that has a dynamic child for a descendant
+        &mut self,
-                    // Skip any node that's a root
+        path: &'static [u8],
-                    let mut start = None;
+        this_id: ElementId,
-                    let mut end = None;
+        template: &VNode,
-
+        attr_id: usize,
-                    // Collect all the dynamic nodes below this root
+    ) -> ElementId {
-                    // We assign the start and end of the range of dynamic nodes since they area ordered in terms of tree path
+        if path.len() == 1 {
-                    //
+            return this_id;
-                    // [0]
-                    // [1, 1]     <---|
-                    // [1, 1, 1]  <---| these are the range of dynamic nodes below root 1
-                    // [1, 1, 2]  <---|
-                    // [2]
-                    //
-                    // We collect each range and then create them and replace the placeholder in the template
-                    while let Some((idx, p)) =
-                        dynamic_nodes.next_if(|(_, p)| p[0] == root_idx as u8)
-                    {
-                        if p.len() == 1 {
-                            continue;
-                        }
-
-                        if start.is_none() {
-                            start = Some(idx);
-                        }
-
-                        end = Some(idx);
-                    }
-
-                    //
-                    if let (Some(start), Some(end)) = (start, end) {
-                        for idx in start..=end {
-                            let node = &template.dynamic_nodes[idx];
-                            let m = self.create_dynamic_node(template, node, idx);
-                            if m > 0 {
-                                self.mutations.push(ReplacePlaceholder {
-                                    m,
-                                    path: &template.template.node_paths[idx][1..],
-                                });
-                            }
-                        }
-                    }
-
-                    // elements create only one node :-)
-                    1
-                }
-            };
         }
 
-        on_stack
+        // if attribute is on a root node, then we've already created the element
+        // Else, it's deep in the template and we should create a new id for it
+        let id = self.next_element(template, template.template.attr_paths[attr_id]);
+
+        self.mutations.push(Mutation::AssignId {
+            path: &path[1..],
+            id,
+        });
+
+        id
     }
 
     /// Insert a new template into the VirtualDom's template registry
@@ -210,17 +254,9 @@ impl<'b> VirtualDom {
             .insert(template.template.name, template.template);
 
         // If it's all dynamic nodes, then we don't need to register it
-        // Quickly run through and see if it's all just dynamic nodes
+        if !template.template.is_completely_dynamic() {
-        if template.template.roots.iter().all(|root| {
+            self.mutations.templates.push(template.template);
-            matches!(
-                root,
-                TemplateNode::Dynamic { .. } | TemplateNode::DynamicText { .. }
-            )
-        }) {
-            return;
         }
-
-        self.mutations.templates.push(template.template);
     }
 
     pub(crate) fn create_dynamic_node(
@@ -248,7 +284,7 @@ impl<'b> VirtualDom {
         let new_id = self.next_element(template, template.template.node_paths[idx]);
 
         // Make sure the text node is assigned to the correct element
-        text.id.set(new_id);
+        text.id.set(Some(new_id));
 
         // Safety: we promise not to re-alias this text later on after committing it to the mutation
         let value = unsafe { std::mem::transmute(text.value) };
@@ -266,7 +302,7 @@ impl<'b> VirtualDom {
 
     pub(crate) fn create_placeholder(
         &mut self,
-        slot: &Cell<ElementId>,
+        placeholder: &VPlaceholder,
         template: &'b VNode<'b>,
         idx: usize,
     ) -> usize {
@@ -274,7 +310,7 @@ impl<'b> VirtualDom {
         let id = self.next_element(template, template.template.node_paths[idx]);
 
         // Make sure the text node is assigned to the correct element
-        slot.set(id);
+        placeholder.id.set(Some(id));
 
         // Assign the ID to the existing node in the template
         self.mutations.push(AssignId {
@@ -296,15 +332,17 @@ impl<'b> VirtualDom {
         component: &'b VComponent<'b>,
         idx: usize,
     ) -> usize {
-        let props = component
+        let scope = match component.props.take() {
-            .props
+            Some(props) => {
-            .take()
+                let unbounded_props = unsafe { std::mem::transmute(props) };
-            .expect("Props to always exist when a component is being created");
+                let scope = self.new_scope(unbounded_props, component.name);
+                scope.id
+            }
 
-        let unbounded_props = unsafe { std::mem::transmute(props) };
+            // Component is coming back, it probably still exists, right?
+            None => component.scope.get().unwrap(),
+        };
 
-        let scope = self.new_scope(unbounded_props, component.name);
-        let scope = scope.id;
         component.scope.set(Some(scope));
 
         let return_nodes = unsafe { self.run_scope(scope).extend_lifetime_ref() };
@@ -394,4 +432,37 @@ impl<'b> VirtualDom {
 
         0
     }
+
+    fn set_slot(
+        &mut self,
+        template: &'b VNode<'b>,
+        slot: &'b Cell<Option<ElementId>>,
+        id: usize,
+    ) -> ElementId {
+        let id = self.next_element(template, template.template.node_paths[id]);
+        slot.set(Some(id));
+        id
+    }
+}
+
+fn collect_dyn_node_range(
+    dynamic_nodes: &mut Peekable<Enumerate<slice::Iter<&[u8]>>>,
+    root_idx: usize,
+) -> Option<(usize, usize)> {
+    let start = match dynamic_nodes.peek() {
+        Some((idx, p)) if p[0] == root_idx as u8 => *idx,
+        _ => return None,
+    };
+
+    let mut end = start;
+
+    while let Some((idx, p)) = dynamic_nodes.next_if(|(_, p)| p[0] == root_idx as u8) {
+        if p.len() == 1 {
+            continue;
+        }
+
+        end = idx;
+    }
+
+    Some((start, end))
 }

packages/core/src/diff.rs

@@ -1,14 +1,12 @@
-use std::cell::Cell;
-
 use crate::{
     arena::ElementId,
-    innerlude::{DirtyScope, VComponent, VText},
+    innerlude::{DirtyScope, VComponent, VPlaceholder, VText},
     mutations::Mutation,
     nodes::RenderReturn,
     nodes::{DynamicNode, VNode},
     scopes::ScopeId,
     virtual_dom::VirtualDom,
-    AttributeValue, TemplateNode,
+    Attribute, AttributeValue, TemplateNode,
 };
 
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -56,89 +54,101 @@ impl<'b> VirtualDom {
     fn diff_err_to_ok(&mut self, _e: &anyhow::Error, _l: &'b VNode<'b>) {}
 
     fn diff_node(&mut self, left_template: &'b VNode<'b>, right_template: &'b VNode<'b>) {
-        if !std::ptr::eq(left_template.template.name, right_template.template.name)
+        // If the templates are the same, we don't need to do anything, nor do we want to
-            && left_template.template.name != right_template.template.name
+        if templates_are_the_same(left_template, right_template) {
-        {
+            return;
+        }
+
+        // If the templates are different by name, we need to replace the entire template
+        if templates_are_different(left_template, right_template) {
             return self.light_diff_templates(left_template, right_template);
         }
 
-        for (left_attr, right_attr) in left_template
+        // If the templates are the same, we can diff the attributes and children
+        // Start with the attributes
+        left_template
             .dynamic_attrs
             .iter()
             .zip(right_template.dynamic_attrs.iter())
-        {
+            .for_each(|(left_attr, right_attr)| {
-            // Move over the ID from the old to the new
+                // Move over the ID from the old to the new
-            right_attr
+                right_attr
-                .mounted_element
+                    .mounted_element
-                .set(left_attr.mounted_element.get());
+                    .set(left_attr.mounted_element.get());
 
-            // We want to make sure anything listener that gets pulled is valid
+                // We want to make sure anything listener that gets pulled is valid
-            if let AttributeValue::Listener(_) = right_attr.value {
+                if let AttributeValue::Listener(_) = right_attr.value {
-                self.update_template(left_attr.mounted_element.get(), right_template);
+                    self.update_template(left_attr.mounted_element.get(), right_template);
-            }
-
-            if left_attr.value != right_attr.value || left_attr.volatile {
-                // todo: add more types of attribute values
-                match right_attr.value {
-                    AttributeValue::Text(text) => {
-                        let name = unsafe { std::mem::transmute(left_attr.name) };
-                        let value = unsafe { std::mem::transmute(text) };
-                        self.mutations.push(Mutation::SetAttribute {
-                            id: left_attr.mounted_element.get(),
-                            ns: right_attr.namespace,
-                            name,
-                            value,
-                        });
-                    }
-                    // todo: more types of attribute values
-                    _ => todo!("other attribute types"),
                 }
-            }
-        }
 
-        for (idx, (left_node, right_node)) in left_template
+                // If the attributes are different (or volatile), we need to update them
+                if left_attr.value != right_attr.value || left_attr.volatile {
+                    self.update_attribute(right_attr, left_attr);
+                }
+            });
+
+        // Now diff the dynamic nodes
+        left_template
             .dynamic_nodes
             .iter()
             .zip(right_template.dynamic_nodes.iter())
             .enumerate()
-        {
+            .for_each(|(idx, (left_node, right_node))| {
-            match (left_node, right_node) {
+                self.diff_dynamic_node(left_node, right_node, right_template, idx);
-                (Text(left), Text(right)) => self.diff_vtext(left, right),
+            });
-                (Fragment(left), Fragment(right)) => self.diff_non_empty_fragment(left, right),
-                (Placeholder(left), Placeholder(right)) => {
-                    right.set(left.get());
-                }
-                (Component(left), Component(right)) => {
-                    self.diff_vcomponent(left, right, right_template, idx)
-                }
-                (Placeholder(left), Fragment(right)) => {
-                    self.replace_placeholder_with_nodes(left, right)
-                }
-                (Fragment(left), Placeholder(right)) => {
-                    self.replace_nodes_with_placeholder(left, right)
-                }
-                _ => todo!(),
-            };
-        }
 
-        // Make sure the roots get transferred over
+        // Make sure the roots get transferred over while we're here
-        for (left, right) in left_template
+        left_template
             .root_ids
             .iter()
             .zip(right_template.root_ids.iter())
-        {
+            .for_each(|(left, right)| right.set(left.get()));
-            right.set(left.get());
+    }
+
+    fn diff_dynamic_node(
+        &mut self,
+        left_node: &'b DynamicNode<'b>,
+        right_node: &'b DynamicNode<'b>,
+        node: &'b VNode<'b>,
+        idx: usize,
+    ) {
+        match (left_node, right_node) {
+            (Text(left), Text(right)) => self.diff_vtext(left, right, node),
+            (Fragment(left), Fragment(right)) => self.diff_non_empty_fragment(left, right),
+            (Placeholder(left), Placeholder(right)) => right.id.set(left.id.get()),
+            (Component(left), Component(right)) => self.diff_vcomponent(left, right, node, idx),
+            (Placeholder(left), Fragment(right)) => self.replace_placeholder(left, right),
+            (Fragment(left), Placeholder(right)) => self.node_to_placeholder(left, right),
+            _ => todo!("This is an usual custom case for dynamic nodes. We don't know how to handle it yet."),
+        };
+    }
+
+    fn update_attribute(&mut self, right_attr: &Attribute, left_attr: &Attribute) {
+        // todo: add more types of attribute values
+        match right_attr.value {
+            AttributeValue::Text(text) => {
+                let name = unsafe { std::mem::transmute(left_attr.name) };
+                let value = unsafe { std::mem::transmute(text) };
+                self.mutations.push(Mutation::SetAttribute {
+                    id: left_attr.mounted_element.get(),
+                    ns: right_attr.namespace,
+                    name,
+                    value,
+                });
+            }
+            // todo: more types of attribute values
+            _ => todo!("other attribute types"),
         }
     }
 
-    fn replace_placeholder_with_nodes(&mut self, l: &'b Cell<ElementId>, r: &'b [VNode<'b>]) {
+    fn replace_placeholder(&mut self, l: &'b VPlaceholder, r: &'b [VNode<'b>]) {
         let m = self.create_children(r);
-        let id = l.get();
+        let id = l.id.get().unwrap();
         self.mutations.push(Mutation::ReplaceWith { id, m });
         self.reclaim(id);
     }
 
-    fn replace_nodes_with_placeholder(&mut self, l: &'b [VNode<'b>], r: &'b Cell<ElementId>) {
+    fn node_to_placeholder(&mut self, l: &'b [VNode<'b>], r: &'b VPlaceholder) {
         // Remove the old nodes, except for one
         self.remove_nodes(&l[1..]);
 
@@ -147,7 +157,7 @@ impl<'b> VirtualDom {
 
         // Create the placeholder first, ensuring we get a dedicated ID for the placeholder
         let placeholder = self.next_element(&l[0], &[]);
-        r.set(placeholder);
+        r.id.set(Some(placeholder));
         self.mutations
             .push(Mutation::CreatePlaceholder { id: placeholder });
 
@@ -164,6 +174,10 @@ impl<'b> VirtualDom {
         right_template: &'b VNode<'b>,
         idx: usize,
     ) {
+        if std::ptr::eq(left, right) {
+            return;
+        }
+
         // Replace components that have different render fns
         if left.render_fn != right.render_fn {
             let created = self.create_component_node(right_template, right, idx);
@@ -183,12 +197,22 @@ impl<'b> VirtualDom {
         }
 
         // Make sure the new vcomponent has the right scopeid associated to it
-        let scope_id = left.scope.get().unwrap();
+        let Some(scope_id) = left.scope.get() else {
+            return;
+        };
+        // let scope_id = left.scope.get().unwrap_or_else(|| {
+        //     panic!(
+        //         "A component should always have a scope associated to it. {:?}\n {:#?}",
+        //         right.name,
+        //         std::backtrace::Backtrace::force_capture()
+        //     )
+        // });
+
         right.scope.set(Some(scope_id));
 
         // copy out the box for both
         let old = self.scopes[scope_id.0].props.as_ref();
-        let new = right.props.replace(None).unwrap();
+        let new = right.props.take().unwrap();
 
         // If the props are static, then we try to memoize by setting the new with the old
         // The target scopestate still has the reference to the old props, so there's no need to update anything
@@ -203,6 +227,11 @@ impl<'b> VirtualDom {
         // Now run the component and diff it
         self.run_scope(scope_id);
         self.diff_scope(scope_id);
+
+        self.dirty_scopes.remove(&DirtyScope {
+            height: self.scopes[scope_id.0].height,
+            id: scope_id,
+        });
     }
 
     /// Lightly diff the two templates, checking only their roots.
@@ -256,10 +285,13 @@ impl<'b> VirtualDom {
     ///
     /// This just moves the ID of the old node over to the new node, and then sets the text of the new node if it's
     /// different.
-    fn diff_vtext(&mut self, left: &'b VText<'b>, right: &'b VText<'b>) {
+    fn diff_vtext(&mut self, left: &'b VText<'b>, right: &'b VText<'b>, node: &'b VNode<'b>) {
-        let id = left.id.get();
+        let id = left
+            .id
+            .get()
+            .unwrap_or_else(|| self.next_element(node, &[0]));
 
-        right.id.set(id);
+        right.id.set(Some(id));
         if left.value != right.value {
             let value = unsafe { std::mem::transmute(right.value) };
             self.mutations.push(Mutation::SetText { id, value });
@@ -271,9 +303,9 @@ impl<'b> VirtualDom {
     /// All IDs will be garbage collected
     fn replace_inner(&mut self, node: &'b VNode<'b>) -> ElementId {
         let id = match node.dynamic_root(0) {
-            None => node.root_ids[0].get(),
+            None => node.root_ids[0].get().unwrap(),
-            Some(Text(t)) => t.id.get(),
+            Some(Text(t)) => t.id.get().unwrap(),
-            Some(Placeholder(e)) => e.get(),
+            Some(Placeholder(e)) => e.id.get().unwrap(),
             Some(Fragment(nodes)) => {
                 let id = self.replace_inner(&nodes[0]);
                 self.remove_nodes(&nodes[1..]);
@@ -311,14 +343,19 @@ impl<'b> VirtualDom {
 
             match dyn_node {
                 Component(comp) => {
-                    let scope = comp.scope.get().unwrap();
+                    if let Some(scope) = comp.scope.take() {
-                    match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
+                        match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
-                        RenderReturn::Sync(Ok(t)) => self.clean_up_node(t),
+                            RenderReturn::Sync(Ok(t)) => self.clean_up_node(t),
-                        _ => todo!("cannot handle nonstandard nodes"),
+                            _ => todo!("cannot handle nonstandard nodes"),
-                    };
+                        };
+                    }
                 }
-                Text(t) => self.reclaim(t.id.get()),
+                Text(t) => {
-                Placeholder(t) => self.reclaim(t.get()),
+                    if let Some(id) = t.id.take() {
+                        self.reclaim(id)
+                    }
+                }
+                Placeholder(t) => self.reclaim(t.id.take().unwrap()),
                 Fragment(nodes) => nodes.iter().for_each(|node| self.clean_up_node(node)),
             };
         }
@@ -346,25 +383,25 @@ impl<'b> VirtualDom {
     fn remove_root_node(&mut self, node: &'b VNode<'b>, idx: usize) {
         match node.dynamic_root(idx) {
             Some(Text(i)) => {
-                let id = i.id.get();
+                let id = i.id.take().unwrap();
                 self.mutations.push(Mutation::Remove { id });
                 self.reclaim(id);
             }
             Some(Placeholder(e)) => {
-                let id = e.get();
+                let id = e.id.take().unwrap();
                 self.mutations.push(Mutation::Remove { id });
                 self.reclaim(id);
             }
             Some(Fragment(nodes)) => self.remove_nodes(nodes),
             Some(Component(comp)) => {
-                let scope = comp.scope.get().unwrap();
+                let scope = comp.scope.take().unwrap();
                 match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
                     RenderReturn::Sync(Ok(t)) => self.remove_node(t),
                     _ => todo!("cannot handle nonstandard nodes"),
                 };
             }
             None => {
-                let id = node.root_ids[idx].get();
+                let id = node.root_ids[idx].get().unwrap();
                 self.mutations.push(Mutation::Remove { id });
                 self.reclaim(id);
             }
@@ -750,12 +787,16 @@ impl<'b> VirtualDom {
     fn remove_node(&mut self, node: &'b VNode<'b>) {
         for (idx, _) in node.template.roots.iter().enumerate() {
             let id = match node.dynamic_root(idx) {
-                Some(Text(t)) => t.id.get(),
+                Some(Text(t)) => t.id.take(),
-                Some(Placeholder(t)) => t.get(),
+                Some(Placeholder(t)) => t.id.take(),
                 Some(Fragment(t)) => return self.remove_nodes(t),
-                Some(Component(comp)) => return self.remove_component(comp.scope.get().unwrap()),
+                Some(Component(comp)) => {
+                    comp.scope.set(None);
+                    return self.remove_component(comp.scope.get().unwrap());
+                }
                 None => node.root_ids[idx].get(),
-            };
+            }
+            .unwrap();
 
             self.mutations.push(Mutation::Remove { id })
         }
@@ -763,7 +804,7 @@ impl<'b> VirtualDom {
         self.clean_up_node(node);
 
         for root in node.root_ids {
-            let id = root.get();
+            let id = root.get().unwrap();
             if id.0 != 0 {
                 self.reclaim(id);
             }
@@ -786,41 +827,45 @@ impl<'b> VirtualDom {
 
     /// Push all the real nodes on the stack
     fn push_all_real_nodes(&mut self, node: &'b VNode<'b>) -> usize {
-        let mut onstack = 0;
+        node.template
-
+            .roots
-        for (idx, _) in node.template.roots.iter().enumerate() {
+            .iter()
-            match node.dynamic_root(idx) {
+            .enumerate()
-                Some(Text(t)) => {
+            .map(|(idx, _)| {
-                    self.mutations.push(Mutation::PushRoot { id: t.id.get() });
+                match node.dynamic_root(idx) {
-                    onstack += 1;
+                    Some(Text(t)) => {
-                }
+                        self.mutations.push(Mutation::PushRoot {
-                Some(Placeholder(t)) => {
+                            id: t.id.get().unwrap(),
-                    self.mutations.push(Mutation::PushRoot { id: t.get() });
+                        });
-                    onstack += 1;
+                        1
-                }
-                Some(Fragment(nodes)) => {
-                    for node in *nodes {
-                        onstack += self.push_all_real_nodes(node);
                     }
-                }
+                    Some(Placeholder(t)) => {
-                Some(Component(comp)) => {
+                        self.mutations.push(Mutation::PushRoot {
-                    let scope = comp.scope.get().unwrap();
+                            id: t.id.get().unwrap(),
-                    onstack +=
+                        });
+                        1
+                    }
+                    Some(Fragment(nodes)) => nodes
+                        .iter()
+                        .map(|node| self.push_all_real_nodes(node))
+                        .count(),
+
+                    Some(Component(comp)) => {
+                        let scope = comp.scope.get().unwrap();
                         match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
                             RenderReturn::Sync(Ok(node)) => self.push_all_real_nodes(node),
                             _ => todo!(),
                         }
-                }
+                    }
-                None => {
+                    None => {
-                    self.mutations.push(Mutation::PushRoot {
+                        self.mutations.push(Mutation::PushRoot {
-                        id: node.root_ids[idx].get(),
+                            id: node.root_ids[idx].get().unwrap(),
-                    });
+                        });
-                    onstack += 1;
+                        1
-                }
+                    }
-            };
+                };
-        }
+            })
-
+            .count()
-        onstack
     }
 
     fn create_children(&mut self, nodes: &'b [VNode<'b>]) -> usize {
@@ -841,10 +886,10 @@ impl<'b> VirtualDom {
 
     fn find_first_element(&self, node: &'b VNode<'b>) -> ElementId {
         match node.dynamic_root(0) {
-            None => node.root_ids[0].get(),
+            None => node.root_ids[0].get().unwrap(),
-            Some(Text(t)) => t.id.get(),
+            Some(Text(t)) => t.id.get().unwrap(),
             Some(Fragment(t)) => self.find_first_element(&t[0]),
-            Some(Placeholder(t)) => t.get(),
+            Some(Placeholder(t)) => t.id.get().unwrap(),
             Some(Component(comp)) => {
                 let scope = comp.scope.get().unwrap();
                 match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
@@ -857,10 +902,10 @@ impl<'b> VirtualDom {
 
     fn find_last_element(&self, node: &'b VNode<'b>) -> ElementId {
         match node.dynamic_root(node.template.roots.len() - 1) {
-            None => node.root_ids.last().unwrap().get(),
+            None => node.root_ids.last().unwrap().get().unwrap(),
-            Some(Text(t)) => t.id.get(),
+            Some(Text(t)) => t.id.get().unwrap(),
             Some(Fragment(t)) => self.find_last_element(t.last().unwrap()),
-            Some(Placeholder(t)) => t.get(),
+            Some(Placeholder(t)) => t.id.get().unwrap(),
             Some(Component(comp)) => {
                 let scope = comp.scope.get().unwrap();
                 match unsafe { self.scopes[scope.0].root_node().extend_lifetime_ref() } {
@@ -894,6 +939,21 @@ impl<'b> VirtualDom {
     }
 }
 
+/// Are the templates the same?
+///
+/// We need to check for the obvious case, and the non-obvious case where the template as cloned
+///
+/// We use the pointer of the dynamic_node list in this case
+fn templates_are_the_same<'b>(left_template: &'b VNode<'b>, right_template: &'b VNode<'b>) -> bool {
+    std::ptr::eq(left_template, right_template)
+        || std::ptr::eq(left_template.dynamic_nodes, right_template.dynamic_nodes)
+}
+
+fn templates_are_different(left_template: &VNode, right_template: &VNode) -> bool {
+    !std::ptr::eq(left_template.template.name, right_template.template.name)
+        && left_template.template.name != right_template.template.name
+}
+
 fn matching_components<'a>(
     left: &'a VNode<'a>,
     right: &'a VNode<'a>,

packages/core/src/dirty_scope.rs

@@ -1,19 +1,21 @@
+use std::hash::Hash;
+
 use crate::ScopeId;
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Eq, PartialOrd, Ord)]
 pub struct DirtyScope {
     pub height: u32,
     pub id: ScopeId,
 }
 
-impl PartialOrd for DirtyScope {
+impl PartialEq for DirtyScope {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+    fn eq(&self, other: &Self) -> bool {
-        Some(self.height.cmp(&other.height))
+        self.id == other.id
     }
 }
 
-impl Ord for DirtyScope {
+impl Hash for DirtyScope {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.height.cmp(&other.height)
+        self.id.hash(state);
     }
 }

packages/core/src/mutations.rs

@@ -230,9 +230,6 @@ pub enum Mutation<'a> {
         /// The name of the event to listen for.
         name: &'a str,
 
-        /// The ID of the node to attach the listener to.
-        scope: ScopeId,
-
         /// The ID of the node to attach the listener to.
         id: ElementId,
     },

packages/core/src/nodes.rs

@@ -46,7 +46,7 @@ pub struct VNode<'a> {
 
     /// The IDs for the roots of this template - to be used when moving the template around and removing it from
     /// the actual Dom
-    pub root_ids: &'a [Cell<ElementId>],
+    pub root_ids: &'a [Cell<Option<ElementId>>],
 
     /// The dynamic parts of the template
     pub dynamic_nodes: &'a [DynamicNode<'a>],
@@ -128,6 +128,18 @@ pub struct Template<'a> {
     pub attr_paths: &'a [&'a [u8]],
 }
 
+impl<'a> Template<'a> {
+    /// Is this template worth caching at all, since it's completely runtime?
+    ///
+    /// There's no point in saving templates that are completely dynamic, since they'll be recreated every time anyway.
+    pub fn is_completely_dynamic(&self) -> bool {
+        use TemplateNode::*;
+        self.roots
+            .iter()
+            .all(|root| matches!(root, Dynamic { .. } | DynamicText { .. }))
+    }
+}
+
 /// A statically known node in a layout.
 ///
 /// This can be created at compile time, saving the VirtualDom time when diffing the tree
@@ -201,7 +213,7 @@ pub enum DynamicNode<'a> {
     /// Used by suspense when a node isn't ready and by fragments that don't render anything
     ///
     /// In code, this is just an ElementId whose initial value is set to 0 upon creation
-    Placeholder(Cell<ElementId>),
+    Placeholder(VPlaceholder),
 
     /// A list of VNodes.
     ///
@@ -236,7 +248,7 @@ pub struct VComponent<'a> {
     /// It is possible that components get folded at comppile time, so these shouldn't be really used as a key
     pub render_fn: *const (),
 
-    pub(crate) props: Cell<Option<Box<dyn AnyProps<'a> + 'a>>>,
+    pub(crate) props: RefCell<Option<Box<dyn AnyProps<'a> + 'a>>>,
 }
 
 impl<'a> std::fmt::Debug for VComponent<'a> {
@@ -256,7 +268,14 @@ pub struct VText<'a> {
     pub value: &'a str,
 
     /// The ID of this node in the real DOM
-    pub id: Cell<ElementId>,
+    pub id: Cell<Option<ElementId>>,
+}
+
+/// A placeholder node, used by suspense and fragments
+#[derive(Debug, Default)]
+pub struct VPlaceholder {
+    /// The ID of this node in the real DOM
+    pub id: Cell<Option<ElementId>>,
 }
 
 /// An attribute of the TemplateNode, created at compile time

packages/core/src/scopes.rs

@@ -237,7 +237,9 @@ impl<'src> ScopeState {
     /// This method should be used when you want to schedule an update for a component
     pub fn schedule_update_any(&self) -> Arc<dyn Fn(ScopeId) + Send + Sync> {
         let chan = self.tasks.sender.clone();
-        Arc::new(move |id| drop(chan.unbounded_send(SchedulerMsg::Immediate(id))))
+        Arc::new(move |id| {
+            chan.unbounded_send(SchedulerMsg::Immediate(id)).unwrap();
+        })
     }
 
     /// Mark this scope as dirty, and schedule a render for it.
@@ -448,7 +450,7 @@ impl<'src> ScopeState {
             name: fn_name,
             render_fn: component as *const (),
             static_props: P::IS_STATIC,
-            props: Cell::new(Some(extended)),
+            props: RefCell::new(Some(extended)),
             scope: Cell::new(None),
         })
     }

packages/core/src/virtual_dom.rs

@@ -280,6 +280,9 @@ impl VirtualDom {
     /// Whenever the VirtualDom "works", it will re-render this scope
     pub fn mark_dirty(&mut self, id: ScopeId) {
         let height = self.scopes[id.0].height;
+
+        println!("marking scope {} dirty with height {}", id.0, height);
+
         self.dirty_scopes.insert(DirtyScope { height, id });
     }
 
@@ -516,6 +519,8 @@ impl VirtualDom {
     pub async fn render_with_deadline(&mut self, deadline: impl Future<Output = ()>) -> Mutations {
         pin_mut!(deadline);
 
+        self.process_events();
+
         loop {
             // first, unload any complete suspense trees
             for finished_fiber in self.finished_fibers.drain(..) {

packages/core/tests/kitchen_sink.rs

@@ -34,7 +34,7 @@ fn dual_stream() {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(1) },
             SetAttribute { name: "class", value: "123", id: ElementId(1), ns: None },
-            NewEventListener { name: "click", scope: ScopeId(0), id: ElementId(1) },
+            NewEventListener { name: "click", id: ElementId(1) },
             HydrateText { path: &[0, 0], value: "123", id: ElementId(2) },
             AppendChildren { id: ElementId(0), m: 1 }
         ],

packages/core/tests/miri_simple.rs

@@ -62,8 +62,8 @@ fn contexts_drop() {
     _ = dom.render_immediate();
 }
 
-#[test]
+#[tokio::test]
-fn tasks_drop() {
+async fn tasks_drop() {
     fn app(cx: Scope) -> Element {
         cx.spawn(async {
             tokio::time::sleep(std::time::Duration::from_millis(100000)).await;

packages/core/tests/miri_stress.rs

@@ -12,9 +12,7 @@ fn test_memory_leak() {
     fn app(cx: Scope) -> Element {
         let val = cx.generation();
 
-        cx.spawn(async {
+        cx.spawn(async {});
-            tokio::time::sleep(std::time::Duration::from_millis(100000)).await;
-        });
 
         if val == 2 || val == 4 {
             return cx.render(rsx!(()));

packages/native-core/src/real_dom.rs

@@ -306,7 +306,7 @@ impl<S: State> RealDom<S> {
                     }
                     mark_dirty(node_id, NodeMask::new().with_text(), &mut nodes_updated);
                 }
-                NewEventListener { name, scope: _, id } => {
+                NewEventListener { name, id } => {
                     let node_id = self.element_to_node_id(id);
                     let node = self.tree.get_mut(node_id).unwrap();
                     if let NodeType::Element { listeners, .. } = &mut node.node_data.node_type {

packages/router/Cargo.toml

@@ -36,6 +36,7 @@ thiserror = "1.0.30"
 futures-util = "0.3.21"
 serde = { version = "1", optional = true }
 serde_urlencoded = { version = "0.7.1", optional = true }
+simple_logger = "4.0.0"
 
 [features]
 default = ["query"]
@@ -50,6 +51,9 @@ wasm-logger = "0.2.0"
 wasm-bindgen-test = "0.3"
 gloo-utils = "0.1.2"
 dioxus-web = { path = "../web" }
+# dioxus-desktop = { path = "../desktop", optional = true }
+
+# not wasm
 
 [target.wasm32-unknown-unknown.dev-dependencies]
 dioxus-router = { path = ".", features = ["web"] }

packages/router/examples/simple.rs

@@ -16,6 +16,7 @@ fn app(cx: Scope) -> Element {
                 Link { to: "/blog", li { "blog" } }
                 Link { to: "/blog/tim", li { "tims' blog" } }
                 Link { to: "/blog/bill", li { "bills' blog" } }
+                Link { to: "/blog/james", li { "james amazing' blog" } }
                 Link { to: "/apples", li { "go to apples" } }
             }
             Route { to: "/", Home {} }
@@ -42,5 +43,10 @@ fn BlogPost(cx: Scope) -> Element {
 
     log::trace!("rendering blog post {}", id);
 
-    cx.render(rsx! { div { "{id:?}" } })
+    cx.render(rsx! {
+        div {
+            h3 { "blog post: {id:?}"  }
+            Link { to: "/blog/", "back to blog list" }
+        }
+    })
 }

packages/router/src/components/link.rs

@@ -120,9 +120,17 @@ pub fn Link<'a>(cx: Scope<'a, LinkProps<'a>>) -> Element {
             prevent_default: "{prevent_default}",
             target: format_args!("{}", if * new_tab { "_blank" } else { "" }),
             onclick: move |_| {
+                log::trace!("Clicked link to {}", to);
+
                 if !outerlink {
                     if let Some(service) = svc {
+                        log::trace!("Pushing route to {}", to);
                         service.push_route(to, cx.props.title.map(|f| f.to_string()), None);
+
+                        #[cfg(feature = "web")]
+                        {
+                            web_sys::window().unwrap().scroll_to_with_x_and_y(0.0, 0.0);
+                        }
                     } else {
                         log::error!(
                             "Attempted to create a Link to {} outside of a Router context", cx.props

packages/router/src/components/route.rs

@@ -45,13 +45,13 @@ pub fn Route<'a>(cx: Scope<'a, RouteProps<'a>>) -> Element {
         router_root.register_total_route(route_context.total_route, cx.scope_id());
     });
 
-    log::trace!("Checking Route: {:?}", cx.props.to);
+    log::debug!("Checking Route: {:?}", cx.props.to);
 
     if router_root.should_render(cx.scope_id()) {
-        log::trace!("Route should render: {:?}", cx.scope_id());
+        log::debug!("Route should render: {:?}", cx.scope_id());
         cx.render(rsx!(&cx.props.children))
     } else {
-        log::trace!("Route should *not* render: {:?}", cx.scope_id());
+        log::debug!("Route should *not* render: {:?}", cx.scope_id());
         cx.render(rsx!(()))
     }
 }

packages/router/src/service.rs

@@ -180,6 +180,7 @@ impl RouterService {
         (self.regen_any_route)(self.router_id);
 
         for listener in self.onchange_listeners.borrow().iter() {
+            log::trace!("Regenerating scope {:?}", listener);
             (self.regen_any_route)(*listener);
         }
 

packages/rsx/src/lib.rs

@@ -147,7 +147,8 @@ impl<'a> ToTokens for TemplateRenderer<'a> {
                 parent: None,
                 key: #key_tokens,
                 template: TEMPLATE,
-                root_ids: std::cell::Cell::from_mut( __cx.bump().alloc([::dioxus::core::ElementId(0); #num_roots]) as &mut [::dioxus::core::ElementId]).as_slice_of_cells(),
+                root_ids: std::cell::Cell::from_mut( __cx.bump().alloc([None; #num_roots]) as &mut _).as_slice_of_cells(),
+                // root_ids: std::cell::Cell::from_mut( __cx.bump().alloc([None; #num_roots]) as &mut [::dioxus::core::ElementId]).as_slice_of_cells(),
                 dynamic_nodes: __cx.bump().alloc([ #( #node_printer ),* ]),
                 dynamic_attrs: __cx.bump().alloc([ #( #dyn_attr_printer ),* ]),
             }

packages/tui/examples/tui_colorpicker.rs

@@ -17,12 +17,14 @@ fn app(cx: Scope) -> Element {
             width: "100%",
             background_color: "hsl({hue}, 70%, {brightness}%)",
             onmousemove: move |evt| {
-                if let RenderReturn::Sync(Ok(node))=cx.root_node(){
+                if let RenderReturn::Sync(Ok(node)) = cx.root_node() {
-                    let node = tui_query.get(node.root_ids[0].get());
+                    if let Some(id) = node.root_ids[0].get() {
-                    let Size{width, height} = node.size().unwrap();
+                        let node = tui_query.get(id);
-                    let pos = evt.inner().element_coordinates();
+                        let Size{width, height} = node.size().unwrap();
-                    hue.set((pos.x as f32/width as f32)*255.0);
+                        let pos = evt.inner().element_coordinates();
-                    brightness.set((pos.y as f32/height as f32)*100.0);
+                        hue.set((pos.x as f32/width as f32)*255.0);
+                        brightness.set((pos.y as f32/height as f32)*100.0);
+                    }
                 }
             },
             "hsl({hue}, 70%, {brightness}%)",

packages/tui/src/widgets/mod.rs

@@ -11,7 +11,7 @@ pub use input::*;
 
 pub(crate) fn get_root_id<T>(cx: Scope<T>) -> Option<ElementId> {
     if let RenderReturn::Sync(Ok(sync)) = cx.root_node() {
-        sync.root_ids.get(0).map(|id| id.get())
+        sync.root_ids.get(0).and_then(|id| id.get())
     } else {
         None
     }

packages/web/src/dom.rs

@@ -7,7 +7,7 @@
 //! - tests to ensure dyn_into works for various event types.
 //! - Partial delegation?>
 
-use dioxus_core::{Mutation, Template, TemplateAttribute, TemplateNode};
+use dioxus_core::{ElementId, Mutation, Template, TemplateAttribute, TemplateNode};
 use dioxus_html::{event_bubbles, CompositionData, FormData};
 use dioxus_interpreter_js::{save_template, Channel};
 use futures_channel::mpsc;
@@ -25,8 +25,16 @@ pub struct WebsysDom {
     interpreter: Channel,
 }
 
+pub struct UiEvent {
+    pub name: String,
+    pub bubbles: bool,
+    pub element: ElementId,
+    pub data: Rc<dyn Any>,
+    pub event: Event,
+}
+
 impl WebsysDom {
-    pub fn new(cfg: Config, event_channel: mpsc::UnboundedSender<Event>) -> Self {
+    pub fn new(cfg: Config, event_channel: mpsc::UnboundedSender<UiEvent>) -> Self {
         // eventually, we just want to let the interpreter do all the work of decoding events into our event type
         // a match here in order to avoid some error during runtime browser test
         let document = load_document();
@@ -38,7 +46,28 @@ impl WebsysDom {
 
         let handler: Closure<dyn FnMut(&Event)> =
             Closure::wrap(Box::new(move |event: &web_sys::Event| {
-                let _ = event_channel.unbounded_send(event.clone());
+                let name = event.type_();
+                let element = walk_event_for_id(event);
+                let bubbles = dioxus_html::event_bubbles(name.as_str());
+                if let Some((element, target)) = element {
+                    if target
+                        .get_attribute("dioxus-prevent-default")
+                        .as_deref()
+                        .map(|f| f.trim_start_matches("on"))
+                        == Some(&name)
+                    {
+                        event.prevent_default();
+                    }
+
+                    let data = virtual_event_from_websys_event(event.clone(), target);
+                    let _ = event_channel.unbounded_send(UiEvent {
+                        name,
+                        bubbles,
+                        element,
+                        data,
+                        event: event.clone(),
+                    });
+                }
             }));
 
         dioxus_interpreter_js::initilize(root.unchecked_into(), handler.as_ref().unchecked_ref());
@@ -56,8 +85,6 @@ impl WebsysDom {
     }
 
     pub fn load_templates(&mut self, templates: &[Template]) {
-        log::debug!("Loading templates {:?}", templates);
-
         for template in templates {
             let mut roots = vec![];
 
@@ -310,3 +337,26 @@ fn read_input_to_data(target: Element) -> Rc<FormData> {
         files: None,
     })
 }
+
+fn walk_event_for_id(event: &web_sys::Event) -> Option<(ElementId, web_sys::Element)> {
+    use wasm_bindgen::JsCast;
+
+    let mut target = event
+        .target()
+        .expect("missing target")
+        .dyn_into::<web_sys::Element>()
+        .expect("not a valid element");
+
+    loop {
+        match target.get_attribute("data-dioxus-id").map(|f| f.parse()) {
+            Some(Ok(id)) => return Some((ElementId(id), target)),
+            Some(Err(_)) => return None,
+
+            // walk the tree upwards until we actually find an event target
+            None => match target.parent_element() {
+                Some(parent) => target = parent,
+                None => return None,
+            },
+        }
+    }
+}

packages/web/src/lib.rs

@@ -218,13 +218,7 @@ pub async fn run_with_props<T: 'static>(root: fn(Scope<T>) -> Element, root_prop
         // Dequeue all of the events from the channel in send order
         // todo: we should re-order these if possible
         while let Some(evt) = res {
-            let name = evt.type_();
+            dom.handle_event(evt.name.as_str(), evt.data, evt.element, evt.bubbles);
-            let element = walk_event_for_id(&evt);
-            let bubbles = dioxus_html::event_bubbles(name.as_str());
-            if let Some((element, target)) = element {
-                let data = virtual_event_from_websys_event(evt, target);
-                dom.handle_event(name.as_str(), data, element, bubbles);
-            }
             res = rx.try_next().transpose().unwrap().ok();
         }
 
@@ -250,29 +244,6 @@ pub async fn run_with_props<T: 'static>(root: fn(Scope<T>) -> Element, root_prop
     }
 }
 
-fn walk_event_for_id(event: &web_sys::Event) -> Option<(ElementId, web_sys::Element)> {
-    use wasm_bindgen::JsCast;
-
-    let mut target = event
-        .target()
-        .expect("missing target")
-        .dyn_into::<web_sys::Element>()
-        .expect("not a valid element");
-
-    loop {
-        match target.get_attribute("data-dioxus-id").map(|f| f.parse()) {
-            Some(Ok(id)) => return Some((ElementId(id), target)),
-            Some(Err(_)) => return None,
-
-            // walk the tree upwards until we actually find an event target
-            None => match target.parent_element() {
-                Some(parent) => target = parent,
-                None => return None,
-            },
-        }
-    }
-}
-
 // if should_hydrate {
 //     // todo: we need to split rebuild and initialize into two phases
 //     // it's a waste to produce edits just to get the vdom loaded