|
@@ -221,7 +221,7 @@ fn app(cx: Scope) -> Element {
|
|
desktop_context.close();
|
|
desktop_context.close();
|
|
}
|
|
}
|
|
|
|
|
|
- cx.render(rsx! {
|
|
|
|
|
|
+ render! {
|
|
div {
|
|
div {
|
|
button {
|
|
button {
|
|
id: "button",
|
|
id: "button",
|
|
@@ -229,14 +229,11 @@ fn app(cx: Scope) -> Element {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.held_buttons().is_empty());
|
|
assert!(event.data.held_buttons().is_empty());
|
|
- assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
|
|
|
|
- received_events.modify(|x| *x + 1)
|
|
|
|
- },
|
|
|
|
assert_eq!(
|
|
assert_eq!(
|
|
event.data.trigger_button(),
|
|
event.data.trigger_button(),
|
|
Some(dioxus_html::input_data::MouseButton::Primary),
|
|
Some(dioxus_html::input_data::MouseButton::Primary),
|
|
);
|
|
);
|
|
- recieved_events.modify(|x| *x + 1)
|
|
|
|
|
|
+ received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
div {
|
|
div {
|
|
@@ -244,7 +241,12 @@ fn app(cx: Scope) -> Element {
|
|
onmousemove: move |event| {
|
|
onmousemove: move |event| {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
- assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
|
|
+ assert!(
|
|
|
|
+ event
|
|
|
|
+ .data
|
|
|
|
+ .held_buttons()
|
|
|
|
+ .contains(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -253,8 +255,16 @@ fn app(cx: Scope) -> Element {
|
|
onclick: move |event| {
|
|
onclick: move |event| {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
- assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
- assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
|
|
+ assert!(
|
|
|
|
+ event
|
|
|
|
+ .data
|
|
|
|
+ .held_buttons()
|
|
|
|
+ .contains(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
|
|
+ assert_eq!(
|
|
|
|
+ event.data.trigger_button(),
|
|
|
|
+ Some(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -263,9 +273,19 @@ fn app(cx: Scope) -> Element {
|
|
ondoubleclick: move |event| {
|
|
ondoubleclick: move |event| {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
- assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary));
|
|
|
|
- assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
- assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
|
|
+ assert!(
|
|
|
|
+ event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary),
|
|
|
|
+ );
|
|
|
|
+ assert!(
|
|
|
|
+ event
|
|
|
|
+ .data
|
|
|
|
+ .held_buttons()
|
|
|
|
+ .contains(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
|
|
+ assert_eq!(
|
|
|
|
+ event.data.trigger_button(),
|
|
|
|
+ Some(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -274,8 +294,16 @@ fn app(cx: Scope) -> Element {
|
|
onmousedown: move |event| {
|
|
onmousedown: move |event| {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
- assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
- assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary));
|
|
|
|
|
|
+ assert!(
|
|
|
|
+ event
|
|
|
|
+ .data
|
|
|
|
+ .held_buttons()
|
|
|
|
+ .contains(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
|
|
+ assert_eq!(
|
|
|
|
+ event.data.trigger_button(),
|
|
|
|
+ Some(dioxus_html::input_data::MouseButton::Secondary),
|
|
|
|
+ );
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -285,7 +313,10 @@ fn app(cx: Scope) -> Element {
|
|
println!("{:?}", event.data);
|
|
println!("{:?}", event.data);
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.modifiers().is_empty());
|
|
assert!(event.data.held_buttons().is_empty());
|
|
assert!(event.data.held_buttons().is_empty());
|
|
- assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary));
|
|
|
|
|
|
+ assert_eq!(
|
|
|
|
+ event.data.trigger_button(),
|
|
|
|
+ Some(dioxus_html::input_data::MouseButton::Primary),
|
|
|
|
+ );
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -312,7 +343,6 @@ fn app(cx: Scope) -> Element {
|
|
assert_eq!(event.data.location(), Location::Standard);
|
|
assert_eq!(event.data.location(), Location::Standard);
|
|
assert!(event.data.is_auto_repeating());
|
|
assert!(event.data.is_auto_repeating());
|
|
received_events.modify(|x| *x + 1)
|
|
received_events.modify(|x| *x + 1)
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
input {
|
|
input {
|
|
@@ -354,5 +384,5 @@ fn app(cx: Scope) -> Element {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- })
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|