derive more traits for serialized types
This commit is contained in:
1 parent
f7dff22552
commit
93cbfd0dbc
20 files changed
+171
-97
No files matched your search
@@ -50,7 +50,7 @@ impl PartialEq for AnimationData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of AnimationData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedAnimationData {
|
||||
animation_name: String,
|
||||
pseudo_element: String,
|
||||
|
||||
@@ -38,7 +38,7 @@ impl ClipboardData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of ClipboardData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedClipboardData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -38,7 +38,7 @@ impl CompositionData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of CompositionData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedCompositionData {
|
||||
data: String,
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ impl DragData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of DragData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedDragData {
|
||||
mouse: crate::point_interaction::SerializedPointInteraction,
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ impl FocusData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of FocusData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone, Default)]
|
||||
pub struct SerializedFocusData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -78,7 +78,7 @@ pub trait HasFormData: std::any::Any {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized form data object
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedFormData {
|
||||
value: String,
|
||||
values: HashMap<String, Vec<String>>,
|
||||
@@ -172,7 +172,7 @@ impl<'de> serde::Deserialize<'de> for FormData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A file engine that serializes files to bytes
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedFileEngine {
|
||||
files: HashMap<String, Vec<u8>>,
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ impl ImageData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of ImageData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedImageData {
|
||||
load_error: bool,
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use dioxus_core::Event;
|
||||
use keyboard_types::{Code, Key, Location, Modifiers};
|
||||
use std::convert::TryInto;
|
||||
use std::fmt::Debug;
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
@@ -80,7 +79,7 @@ impl KeyboardData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of KeyboardData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedKeyboardData {
|
||||
auto_repeating: bool,
|
||||
#[serde(deserialize_with = "resilient_deserialize_code")]
|
||||
@@ -90,6 +89,26 @@ pub struct SerializedKeyboardData {
|
||||
modifiers: Modifiers,
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl SerializedKeyboardData {
|
||||
/// Create a new SerializedKeyboardData
|
||||
pub fn new(
|
||||
auto_repeating: bool,
|
||||
code: Code,
|
||||
key: Key,
|
||||
location: Location,
|
||||
modifiers: Modifiers,
|
||||
) -> Self {
|
||||
Self {
|
||||
auto_repeating,
|
||||
code,
|
||||
key,
|
||||
location,
|
||||
modifiers,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl From<&KeyboardData> for SerializedKeyboardData {
|
||||
fn from(data: &KeyboardData) -> Self {
|
||||
@@ -186,6 +205,8 @@ impl<'de> serde::Deserialize<'de> for KeyCode {
|
||||
where
|
||||
D: serde::Deserializer<'de>,
|
||||
{
|
||||
use std::convert::TryInto;
|
||||
|
||||
// We could be deserializing a unicode character, so we need to use u64 even if the output only takes u8
|
||||
let value = u64::deserialize(deserializer)?;
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ impl MediaData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of MediaData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedMediaData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -106,6 +106,13 @@ impl_event! {
|
||||
}
|
||||
|
||||
impl MouseData {
|
||||
/// Create a new instance of MouseData
|
||||
pub fn new(inner: impl HasMouseData + 'static) -> Self {
|
||||
Self {
|
||||
inner: Box::new(inner),
|
||||
}
|
||||
}
|
||||
|
||||
/// Downcast this event to a concrete event type
|
||||
pub fn downcast<T: 'static>(&self) -> Option<&T> {
|
||||
self.inner.as_any().downcast_ref::<T>()
|
||||
@@ -172,23 +179,98 @@ impl PartialEq for MouseData {
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl HasMouseData for crate::point_interaction::SerializedPointInteraction {
|
||||
/// A serialized version of [`MouseData`]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone, Default)]
|
||||
pub struct SerializedMouseData {
|
||||
/// Common data for all pointer/mouse events
|
||||
#[serde(flatten)]
|
||||
point_data: crate::point_interaction::SerializedPointInteraction,
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl SerializedMouseData {
|
||||
/// Create a new instance of SerializedMouseData
|
||||
pub fn new(
|
||||
client_coordinates: ClientPoint,
|
||||
element_coordinates: ElementPoint,
|
||||
page_coordinates: PagePoint,
|
||||
screen_coordinates: ScreenPoint,
|
||||
modifiers: Modifiers,
|
||||
held_buttons: MouseButtonSet,
|
||||
trigger_button: Option<MouseButton>,
|
||||
) -> Self {
|
||||
Self {
|
||||
point_data: crate::point_interaction::SerializedPointInteraction::new(
|
||||
client_coordinates,
|
||||
element_coordinates,
|
||||
page_coordinates,
|
||||
screen_coordinates,
|
||||
modifiers,
|
||||
held_buttons,
|
||||
trigger_button,
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl From<&MouseData> for SerializedMouseData {
|
||||
fn from(e: &MouseData) -> Self {
|
||||
Self {
|
||||
point_data: crate::point_interaction::SerializedPointInteraction::from(e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl HasMouseData for SerializedMouseData {
|
||||
fn as_any(&self) -> &dyn std::any::Any {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl PointInteraction for SerializedMouseData {
|
||||
fn client_coordinates(&self) -> ClientPoint {
|
||||
self.point_data.client_coordinates()
|
||||
}
|
||||
|
||||
fn element_coordinates(&self) -> ElementPoint {
|
||||
self.point_data.element_coordinates()
|
||||
}
|
||||
|
||||
fn page_coordinates(&self) -> PagePoint {
|
||||
self.point_data.page_coordinates()
|
||||
}
|
||||
|
||||
fn screen_coordinates(&self) -> ScreenPoint {
|
||||
self.point_data.screen_coordinates()
|
||||
}
|
||||
|
||||
fn modifiers(&self) -> Modifiers {
|
||||
self.point_data.modifiers()
|
||||
}
|
||||
|
||||
fn held_buttons(&self) -> MouseButtonSet {
|
||||
self.point_data.held_buttons()
|
||||
}
|
||||
|
||||
fn trigger_button(&self) -> Option<MouseButton> {
|
||||
self.point_data.trigger_button()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl serde::Serialize for MouseData {
|
||||
fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
||||
crate::point_interaction::SerializedPointInteraction::from(self).serialize(serializer)
|
||||
SerializedMouseData::from(self).serialize(serializer)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl<'de> serde::Deserialize<'de> for MouseData {
|
||||
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
||||
let data = crate::point_interaction::SerializedPointInteraction::deserialize(deserializer)?;
|
||||
let data = SerializedMouseData::deserialize(deserializer)?;
|
||||
Ok(Self {
|
||||
inner: Box::new(data),
|
||||
})
|
||||
|
||||
@@ -209,7 +209,7 @@ impl PointInteraction for PointerData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of PointerData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedPointerData {
|
||||
/// Common data for all pointer/mouse events
|
||||
#[serde(flatten)]
|
||||
|
||||
@@ -33,7 +33,7 @@ impl PartialEq for ScrollData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of ScrollData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedScrollData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -33,7 +33,7 @@ impl PartialEq for SelectionData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of SelectionData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedSelectionData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -33,7 +33,7 @@ impl ToggleData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of ToggleData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedToggleData {}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
|
||||
@@ -60,7 +60,7 @@ impl TouchData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of TouchData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedTouchData {
|
||||
alt_key: bool,
|
||||
ctrl_key: bool,
|
||||
|
||||
@@ -39,7 +39,7 @@ impl TransitionData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of TransitionData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedTransitionData {
|
||||
property_name: String,
|
||||
pseudo_element: String,
|
||||
|
||||
@@ -44,11 +44,19 @@ impl WheelData {
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
/// A serialized version of WheelData
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
|
||||
pub struct SerializedWheelData {
|
||||
delta: WheelDelta,
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl SerializedWheelData {
|
||||
/// Create a new SerializedWheelData
|
||||
pub fn new(delta: WheelDelta) -> Self {
|
||||
Self { delta }
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "serialize")]
|
||||
impl From<&WheelData> for SerializedWheelData {
|
||||
fn from(data: &WheelData) -> Self {
|
||||
|
||||
Reference in new issue
Block a user