diff --git a/examples/crm.rs b/examples/crm.rs index 818c190bb..8af49b401 100644 --- a/examples/crm.rs +++ b/examples/crm.rs @@ -66,7 +66,7 @@ fn ClientList(cx: Scope) -> Element { div { class: "client", style: "margin-bottom: 50px", - + p { "Name: {client.first_name} {client.last_name}" } p { "Description: {client.description}" } } diff --git a/packages/core/src/virtual_dom.rs b/packages/core/src/virtual_dom.rs index f469cd9e2..9327e8f29 100644 --- a/packages/core/src/virtual_dom.rs +++ b/packages/core/src/virtual_dom.rs @@ -16,7 +16,9 @@ use crate::{ use futures_util::{pin_mut, StreamExt}; use rustc_hash::{FxHashMap, FxHashSet}; use slab::Slab; -use std::{any::Any, cell::Cell, collections::BTreeSet, future::Future, ptr::NonNull, rc::Rc, sync::Arc}; +use std::{ + any::Any, cell::Cell, collections::BTreeSet, future::Future, ptr::NonNull, rc::Rc, sync::Arc, +}; /// A virtual node system that progresses user events and diffs UI trees. /// diff --git a/packages/desktop/headless_tests/events.rs b/packages/desktop/headless_tests/events.rs index a1744fb96..f957dd321 100644 --- a/packages/desktop/headless_tests/events.rs +++ b/packages/desktop/headless_tests/events.rs @@ -221,7 +221,7 @@ fn app(cx: Scope) -> Element { desktop_context.close(); } - cx.render(rsx! { + render! { div { button { id: "button", @@ -229,14 +229,11 @@ fn app(cx: Scope) -> Element { println!("{:?}", event.data); assert!(event.data.modifiers().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!( event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Primary), ); - recieved_events.modify(|x| *x + 1) + received_events.modify(|x| *x + 1) } } div { @@ -244,7 +241,12 @@ fn app(cx: Scope) -> Element { onmousemove: move |event| { println!("{:?}", event.data); 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) } } @@ -253,8 +255,16 @@ fn app(cx: Scope) -> Element { onclick: move |event| { println!("{:?}", event.data); 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) } } @@ -263,9 +273,19 @@ fn app(cx: Scope) -> Element { ondoubleclick: move |event| { println!("{:?}", event.data); 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) } } @@ -274,8 +294,16 @@ fn app(cx: Scope) -> Element { onmousedown: move |event| { println!("{:?}", event.data); 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) } } @@ -285,7 +313,10 @@ fn app(cx: Scope) -> Element { println!("{:?}", event.data); assert!(event.data.modifiers().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) } } @@ -312,7 +343,6 @@ fn app(cx: Scope) -> Element { assert_eq!(event.data.location(), Location::Standard); assert!(event.data.is_auto_repeating()); received_events.modify(|x| *x + 1) - } } input { @@ -354,5 +384,5 @@ fn app(cx: Scope) -> Element { } } } - }) + } } diff --git a/packages/desktop/src/lib.rs b/packages/desktop/src/lib.rs index 83e8105bc..519c198a9 100644 --- a/packages/desktop/src/lib.rs +++ b/packages/desktop/src/lib.rs @@ -28,8 +28,8 @@ pub use desktop_context::{ }; use desktop_context::{EventData, UserWindowEvent, WebviewQueue, WindowEventHandlers}; use dioxus_core::*; -use dioxus_html::{native_bind::NativeFileEngine, HtmlEvent}; use dioxus_html::{event_bubbles, FileEngine, HasFormData, MountedData, PlatformEventData}; +use dioxus_html::{native_bind::NativeFileEngine, HtmlEvent}; use dioxus_interpreter_js::binary_protocol::Channel; use element::DesktopElement; use eval::init_eval; diff --git a/packages/liveview/src/pool.rs b/packages/liveview/src/pool.rs index 130ac9b31..6fac0abfe 100644 --- a/packages/liveview/src/pool.rs +++ b/packages/liveview/src/pool.rs @@ -6,7 +6,7 @@ use crate::{ LiveViewError, }; use dioxus_core::{prelude::*, BorrowedAttributeValue, Mutations}; -use dioxus_html::{event_bubbles,EventData, HtmlEvent, MountedData, PlatformEventData}; +use dioxus_html::{event_bubbles, EventData, HtmlEvent, MountedData, PlatformEventData}; use dioxus_interpreter_js::binary_protocol::Channel; use futures_util::{pin_mut, SinkExt, StreamExt}; use rustc_hash::FxHashMap; diff --git a/packages/router/examples/simple_routes.rs b/packages/router/examples/simple_routes.rs index 74ccded8e..6c33c275b 100644 --- a/packages/router/examples/simple_routes.rs +++ b/packages/router/examples/simple_routes.rs @@ -127,7 +127,7 @@ fn Route3(cx: Scope, dynamic: String) -> Element { .collect::>(); let navigator = use_navigator(cx); - + render! { input { oninput: move |evt| { diff --git a/packages/web/src/dom.rs b/packages/web/src/dom.rs index 118b3eddb..da46e5012 100644 --- a/packages/web/src/dom.rs +++ b/packages/web/src/dom.rs @@ -6,11 +6,11 @@ //! - tests to ensure dyn_into works for various event types. //! - Partial delegation? -use dioxus_interpreter_js::get_node; use dioxus_core::{ BorrowedAttributeValue, ElementId, Mutation, Template, TemplateAttribute, TemplateNode, }; -use dioxus_html::{event_bubbles, PlatformEventData, MountedData}; +use dioxus_html::{event_bubbles, MountedData, PlatformEventData}; +use dioxus_interpreter_js::get_node; use dioxus_interpreter_js::{minimal_bindings, save_template, Channel}; use futures_channel::mpsc; use rustc_hash::FxHashMap;