fix custom attribute value support

packages/core/src/create.rs

@@ -105,27 +105,10 @@ impl<'b> VirtualDom {
                             attribute.mounted_element.set(id);
 
                             // Safety: we promise not to re-alias this text later on after committing it to the mutation
-                            let unbounded_name = unsafe { std::mem::transmute(attribute.name) };
+                            let unbounded_name: &str =
+                                unsafe { std::mem::transmute(attribute.name) };
 
                             match &attribute.value {
-                                AttributeValue::Text(value) => {
-                                    // Safety: we promise not to re-alias this text later on after committing it to the mutation
-                                    let unbounded_value = unsafe { std::mem::transmute(*value) };
-
-                                    self.mutations.push(SetAttribute {
-                                        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"
@@ -134,10 +117,18 @@ impl<'b> VirtualDom {
                                         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
+                                    let unbounded_value =
+                                        unsafe { std::mem::transmute(attribute.value.clone()) };
+
+                                    self.mutations.push(SetAttribute {
+                                        name: unbounded_name,
+                                        value: unbounded_value,
+                                        ns: attribute.namespace,
+                                        id,
+                                    })
+                                }
                             }
 
                             // Only push the dynamic attributes forward if they match the current path (same element)

packages/core/src/diff.rs

@@ -77,20 +77,14 @@ impl<'b> VirtualDom {
 
             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"),
-                }
+                let name = unsafe { std::mem::transmute(left_attr.name) };
+                let value = unsafe { std::mem::transmute(right_attr.value.clone()) };
+                self.mutations.push(Mutation::SetAttribute {
+                    id: left_attr.mounted_element.get(),
+                    ns: right_attr.namespace,
+                    name,
+                    value,
+                });
             }
         }
 

packages/core/src/lib.rs

@@ -70,10 +70,10 @@ pub(crate) mod innerlude {
 }
 
 pub use crate::innerlude::{
-    fc_to_builder, Attribute, AttributeValue, Component, DynamicNode, Element, ElementId, Event,
-    Fragment, IntoDynNode, LazyNodes, Mutation, Mutations, Properties, RenderReturn, Scope,
-    ScopeId, ScopeState, Scoped, SuspenseContext, TaskId, Template, TemplateAttribute,
-    TemplateNode, VComponent, VNode, VText, VirtualDom,
+    fc_to_builder, AnyValueBox, Attribute, AttributeValue, Component, DynamicNode, Element,
+    ElementId, Event, Fragment, IntoAttributeValue, IntoDynNode, LazyNodes, Mutation, Mutations,
+    Properties, RenderReturn, Scope, ScopeId, ScopeState, Scoped, SuspenseContext, TaskId,
+    Template, TemplateAttribute, TemplateNode, VComponent, VNode, VText, VirtualDom,
 };
 
 /// The purpose of this module is to alleviate imports of many common types
