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
This commit is contained in:
Reinis Mazeiks committed 2022-05-11 13:47:58 +03:00
1 parent 90cb221b82
commit 765baf6e48
6 files changed
+7 -7

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
use dioxus::events::WheelEvent; use dioxus::events::WheelEvent;
use dioxus::prelude::*; use dioxus::prelude::*;
use dioxus_html::geometry::ScreenPoint; 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::on::{KeyboardEvent, MouseEvent};
use dioxus_html::KeyCode; use dioxus_html::KeyCode;
+1 -1
View File
@@ -6,7 +6,7 @@ pub mod on {
//! Input events and associated data //! Input events and associated data
use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; 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, decode_mouse_button_set, encode_mouse_button_set, MouseButton, MouseButtonSet,
}; };
use keyboard_types::Modifiers; use keyboard_types::Modifiers;
File renamed without changes.
+1 -1
View File
@@ -17,7 +17,7 @@ mod elements;
mod events; mod events;
pub mod geometry; pub mod geometry;
mod global_attributes; mod global_attributes;
pub mod input; pub mod input_data;
#[cfg(feature = "wasm-bind")] #[cfg(feature = "wasm-bind")]
mod web_sys_bind; mod web_sys_bind;
+1 -1
View File
@@ -1,5 +1,5 @@
use crate::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; 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::{ use crate::on::{
AnimationData, CompositionData, KeyboardData, MouseData, PointerData, TouchData, AnimationData, CompositionData, KeyboardData, MouseData, PointerData, TouchData,
TransitionData, WheelData, TransitionData, WheelData,
+3 -3
View File
@@ -6,9 +6,9 @@ use fxhash::{FxHashMap, FxHashSet};
use dioxus_html::geometry::euclid::{Point2D, Rect, Size2D}; use dioxus_html::geometry::euclid::{Point2D, Rect, Size2D};
use dioxus_html::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint}; use dioxus_html::geometry::{ClientPoint, Coordinates, ElementPoint, PagePoint, ScreenPoint};
use dioxus_html::input::keyboard_types::Modifiers; use dioxus_html::input_data::keyboard_types::Modifiers;
use dioxus_html::input::MouseButtonSet as DioxusMouseButtons; use dioxus_html::input_data::MouseButtonSet as DioxusMouseButtons;
use dioxus_html::input::{MouseButton as DioxusMouseButton, MouseButtonSet}; use dioxus_html::input_data::{MouseButton as DioxusMouseButton, MouseButtonSet};
use dioxus_html::{on::*, KeyCode}; use dioxus_html::{on::*, KeyCode};
use std::{ use std::{
any::Any, any::Any,