feat: 增加white-space

Author: heiazu

src/parse_style_properties.rs

@@ -4,7 +4,7 @@ use lightningcss::{properties::{custom::TokenOrValue, Property}, stylesheet::Pri
 use swc_core::{common::DUMMY_SP, ecma::{ast::{self}, utils::quote_ident}};
 use swc_core::ecma::ast::*;
 
-use crate::{style_parser::KeyFrameItem, style_propetries::{animation::Animation, aspect_ratio::AspectRatio, background::Background, background_image::BackgroundImage, background_position::BackgroundPosition, background_repeat::BackgroundRepeat, background_size::BackgroundSize, border::Border, border_color::BorderColor, border_radius::BorderRadius, border_style::BorderStyle, border_width::BorderWidth, box_shadow::BoxShadow, color::ColorProperty, display::Display, flex::Flex, flex_align::FlexAlign, flex_basis::FlexBasis, flex_direction::FlexDirection, flex_wrap::FlexWrap, font_size::FontSize, font_style::FontStyle, font_weight::FontWeight, gap::Gap, item_align::ItemAlign, length_value::LengthValueProperty, letter_spacing::LetterSpacing, line_height::LineHeight, marin_padding::MarginPadding, max_size::MaxSizeProperty, normal::Normal, number::NumberProperty, opacity::Opacity, overflow::Overflow, position::Position, size::SizeProperty, style_property_type::CSSPropertyType, style_value_type::StyleValueType, text_align::TextAlign, text_decoration::TextDecoration, text_overflow::TextOverflow, text_shadow::TextShadow, text_transform::TextTransform, transform::Transform, transform_origin::TransformOrigin, vertical_align::VerticalAlign, visibility::Visibility, word_break::WordBreak}};
+use crate::{style_parser::KeyFrameItem, style_propetries::{animation::Animation, aspect_ratio::AspectRatio, background::Background, background_image::BackgroundImage, background_position::BackgroundPosition, background_repeat::BackgroundRepeat, background_size::BackgroundSize, border::Border, border_color::BorderColor, border_radius::BorderRadius, border_style::BorderStyle, border_width::BorderWidth, box_shadow::BoxShadow, color::ColorProperty, display::Display, flex::Flex, flex_align::FlexAlign, flex_basis::FlexBasis, flex_direction::FlexDirection, flex_wrap::FlexWrap, font_size::FontSize, font_style::FontStyle, font_weight::FontWeight, gap::Gap, item_align::ItemAlign, length_value::LengthValueProperty, letter_spacing::LetterSpacing, line_height::LineHeight, marin_padding::MarginPadding, max_size::MaxSizeProperty, normal::Normal, number::NumberProperty, opacity::Opacity, overflow::Overflow, position::Position, size::SizeProperty, style_property_type::CSSPropertyType, style_value_type::StyleValueType, text_align::TextAlign, text_decoration::TextDecoration, text_overflow::TextOverflow, text_shadow::TextShadow, text_transform::TextTransform, transform::Transform, transform_origin::TransformOrigin, vertical_align::VerticalAlign, visibility::Visibility, white_space::WhiteSpace, word_break::WordBreak}};
 
 pub fn parse_style_properties(properties: &Vec<(String, Property)>, keyframes_map: Option<Rc<RefCell<HashMap<String, Vec<KeyFrameItem>>>>>) -> Vec<StyleValueType> {
   let mut final_properties = vec![];
@@ -251,6 +251,9 @@ pub fn parse_style_properties(properties: &Vec<(String, Property)>, keyframes_ma
           "wordBreak" => {
             final_properties.push(StyleValueType::WordBreak(WordBreak::from(( id.to_string(), value ))))
           }
+          "whiteSpace" => {
+            final_properties.push(StyleValueType::WhiteSpace(WhiteSpace::from(( id.to_string(), value ))))
+          }
           _ => {
             // position、zIndex等... 会自动处理 单位、数字等相关信息
             // final_properties.push(StyleValueType::Normal(Normal::new(id.to_string(), value.value_to_css_string(PrinterOptions::default()).unwrap())));

src/style_propetries/mod.rs

@@ -52,4 +52,5 @@ pub mod box_shadow;
 pub mod position;
 pub mod visibility;
 pub mod opacity;
-pub mod word_break;
+pub mod word_break;
+pub mod white_space;

src/style_propetries/style_property_enum.rs

@@ -374,3 +374,11 @@ pub enum Position {
     Fixed,
     Sticky,
 }
+
+
+#[repr(u32)]
+#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
+pub enum WhiteSpace {
+    NoWrap = 0,
+    Wrap,
+}

src/style_propetries/style_property_type.rs

@@ -91,5 +91,6 @@ pub enum CSSPropertyType {
     transitionProperty = 86,
     transitionDuration = 87,
     transitionTimingFunction = 88,
-    transitionDelay = 89
+    transitionDelay = 89,
+    WhiteSpace = 90,
 }

src/style_propetries/style_value_type.rs

@@ -1,6 +1,6 @@
 use crate::generate_expr_based_on_platform;
 
-use super::{animation::Animation, aspect_ratio::AspectRatio, background::Background, background_image::BackgroundImage, background_position::BackgroundPosition, background_repeat::BackgroundRepeat, background_size::BackgroundSize, border::Border, border_color::BorderColor, border_radius::BorderRadius, border_style::BorderStyle, border_width::BorderWidth, box_shadow::BoxShadow, color::ColorProperty, display::Display, flex::Flex, flex_align::FlexAlign, flex_basis::FlexBasis, flex_direction::FlexDirection, flex_wrap::FlexWrap, font_size::FontSize, font_style::FontStyle, font_weight::FontWeight, gap::Gap, item_align::ItemAlign, length_value::LengthValueProperty, letter_spacing::LetterSpacing, line_height::LineHeight, marin_padding::MarginPadding, max_size::MaxSizeProperty, normal::Normal, number::NumberProperty, opacity::Opacity, overflow::Overflow, position::Position, size::SizeProperty, text_align::TextAlign, text_decoration::TextDecoration, text_overflow::TextOverflow, text_shadow::TextShadow, text_transform::TextTransform, traits::{ToExpr, ToStyleValue}, transform::Transform, transform_origin::TransformOrigin, unit::{Platform, PropertyTuple}, vertical_align::VerticalAlign, visibility::Visibility, word_break::WordBreak};
+use super::{animation::Animation, aspect_ratio::AspectRatio, background::Background, background_image::BackgroundImage, background_position::BackgroundPosition, background_repeat::BackgroundRepeat, background_size::BackgroundSize, border::Border, border_color::BorderColor, border_radius::BorderRadius, border_style::BorderStyle, border_width::BorderWidth, box_shadow::BoxShadow, color::ColorProperty, display::Display, flex::Flex, flex_align::FlexAlign, flex_basis::FlexBasis, flex_direction::FlexDirection, flex_wrap::FlexWrap, font_size::FontSize, font_style::FontStyle, font_weight::FontWeight, gap::Gap, item_align::ItemAlign, length_value::LengthValueProperty, letter_spacing::LetterSpacing, line_height::LineHeight, marin_padding::MarginPadding, max_size::MaxSizeProperty, normal::Normal, number::NumberProperty, opacity::Opacity, overflow::Overflow, position::Position, size::SizeProperty, text_align::TextAlign, text_decoration::TextDecoration, text_overflow::TextOverflow, text_shadow::TextShadow, text_transform::TextTransform, traits::{ToExpr, ToStyleValue}, transform::Transform, transform_origin::TransformOrigin, unit::{Platform, PropertyTuple}, vertical_align::VerticalAlign, visibility::Visibility, white_space::WhiteSpace, word_break::WordBreak};
 
 
 #[derive(Debug, Clone)]
@@ -51,7 +51,8 @@ pub enum StyleValueType {
   Position(Position),
   Visibility(Visibility),
   Opacity(Opacity),
-  WordBreak(WordBreak)
+  WordBreak(WordBreak),
+  WhiteSpace(WhiteSpace)
 }
 
 impl ToStyleValue for StyleValueType {
@@ -198,6 +199,9 @@ impl ToStyleValue for StyleValueType {
       StyleValueType::WordBreak(value) => {
         generate_expr_based_on_platform!(platform, value)
       }
+      StyleValueType::WhiteSpace(value) => {
+        generate_expr_based_on_platform!(platform, value)
+      }
     }
   }
 }

src/style_propetries/white_space.rs

@@ -0,0 +1,50 @@
+use std::default;
+
+use lightningcss::properties::{Property, font};
+
+use crate::{generate_expr_enum, generate_invalid_expr, style_propetries::style_property_enum};
+
+use super::{style_property_type::CSSPropertyType, traits::ToExpr, unit::PropertyTuple};
+
+#[derive(Debug, Clone)]
+pub struct WhiteSpace {
+  pub id: String,
+  pub value: EnumValue
+}
+
+#[derive(Debug, Clone)]
+pub enum EnumValue {
+  NoWrap,
+  Invalid
+}
+
+impl ToExpr for WhiteSpace {
+  fn to_expr(&self) -> PropertyTuple {
+    PropertyTuple::One(
+      CSSPropertyType::WhiteSpace,
+      {
+        match self.value {
+          EnumValue::NoWrap => generate_expr_enum!(style_property_enum::WhiteSpace::NoWrap),
+          EnumValue::Invalid => generate_invalid_expr!(),
+        }
+      }
+    )
+  }
+}
+
+impl From<(String, &Property<'_>)> for WhiteSpace {
+  fn from(prop: (String, &Property<'_>)) -> Self {
+    WhiteSpace {
+      id: prop.0,
+      value: match prop.1 {
+        Property::WhiteSpace(value) => {
+          match value {
+            lightningcss::properties::text::WhiteSpace::NoWrap => EnumValue::NoWrap,
+            _ => EnumValue::Invalid,
+        }
+        }
+        _ => EnumValue::Invalid,
+      }
+    }
+  }
+}