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

update dependancy to stretch2 master and remove refrences to tree

Browse Source
This commit is contained in:
Evan Almloff committed 2022-04-04 13:37:04 -05:00
1 parent 06e8785938
commit 351722d136
10 files changed
+125 -191
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/native-core/tests/change_nodes.rs
+20 -20
View File
@@ -20,9 +20,9 @@ fn remove_node() {
}
});
let mut tree: RealDom<(), ()> = RealDom::new();
let mut dom: RealDom<(), ()> = RealDom::new();
let _to_update = tree.apply_mutations(vec![mutations]);
let _to_update = dom.apply_mutations(vec![mutations]);
let child_div = VElement {
id: Cell::new(Some(ElementId(2))),
key: None,
@@ -45,10 +45,10 @@ fn remove_node() {
children: &[child_div_el],
};
assert_eq!(tree.size(), 2);
assert!(&tree.contains_node(&VNode::Element(&root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(tree[2].height, 2);
assert_eq!(dom.size(), 2);
assert!(&dom.contains_node(&VNode::Element(&root_div)));
assert_eq!(dom[1].height, 1);
assert_eq!(dom[2].height, 2);
let vdom = VirtualDom::new(Base);
let mutations = vdom.diff_lazynodes(
@@ -61,7 +61,7 @@ fn remove_node() {
div{}
},
);
tree.apply_mutations(vec![mutations.1]);
dom.apply_mutations(vec![mutations.1]);
let new_root_div = VElement {
id: Cell::new(Some(ElementId(1))),
@@ -74,9 +74,9 @@ fn remove_node() {
children: &[],
};
assert_eq!(tree.size(), 1);
assert!(&tree.contains_node(&VNode::Element(&new_root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(dom.size(), 1);
assert!(&dom.contains_node(&VNode::Element(&new_root_div)));
assert_eq!(dom[1].height, 1);
}
#[test]
@@ -92,9 +92,9 @@ fn add_node() {
div{}
});
let mut tree: RealDom<(), ()> = RealDom::new();
let mut dom: RealDom<(), ()> = RealDom::new();
let _to_update = tree.apply_mutations(vec![mutations]);
let _to_update = dom.apply_mutations(vec![mutations]);
let root_div = VElement {
id: Cell::new(Some(ElementId(1))),
@@ -107,9 +107,9 @@ fn add_node() {
children: &[],
};
assert_eq!(tree.size(), 1);
assert!(&tree.contains_node(&VNode::Element(&root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(dom.size(), 1);
assert!(&dom.contains_node(&VNode::Element(&root_div)));
assert_eq!(dom[1].height, 1);
let vdom = VirtualDom::new(Base);
let mutations = vdom.diff_lazynodes(
@@ -122,7 +122,7 @@ fn add_node() {
}
},
);
tree.apply_mutations(vec![mutations.1]);
dom.apply_mutations(vec![mutations.1]);
let child_div = VElement {
id: Cell::new(Some(ElementId(2))),
@@ -146,8 +146,8 @@ fn add_node() {
children: &[child_div_el],
};
assert_eq!(tree.size(), 2);
assert!(&tree.contains_node(&VNode::Element(&new_root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(tree[2].height, 2);
assert_eq!(dom.size(), 2);
assert!(&dom.contains_node(&VNode::Element(&new_root_div)));
assert_eq!(dom[1].height, 1);
assert_eq!(dom[2].height, 2);
}
packages/native-core/tests/initial_build.rs
+15 -15
View File
@@ -21,9 +21,9 @@ fn initial_build_simple() {
div{}
});
let mut tree: RealDom<(), ()> = RealDom::new();
let mut dom: RealDom<(), ()> = RealDom::new();
let _to_update = tree.apply_mutations(vec![mutations]);
let _to_update = dom.apply_mutations(vec![mutations]);
let root_div = VElement {
id: Cell::new(Some(ElementId(1))),
key: None,
@@ -34,9 +34,9 @@ fn initial_build_simple() {
attributes: &[],
children: &[],
};
assert_eq!(tree.size(), 1);
assert!(&tree.contains_node(&VNode::Element(&root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(dom.size(), 1);
assert!(&dom.contains_node(&VNode::Element(&root_div)));
assert_eq!(dom[1].height, 1);
}
#[test]
@@ -60,9 +60,9 @@ fn initial_build_with_children() {
}
});
let mut tree: RealDom<(), ()> = RealDom::new();
let mut dom: RealDom<(), ()> = RealDom::new();
let _to_update = tree.apply_mutations(vec![mutations]);
let _to_update = dom.apply_mutations(vec![mutations]);
let first_text = VText {
id: Cell::new(Some(ElementId(3))),
text: "hello",
@@ -113,12 +113,12 @@ fn initial_build_with_children() {
attributes: &[],
children: &[child_div_node],
};
assert_eq!(tree.size(), 6);
assert!(&tree.contains_node(&VNode::Element(&root_div)));
assert_eq!(tree[1].height, 1);
assert_eq!(tree[2].height, 2);
assert_eq!(tree[3].height, 3);
assert_eq!(tree[4].height, 3);
assert_eq!(tree[5].height, 4);
assert_eq!(tree[6].height, 3);
assert_eq!(dom.size(), 6);
assert!(&dom.contains_node(&VNode::Element(&root_div)));
assert_eq!(dom[1].height, 1);
assert_eq!(dom[2].height, 2);
assert_eq!(dom[3].height, 3);
assert_eq!(dom[4].height, 3);
assert_eq!(dom[5].height, 4);
assert_eq!(dom[6].height, 3);
}
packages/native-core/tests/state.rs
+22 -22
View File
@@ -77,12 +77,12 @@ fn state_initial() {
}
});
let mut tree: RealDom<BubbledUpStateTester, PushedDownStateTester> = RealDom::new();
let mut dom: RealDom<BubbledUpStateTester, PushedDownStateTester> = RealDom::new();
let nodes_updated = tree.apply_mutations(vec![mutations]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut 42, &mut 42);
let nodes_updated = dom.apply_mutations(vec![mutations]);
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut 42, &mut 42);
let root_div = &tree[1];
let root_div = &dom[1];
assert_eq!(root_div.up_state.0, "1");
assert_eq!(
root_div.up_state.1,
@@ -94,7 +94,7 @@ fn state_initial() {
assert_eq!(root_div.down_state.0, "1");
assert_eq!(root_div.down_state.1, None);
let child_p = &tree[2];
let child_p = &dom[2];
assert_eq!(child_p.up_state.0, "2");
assert_eq!(child_p.up_state.1, Vec::new());
assert_eq!(child_p.down_state.0, "2");
@@ -103,7 +103,7 @@ fn state_initial() {
Some(Box::new(PushedDownStateTester("1".to_string(), None)))
);
let child_h1 = &tree[3];
let child_h1 = &dom[3];
assert_eq!(child_h1.up_state.0, "3");
assert_eq!(child_h1.up_state.1, Vec::new());
assert_eq!(child_h1.down_state.0, "3");
@@ -178,12 +178,12 @@ fn state_reduce_initally_called_minimally() {
}
});
let mut tree: RealDom<CallCounter, CallCounter> = RealDom::new();
let mut dom: RealDom<CallCounter, CallCounter> = RealDom::new();
let nodes_updated = tree.apply_mutations(vec![mutations]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut (), &mut ());
let nodes_updated = dom.apply_mutations(vec![mutations]);
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut (), &mut ());
tree.traverse_depth_first(|n| {
dom.traverse_depth_first(|n| {
assert_eq!(n.up_state.0, 1);
assert_eq!(n.down_state.0, 1);
});
@@ -233,11 +233,11 @@ fn state_reduce_down_called_minimally_on_update() {
}
});
let mut tree: RealDom<CallCounter, CallCounter> = RealDom::new();
let mut dom: RealDom<CallCounter, CallCounter> = RealDom::new();
let nodes_updated = tree.apply_mutations(vec![mutations]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut (), &mut ());
let nodes_updated = tree.apply_mutations(vec![Mutations {
let nodes_updated = dom.apply_mutations(vec![mutations]);
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut (), &mut ());
let nodes_updated = dom.apply_mutations(vec![Mutations {
edits: vec![DomEdit::SetAttribute {
root: 1,
field: "width",
@@ -247,9 +247,9 @@ fn state_reduce_down_called_minimally_on_update() {
dirty_scopes: fxhash::FxHashSet::default(),
refs: Vec::new(),
}]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut (), &mut ());
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut (), &mut ());
tree.traverse_depth_first(|n| {
dom.traverse_depth_first(|n| {
assert_eq!(n.down_state.0, 2);
});
}
@@ -298,11 +298,11 @@ fn state_reduce_up_called_minimally_on_update() {
}
});
let mut tree: RealDom<CallCounter, CallCounter> = RealDom::new();
let mut dom: RealDom<CallCounter, CallCounter> = RealDom::new();
let nodes_updated = tree.apply_mutations(vec![mutations]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut (), &mut ());
let nodes_updated = tree.apply_mutations(vec![Mutations {
let nodes_updated = dom.apply_mutations(vec![mutations]);
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut (), &mut ());
let nodes_updated = dom.apply_mutations(vec![Mutations {
edits: vec![DomEdit::SetAttribute {
root: 4,
field: "width",
@@ -312,9 +312,9 @@ fn state_reduce_up_called_minimally_on_update() {
dirty_scopes: fxhash::FxHashSet::default(),
refs: Vec::new(),
}]);
let _to_rerender = tree.update_state(&vdom, nodes_updated, &mut (), &mut ());
let _to_rerender = dom.update_state(&vdom, nodes_updated, &mut (), &mut ());
tree.traverse_depth_first(|n| {
dom.traverse_depth_first(|n| {
assert_eq!(n.up_state.0, if n.id.0 > 4 { 1 } else { 2 });
});
}