Skip to content

Commit

Permalink
fix: margin/padding 为 0 被忽略
Browse files Browse the repository at this point in the history
  • Loading branch information
luckyadam committed Oct 27, 2023
1 parent d5f6091 commit b9eeec0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
19 changes: 3 additions & 16 deletions src/style_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/style_transform/margin_padding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit b9eeec0

Please # to comment.