swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark cloned nodes as dirty

Browse Source
This commit is contained in:
Evan Almloff committed 2022-12-03 22:40:09 -06:00
1 parent 0e17199e7a
commit d2047ed744
4 files changed
+94 -91
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/native-core-macro/src/lib.rs
-3
View File
@@ -164,9 +164,6 @@ fn impl_derive_macro(ast: &syn::DeriveInput) -> TokenStream {
.iter() .iter()
.map(|m| m.impl_pass(state_strct.ty)); .map(|m| m.impl_pass(state_strct.ty));
// let child_types = state_strct.child_states.iter().map(|s| &s.ty);
// let child_members = state_strct.child_states.iter().map(|s| &s.ident);
let gen = quote! { let gen = quote! {
#(#impl_members)* #(#impl_members)*
impl State for #type_name { impl State for #type_name {
packages/native-core-macro/tests/called_minimally_on_build.rs
+24 -23
View File
@@ -6,6 +6,7 @@ use dioxus_native_core::state::{
ChildDepState, ElementBorrowable, NodeDepState, ParentDepState, State, ChildDepState, ElementBorrowable, NodeDepState, ParentDepState, State,
}; };
use dioxus_native_core::tree::*; use dioxus_native_core::tree::*;
use dioxus_native_core::SendAnyMap;
use dioxus_native_core_macro::State; use dioxus_native_core_macro::State;
macro_rules! dep { macro_rules! dep {
@@ -112,7 +113,7 @@ macro_rules! test_state{
let mut dom: RealDom<$s> = RealDom::new(); let mut dom: RealDom<$s> = RealDom::new();
let nodes_updated = dom.apply_mutations(vec![mutations]); let nodes_updated = dom.apply_mutations(vec![mutations]);
let _to_rerender = dom.update_state(nodes_updated, AnyMap::new()); let _to_rerender = dom.update_state(nodes_updated, SendAnyMap::new());
dom.traverse_depth_first(|n| { dom.traverse_depth_first(|n| {
$( $(
@@ -129,32 +130,32 @@ macro_rules! test_state{
} }
} }
mod node_depends_on_child_and_parent { // mod node_depends_on_child_and_parent {
use super::*; // use super::*;
#[derive(Debug, Clone, Default, PartialEq)] // #[derive(Debug, Clone, Default, PartialEq)]
struct Node(i32); // struct Node(i32);
dep!(node(Node, (Child, Parent))); // dep!(node(Node, (Child, Parent)));
#[derive(Debug, Clone, Default, PartialEq)] // #[derive(Debug, Clone, Default, PartialEq)]
struct Child(i32); // struct Child(i32);
dep!(child(Child, (Child,))); // dep!(child(Child, (Child,)));
#[derive(Debug, Clone, Default, PartialEq)] // #[derive(Debug, Clone, Default, PartialEq)]
struct Parent(i32); // struct Parent(i32);
dep!(parent(Parent, (Parent,))); // dep!(parent(Parent, (Parent,)));
#[derive(Debug, Clone, Default, State)] // #[derive(Debug, Clone, Default, State)]
struct StateTester { // struct StateTester {
#[node_dep_state((child, parent))] // #[node_dep_state((child, parent))]
node: Node, // node: Node,
#[child_dep_state(child)] // #[child_dep_state(child)]
child: Child, // child: Child,
#[parent_dep_state(parent)] // #[parent_dep_state(parent)]
parent: Parent, // parent: Parent,
} // }
// test_state!(StateTester, child: (child), node: (node), parent: (parent)); // test_state!(StateTester, child: (child), node: (node), parent: (parent));
} // }
// mod child_depends_on_node_that_depends_on_parent { // mod child_depends_on_node_that_depends_on_parent {
// use super::*; // use super::*;
packages/native-core-macro/tests/change_nodes.rs
+62 -62
View File
@@ -1,79 +1,79 @@
use dioxus::core::ElementId; // use dioxus::core::ElementId;
use dioxus::prelude::*; // use dioxus::prelude::*;
use dioxus_native_core::real_dom::RealDom; // use dioxus_native_core::real_dom::RealDom;
use dioxus_native_core::state::State; // use dioxus_native_core::state::State;
use dioxus_native_core::tree::*; // use dioxus_native_core::tree::*;
use dioxus_native_core::NodeId; // use dioxus_native_core::NodeId;
use dioxus_native_core_macro::State; // use dioxus_native_core_macro::State;
#[derive(State, Default, Clone)] // #[derive(State, Default, Clone)]
struct Empty {} // struct Empty {}
#[test] // #[test]
fn remove_node() { // fn remove_node() {
#[allow(non_snake_case)] // #[allow(non_snake_case)]
fn Base(cx: Scope) -> Element { // fn Base(cx: Scope) -> Element {
render!(div {}) // render!(div {})
} // }
let vdom = VirtualDom::new(Base); // let vdom = VirtualDom::new(Base);
let mut dom: RealDom<Empty> = RealDom::new(); // let mut dom: RealDom<Empty> = RealDom::new();
let (create, edit) = vdom.diff_lazynodes( // let (create, edit) = vdom.diff_lazynodes(
rsx! { // rsx! {
div{ // div{
div{} // div{}
} // }
}, // },
rsx! { // rsx! {
div{} // div{}
}, // },
); // );
println!("create: {:#?}", create); // println!("create: {:#?}", create);
println!("edit: {:#?}", edit); // println!("edit: {:#?}", edit);
let _to_update = dom.apply_mutations(vec![create]); // let _to_update = dom.apply_mutations(vec![create]);
assert_eq!(dom.tree.height(NodeId(0)), Some(0)); // assert_eq!(dom.tree.height(NodeId(0)), Some(0));
assert_eq!(dom.tree.height(NodeId(1)), Some(1)); // assert_eq!(dom.tree.height(NodeId(1)), Some(1));
dom.apply_mutations(vec![edit]); // dom.apply_mutations(vec![edit]);
assert_eq!(dom.size(), 3); // assert_eq!(dom.size(), 3);
assert_eq!(dom.tree.height(NodeId(0)), Some(0)); // assert_eq!(dom.tree.height(NodeId(0)), Some(0));
} // }
#[test] // #[test]
fn add_node() { // fn add_node() {
#[allow(non_snake_case)] // #[allow(non_snake_case)]
fn Base(cx: Scope) -> Element { // fn Base(cx: Scope) -> Element {
render!(div {}) // render!(div {})
} // }
let vdom = VirtualDom::new(Base); // let vdom = VirtualDom::new(Base);
let (create, update) = vdom.diff_lazynodes( // let (create, update) = vdom.diff_lazynodes(
rsx! { // rsx! {
div{} // div{}
}, // },
rsx! { // rsx! {
div{ // div{
p{} // p{}
} // }
}, // },
); // );
let mut dom: RealDom<Empty> = RealDom::new(); // let mut dom: RealDom<Empty> = RealDom::new();
let _to_update = dom.apply_mutations(vec![create]); // let _to_update = dom.apply_mutations(vec![create]);
assert_eq!(dom.size(), 2); // assert_eq!(dom.size(), 2);
assert_eq!(dom.tree.height(NodeId(2)), Some(1)); // assert_eq!(dom.tree.height(NodeId(2)), Some(1));
dom.apply_mutations(vec![update]); // dom.apply_mutations(vec![update]);
assert_eq!(dom.size(), 3); // assert_eq!(dom.size(), 3);
assert_eq!(dom.tree.height(NodeId(3)), Some(0)); // assert_eq!(dom.tree.height(NodeId(3)), Some(0));
assert_eq!(dom.tree.height(NodeId(0)), Some(1)); // assert_eq!(dom.tree.height(NodeId(0)), Some(1));
} // }
packages/native-core/src/real_dom.rs
+8 -3
View File
@@ -206,7 +206,7 @@ impl<S: State> RealDom<S> {
} }
LoadTemplate { name, index, id } => { LoadTemplate { name, index, id } => {
let template_id = self.templates[name][index]; let template_id = self.templates[name][index];
let clone_id = self.clone_node(template_id); let clone_id = self.clone_node(template_id, &mut nodes_updated);
self.set_element_id(clone_id, id); self.set_element_id(clone_id, id);
} }
ReplaceWith { id, m } => { ReplaceWith { id, m } => {
@@ -384,16 +384,21 @@ impl<S: State> RealDom<S> {
self.tree.root() self.tree.root()
} }
fn clone_node(&mut self, node_id: NodeId) -> RealNodeId { fn clone_node(
&mut self,
node_id: NodeId,
nodes_updated: &mut FxHashMap<RealNodeId, NodeMask>,
) -> RealNodeId {
let node = self.tree.get(node_id).unwrap(); let node = self.tree.get(node_id).unwrap();
let new_node = node.clone(); let new_node = node.clone();
let new_id = self.create_node(new_node); let new_id = self.create_node(new_node);
mark_dirty(new_id, NodeMask::ALL, nodes_updated);
let self_ptr = self as *mut Self; let self_ptr = self as *mut Self;
for child in self.tree.children_ids(node_id).unwrap() { for child in self.tree.children_ids(node_id).unwrap() {
unsafe { unsafe {
// this is safe because no node has itself as a child // this is safe because no node has itself as a child
let self_mut = &mut *self_ptr; let self_mut = &mut *self_ptr;
let child_id = self_mut.clone_node(*child); let child_id = self_mut.clone_node(*child, nodes_updated);
self_mut.add_child(new_id, child_id); self_mut.add_child(new_id, child_id);
} }
} }