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

feat: support desktop more completely

Browse Source
This commit is contained in:
Jonathan Kelley committed 2021-10-05 03:37:15 -04:00
1 parent a2b0c50a34
commit efd0e9b564
25 files changed
+701 -441
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/core/src/diff.rs
+1 -19
View File
@@ -467,7 +467,7 @@ impl<'bump> DiffMachine<'bump> {
if !has_comitted {
has_comitted = true;
edits.push(PushRoot {
id: root.unwrap().as_u64(),
root: root.unwrap().as_u64(),
});
}
};
@@ -1026,14 +1026,6 @@ impl<'bump> DiffMachine<'bump> {
}
}
fn replace_and_create_one_with_many(
&mut self,
old: &'bump VNode<'bump>,
new: &'bump [VNode<'bump>],
) {
//
}
fn replace_and_create_many_with_one(
&mut self,
old: &'bump [VNode<'bump>],
@@ -1130,13 +1122,3 @@ impl<'bump> DiffMachine<'bump> {
}
}
}
fn compare_strs(a: &str, b: &str) -> bool {
// Check by pointer, optimizing for static strs
if !std::ptr::eq(a, b) {
// If the pointers are different then check by value
a == b
} else {
true
}
}
packages/core/src/diff_stack.rs
-6
View File
@@ -39,7 +39,6 @@ pub(crate) struct DiffStack<'bump> {
instructions: Vec<DiffInstruction<'bump>>,
nodes_created_stack: SmallVec<[usize; 10]>,
pub scope_stack: SmallVec<[ScopeId; 5]>,
pub element_id_stack: SmallVec<[ElementId; 5]>,
}
impl<'bump> DiffStack<'bump> {
@@ -48,7 +47,6 @@ impl<'bump> DiffStack<'bump> {
instructions: Vec::with_capacity(1000),
nodes_created_stack: smallvec![],
scope_stack: smallvec![],
element_id_stack: smallvec![],
}
}
@@ -82,10 +80,6 @@ impl<'bump> DiffStack<'bump> {
self.nodes_created_stack.push(count);
}
pub fn _push_element_id(&mut self, id: ElementId) {
self.element_id_stack.push(id);
}
pub fn create_node(&mut self, node: &'bump VNode<'bump>, and: MountType<'bump>) {
self.nodes_created_stack.push(0);
self.instructions.push(DiffInstruction::Mount { and });
packages/core/src/events.rs
-2
View File
@@ -13,8 +13,6 @@ use std::{
cell::{Cell, RefCell},
fmt::Debug,
ops::Deref,
rc::Rc,
sync::Arc,
};
pub use on::*;
packages/core/src/mutations.rs
+12 -12
View File
@@ -23,7 +23,7 @@ impl<'a> Mutations<'a> {
// Navigation
pub(crate) fn push_root(&mut self, root: ElementId) {
let id = root.as_u64();
self.edits.push(PushRoot { id });
self.edits.push(PushRoot { root: id });
}
pub(crate) fn pop(&mut self) {
@@ -53,7 +53,7 @@ impl<'a> Mutations<'a> {
// Create
pub(crate) fn create_text_node(&mut self, text: &'a str, id: ElementId) {
let id = id.as_u64();
self.edits.push(CreateTextNode { text, id });
self.edits.push(CreateTextNode { text, root: id });
}
pub(crate) fn create_element(
@@ -64,14 +64,14 @@ impl<'a> Mutations<'a> {
) {
let id = id.as_u64();
match ns {
Some(ns) => self.edits.push(CreateElementNs { id, ns, tag }),
None => self.edits.push(CreateElement { id, tag }),
Some(ns) => self.edits.push(CreateElementNs { root: id, ns, tag }),
None => self.edits.push(CreateElement { root: id, tag }),
}
}
// placeholders are nodes that don't get rendered but still exist as an "anchor" in the real dom
pub(crate) fn create_placeholder(&mut self, id: ElementId) {
let id = id.as_u64();
self.edits.push(CreatePlaceholder { id });
self.edits.push(CreatePlaceholder { root: id });
}
// events
@@ -87,7 +87,7 @@ impl<'a> Mutations<'a> {
self.edits.push(NewEventListener {
scope,
event_name: event,
mounted_node_id: element_id,
root: element_id,
});
}
pub(crate) fn remove_event_listener(&mut self, event: &'static str) {
@@ -159,7 +159,7 @@ impl<'a> NodeRefMutation<'a> {
)]
pub enum DomEdit<'bump> {
PushRoot {
id: u64,
root: u64,
},
PopRoot,
@@ -187,24 +187,24 @@ pub enum DomEdit<'bump> {
CreateTextNode {
text: &'bump str,
id: u64,
root: u64,
},
CreateElement {
tag: &'bump str,
id: u64,
root: u64,
},
CreateElementNs {
tag: &'bump str,
id: u64,
root: u64,
ns: &'static str,
},
CreatePlaceholder {
id: u64,
root: u64,
},
NewEventListener {
event_name: &'static str,
scope: ScopeId,
mounted_node_id: u64,
root: u64,
},
RemoveEventListener {
event: &'static str,
packages/core/src/scheduler.rs
+2
View File
@@ -506,6 +506,8 @@ impl Scheduler {
}
}
log::debug!("work with deadline completed: {:#?}", committed_mutations);
committed_mutations
}
packages/core/src/scope.rs
-1
View File
@@ -7,7 +7,6 @@ use std::{
future::Future,
pin::Pin,
rc::Rc,
sync::Arc,
};
/// Every component in Dioxus is represented by a `Scope`.
packages/core/tests/create_dom.rs
+87 -36
View File
@@ -34,10 +34,16 @@ fn test_original_diff() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement { id: 1, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateElement {
root: 1,
tag: "div"
},
CreateTextNode {
id: 2,
root: 2,
text: "Hello, world!"
},
AppendChildren { many: 1 },
@@ -73,20 +79,32 @@ fn create() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement { id: 1, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateElement {
root: 1,
tag: "div"
},
CreateTextNode {
id: 2,
root: 2,
text: "Hello, world!"
},
CreateElement { id: 3, tag: "div" },
CreateElement { id: 4, tag: "div" },
CreateElement {
root: 3,
tag: "div"
},
CreateElement {
root: 4,
tag: "div"
},
CreateTextNode {
id: 5,
root: 5,
text: "hello"
},
CreateTextNode {
id: 6,
root: 6,
text: "world"
},
AppendChildren { many: 2 },
@@ -115,21 +133,30 @@ fn create_list() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateTextNode {
id: 1,
root: 1,
text: "hello"
},
AppendChildren { many: 1 },
CreateElement { id: 2, tag: "div" },
CreateElement {
root: 2,
tag: "div"
},
CreateTextNode {
id: 3,
root: 3,
text: "hello"
},
AppendChildren { many: 1 },
CreateElement { id: 4, tag: "div" },
CreateElement {
root: 4,
tag: "div"
},
CreateTextNode {
id: 5,
root: 5,
text: "hello"
},
AppendChildren { many: 1 },
@@ -156,10 +183,22 @@ fn create_simple() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement { id: 1, tag: "div" },
CreateElement { id: 2, tag: "div" },
CreateElement { id: 3, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateElement {
root: 1,
tag: "div"
},
CreateElement {
root: 2,
tag: "div"
},
CreateElement {
root: 3,
tag: "div"
},
AppendChildren { many: 4 },
]
);
@@ -188,30 +227,39 @@ fn create_components() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "h1" },
CreateElement { id: 1, tag: "div" },
CreateElement { root: 0, tag: "h1" },
CreateElement {
root: 1,
tag: "div"
},
CreateTextNode {
id: 2,
root: 2,
text: "abc1"
},
AppendChildren { many: 1 },
CreateElement { id: 3, tag: "p" },
CreateElement { id: 4, tag: "h1" },
CreateElement { id: 5, tag: "div" },
CreateElement { root: 3, tag: "p" },
CreateElement { root: 4, tag: "h1" },
CreateElement {
root: 5,
tag: "div"
},
CreateTextNode {
id: 6,
root: 6,
text: "abc2"
},
AppendChildren { many: 1 },
CreateElement { id: 7, tag: "p" },
CreateElement { id: 8, tag: "h1" },
CreateElement { id: 9, tag: "div" },
CreateElement { root: 7, tag: "p" },
CreateElement { root: 8, tag: "h1" },
CreateElement {
root: 9,
tag: "div"
},
CreateTextNode {
id: 10,
root: 10,
text: "abc3"
},
AppendChildren { many: 1 },
CreateElement { id: 11, tag: "p" },
CreateElement { root: 11, tag: "p" },
AppendChildren { many: 9 },
]
);
@@ -230,13 +278,16 @@ fn anchors() {
assert_eq!(
mutations.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateTextNode {
id: 1,
root: 1,
text: "hello"
},
AppendChildren { many: 1 },
CreatePlaceholder { id: 2 },
CreatePlaceholder { root: 2 },
AppendChildren { many: 2 },
]
);
@@ -260,6 +311,6 @@ fn suspended() {
assert_eq!(
mutations.edits,
[CreatePlaceholder { id: 0 }, AppendChildren { many: 1 },]
[CreatePlaceholder { root: 0 }, AppendChildren { many: 1 },]
);
}
packages/core/tests/diffing.rs
+182 -74
View File
@@ -30,9 +30,12 @@ fn html_and_rsx_generate_the_same_output() {
assert_eq!(
create.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateTextNode {
id: 1,
root: 1,
text: "Hello world"
},
AppendChildren { many: 1 },
@@ -43,7 +46,7 @@ fn html_and_rsx_generate_the_same_output() {
assert_eq!(
change.edits,
[
PushRoot { id: 1 },
PushRoot { root: 1 },
SetText {
text: "Goodbye world"
},
@@ -66,21 +69,30 @@ fn fragments_create_properly() {
assert_eq!(
create.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateTextNode {
id: 1,
root: 1,
text: "Hello a"
},
AppendChildren { many: 1 },
CreateElement { id: 2, tag: "div" },
CreateElement {
root: 2,
tag: "div"
},
CreateTextNode {
id: 3,
root: 3,
text: "Hello b"
},
AppendChildren { many: 1 },
CreateElement { id: 4, tag: "div" },
CreateElement {
root: 4,
tag: "div"
},
CreateTextNode {
id: 5,
root: 5,
text: "Hello c"
},
AppendChildren { many: 1 },
@@ -101,12 +113,15 @@ fn empty_fragments_create_anchors() {
assert_eq!(
create.edits,
[CreatePlaceholder { id: 0 }, AppendChildren { many: 1 }]
[CreatePlaceholder { root: 0 }, AppendChildren { many: 1 }]
);
assert_eq!(
change.edits,
[
CreateElement { id: 1, tag: "div" },
CreateElement {
root: 1,
tag: "div"
},
ReplaceWith { m: 1, root: 0 }
]
);
@@ -123,16 +138,31 @@ fn empty_fragments_create_many_anchors() {
let (create, change) = dom.lazy_diff(left, right);
assert_eq!(
create.edits,
[CreatePlaceholder { id: 0 }, AppendChildren { many: 1 }]
[CreatePlaceholder { root: 0 }, AppendChildren { many: 1 }]
);
assert_eq!(
change.edits,
[
CreateElement { id: 1, tag: "div" },
CreateElement { id: 2, tag: "div" },
CreateElement { id: 3, tag: "div" },
CreateElement { id: 4, tag: "div" },
CreateElement { id: 5, tag: "div" },
CreateElement {
root: 1,
tag: "div"
},
CreateElement {
root: 2,
tag: "div"
},
CreateElement {
root: 3,
tag: "div"
},
CreateElement {
root: 4,
tag: "div"
},
CreateElement {
root: 5,
tag: "div"
},
ReplaceWith { m: 5, root: 0 }
]
);
@@ -154,27 +184,36 @@ fn empty_fragments_create_anchors_with_many_children() {
let (create, change) = dom.lazy_diff(left, right);
assert_eq!(
create.edits,
[CreatePlaceholder { id: 0 }, AppendChildren { many: 1 }]
[CreatePlaceholder { root: 0 }, AppendChildren { many: 1 }]
);
assert_eq!(
change.edits,
[
CreateElement { id: 1, tag: "div" },
CreateElement {
root: 1,
tag: "div"
},
CreateTextNode {
text: "hello: 0",
id: 2
root: 2
},
AppendChildren { many: 1 },
CreateElement { id: 3, tag: "div" },
CreateElement {
root: 3,
tag: "div"
},
CreateTextNode {
text: "hello: 1",
id: 4
root: 4
},
AppendChildren { many: 1 },
CreateElement { id: 5, tag: "div" },
CreateElement {
root: 5,
tag: "div"
},
CreateTextNode {
text: "hello: 2",
id: 6
root: 6
},
AppendChildren { many: 1 },
ReplaceWith { m: 3, root: 0 }
@@ -198,16 +237,22 @@ fn many_items_become_fragment() {
assert_eq!(
create.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement {
root: 0,
tag: "div"
},
CreateTextNode {
text: "hello",
id: 1
root: 1
},
AppendChildren { many: 1 },
CreateElement { id: 2, tag: "div" },
CreateElement {
root: 2,
tag: "div"
},
CreateTextNode {
text: "hello",
id: 3
root: 3
},
AppendChildren { many: 1 },
AppendChildren { many: 2 },
@@ -219,7 +264,7 @@ fn many_items_become_fragment() {
change.edits,
[
Remove { root: 2 },
CreatePlaceholder { id: 4 },
CreatePlaceholder { root: 4 },
ReplaceWith { root: 0, m: 1 },
]
);
@@ -265,14 +310,14 @@ fn two_fragments_with_differrent_elements_are_differet() {
changes.edits,
[
// create the new h1s
CreateElement { tag: "h1", id: 3 },
CreateElement { tag: "h1", id: 4 },
CreateElement { tag: "h1", id: 5 },
CreateElement { tag: "h1", root: 3 },
CreateElement { tag: "h1", root: 4 },
CreateElement { tag: "h1", root: 5 },
InsertAfter { root: 1, n: 3 },
// replace the divs with new h1s
CreateElement { tag: "h1", id: 6 },
CreateElement { tag: "h1", root: 6 },
ReplaceWith { root: 0, m: 1 },
CreateElement { tag: "h1", id: 7 },
CreateElement { tag: "h1", root: 7 },
ReplaceWith { root: 1, m: 1 },
]
);
@@ -296,12 +341,27 @@ fn two_fragments_with_differrent_elements_are_differet_shorter() {
assert_eq!(
create.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement { id: 1, tag: "div" },
CreateElement { id: 2, tag: "div" },
CreateElement { id: 3, tag: "div" },
CreateElement { id: 4, tag: "div" },
CreateElement { id: 5, tag: "p" },
CreateElement {
root: 0,
tag: "div"
},
CreateElement {
root: 1,
tag: "div"
},
CreateElement {
root: 2,
tag: "div"
},
CreateElement {
root: 3,
tag: "div"
},
CreateElement {
root: 4,
tag: "div"
},
CreateElement { root: 5, tag: "p" },
AppendChildren { many: 6 },
]
);
@@ -311,9 +371,9 @@ fn two_fragments_with_differrent_elements_are_differet_shorter() {
Remove { root: 2 },
Remove { root: 3 },
Remove { root: 4 },
CreateElement { id: 6, tag: "h1" },
CreateElement { root: 6, tag: "h1" },
ReplaceWith { root: 0, m: 1 },
CreateElement { id: 7, tag: "h1" },
CreateElement { root: 7, tag: "h1" },
ReplaceWith { root: 1, m: 1 },
]
);
@@ -337,18 +397,33 @@ fn two_fragments_with_same_elements_are_differet() {
assert_eq!(
create.edits,
[
CreateElement { id: 0, tag: "div" },
CreateElement { id: 1, tag: "div" },
CreateElement { id: 2, tag: "p" },
CreateElement {
root: 0,
tag: "div"
},
CreateElement {
root: 1,
tag: "div"
},
CreateElement { root: 2, tag: "p" },
AppendChildren { many: 3 },
]
);
assert_eq!(
change.edits,
[
CreateElement { id: 3, tag: "div" },
CreateElement { id: 4, tag: "div" },
CreateElement { id: 5, tag: "div" },
CreateElement {
root: 3,
tag: "div"
},
CreateElement {
root: 4,
tag: "div"
},
CreateElement {
root: 5,
tag: "div"
},
InsertAfter { root: 1, n: 3 },
]
);
@@ -396,7 +471,7 @@ fn keyed_diffing_out_of_order() {
log::debug!("{:?}", &changes);
assert_eq!(
changes.edits,
[PushRoot { id: 6 }, InsertBefore { root: 4, n: 1 }]
[PushRoot { root: 6 }, InsertBefore { root: 4, n: 1 }]
);
}
@@ -421,8 +496,8 @@ fn keyed_diffing_out_of_order_adds() {
assert_eq!(
change.edits,
[
PushRoot { id: 4 },
PushRoot { id: 3 },
PushRoot { root: 4 },
PushRoot { root: 3 },
InsertBefore { n: 2, root: 0 }
]
);
@@ -448,8 +523,8 @@ fn keyed_diffing_out_of_order_adds_2() {
assert_eq!(
change.edits,
[
PushRoot { id: 3 },
PushRoot { id: 4 },
PushRoot { root: 3 },
PushRoot { root: 4 },
InsertBefore { n: 2, root: 0 }
]
);
@@ -476,8 +551,8 @@ fn keyed_diffing_out_of_order_adds_3() {
assert_eq!(
change.edits,
[
PushRoot { id: 4 },
PushRoot { id: 3 },
PushRoot { root: 4 },
PushRoot { root: 3 },
InsertBefore { n: 2, root: 1 }
]
);
@@ -504,8 +579,8 @@ fn keyed_diffing_out_of_order_adds_4() {
assert_eq!(
change.edits,
[
PushRoot { id: 4 },
PushRoot { id: 3 },
PushRoot { root: 4 },
PushRoot { root: 3 },
InsertBefore { n: 2, root: 2 }
]
);
@@ -531,7 +606,7 @@ fn keyed_diffing_out_of_order_adds_5() {
let (_, change) = dom.lazy_diff(left, right);
assert_eq!(
change.edits,
[PushRoot { id: 4 }, InsertBefore { n: 1, root: 3 }]
[PushRoot { root: 4 }, InsertBefore { n: 1, root: 3 }]
);
}
@@ -555,8 +630,14 @@ fn keyed_diffing_additions() {
assert_eq!(
change.edits,
[
CreateElement { id: 5, tag: "div" },
CreateElement { id: 6, tag: "div" },
CreateElement {
root: 5,
tag: "div"
},
CreateElement {
root: 6,
tag: "div"
},
InsertAfter { n: 2, root: 4 }
]
);
@@ -584,11 +665,17 @@ fn keyed_diffing_additions_and_moves_on_ends() {
change.edits,
[
// create 11, 12
CreateElement { tag: "div", id: 4 },
CreateElement { tag: "div", id: 5 },
CreateElement {
tag: "div",
root: 4
},
CreateElement {
tag: "div",
root: 5
},
InsertAfter { root: 2, n: 2 },
// move 7 to the front
PushRoot { id: 3 },
PushRoot { root: 3 },
InsertBefore { root: 0, n: 1 }
]
);
@@ -617,15 +704,27 @@ fn keyed_diffing_additions_and_moves_in_middle() {
change.edits,
[
// create 13, 17
CreateElement { tag: "div", id: 4 },
CreateElement { tag: "div", id: 5 },
CreateElement {
tag: "div",
root: 4
},
CreateElement {
tag: "div",
root: 5
},
InsertBefore { root: 1, n: 2 },
// create 11, 12
CreateElement { tag: "div", id: 6 },
CreateElement { tag: "div", id: 7 },
CreateElement {
tag: "div",
root: 6
},
CreateElement {
tag: "div",
root: 7
},
InsertBefore { root: 2, n: 2 },
// move 7
PushRoot { id: 3 },
PushRoot { root: 3 },
InsertBefore { root: 0, n: 1 }
]
);
@@ -654,15 +753,21 @@ fn controlled_keyed_diffing_out_of_order() {
changes.edits,
[
// move 4 to after 6
PushRoot { id: 0 },
PushRoot { root: 0 },
InsertAfter { n: 1, root: 2 },
// remove 7
// create 9 and insert before 6
CreateElement { id: 4, tag: "div" },
CreateElement {
root: 4,
tag: "div"
},
InsertBefore { n: 1, root: 2 },
// create 0 and insert before 5
CreateElement { id: 5, tag: "div" },
CreateElement {
root: 5,
tag: "div"
},
InsertBefore { n: 1, root: 1 },
]
);
@@ -689,9 +794,12 @@ fn controlled_keyed_diffing_out_of_order_max_test() {
assert_eq!(
changes.edits,
[
CreateElement { id: 5, tag: "div" },
CreateElement {
root: 5,
tag: "div"
},
InsertBefore { n: 1, root: 2 },
PushRoot { id: 3 },
PushRoot { root: 3 },
InsertBefore { n: 1, root: 0 },
]
);
@@ -711,6 +819,6 @@ fn suspense() {
}));
assert_eq!(
edits.edits,
[CreatePlaceholder { id: 0 }, AppendChildren { many: 1 }]
[CreatePlaceholder { root: 0 }, AppendChildren { many: 1 }]
);
}
packages/core/tests/sharedstate.rs
+1 -1
View File
@@ -34,7 +34,7 @@ fn shared_state_test() {
edits,
[
CreateTextNode {
id: 0,
root: 0,
text: "Hello, world!"
},
AppendChildren { many: 1 },