feat: 拆分text-decoration

Author: mayintao3

src/style_propetries/style_property_enum.rs

@@ -159,7 +159,7 @@ pub enum ArkUI_AnimationCurve {
 #[allow(non_camel_case_types)]
 pub enum ArkUI_AnimationFillMode {
     // 动画未执行时不会将任何样式应用于目标，动画播放完成之后恢复初始默认状态。
-    ARKUI_ANIMATION_FILL_MODE_NONE = 0 ,
+    ARKUI_ANIMATION_FILL_MODE_NONE = 0,
     // 目标将保留动画执行期间最后一个关键帧的状态。
     ARKUI_ANIMATION_FILL_MODE_FORWARDS,
     // 动画将在应用于目标时立即应用第一个关键帧中定义的值，并在delay期间保留此值。
@@ -251,6 +251,22 @@ pub enum ArkUI_TextDecorationType {
     ARKUI_TEXT_DECORATION_TYPE_LINE_THROUGH,
 }
 
+#[repr(u32)]
+#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
+#[allow(non_camel_case_types)]
+pub enum ArkUI_TextDecorationStyle {
+    /** Single solid line. */
+    ARKUI_TEXT_DECORATION_STYLE_SOLID = 0,
+    /** Double solid line. */
+    ARKUI_TEXT_DECORATION_STYLE_DOUBLE,
+    /** Dotted line. */
+    ARKUI_TEXT_DECORATION_STYLE_DOTTED,
+    /** Dashed line. */
+    ARKUI_TEXT_DECORATION_STYLE_DASHED,
+    /** Wavy line. */
+    ARKUI_TEXT_DECORATION_STYLE_WAVY,
+}
+
 #[repr(u32)]
 #[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
 #[allow(non_camel_case_types)]

src/style_propetries/style_property_type.rs

@@ -87,10 +87,14 @@ pub enum CSSPropertyType {
     AnimationFillMode = 82,
     BackgroundPositionX = 83,
     BackgroundPositionY = 84,
-    transition = 85,
-    transitionProperty = 86,
-    transitionDuration = 87,
-    transitionTimingFunction = 88,
-    transitionDelay = 89,
+    Transition = 85,
+    TransitionProperty = 86,
+    TransitionDuration = 87,
+    TransitionTimingFunction = 88,
+    TransitionDelay = 89,
     WhiteSpace = 90,
+    TextDecorationLine = 91,
+    TextDecorationThickness = 92,
+    TextDecorationStyle = 93,
+    TextDecorationColor = 94,
 }

src/style_propetries/text_decoration.rs

@@ -35,34 +35,43 @@ pub struct TextDecorationColor(CssColor);
 
 impl ToExpr for TextDecoration {
   fn to_expr(&self) -> PropertyTuple {
-    let mut props = vec![];
+    let mut props: Vec<(CSSPropertyType, Expr)> = vec![];
 
     if let Some(line) = &self.line {
-      props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
-        key: generate_prop_name!("type"),
-        value: match line {
+      props.push((
+        CSSPropertyType::TextDecorationLine,
+        match line {
           TextDecorationLine::Underline => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationType::ARKUI_TEXT_DECORATION_TYPE_UNDERLINE),
           TextDecorationLine::LineThrough => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationType::ARKUI_TEXT_DECORATION_TYPE_LINE_THROUGH),
           TextDecorationLine::Overline => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationType::ARKUI_TEXT_DECORATION_TYPE_OVERLINE),
           _ => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationType::ARKUI_TEXT_DECORATION_TYPE_NONE),
-        }.into()
-      }))));
+        }
+      ));
     }
 
     if let Some(color) = &self.color {
-      props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
-        key: generate_prop_name!("color"),
-        value: generate_expr_lit_color!(color.0.clone()).into()
-      }))));
+      props.push((
+        CSSPropertyType::TextDecorationColor,
+        generate_expr_lit_color!(color.0.clone())
+      ));
+     
+    }
+
+    if let Some(style) = &self.style {
+      props.push((
+        CSSPropertyType::TextDecorationStyle,
+        match style {
+          TextDecorationStyle::Solid => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationStyle::ARKUI_TEXT_DECORATION_STYLE_SOLID),
+          TextDecorationStyle::Double => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationStyle::ARKUI_TEXT_DECORATION_STYLE_DOUBLE),
+          TextDecorationStyle::Dotted => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationStyle::ARKUI_TEXT_DECORATION_STYLE_DOTTED),
+          TextDecorationStyle::Dashed => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationStyle::ARKUI_TEXT_DECORATION_STYLE_DASHED),
+          TextDecorationStyle::Wavy => generate_expr_enum!(style_property_enum::ArkUI_TextDecorationStyle::ARKUI_TEXT_DECORATION_STYLE_WAVY),
+        }
+      ));
+     
     }
 
-    PropertyTuple::One(
-      CSSPropertyType::TextDecoration,
-      Expr::Object(ObjectLit {
-        span: DUMMY_SP,
-        props: props
-      })
-    )
+    PropertyTuple::Array(props)
   }
 }