Fix mount use after removal/Simplify mounts a bit (#2834)
* remove clone mounted; mounted nodes should never leak into components? * Remove the mount from vnodes after unmounting them * Fix use after removal in iterator diffing * remove logs * Re-fix keyed list diffing * Use new.len for diffing keyed lens and remove redundant check * simplify core list diffing logic a bit * remove println * add proper asserts for new tests --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
This commit is contained in:
1 parent
959ab67624
commit
d649b0c54d
13 files changed
+310
-221
No files matched your search
@@ -47,3 +47,68 @@ fn toggle_option_text() {
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
// Regression test for https://github.com/DioxusLabs/dioxus/issues/2815
|
||||
#[test]
|
||||
fn toggle_template() {
|
||||
fn app() -> Element {
|
||||
rsx!(
|
||||
Comp {
|
||||
if true {
|
||||
"{true}"
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn Comp(children: Element) -> Element {
|
||||
let show = generation() % 2 == 0;
|
||||
|
||||
rsx! {
|
||||
if show {
|
||||
{children}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut dom = VirtualDom::new(app);
|
||||
dom.rebuild(&mut dioxus_core::NoOpMutations);
|
||||
|
||||
// Rendering again should replace the placeholder with an text node
|
||||
dom.mark_dirty(ScopeId::APP);
|
||||
assert_eq!(
|
||||
dom.render_immediate_to_vec().edits,
|
||||
[
|
||||
CreatePlaceholder { id: ElementId(2) },
|
||||
ReplaceWith { id: ElementId(1), m: 1 },
|
||||
]
|
||||
);
|
||||
|
||||
dom.mark_dirty(ScopeId(ScopeId::APP.0 + 1));
|
||||
assert_eq!(
|
||||
dom.render_immediate_to_vec().edits,
|
||||
[
|
||||
CreateTextNode { value: "true".to_string(), id: ElementId(1) },
|
||||
ReplaceWith { id: ElementId(2), m: 1 },
|
||||
]
|
||||
);
|
||||
|
||||
dom.mark_dirty(ScopeId(ScopeId::APP.0 + 1));
|
||||
assert_eq!(
|
||||
dom.render_immediate_to_vec().edits,
|
||||
[
|
||||
CreatePlaceholder { id: ElementId(2) },
|
||||
ReplaceWith { id: ElementId(1), m: 1 },
|
||||
]
|
||||
);
|
||||
|
||||
dom.mark_dirty(ScopeId(ScopeId::APP.0 + 1));
|
||||
assert_eq!(
|
||||
dom.render_immediate_to_vec().edits,
|
||||
[
|
||||
CreateTextNode { value: "true".to_string(), id: ElementId(1) },
|
||||
ReplaceWith { id: ElementId(2), m: 1 },
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -356,3 +356,92 @@ fn no_common_keys() {
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn perfect_reverse() {
|
||||
let mut dom = VirtualDom::new(|| {
|
||||
let order: &[_] = match generation() % 2 {
|
||||
0 => &[1, 2, 3, 4, 5, 6, 7, 8],
|
||||
1 => &[9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
rsx!({ order.iter().map(|i| rsx!(div { key: "{i}" })) })
|
||||
});
|
||||
|
||||
dom.rebuild(&mut dioxus_core::NoOpMutations);
|
||||
|
||||
dom.mark_dirty(ScopeId::APP);
|
||||
let edits = dom.render_immediate_to_vec().edits;
|
||||
assert_eq!(
|
||||
edits,
|
||||
[
|
||||
LoadTemplate { index: 0, id: ElementId(9,) },
|
||||
InsertAfter { id: ElementId(1,), m: 1 },
|
||||
LoadTemplate { index: 0, id: ElementId(10,) },
|
||||
PushRoot { id: ElementId(8,) },
|
||||
PushRoot { id: ElementId(7,) },
|
||||
PushRoot { id: ElementId(6,) },
|
||||
PushRoot { id: ElementId(5,) },
|
||||
PushRoot { id: ElementId(4,) },
|
||||
PushRoot { id: ElementId(3,) },
|
||||
PushRoot { id: ElementId(2,) },
|
||||
InsertBefore { id: ElementId(1,), m: 8 },
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn old_middle_empty_left_pivot() {
|
||||
let mut dom = VirtualDom::new(|| {
|
||||
let order: &[_] = match generation() % 2 {
|
||||
0 => &[/* */ /* */ 6, 7, 8, 9, 10],
|
||||
1 => &[/* */ 4, 5, /* */ 6, 7, 8, 9, 10],
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
rsx!({ order.iter().map(|i| rsx!(div { key: "{i}" })) })
|
||||
});
|
||||
|
||||
dom.rebuild(&mut dioxus_core::NoOpMutations);
|
||||
|
||||
dom.mark_dirty(ScopeId::APP);
|
||||
let edits = dom.render_immediate_to_vec().edits;
|
||||
assert_eq!(
|
||||
edits,
|
||||
[
|
||||
LoadTemplate { index: 0, id: ElementId(6,) },
|
||||
LoadTemplate { index: 0, id: ElementId(7,) },
|
||||
InsertBefore { id: ElementId(1,), m: 2 },
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn old_middle_empty_right_pivot() {
|
||||
let mut dom = VirtualDom::new(|| {
|
||||
let order: &[_] = match generation() % 2 {
|
||||
0 => &[1, 2, 3, /* */ 6, 7, 8, 9, 10],
|
||||
1 => &[1, 2, 3, /* */ 4, 5, 6, 7, 8, 9, 10 /* */],
|
||||
|
||||
// 0 => &[/* */ 6, 7, 8, 9, 10],
|
||||
// 1 => &[/* */ 6, 7, 8, 9, 10, /* */ 4, 5],
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
rsx!({ order.iter().map(|i| rsx!(div { key: "{i}" })) })
|
||||
});
|
||||
|
||||
dom.rebuild(&mut dioxus_core::NoOpMutations);
|
||||
|
||||
dom.mark_dirty(ScopeId::APP);
|
||||
let edits = dom.render_immediate_to_vec().edits;
|
||||
assert_eq!(
|
||||
edits,
|
||||
[
|
||||
LoadTemplate { index: 0, id: ElementId(9) },
|
||||
LoadTemplate { index: 0, id: ElementId(10) },
|
||||
InsertBefore { id: ElementId(4), m: 2 },
|
||||
]
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user