@@ -81,9 +81,9 @@ pub use crate::innerlude::{
 /// This includes types like [`Scope`], [`Element`], and [`Component`].
 pub mod prelude {
     pub use crate::innerlude::{
-        fc_to_builder, Element, Event, EventHandler, Fragment, LazyNodes, Properties, Scope,
-        ScopeId, ScopeState, Scoped, TaskId, Template, TemplateAttribute, TemplateNode, VNode,
-        VirtualDom,
+        fc_to_builder, Element, Event, EventHandler, Fragment, IntoAttributeValue, LazyNodes,
+        Properties, Scope, ScopeId, ScopeState, Scoped, TaskId, Template, TemplateAttribute,
+        TemplateNode, VNode, VirtualDom,
     };
 }
 

packages/core/src/mutations.rs

@@ -1,6 +1,6 @@
 use fxhash::FxHashSet;
 
-use crate::{arena::ElementId, ScopeId, Template};
+use crate::{arena::ElementId, AttributeValue, ScopeId, Template};
 
 /// A container for all the relevant steps to modify the Real DOM
 ///
@@ -48,7 +48,7 @@ impl<'a> Mutations<'a> {
 
     /// Push a new mutation into the dom_edits list
     pub(crate) fn push(&mut self, mutation: Mutation<'static>) {
-        self.edits.push(mutation)
+        unsafe { self.edits.push(std::mem::transmute(mutation)) }
     }
 }
 
@@ -61,7 +61,7 @@ impl<'a> Mutations<'a> {
     derive(serde::Serialize, serde::Deserialize),
     serde(tag = "type")
 )]
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum Mutation<'a> {
     /// Add these m children to the target element
     AppendChildren {
@@ -193,8 +193,9 @@ pub enum Mutation<'a> {
     SetAttribute {
         /// The name of the attribute to set.
         name: &'a str,
+
         /// The value of the attribute.
-        value: &'a str,
+        value: AttributeValue<'a>,
 
         /// The ID of the node to set the attribute of.
         id: ElementId,
@@ -204,18 +205,6 @@ pub enum Mutation<'a> {
         ns: Option<&'a str>,
     },
 
-    /// Set the value of a node's attribute.
-    SetBoolAttribute {
-        /// The name of the attribute to set.
-        name: &'a str,
-
-        /// The value of the attribute.
-        value: bool,
-
-        /// The ID of the node to set the attribute of.
-        id: ElementId,
-    },
-
     /// Set the textcontent of a node.
     SetText {
         /// The textcontent of the node

packages/core/src/nodes.rs

@@ -8,6 +8,7 @@ use std::{
     cell::{Cell, RefCell},
     fmt::Arguments,
     future::Future,
+    rc::Rc,
 };
 
 pub type TemplateId = &'static str;
@@ -88,7 +89,7 @@ impl<'a> VNode<'a> {
     pub(crate) fn clear_listeners(&self) {
         for attr in self.dynamic_attrs {
             if let AttributeValue::Listener(l) = &attr.value {
-                l.borrow_mut().take();
+                l.0.borrow_mut().take();
             }
         }
     }
@@ -317,6 +318,9 @@ pub struct Attribute<'a> {
 ///
 /// These are built-in to be faster during the diffing process. To use a custom value, use the [`AttributeValue::Any`]
 /// variant.
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serialize", serde(untagged))]
+#[derive(Clone)]
 pub enum AttributeValue<'a> {
     /// Text attribute
     Text(&'a str),
@@ -331,16 +335,67 @@ pub enum AttributeValue<'a> {
     Bool(bool),
 
     /// A listener, like "onclick"
-    Listener(RefCell<Option<ListenerCb<'a>>>),
+    Listener(ListenerCb<'a>),
 
     /// An arbitrary value that implements PartialEq and is static
-    Any(BumpBox<'a, dyn AnyValue>),
+    Any(AnyValueBox),
 
     /// A "none" value, resulting in the removal of an attribute from the dom
     None,
 }
 
-type ListenerCb<'a> = BumpBox<'a, dyn FnMut(Event<dyn Any>) + 'a>;
+pub type ListenerCbInner<'a> = RefCell<Option<BumpBox<'a, dyn FnMut(Event<dyn Any>) + 'a>>>;
+pub struct ListenerCb<'a>(pub ListenerCbInner<'a>);
+
+impl Clone for ListenerCb<'_> {
+    fn clone(&self) -> Self {
+        panic!("ListenerCb cannot be cloned")
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'a> serde::Serialize for ListenerCb<'a> {
+    fn serialize<S>(&self, _: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        panic!("ListenerCb cannot be serialized")
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de, 'a> serde::Deserialize<'de> for ListenerCb<'a> {
+    fn deserialize<D>(_: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        panic!("ListenerCb cannot be deserialized")
+    }
+}
+
+/// A boxed value that implements PartialEq and Any
+#[derive(Clone)]
+pub struct AnyValueBox(pub Rc<dyn AnyValue>);
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for AnyValueBox {
+    fn serialize<S>(&self, _: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        panic!("AnyValueBox cannot be serialized")
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for AnyValueBox {
+    fn deserialize<D>(_: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        panic!("AnyValueBox cannot be deserialized")
+    }
+}
 
 impl<'a> std::fmt::Debug for AttributeValue<'a> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -364,8 +419,8 @@ impl<'a> PartialEq for AttributeValue<'a> {
             (Self::Int(l0), Self::Int(r0)) => l0 == r0,
             (Self::Bool(l0), Self::Bool(r0)) => l0 == r0,
             (Self::Listener(_), Self::Listener(_)) => true,
-            (Self::Any(l0), Self::Any(r0)) => l0.any_cmp(r0.as_ref()),
-            _ => core::mem::discriminant(self) == core::mem::discriminant(other),
+            (Self::Any(l0), Self::Any(r0)) => l0.0.any_cmp(r0.0.as_ref()),
+            _ => false,
         }
     }
 }
@@ -559,21 +614,25 @@ impl<'a> IntoAttributeValue<'a> for &'a str {
         AttributeValue::Text(self)
     }
 }
+
 impl<'a> IntoAttributeValue<'a> for f64 {
     fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
         AttributeValue::Float(self)
     }
 }
+
 impl<'a> IntoAttributeValue<'a> for i64 {
     fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
         AttributeValue::Int(self)
     }
 }
+
 impl<'a> IntoAttributeValue<'a> for bool {
     fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
         AttributeValue::Bool(self)
     }
 }
+
 impl<'a> IntoAttributeValue<'a> for Arguments<'_> {
     fn into_value(self, bump: &'a Bump) -> AttributeValue<'a> {
         use bumpalo::core_alloc::fmt::Write;
@@ -582,3 +641,9 @@ impl<'a> IntoAttributeValue<'a> for Arguments<'_> {
         AttributeValue::Text(str_buf.into_bump_str())
     }
 }
+
+impl<'a> IntoAttributeValue<'a> for AnyValueBox {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Any(self)
+    }
+}

packages/core/src/scopes.rs

@@ -4,7 +4,7 @@ use crate::{
     arena::ElementId,
     bump_frame::BumpFrame,
     innerlude::{DynamicNode, EventHandler, VComponent, VText},
-    innerlude::{Scheduler, SchedulerMsg},
+    innerlude::{ListenerCb, Scheduler, SchedulerMsg},
     lazynodes::LazyNodes,
     nodes::{ComponentReturn, IntoAttributeValue, IntoDynNode, RenderReturn},
     Attribute, AttributeValue, Element, Event, Properties, TaskId,
@@ -483,7 +483,7 @@ impl<'src> ScopeState {
             }))
         };
 
