fix: 修复选择器被合并导致匹配异常、修复fontfamliy不能有数字

Author: heiazu

src/parse_style_properties.rs

@@ -269,11 +269,9 @@ pub fn parse_style_properties(properties: &Vec<(String, Property)>) -> DeclsAndV
         ))));
       }
       "fontFamily" => {
-        final_properties.push(StyleValueType::Normal(Normal::new(
+        final_properties.push(StyleValueType::Expr(Expr::new(
           CSSPropertyType::FontFamily,
-          value
-            .value_to_css_string(PrinterOptions::default())
-            .unwrap(),
+          generate_expr_lit_str!(value.value_to_css_string(PrinterOptions::default()).unwrap()),
         )));
       }
       "lineHeight" => {

src/style_parser.rs

@@ -236,15 +236,15 @@ impl<'i> Visitor<'i> for StyleVisitor<'i> {
 
         for (index, selector) in selectors.iter().enumerate() {
           let mut all_style = self.all_style.borrow_mut();
-          let decorations = all_style
-            .iter_mut()
-            .find(|(media_idx, id, _)| id == selector && media_idx == &self.media_index);
-          if let Some((_, _, declarations)) = decorations {
-            declarations.push(StyleDeclaration {
-              specificity: style.selectors.0.get(index).unwrap().specificity(),
-              declaration: style.declarations.clone(),
-            });
-          } else {
+          // let decorations = all_style
+          //   .iter_mut()
+          //   .find(|(media_idx, id, _)| id == selector && media_idx == &self.media_index);
+          // if let Some((_, _, declarations)) = decorations {
+          //   declarations.push(StyleDeclaration {
+          //     specificity: style.selectors.0.get(index).unwrap().specificity(),
+          //     declaration: style.declarations.clone(),
+          //   });
+          // } else {
             all_style.push((
               self.media_index,
               selector.clone(),
@@ -253,7 +253,7 @@ impl<'i> Visitor<'i> for StyleVisitor<'i> {
                 declaration: style.declarations.clone(),
               }],
             ));
-          }
+          // }
         }
       }
       // media