Code refactor

charming/src/component/grid.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     datatype::CompositeValue,
-    element::{Color, PaddingProperty, TextStyle, TooltipTrigger},
+    element::{Color, Padding, TextStyle, TooltipTrigger},
 };
 
 #[derive(Serialize)]
@@ -43,7 +43,7 @@ pub struct GridTooltip {
 
     /// The floating layer of tooltip space around content.
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     /// Text style of tooltip's floating layer.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -111,7 +111,7 @@ impl GridTooltip {
         self
     }
 
-    pub fn padding<P: Into<PaddingProperty>>(mut self, padding: P) -> Self {
+    pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
         self.padding = Some(padding.into());
         self
     }

charming/src/component/legend.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     datatype::CompositeValue,
-    element::{Color, Icon, ItemStyle, LabelAlign, LineStyle, Orient, PaddingProperty, TextStyle},
+    element::{Color, Icon, ItemStyle, LabelAlign, LineStyle, Orient, Padding, TextStyle},
 };
 
 #[derive(Serialize)]
@@ -125,7 +125,7 @@ pub struct Legend {
 
     /// Legend padding.
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     /// The gap between each legend.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -263,7 +263,7 @@ impl Legend {
         self
     }
 
-    pub fn padding<P: Into<PaddingProperty>>(mut self, padding: P) -> Self {
+    pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
         self.padding = Some(padding.into());
         self
     }

charming/src/component/radar_coordinate.rs

@@ -3,8 +3,7 @@ use serde::Serialize;
 use crate::{
     datatype::CompositeValue,
     element::{
-        AxisLabel, AxisLine, AxisTick, Color, Formatter, PaddingProperty, Shape, SplitArea,
-        SplitLine,
+        AxisLabel, AxisLine, AxisTick, Color, Formatter, Padding, Shape, SplitArea, SplitLine,
     },
 };
 
