fix: double quote when extending inline styles

Author: tborg

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Bump MSRV to `1.70`.
 
+### Fixed
+
+- Replace double quotes when merging styles. [#392](https://github.com/Stranger6667/css-inline/issues/392)
+
 ## [0.14.1] - 2024-04-27
 
 ### Fixed

bindings/c/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Bump MSRV to `1.70`.
 
+### Fixed
+
+- Replace double quotes when merging styles. [#392](https://github.com/Stranger6667/css-inline/issues/392)
+
 ## [0.14.1] - 2024-04-27
 
 ### Fixed

bindings/javascript/CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Fixed
 
 - Build on `linux-arm-gnueabihf`
+- Replace double quotes when merging styles. [#392](https://github.com/Stranger6667/css-inline/issues/392)
 
 ## [0.14.1] - 2024-04-27
 

bindings/python/CHANGELOG.md

@@ -7,6 +7,10 @@
 - Update `PyO3` to `0.22.0`.
 - Bump MSRV to `1.70`.
 
+### Fixed
+
+- Replace double quotes when merging styles. [#392](https://github.com/Stranger6667/css-inline/issues/392)
+
 ## [0.14.1] - 2024-04-27
 
 ### Fixed

bindings/ruby/CHANGELOG.md

@@ -7,6 +7,10 @@
 - Update `magnus` to `0.7`.
 - Bump MSRV to `1.70`.
 
+### Fixed
+
+- Replace double quotes when merging styles. [#392](https://github.com/Stranger6667/css-inline/issues/392)
+
 ## [0.14.1] - 2024-04-27
 
 ### Fixed

css-inline/src/html/serializer.rs

@@ -399,6 +399,11 @@ fn write_declaration<Wr: Write>(
 ) -> Result<(), InlineError> {
     writer.write_all(name.as_bytes())?;
     writer.write_all(STYLE_SEPARATOR)?;
+    write_declaration_value(writer, value)
+}
+
+#[inline]
+fn write_declaration_value<Wr: Write>(writer: &mut Wr, value: &str) -> Result<(), InlineError> {
     let value = value.trim();
     if value.as_bytes().contains(&b'"') {
         // Roughly based on `str::replace`
@@ -429,9 +434,7 @@ macro_rules! push_or_update {
     ($style_buffer:expr, $length:expr, $name: expr, $value:expr) => {{
         if let Some(style) = $style_buffer.get_mut($length) {
             style.clear();
-            style.extend_from_slice($name.as_bytes());
-            style.extend_from_slice(STYLE_SEPARATOR);
-            style.extend_from_slice($value.trim().as_bytes());
+            write_declaration(style, &$name, $value)?;
         } else {
             let value = $value.trim();
             let mut style = Vec::with_capacity(
@@ -440,9 +443,7 @@ macro_rules! push_or_update {
                     .saturating_add(STYLE_SEPARATOR.len())
                     .saturating_add(value.len()),
             );
-            style.extend_from_slice($name.as_bytes());
-            style.extend_from_slice(STYLE_SEPARATOR);
-            style.extend_from_slice(value.as_bytes());
+            write_declaration(&mut style, &$name, $value)?;
             $style_buffer.push(style);
         };
         $length = $length.saturating_add(1);
@@ -507,7 +508,7 @@ fn merge_styles<Wr: Write>(
             (Some(value), Some(buffer)) => {
                 // We keep the rule name and the colon-space suffix - '<rule>: `
                 buffer.truncate(property.len().saturating_add(STYLE_SEPARATOR.len()));
-                buffer.extend_from_slice(value.trim().as_bytes());
+                write_declaration_value(buffer, value)?;
             }
             // There's no existing rule with the same name, but the new rule is `!important`
             // In this case, we add the new rule with the `!important` suffix removed

css-inline/tests/test_inlining.rs

@@ -267,6 +267,28 @@ fn font_family_quoted() {
     )
 }
 
+#[test]
+fn font_family_quoted_with_existing_inline_style() {
+    // When property value contains double quotes
+    assert_inlined!(
+        style = r#"h1 { font-family: "Open Sans", sans-serif; }"#,
+        body = r#"<h1 style="whitespace: nowrap">Hello world!</h1>"#,
+        // Then it should be replaced with single quotes
+        expected = r#"<h1 style="font-family: 'Open Sans', sans-serif;whitespace: nowrap">Hello world!</h1>"#
+    )
+}
+
+#[test]
+fn font_family_quoted_with_inline_style_override() {
+    // When property value contains double quotes
+    assert_inlined!(
+        style = r#"h1 { font-family: "Open Sans", sans-serif !important; }"#,
+        body = r#"<h1 style="font-family: Helvetica; whitespace: nowrap">Hello world!</h1>"#,
+        // Then it should be replaced with single quotes
+        expected = r#"<h1 style="font-family: 'Open Sans', sans-serif;whitespace: nowrap">Hello world!</h1>"#
+    )
+}
+
 #[test]
 fn other_property_quoted() {
     // When property value contains double quotes