fix formatting

This commit is contained in:
Evan Almloff committed 2024-01-04 19:21:06 -06:00
1 parent 0b40878fce
commit 0388a5c1f4
7 files changed
+55 -23

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ fn ClientList(cx: Scope) -> Element {
div { div {
class: "client", class: "client",
style: "margin-bottom: 50px", style: "margin-bottom: 50px",
p { "Name: {client.first_name} {client.last_name}" } p { "Name: {client.first_name} {client.last_name}" }
p { "Description: {client.description}" } p { "Description: {client.description}" }
} }
+3 -1
View File
@@ -16,7 +16,9 @@ use crate::{
use futures_util::{pin_mut, StreamExt}; use futures_util::{pin_mut, StreamExt};
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use slab::Slab; 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. /// A virtual node system that progresses user events and diffs UI trees.
/// ///
+46 -16
View File
@@ -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!(
assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary)); 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!(
assert!(event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Secondary)); event.data.held_buttons().contains(dioxus_html::input_data::MouseButton::Primary),
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)
} }
} }
@@ -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!(
assert_eq!(event.data.trigger_button(), Some(dioxus_html::input_data::MouseButton::Secondary)); 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 {
} }
} }
} }
}) }
} }
+1 -1
View File
@@ -28,8 +28,8 @@ pub use desktop_context::{
}; };
use desktop_context::{EventData, UserWindowEvent, WebviewQueue, WindowEventHandlers}; use desktop_context::{EventData, UserWindowEvent, WebviewQueue, WindowEventHandlers};
use dioxus_core::*; use dioxus_core::*;
use dioxus_html::{native_bind::NativeFileEngine, HtmlEvent};
use dioxus_html::{event_bubbles, FileEngine, HasFormData, MountedData, PlatformEventData}; use dioxus_html::{event_bubbles, FileEngine, HasFormData, MountedData, PlatformEventData};
use dioxus_html::{native_bind::NativeFileEngine, HtmlEvent};
use dioxus_interpreter_js::binary_protocol::Channel; use dioxus_interpreter_js::binary_protocol::Channel;
use element::DesktopElement; use element::DesktopElement;
use eval::init_eval; use eval::init_eval;
+1 -1
View File
@@ -6,7 +6,7 @@ use crate::{
LiveViewError, LiveViewError,
}; };
use dioxus_core::{prelude::*, BorrowedAttributeValue, Mutations}; 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 dioxus_interpreter_js::binary_protocol::Channel;
use futures_util::{pin_mut, SinkExt, StreamExt}; use futures_util::{pin_mut, SinkExt, StreamExt};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
+1 -1
View File
@@ -127,7 +127,7 @@ fn Route3(cx: Scope, dynamic: String) -> Element {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let navigator = use_navigator(cx); let navigator = use_navigator(cx);
render! { render! {
input { input {
oninput: move |evt| { oninput: move |evt| {
+2 -2
View File
@@ -6,11 +6,11 @@
//! - tests to ensure dyn_into works for various event types. //! - tests to ensure dyn_into works for various event types.
//! - Partial delegation? //! - Partial delegation?
use dioxus_interpreter_js::get_node;
use dioxus_core::{ use dioxus_core::{
BorrowedAttributeValue, ElementId, Mutation, Template, TemplateAttribute, TemplateNode, 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 dioxus_interpreter_js::{minimal_bindings, save_template, Channel};
use futures_channel::mpsc; use futures_channel::mpsc;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;