trait based event system

packages/html/src/events/wheel.rs

@@ -1,21 +1,88 @@
 use dioxus_core::Event;
-use euclid::UnknownUnit;
-use std::fmt::{Debug, Formatter};
+use std::fmt::Formatter;
 
-use crate::geometry::{LinesVector, PagesVector, PixelsVector, WheelDelta};
+use crate::geometry::WheelDelta;
 
 pub type WheelEvent = Event<WheelData>;
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, PartialEq, Default)]
+
 pub struct WheelData {
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_mode: u32,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_x: f64,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_y: f64,
-    #[deprecated(since = "0.3.0", note = "use delta() instead")]
-    pub delta_z: f64,
+    inner: Box<dyn HasWheelData>,
+}
+
+impl<E: HasWheelData> From<E> for WheelData {
+    fn from(e: E) -> Self {
+        Self { inner: Box::new(e) }
+    }
+}
+
+impl std::fmt::Debug for WheelData {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("WheelData")
+            .field("delta", &self.delta())
+            .finish()
+    }
+}
+
+impl PartialEq for WheelData {
+    fn eq(&self, other: &Self) -> bool {
+        self.inner.delta() == other.inner.delta()
+    }
+}
+
+impl WheelData {
+    /// The amount of wheel movement
+    #[allow(deprecated)]
+    pub fn delta(&self) -> WheelDelta {
+        self.inner.delta()
+    }
+
+    /// Downcast this event to a concrete event type
+    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+        self.inner.as_any().downcast_ref::<T>()
+    }
+}
+
+#[cfg(feature = "serialize")]
+#[derive(serde::Serialize, serde::Deserialize)]
+struct SerializedWheelData {
+    delta: WheelDelta,
+}
+
+#[cfg(feature = "serialize")]
+impl From<&WheelData> for SerializedWheelData {
+    fn from(data: &WheelData) -> Self {
+        Self {
+            delta: data.inner.delta(),
+        }
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl HasWheelData for SerializedWheelData {
+    fn delta(&self) -> WheelDelta {
+        self.delta
+    }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl serde::Serialize for WheelData {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        SerializedWheelData::from(self).serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serialize")]
+impl<'de> serde::Deserialize<'de> for WheelData {
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let data = SerializedWheelData::deserialize(deserializer)?;
+        Ok(Self {
+            inner: Box::new(data),
+        })
+    }
 }
 
 impl_event![
@@ -25,54 +92,10 @@ impl_event![
     onwheel
 ];
 
-impl WheelData {
-    /// Construct a new WheelData with the specified wheel movement delta
-    pub fn new(delta: WheelDelta) -> Self {
-        let (delta_mode, vector) = match delta {
-            WheelDelta::Pixels(v) => (0, v.cast_unit::<UnknownUnit>()),
-            WheelDelta::Lines(v) => (1, v.cast_unit::<UnknownUnit>()),
-            WheelDelta::Pages(v) => (2, v.cast_unit::<UnknownUnit>()),
-        };
-
-        #[allow(deprecated)]
-        WheelData {
-            delta_mode,
-            delta_x: vector.x,
-            delta_y: vector.y,
-            delta_z: vector.z,
-        }
-    }
-
-    /// Construct from the attributes of the web wheel event
-    pub fn from_web_attributes(delta_mode: u32, delta_x: f64, delta_y: f64, delta_z: f64) -> Self {
-        #[allow(deprecated)]
-        Self {
-            delta_mode,
-            delta_x,
-            delta_y,
-            delta_z,
-        }
-    }
-
+pub trait HasWheelData: std::any::Any {
     /// The amount of wheel movement
-    #[allow(deprecated)]
-    pub fn delta(&self) -> WheelDelta {
-        let x = self.delta_x;
-        let y = self.delta_y;
-        let z = self.delta_z;
-        match self.delta_mode {
-            0 => WheelDelta::Pixels(PixelsVector::new(x, y, z)),
-            1 => WheelDelta::Lines(LinesVector::new(x, y, z)),
-            2 => WheelDelta::Pages(PagesVector::new(x, y, z)),
-            _ => panic!("Invalid delta mode, {:?}", self.delta_mode),
-        }
-    }
-}
+    fn delta(&self) -> WheelDelta;
 
-impl Debug for WheelData {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("WheelData")
-            .field("delta", &self.delta())
-            .finish()
-    }
+    /// return self as Any
+    fn as_any(&self) -> &dyn std::any::Any;
 }