Bläddra i källkod

Rename module `input` to avoid naming conflict with element of the same name

Not sure if this was supposed to be allowed, but it was causing https://github.com/rust-lang/rust/issues/96934
Reinis Mazeiks 3 år sedan
förälder
incheckning
765baf6e48

+ 1 - 1
examples/tui_keys.rs

@@ -1,7 +1,7 @@
 use dioxus::events::WheelEvent;
 use dioxus::prelude::*;
 use dioxus_html::geometry::ScreenPoint;
-use dioxus_html::input::MouseButtonSet;
+use dioxus_html::input_data::MouseButtonSet;
 use dioxus_html::on::{KeyboardEvent, MouseEvent};
 use dioxus_html::KeyCode;
 

+ 1 - 1
packages/html/src/events.rs

@@ -6,7 +6,7 @@ pub mod on {
     //! Input events and associated data
 
     use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
-    use crate::input::{
+    use crate::input_data::{
         decode_mouse_button_set, encode_mouse_button_set, MouseButton, MouseButtonSet,
     };
     use keyboard_types::Modifiers;

+ 0 - 0
packages/html/src/input.rs → packages/html/src/input_data.rs


+ 1 - 1
packages/html/src/lib.rs

@@ -17,7 +17,7 @@ mod elements;
 mod events;
 pub mod geometry;
 mod global_attributes;
-pub mod input;
+pub mod input_data;
 #[cfg(feature = "wasm-bind")]
 mod web_sys_bind;
 

+ 1 - 1
packages/html/src/web_sys_bind/events.rs

@@ -1,5 +1,5 @@
 use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
-use crate::input::{decode_mouse_button_set, MouseButton};
+use crate::input_data::{decode_mouse_button_set, MouseButton};
 use crate::on::{
     AnimationData, CompositionData, KeyboardData, MouseData, PointerData, TouchData,
     TransitionData, WheelData,

+ 3 - 3
packages/tui/src/hooks.rs

@@ -6,9 +6,9 @@ use fxhash::{FxHashMap, FxHashSet};
 
 use dioxus_html::geometry::euclid::{Point2D, Rect, Size2D};
 use dioxus_html::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
-use dioxus_html::input::keyboard_types::Modifiers;
-use dioxus_html::input::MouseButtonSet as DioxusMouseButtons;
-use dioxus_html::input::{MouseButton as DioxusMouseButton, MouseButtonSet};
+use dioxus_html::input_data::keyboard_types::Modifiers;
+use dioxus_html::input_data::MouseButtonSet as DioxusMouseButtons;
+use dioxus_html::input_data::{MouseButton as DioxusMouseButton, MouseButtonSet};
 use dioxus_html::{on::*, KeyCode};
 use std::{
     any::Any,