-        AttributeValue::Listener(RefCell::new(Some(boxed)))
+        AttributeValue::Listener(ListenerCb(RefCell::new(Some(boxed))))
     }
 
     /// Store a value between renders. The foundational hook for all other hooks.

packages/core/src/virtual_dom.rs

@@ -386,7 +386,7 @@ impl VirtualDom {
             // We check the bubble state between each call to see if the event has been stopped from bubbling
             for listener in listeners.drain(..).rev() {
                 if let AttributeValue::Listener(listener) = listener {
-                    if let Some(cb) = listener.borrow_mut().as_deref_mut() {
+                    if let Some(cb) = listener.0.borrow_mut().as_deref_mut() {
                         cb(uievent.clone());
                     }
 
@@ -493,7 +493,7 @@ impl VirtualDom {
             RenderReturn::Async(_) => unreachable!("Root scope cannot be an async component"),
         }
 
-        self.finalize()
+        unsafe { std::mem::transmute(self.finalize()) }
     }
 
     /// Render whatever the VirtualDom has ready as fast as possible without requiring an executor to progress
@@ -591,7 +591,7 @@ impl VirtualDom {
 
             // If there's no pending suspense, then we have no reason to wait for anything
             if self.scheduler.leaves.borrow().is_empty() {
-                return self.finalize();
+                return unsafe { std::mem::transmute(self.finalize()) };
             }
 
             // Poll the suspense leaves in the meantime
@@ -605,13 +605,13 @@ impl VirtualDom {
             if let Either::Left((_, _)) = select(&mut deadline, pinned).await {
                 // release the borrowed
                 drop(work);
-                return self.finalize();
+                return unsafe { std::mem::transmute(self.finalize()) };
             }
         }
     }
 
     /// Swap the current mutations with a new
-    fn finalize(&mut self) -> Mutations {
+    fn finalize(&mut self) -> Mutations<'static> {
         // todo: make this a routine
         let mut out = Mutations::default();
         std::mem::swap(&mut self.mutations, &mut out);

packages/core/tests/attr_cleanup.rs

@@ -2,6 +2,7 @@
 //!
 //! This tests to ensure we clean it up
 
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation::*};
 use dioxus::prelude::*;
 
@@ -22,6 +23,8 @@ fn attrs_cycle() {
         }
     });
 
+    let bump = Bump::new();
+
     assert_eq!(
         dom.rebuild().santize().edits,
         [
@@ -36,8 +39,13 @@ fn attrs_cycle() {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
             AssignId { path: &[0,], id: ElementId(3,) },
-            SetAttribute { name: "class", value: "1", id: ElementId(3,), ns: None },
-            SetAttribute { name: "id", value: "1", id: ElementId(3,), ns: None },
+            SetAttribute {
+                name: "class",
+                value: "1".into_value(&bump),
+                id: ElementId(3,),
+                ns: None
+            },
+            SetAttribute { name: "id", value: "1".into_value(&bump), id: ElementId(3,), ns: None },
             ReplaceWith { id: ElementId(1,), m: 1 },
         ]
     );
@@ -57,8 +65,13 @@ fn attrs_cycle() {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(2) },
             AssignId { path: &[0], id: ElementId(1) },
-            SetAttribute { name: "class", value: "3", id: ElementId(1), ns: None },
-            SetAttribute { name: "id", value: "3", id: ElementId(1), ns: None },
+            SetAttribute {
+                name: "class",
+                value: "3".into_value(&bump),
+                id: ElementId(1),
+                ns: None
+            },
+            SetAttribute { name: "id", value: "3".into_value(&bump), id: ElementId(1), ns: None },
             ReplaceWith { id: ElementId(3), m: 1 }
         ]
     );

