From a14789eebcdb11f8eacd0fe95c345e4e15c021cb Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 31 Jan 2024 14:07:00 -0800 Subject: [PATCH] rename inner on event to data --- examples/all_events.rs | 24 ++++++++--------- examples/control_focus.rs | 2 +- examples/crm.rs | 2 +- examples/file_upload.rs | 2 +- examples/inputs.rs | 7 ++--- examples/read_size.rs | 2 +- examples/scroll_to_top.rs | 2 +- packages/core/src/events.rs | 4 +-- .../examples/all_terminal_events.rs | 22 ++++++++-------- packages/dioxus-tui/examples/buttons.rs | 2 +- packages/dioxus-tui/examples/hover.rs | 26 +++++++++---------- packages/dioxus-tui/examples/text.rs | 2 +- 12 files changed, 47 insertions(+), 50 deletions(-) diff --git a/examples/all_events.rs b/examples/all_events.rs index 62baf3f43..4ceca1a5a 100644 --- a/examples/all_events.rs +++ b/examples/all_events.rs @@ -39,21 +39,21 @@ fn app() -> Element { rsx! { div { style: "{CONTAINER_STYLE}", // focusing is necessary to catch keyboard events - div { style: "{RECT_STYLE}", tabindex: "0", - onmousemove: move |event| log_event(event.inner().clone()), - onclick: move |event| log_event(event.inner().clone()), - ondoubleclick: move |event| log_event(event.inner().clone()), - onmousedown: move |event| log_event(event.inner().clone()), - onmouseup: move |event| log_event(event.inner().clone()), + div { style: "{RECT_STYLE}", tabindex: 0, + onmousemove: move |event| log_event(event.data()), + onclick: move |event| log_event(event.data()), + ondoubleclick: move |event| log_event(event.data()), + onmousedown: move |event| log_event(event.data()), + onmouseup: move |event| log_event(event.data()), - onwheel: move |event| log_event(event.inner().clone()), + onwheel: move |event| log_event(event.data()), - onkeydown: move |event| log_event(event.inner().clone()), - onkeyup: move |event| log_event(event.inner().clone()), - onkeypress: move |event| log_event(event.inner().clone()), + onkeydown: move |event| log_event(event.data()), + onkeyup: move |event| log_event(event.data()), + onkeypress: move |event| log_event(event.data()), - onfocusin: move |event| log_event(event.inner().clone()), - onfocusout: move |event| log_event(event.inner().clone()), + onfocusin: move |event| log_event(event.data()), + onfocusout: move |event| log_event(event.data()), "Hover, click, type or scroll to see the info down below" } diff --git a/examples/control_focus.rs b/examples/control_focus.rs index 0310f2cc7..1ca3f7aa8 100644 --- a/examples/control_focus.rs +++ b/examples/control_focus.rs @@ -32,7 +32,7 @@ fn app() -> Element { input { value: "{i}", onmounted: move |cx| { - elements.write().push(cx.inner().clone()); + elements.write().push(cx.data()); }, oninput: move |_| { running.set(false); diff --git a/examples/crm.rs b/examples/crm.rs index 4bc7470c4..3ae23fc6a 100644 --- a/examples/crm.rs +++ b/examples/crm.rs @@ -94,7 +94,7 @@ fn ClientAdd() -> Element { // when the form mounts, focus the first name input onmounted: move |e| async move { - _ = e.inner().set_focus(true).await; + _ = e.set_focus(true).await; }, } } diff --git a/examples/file_upload.rs b/examples/file_upload.rs index 1ee5d968b..c98221c16 100644 --- a/examples/file_upload.rs +++ b/examples/file_upload.rs @@ -35,7 +35,7 @@ fn App() -> Element { input { r#type: "checkbox", checked: enable_directory_upload, - oninput: move |evt| enable_directory_upload.set(evt.value().parse().unwrap()), + oninput: move |evt| enable_directory_upload.set(evt.checked()), }, "Enable directory upload" } diff --git a/examples/inputs.rs b/examples/inputs.rs index e61ba3b05..66d4fe696 100644 --- a/examples/inputs.rs +++ b/examples/inputs.rs @@ -48,7 +48,7 @@ fn app() -> Element { id: "huey", r#type: "radio", value: "huey", - checked: "", + checked: true, name: "drone", } label { @@ -63,10 +63,7 @@ fn app() -> Element { value: "dewey", name: "drone", } - label { - r#for: "dewey", - "Dewey" - } + label { r#for: "dewey", "Dewey" } } div { input { diff --git a/examples/read_size.rs b/examples/read_size.rs index 5b9402de1..0a9f802b8 100644 --- a/examples/read_size.rs +++ b/examples/read_size.rs @@ -45,7 +45,7 @@ fn app() -> Element { width: "50%", height: "50%", background_color: "red", - onmounted: move |cx| div_element.set(Some(cx.inner().clone())), + onmounted: move |cx| div_element.set(Some(cx.data())), "This element is {dimensions():?}" } diff --git a/examples/scroll_to_top.rs b/examples/scroll_to_top.rs index d84b4c994..1c042b912 100644 --- a/examples/scroll_to_top.rs +++ b/examples/scroll_to_top.rs @@ -10,7 +10,7 @@ fn app() -> Element { rsx! { div { h1 { - onmounted: move |cx| header_element.set(Some(cx.inner().clone())), + onmounted: move |cx| header_element.set(Some(cx.data())), "Scroll to top example" } diff --git a/packages/core/src/events.rs b/packages/core/src/events.rs index 879f36118..20f304991 100644 --- a/packages/core/src/events.rs +++ b/packages/core/src/events.rs @@ -107,8 +107,8 @@ impl Event { /// } /// } /// ``` - pub fn inner(&self) -> &Rc { - &self.data + pub fn data(&self) -> Rc { + self.data.clone() } } diff --git a/packages/dioxus-tui/examples/all_terminal_events.rs b/packages/dioxus-tui/examples/all_terminal_events.rs index 605751c8c..45aec8837 100644 --- a/packages/dioxus-tui/examples/all_terminal_events.rs +++ b/packages/dioxus-tui/examples/all_terminal_events.rs @@ -23,23 +23,23 @@ fn app() -> Element { background_color: "hsl(248, 53%, 58%)", // Mosue - onmousemove: move |event| log_event(event.inner().clone()), - onclick: move |event| log_event(event.inner().clone()), - ondoubleclick: move |event| log_event(event.inner().clone()), - onmousedown: move |event| log_event(event.inner().clone()), - onmouseup: move |event| log_event(event.inner().clone()), + onmousemove: move |event| log_event(event.data()), + onclick: move |event| log_event(event.data()), + ondoubleclick: move |event| log_event(event.data()), + onmousedown: move |event| log_event(event.data()), + onmouseup: move |event| log_event(event.data()), // Scroll - onwheel: move |event| log_event(event.inner().clone()), + onwheel: move |event| log_event(event.data()), // Keyboard - onkeydown: move |event| log_event(event.inner().clone()), - onkeyup: move |event| log_event(event.inner().clone()), - onkeypress: move |event| log_event(event.inner().clone()), + onkeydown: move |event| log_event(event.data()), + onkeyup: move |event| log_event(event.data()), + onkeypress: move |event| log_event(event.data()), // Focus - onfocusin: move |event| log_event(event.inner().clone()), - onfocusout: move |event| log_event(event.inner().clone()), + onfocusin: move |event| log_event(event.data()), + onfocusout: move |event| log_event(event.data()), "Hover, click, type or scroll to see the info down below" } diff --git a/packages/dioxus-tui/examples/buttons.rs b/packages/dioxus-tui/examples/buttons.rs index a02facda1..5173103af 100644 --- a/packages/dioxus-tui/examples/buttons.rs +++ b/packages/dioxus-tui/examples/buttons.rs @@ -22,7 +22,7 @@ fn Button(color_offset: u32, layer: u16) -> Element { background_color: "{color}", tabindex: "{layer}", onkeydown: move |e| { - if let Code::Space = e.inner().code() { + if let Code::Space = e.code() { toggle.toggle(); } }, diff --git a/packages/dioxus-tui/examples/hover.rs b/packages/dioxus-tui/examples/hover.rs index 376424305..30740e0d7 100644 --- a/packages/dioxus-tui/examples/hover.rs +++ b/packages/dioxus-tui/examples/hover.rs @@ -18,7 +18,7 @@ fn app() -> Element { result } - fn get_brightness(m: &Rc) -> i32 { + fn get_brightness(m: Rc) -> i32 { let b: i32 = m.held_buttons().len().try_into().unwrap(); 127 * b } @@ -59,9 +59,9 @@ fn app() -> Element { justify_content: "center", align_items: "center", background_color: to_str(&q1_color()), - onmouseenter: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]), - onmousedown: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]), - onmouseup: move |m| q1_color.set([get_brightness(m.inner()), 0, 0]), + onmouseenter: move |m| q1_color.set([get_brightness(m.data()), 0, 0]), + onmousedown: move |m| q1_color.set([get_brightness(m.data()), 0, 0]), + onmouseup: move |m| q1_color.set([get_brightness(m.data()), 0, 0]), onwheel: move |w| q1_color.set([q1_color()[0] + (10.0 * w.delta().strip_units().y) as i32, 0, 0]), onmouseleave: move |_| q1_color.set([200; 3]), onmousemove: update_data, @@ -73,9 +73,9 @@ fn app() -> Element { justify_content: "center", align_items: "center", background_color: to_str(&q2_color()), - onmouseenter: move |m| q2_color.set([get_brightness(m.inner()); 3]), - onmousedown: move |m| q2_color.set([get_brightness(m.inner()); 3]), - onmouseup: move |m| q2_color.set([get_brightness(m.inner()); 3]), + onmouseenter: move |m| q2_color.set([get_brightness(m.data()); 3]), + onmousedown: move |m| q2_color.set([get_brightness(m.data()); 3]), + onmouseup: move |m| q2_color.set([get_brightness(m.data()); 3]), onwheel: move |w| q2_color.set([q2_color()[0] + (10.0 * w.delta().strip_units().y) as i32; 3]), onmouseleave: move |_| q2_color.set([200; 3]), onmousemove: update_data, @@ -93,9 +93,9 @@ fn app() -> Element { justify_content: "center", align_items: "center", background_color: to_str(&q3_color()), - onmouseenter: move |m| q3_color.set([0, get_brightness(m.inner()), 0]), - onmousedown: move |m| q3_color.set([0, get_brightness(m.inner()), 0]), - onmouseup: move |m| q3_color.set([0, get_brightness(m.inner()), 0]), + onmouseenter: move |m| q3_color.set([0, get_brightness(m.data()), 0]), + onmousedown: move |m| q3_color.set([0, get_brightness(m.data()), 0]), + onmouseup: move |m| q3_color.set([0, get_brightness(m.data()), 0]), onwheel: move |w| q3_color.set([0, q3_color()[1] + (10.0 * w.delta().strip_units().y) as i32, 0]), onmouseleave: move |_| q3_color.set([200; 3]), onmousemove: update_data, @@ -107,9 +107,9 @@ fn app() -> Element { justify_content: "center", align_items: "center", background_color: to_str(&q4_color()), - onmouseenter: move |m| q4_color.set([0, 0, get_brightness(m.inner())]), - onmousedown: move |m| q4_color.set([0, 0, get_brightness(m.inner())]), - onmouseup: move |m| q4_color.set([0, 0, get_brightness(m.inner())]), + onmouseenter: move |m| q4_color.set([0, 0, get_brightness(m.data())]), + onmousedown: move |m| q4_color.set([0, 0, get_brightness(m.data())]), + onmouseup: move |m| q4_color.set([0, 0, get_brightness(m.data())]), onwheel: move |w| q4_color.set([0, 0, q4_color()[2] + (10.0 * w.delta().strip_units().y) as i32]), onmouseleave: move |_| q4_color.set([200; 3]), onmousemove: update_data, diff --git a/packages/dioxus-tui/examples/text.rs b/packages/dioxus-tui/examples/text.rs index 8ea1f95ae..7e3a59d4d 100644 --- a/packages/dioxus-tui/examples/text.rs +++ b/packages/dioxus-tui/examples/text.rs @@ -12,7 +12,7 @@ fn app() -> Element { width: "100%", height: "100%", flex_direction: "column", - onwheel: move |evt| alpha.set((alpha() + evt.inner().delta().strip_units().y as i64).clamp(0, 100)), + onwheel: move |evt| alpha.set((alpha() + evt.delta().strip_units().y as i64).clamp(0, 100)), p { background_color: "black",