From b9eeec0271e514f4480c0f6197ca8c551c72dd23 Mon Sep 17 00:00:00 2001 From: luckyadam Date: Fri, 27 Oct 2023 20:15:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20margin/padding=20=E4=B8=BA=200=20?= =?UTF-8?q?=E8=A2=AB=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style_parser.rs | 19 +++---------------- src/style_transform/margin_padding.rs | 4 ---- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/style_parser.rs b/src/style_parser.rs index 307f191..a709b0e 100644 --- a/src/style_parser.rs +++ b/src/style_parser.rs @@ -113,13 +113,8 @@ pub fn parse_style_properties(properties: &Vec<(String, Property<'_>)>) -> Style for (id, value) in properties.iter() { match id.as_str() { "margin" => { - let margin = MarginPadding::from(value); - if margin.is_zero() { - final_properties.remove("margin"); - } else { - final_properties.insert("margin".to_string(), StyleValueType::MarginPadding(margin)); - } - } + final_properties.insert("margin".to_string(), StyleValueType::MarginPadding(MarginPadding::from(value))); + }, "marginLeft" => { let margin = final_properties .entry("margin".to_string()) @@ -173,15 +168,7 @@ pub fn parse_style_properties(properties: &Vec<(String, Property<'_>)>) -> Style } } "padding" => { - let padding = MarginPadding::from(value); - if padding.is_zero() { - final_properties.remove("padding"); - } else { - final_properties.insert( - "padding".to_string(), - StyleValueType::MarginPadding(padding), - ); - } + final_properties.insert("padding".to_string(), StyleValueType::MarginPadding(MarginPadding::from(value))); } "paddingLeft" => { let padding = final_properties diff --git a/src/style_transform/margin_padding.rs b/src/style_transform/margin_padding.rs index 867e0d0..ae4fcb2 100644 --- a/src/style_transform/margin_padding.rs +++ b/src/style_transform/margin_padding.rs @@ -22,10 +22,6 @@ impl MarginPadding { } } - pub fn is_zero(&self) -> bool { - self.top == "0" && self.right == "0" && self.bottom == "0" && self.left == "0" - } - pub fn set_top(&mut self, top: &str) { self.top = top.to_string(); }