packages/core/tests/boolattrs.rs

@@ -1,15 +1,22 @@
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation::*};
 use dioxus::prelude::*;
 
 #[test]
 fn bool_test() {
     let mut app = VirtualDom::new(|cx| cx.render(rsx!(div { hidden: false })));
+    let bump = Bump::new();
     assert_eq!(
         app.rebuild().santize().edits,
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            SetBoolAttribute { name: "hidden", value: false, id: ElementId(1,) },
+            SetAttribute {
+                name: "hidden",
+                value: false.into_value(&bump),
+                id: ElementId(1,),
+                ns: None
+            },
             AppendChildren { m: 1, id: ElementId(0) },
         ]
-    )
+    );
 }

packages/core/tests/borrowedstate.rs

@@ -18,7 +18,7 @@ fn test_borrowed_state() {
             ReplacePlaceholder { path: &[0,], m: 1 },
             AppendChildren { m: 1, id: ElementId(0) },
         ]
-    )
+    );
 }
 
 fn Parent(cx: Scope) -> Element {

packages/core/tests/bubble_error.rs

@@ -20,7 +20,9 @@ fn app(cx: Scope) -> Element {
 fn bubbles_error() {
     let mut dom = VirtualDom::new(app);
 
-    let _edits = dom.rebuild().santize();
+    {
+        let _edits = dom.rebuild().santize();
+    }
 
     dom.mark_dirty(ScopeId(0));
 

packages/core/tests/cycle.rs

@@ -12,14 +12,16 @@ fn cycling_elements() {
         })
     });
 
-    let edits = dom.rebuild().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            AppendChildren { m: 1, id: ElementId(0) },
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                AppendChildren { m: 1, id: ElementId(0) },
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(

packages/core/tests/diff_component.rs

@@ -59,19 +59,21 @@ fn component_swap() {
     }
 
     let mut dom = VirtualDom::new(app);
-    let edits = dom.rebuild().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(2) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(3) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(4) },
-            ReplacePlaceholder { path: &[1], m: 3 },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5) },
-            AppendChildren { m: 2, id: ElementId(0) }
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(2) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(3) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(4) },
+                ReplacePlaceholder { path: &[1], m: 3 },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5) },
+                AppendChildren { m: 2, id: ElementId(0) }
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(

packages/core/tests/diff_keyed_list.rs

@@ -20,22 +20,24 @@ fn keyed_diffing_out_of_order() {
         cx.render(rsx!(order.iter().map(|i| rsx!(div { key: "{i}" }))))
     });
 