@@ -57,7 +56,7 @@ pub struct RadarAxisName {
     border_radius: Option<CompositeValue>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     shadow_color: Option<Color>,
@@ -211,7 +210,7 @@ impl RadarAxisName {
         self
     }
 
-    pub fn padding<C: Into<PaddingProperty>>(mut self, padding: C) -> Self {
+    pub fn padding<C: Into<Padding>>(mut self, padding: C) -> Self {
         self.padding = Some(padding.into());
         self
     }

charming/src/component/title.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     datatype::CompositeValue,
-    element::{Color, LinkTarget, PaddingProperty, TextAlign, TextStyle, TextVerticalAlign},
+    element::{Color, LinkTarget, Padding, TextAlign, TextStyle, TextVerticalAlign},
 };
 
 /// Title component, including main title and subtitle.
@@ -59,7 +59,7 @@ pub struct Title {
 
     /// Title padding, the unit is px.
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     /// The gap between the main title and the sub title, the unit is px.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -214,7 +214,7 @@ impl Title {
         self
     }
 
-    pub fn padding<P: Into<PaddingProperty>>(mut self, padding: P) -> Self {
+    pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
         self.padding = Some(padding.into());
         self
     }

charming/src/component/tooltip.rs

@@ -1,6 +1,6 @@
 use serde::Serialize;
 
-use crate::element::{AxisPointer, Color, Formatter, PaddingProperty, TooltipTrigger};
+use crate::element::{AxisPointer, Color, Formatter, Padding, TooltipTrigger};
 
 #[derive(Serialize)]
 #[serde(rename_all = "snake_case")]
@@ -31,7 +31,7 @@ pub struct Tooltip {
     position: Option<String>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     background_color: Option<Color>,
@@ -83,7 +83,7 @@ impl Tooltip {
         self
     }
 
-    pub fn padding<P: Into<PaddingProperty>>(mut self, padding: P) -> Self {
+    pub fn padding<P: Into<Padding>>(mut self, padding: P) -> Self {
         self.padding = Some(padding.into());
         self
     }

charming/src/element/coordinate_tooltip.rs

@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::datatype::CompositeValue;
 
-use super::{Color, Formatter, PaddingProperty, TextStyle, TooltipTrigger};
+use super::{Color, Formatter, Padding, TextStyle, TooltipTrigger};
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -29,7 +29,7 @@ pub struct CoordinateTooltip {
     border_color: Option<Color>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    padding: Option<PaddingProperty>,
+    padding: Option<Padding>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     text_style: Option<TextStyle>,

charming/src/element/mod.rs

@@ -30,7 +30,7 @@ pub mod minor_split_line;
 pub mod minor_tick;
 pub mod name_location;
 pub mod orient;
-pub mod padding_property;
+pub mod padding;
 pub mod parallel_layout;
 pub mod pointer;
 pub mod scale_limit;
@@ -77,7 +77,7 @@ pub use minor_split_line::*;
 pub use minor_tick::*;
 pub use name_location::*;
 pub use orient::*;
-pub use padding_property::*;
+pub use padding::*;
 pub use parallel_layout::*;
 pub use pointer::*;
 pub use scale_limit::*;

charming/src/element/padding_property.rs → charming/src/element/padding.rs

@@ -1,7 +1,7 @@
 use serde::{ser::SerializeSeq, Serialize};
 
 /// Padding space around content.
-pub enum PaddingProperty {
+pub enum Padding {
     /// Set padding of all sides.
     Single(f64),
     /// Set top and bottom padding to the first value, and left and right
@@ -11,17 +11,17 @@ pub enum PaddingProperty {
     Quadruple(f64, f64, f64, f64),
 }
 
-impl Serialize for PaddingProperty {
+impl Serialize for Padding {
     fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         match self {
-            PaddingProperty::Single(padding) => serializer.serialize_f64(*padding),
-            PaddingProperty::Double(top_bottom, left_right) => {
+            Padding::Single(padding) => serializer.serialize_f64(*padding),
+            Padding::Double(top_bottom, left_right) => {
                 let mut s = serializer.serialize_seq(Some(2))?;
                 s.serialize_element(top_bottom)?;
                 s.serialize_element(left_right)?;
                 s.end()
             }
-            PaddingProperty::Quadruple(top, right, bottom, left) => {
+            Padding::Quadruple(top, right, bottom, left) => {
                 let mut s = serializer.serialize_seq(Some(4))?;
                 s.serialize_element(top)?;
                 s.serialize_element(right)?;
@@ -33,39 +33,39 @@ impl Serialize for PaddingProperty {
     }
 }
 
-impl From<f64> for PaddingProperty {
+impl From<f64> for Padding {
     fn from(padding: f64) -> Self {
-        PaddingProperty::Single(padding)
+        Padding::Single(padding)
     }
 }
 
-impl From<i64> for PaddingProperty {
+impl From<i64> for Padding {
     fn from(padding: i64) -> Self {
-        PaddingProperty::Single(padding as f64)
+        Padding::Single(padding as f64)
     }
 }
 
-impl From<(f64, f64)> for PaddingProperty {
+impl From<(f64, f64)> for Padding {
     fn from(padding: (f64, f64)) -> Self {
-        PaddingProperty::Double(padding.0, padding.1)
+        Padding::Double(padding.0, padding.1)
     }
 }
 
-impl From<(i64, i64)> for PaddingProperty {
+impl From<(i64, i64)> for Padding {
     fn from(padding: (i64, i64)) -> Self {
-        PaddingProperty::Double(padding.0 as f64, padding.1 as f64)
+        Padding::Double(padding.0 as f64, padding.1 as f64)
     }
 }
 
-impl From<(f64, f64, f64, f64)> for PaddingProperty {
+impl From<(f64, f64, f64, f64)> for Padding {
     fn from(padding: (f64, f64, f64, f64)) -> Self {
-        PaddingProperty::Quadruple(padding.0, padding.1, padding.2, padding.3)
+        Padding::Quadruple(padding.0, padding.1, padding.2, padding.3)
     }
 }
 
-impl From<(i64, i64, i64, i64)> for PaddingProperty {
+impl From<(i64, i64, i64, i64)> for Padding {
     fn from(padding: (i64, i64, i64, i64)) -> Self {
-        PaddingProperty::Quadruple(
+        Padding::Quadruple(
             padding.0 as f64,
             padding.1 as f64,
             padding.2 as f64,