Fix merge conflict
This commit is contained in:
2 files changed
-7
No files matched your search
@@ -231,12 +231,6 @@ fn app(cx: Scope) -> Element {
|
|||||||
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)
|
||||||
},
|
|
||||||
assert_eq!(
|
|
||||||
event.data.trigger_button(),
|
|
||||||
Some(dioxus_html::input_data::MouseButton::Primary),
|
|
||||||
);
|
|
||||||
recieved_events.modify(|x| *x + 1)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
|
|||||||
@@ -147,7 +147,6 @@ pub fn launch_with_props<P: 'static>(root: Component<P>, props: P, cfg: Config)
|
|||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update the control flow
|
|
||||||
*control_flow = app.control_flow;
|
*control_flow = app.control_flow;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user