-    assert_eq!(
-        dom.rebuild().santize().edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(3,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(4,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(6,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(8,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(10,) },
-            AppendChildren { m: 10, id: ElementId(0) },
-        ]
-    );
+    {
+        assert_eq!(
+            dom.rebuild().santize().edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(3,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(4,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(6,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(8,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(10,) },
+                AppendChildren { m: 10, id: ElementId(0) },
+            ]
+        );
+    }
 
     dom.mark_dirty(ScopeId(0));
     assert_eq!(
@@ -44,7 +46,7 @@ fn keyed_diffing_out_of_order() {
             PushRoot { id: ElementId(7,) },
             InsertBefore { id: ElementId(5,), m: 1 },
         ]
-    )
+    );
 }
 
 /// Should result in moves only
@@ -70,7 +72,7 @@ fn keyed_diffing_out_of_order_adds() {
             PushRoot { id: ElementId(4,) },
             InsertBefore { id: ElementId(1,), m: 2 },
         ]
-    )
+    );
 }
 
 /// Should result in moves only

packages/core/tests/diff_unkeyed_list.rs

@@ -314,66 +314,76 @@ fn remove_many() {
         })
     });
 
-    let edits = dom.rebuild().santize();
-    assert!(edits.templates.is_empty());
-    assert_eq!(
-        edits.edits,
-        [
-            CreatePlaceholder { id: ElementId(1,) },
-            AppendChildren { id: ElementId(0), m: 1 },
-        ]
-    );
+    {
+        let edits = dom.rebuild().santize();
+        assert!(edits.templates.is_empty());
+        assert_eq!(
+            edits.edits,
+            [
+                CreatePlaceholder { id: ElementId(1,) },
+                AppendChildren { id: ElementId(0), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
-            ReplaceWith { id: ElementId(1,), m: 1 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                HydrateText { path: &[0,], value: "hello 0", id: ElementId(3,) },
+                ReplaceWith { id: ElementId(1,), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
-            HydrateText { path: &[0,], value: "hello 1", id: ElementId(4,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
-            HydrateText { path: &[0,], value: "hello 2", id: ElementId(6,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
-            HydrateText { path: &[0,], value: "hello 3", id: ElementId(8,) },
-            LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
-            HydrateText { path: &[0,], value: "hello 4", id: ElementId(10,) },
-            InsertAfter { id: ElementId(2,), m: 4 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1,) },
+                HydrateText { path: &[0,], value: "hello 1", id: ElementId(4,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(5,) },
+                HydrateText { path: &[0,], value: "hello 2", id: ElementId(6,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(7,) },
+                HydrateText { path: &[0,], value: "hello 3", id: ElementId(8,) },
+                LoadTemplate { name: "template", index: 0, id: ElementId(9,) },
+                HydrateText { path: &[0,], value: "hello 4", id: ElementId(10,) },
+                InsertAfter { id: ElementId(2,), m: 4 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            Remove { id: ElementId(9,) },
-            Remove { id: ElementId(7,) },
-            Remove { id: ElementId(5,) },
-            Remove { id: ElementId(1,) },
-            CreatePlaceholder { id: ElementId(3,) },
-            ReplaceWith { id: ElementId(2,), m: 1 },
-        ]
-    );
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                Remove { id: ElementId(9,) },
+                Remove { id: ElementId(7,) },
+                Remove { id: ElementId(5,) },
+                Remove { id: ElementId(1,) },
+                CreatePlaceholder { id: ElementId(3,) },
+                ReplaceWith { id: ElementId(2,), m: 1 },
+            ]
+        );
+    }
 
-    dom.mark_dirty(ScopeId(0));
-    let edits = dom.render_immediate().santize();
-    assert_eq!(
-        edits.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
-            HydrateText { path: &[0,], value: "hello 0", id: ElementId(1,) },
-            ReplaceWith { id: ElementId(3,), m: 1 },
-        ]
-    )
+    {
+        dom.mark_dirty(ScopeId(0));
+        let edits = dom.render_immediate().santize();
+        assert_eq!(
+            edits.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(2,) },
+                HydrateText { path: &[0,], value: "hello 0", id: ElementId(1,) },
+                ReplaceWith { id: ElementId(3,), m: 1 },
+            ]
+        )
+    }
 }

packages/core/tests/kitchen_sink.rs

@@ -1,3 +1,4 @@
+use bumpalo::Bump;
 use dioxus::core::{ElementId, Mutation};
 use dioxus::prelude::*;
 
@@ -26,17 +27,22 @@ fn basic_syntax_is_a_template(cx: Scope) -> Element {
 #[test]
 fn dual_stream() {
     let mut dom = VirtualDom::new(basic_syntax_is_a_template);
+    let bump = Bump::new();
     let edits = dom.rebuild().santize();
 
     use Mutation::*;
-    assert_eq!(
-        edits.edits,
+    assert_eq!(edits.edits, {
         [
             LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            SetAttribute { name: "class", value: "123", id: ElementId(1), ns: None },
+            SetAttribute {
+                name: "class",
+                value: "123".into_value(&bump),
+                id: ElementId(1),
+                ns: None,
+            },
             NewEventListener { name: "click", scope: ScopeId(0), id: ElementId(1) },
             HydrateText { path: &[0, 0], value: "123", id: ElementId(2) },
-            AppendChildren { id: ElementId(0), m: 1 }
-        ],
-    );
+            AppendChildren { id: ElementId(0), m: 1 },
+        ]
+    });
 }

packages/core/tests/suspense.rs

@@ -9,32 +9,34 @@ use std::time::Duration;
 async fn it_works() {
     let mut dom = VirtualDom::new(app);
 
-    let mutations = dom.rebuild().santize();
+    {
+        let mutations = dom.rebuild().santize();
 
-    // We should at least get the top-level template in before pausing for the children
-    // note: we dont test template edits anymore
-    // assert_eq!(
-    //     mutations.templates,
-    //     [
-    //         CreateElement { name: "div" },
-    //         CreateStaticText { value: "Waiting for child..." },
-    //         CreateStaticPlaceholder,
-    //         AppendChildren { m: 2 },
-    //         SaveTemplate { name: "template", m: 1 }
-    //     ]
-    // );
+        // We should at least get the top-level template in before pausing for the children
+        // note: we dont test template edits anymore
+        // assert_eq!(
+        //     mutations.templates,
+        //     [
+        //         CreateElement { name: "div" },
+        //         CreateStaticText { value: "Waiting for child..." },
+        //         CreateStaticPlaceholder,
+        //         AppendChildren { m: 2 },
+        //         SaveTemplate { name: "template", m: 1 }
+        //     ]
+        // );
 
-    // And we should load it in and assign the placeholder properly
-    assert_eq!(
-        mutations.edits,
-        [
-            LoadTemplate { name: "template", index: 0, id: ElementId(1) },
-            // hmmmmmmmmm.... with suspense how do we guarantee that IDs increase linearly?
-            // can we even?
-            AssignId { path: &[1], id: ElementId(3) },
-            AppendChildren { m: 1, id: ElementId(0) },
-        ]
-    );
+        // And we should load it in and assign the placeholder properly
+        assert_eq!(
+            mutations.edits,
+            [
+                LoadTemplate { name: "template", index: 0, id: ElementId(1) },
+                // hmmmmmmmmm.... with suspense how do we guarantee that IDs increase linearly?
+                // can we even?
+                AssignId { path: &[1], id: ElementId(3) },
+                AppendChildren { m: 1, id: ElementId(0) },
+            ]
+        );
+    }
 
     // wait just a moment, not enough time for the boundary to resolve