fix event tests in core
This commit is contained in:
1 parent
0388a5c1f4
commit
fae81e2364
2 files changed
+7
-11
No files matched your search
+1
-1
@@ -26,7 +26,7 @@ fn app(cx: Scope) -> Element {
|
|||||||
button {
|
button {
|
||||||
onclick: move |_| {
|
onclick: move |_| {
|
||||||
let dom = VirtualDom::new_with_props(compose, ComposeProps { app_tx: tx.clone() });
|
let dom = VirtualDom::new_with_props(compose, ComposeProps { app_tx: tx.clone() });
|
||||||
window.new_window(dom, Default::default());
|
dioxus_desktop::window().new_window(dom, Default::default());
|
||||||
},
|
},
|
||||||
"Click to compose a new email"
|
"Click to compose a new email"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ fn events_propagate() {
|
|||||||
_ = dom.rebuild();
|
_ = dom.rebuild();
|
||||||
|
|
||||||
// Top-level click is registered
|
// Top-level click is registered
|
||||||
dom.handle_event("click", Rc::new(MouseData::default()), ElementId(1), true);
|
dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(1), true);
|
||||||
assert_eq!(*CLICKS.lock().unwrap(), 1);
|
assert_eq!(*CLICKS.lock().unwrap(), 1);
|
||||||
|
|
||||||
// break reference....
|
// break reference....
|
||||||
@@ -20,7 +20,7 @@ fn events_propagate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lower click is registered
|
// Lower click is registered
|
||||||
dom.handle_event("click", Rc::new(MouseData::default()), ElementId(2), true);
|
dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(2), true);
|
||||||
assert_eq!(*CLICKS.lock().unwrap(), 3);
|
assert_eq!(*CLICKS.lock().unwrap(), 3);
|
||||||
|
|
||||||
// break reference....
|
// break reference....
|
||||||
@@ -30,14 +30,13 @@ fn events_propagate() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Stop propagation occurs
|
// Stop propagation occurs
|
||||||
dom.handle_event("click", Rc::new(MouseData::default()), ElementId(2), true);
|
dom.handle_event("click", Rc::new(PlatformEventData::new(Box::<SerializedMouseData>::default())), ElementId(2), true);
|
||||||
assert_eq!(*CLICKS.lock().unwrap(), 3);
|
assert_eq!(*CLICKS.lock().unwrap(), 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn app(cx: Scope) -> Element {
|
fn app(cx: Scope) -> Element {
|
||||||
render! {
|
render! {
|
||||||
div {
|
div { onclick: move |_| {
|
||||||
onclick: move |_| {
|
|
||||||
println!("top clicked");
|
println!("top clicked");
|
||||||
*CLICKS.lock().unwrap() += 1;
|
*CLICKS.lock().unwrap() += 1;
|
||||||
},
|
},
|
||||||
@@ -53,17 +52,14 @@ fn app(cx: Scope) -> Element {
|
|||||||
|
|
||||||
fn problematic_child(cx: Scope) -> Element {
|
fn problematic_child(cx: Scope) -> Element {
|
||||||
render! {
|
render! {
|
||||||
button {
|
button { onclick: move |evt| {
|
||||||
onclick: move |evt| {
|
|
||||||
println!("bottom clicked");
|
println!("bottom clicked");
|
||||||
let mut clicks = CLICKS.lock().unwrap();
|
let mut clicks = CLICKS.lock().unwrap();
|
||||||
|
|
||||||
if *clicks == 3 {
|
if *clicks == 3 {
|
||||||
evt.stop_propagation();
|
evt.stop_propagation();
|
||||||
} else {
|
} else {
|
||||||
*clicks += 1;
|
*clicks += 1;
|
||||||
}
|
}
|
||||||
}
|
} }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user