milkshakesoftware · martinnormark · May 21, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025
diff --git a/PreMailer.Net/PreMailer.Net.Tests/CssElementStyleResolverTests.cs b/PreMailer.Net/PreMailer.Net.Tests/CssElementStyleResolverTests.cs
@@ -22,5 +22,39 @@ public void GetAllStylesForElement()
             Assert.Equal("style", result.ElementAt(0).AttributeName);
             Assert.Equal("bgcolor", result.ElementAt(1).AttributeName);
         }
+
+        [Fact]
+        public void GetAllStyles_PreservesImportantFlagsInInlineStyles()
+        {
+            var document = new HtmlParser().ParseDocument("<div style=\"font-weight: bold !important;\"></div>");
+            var element = document.Body.FirstElementChild;
+
+            var styleClass = new StyleClass();
+            styleClass.Attributes["color"] = CssAttribute.FromRule("color: red");
+
+            var result = CssElementStyleResolver.GetAllStyles(element, styleClass);
+
+            var styleAttribute = result.FirstOrDefault(a => a.AttributeName == "style");
+            Assert.NotNull(styleAttribute);
+            Assert.Contains("font-weight: bold !important", styleAttribute.CssValue);
+            Assert.Contains("color: red", styleAttribute.CssValue);
+        }
+
+        [Fact]
+        public void GetAllStyles_PreservesImportantFlagsWhenMergingStyles()
+        {
+            var document = new HtmlParser().ParseDocument("<div style=\"font-weight: bold !important;\"></div>");
+            var element = document.Body.FirstElementChild;
+
+            var styleClass = new StyleClass();
+            styleClass.Attributes["font-weight"] = CssAttribute.FromRule("font-weight: normal");
+
+            var result = CssElementStyleResolver.GetAllStyles(element, styleClass);
+
+            var styleAttribute = result.FirstOrDefault(a => a.AttributeName == "style");
+            Assert.NotNull(styleAttribute);
+            Assert.Contains("font-weight: bold !important", styleAttribute.CssValue);
+            Assert.DoesNotContain("font-weight: normal", styleAttribute.CssValue);
+        }
     }
 }
diff --git a/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs b/PreMailer.Net/PreMailer.Net.Tests/PreMailerTests.cs
@@ -188,6 +188,23 @@ public void MoveCssInline_ImportantFlag_HonorsImportantFlagInline()
 			Assert.Contains("<div style=\"color: red", premailedOutput.Html);
 		}
 
+	[Fact]
+	public void MoveCssInline_ShouldPreserveImportantFlagInInlineStyles_WhenApplyingClassStyles()
+	{
+		string input = @"<style> 
+.test {
+ color:red;
+ }
+ </style>
+<body>
+<p class=""test"" style=""font-weight: bold !important;"">test</p>
+</body>";
+
+		var premailedOutput = PreMailer.MoveCssInline(input);
+
+		Assert.Contains("font-weight: bold !important", premailedOutput.Html);
+	}
+
 		[Fact]
 		public void MoveCssInline_AbsoluteBackgroundUrl_ShouldNotBeCleanedAsComment()
 		{

diff --git a/PreMailer.Net/PreMailer.Net.Tests/StyleClassApplierTests.cs b/PreMailer.Net/PreMailer.Net.Tests/StyleClassApplierTests.cs
@@ -58,7 +58,24 @@ public void ApplyInlineStylesWithoutImportant()
 
 			var result = StyleClassApplier.ApplyAllStyles(elementDictionary);
 
-			Assert.Equal("<div style=\"color: #000\"></div>", result.ElementAt(0).Key.OuterHtml);
+			Assert.Equal("<div style=\"color: #000 !important\"></div>", result.ElementAt(0).Key.OuterHtml);
+		}
+
+		[Fact]
+		public void ApplyInlineStylesWithImportant()
+		{
+			var document = new HtmlParser().ParseDocument("<div style=\"font-weight: bold !important;\"></div>");
+
+			var clazz = new StyleClass();
+			clazz.Attributes["color"] = CssAttribute.FromRule("color: #000");
+
+			var elementDictionary = new Dictionary<IElement, StyleClass> {
+				{document.Body.FirstElementChild, clazz}
+			};
+
+			var result = StyleClassApplier.ApplyAllStyles(elementDictionary);
+
+			Assert.Equal("<div style=\"color: #000;font-weight: bold !important\"></div>", result.ElementAt(0).Key.OuterHtml);
 		}
     }
 }
diff --git a/PreMailer.Net/PreMailer.Net/CssElementStyleResolver.cs b/PreMailer.Net/PreMailer.Net/CssElementStyleResolver.cs
@@ -8,19 +8,47 @@ public static class CssElementStyleResolver
 	{
 		private const string premailerAttributePrefix = "-premailer-";
 
-		public static IEnumerable<AttributeToCss> GetAllStyles(IElement domElement, StyleClass styleClass)
+	public static IEnumerable<AttributeToCss> GetAllStyles(IElement domElement, StyleClass styleClass)
+	{
+		var attributeCssList = new List<AttributeToCss>();
+		var originalStyleAttr = domElement.Attributes["style"];
+
+		AddSpecialPremailerAttributes(attributeCssList, styleClass);
+
+		var mergedStyleClass = new StyleClass();
+
+		if (styleClass.Attributes.Count > 0)
 		{
-			var attributeCssList = new List<AttributeToCss>();
-
-			AddSpecialPremailerAttributes(attributeCssList, styleClass);
-
-			if (styleClass.Attributes.Count > 0)
-				attributeCssList.Add(new AttributeToCss { AttributeName = "style", CssValue = styleClass.ToString() });
-
-			attributeCssList.AddRange(CssStyleEquivalence.FindEquivalent(domElement, styleClass));
-
-			return attributeCssList;
+			mergedStyleClass.Merge(styleClass, true);
+		}
+
+		if (originalStyleAttr != null)
+		{
+			var parser = new CssParser();
+			var originalStyleClass = parser.ParseStyleClass("inline", originalStyleAttr.Value);
+
+			foreach (var attr in originalStyleClass.Attributes)
+			{
+				if (attr.Important)
+				{
+					mergedStyleClass.Attributes.Merge(attr);
+				}
+				else if (!mergedStyleClass.Attributes.TryGetValue(attr.Style, out var existing) || !existing.Important)
+				{
+					mergedStyleClass.Attributes.Merge(attr);
+				}
+			}
 		}
+
+		if (mergedStyleClass.Attributes.Count > 0)
+		{
+			attributeCssList.Add(new AttributeToCss { AttributeName = "style", CssValue = mergedStyleClass.ToString(emitImportant: true) });
+		}
+
+		attributeCssList.AddRange(CssStyleEquivalence.FindEquivalent(domElement, styleClass));
+
+		return attributeCssList;
+	}
 
 		private static void AddSpecialPremailerAttributes(List<AttributeToCss> attributeCssList, StyleClass styleClass)
 		{
@@ -44,4 +72,4 @@ private static void AddSpecialPremailerAttributes(List<AttributeToCss> attribute
 			}
 		}
 	}
-}
+}
diff --git a/PreMailer.Net/PreMailer.Net/PreMailer.cs b/PreMailer.Net/PreMailer.Net/PreMailer.cs
@@ -537,4 +537,4 @@ public void Dispose()
 			_document.Dispose();
 		}
 	}
-}
+}
diff --git a/PreMailer.Net/PreMailer.Net/StyleClassApplier.cs b/PreMailer.Net/PreMailer.Net/StyleClassApplier.cs
@@ -15,24 +15,24 @@ public static Dictionary<IElement, StyleClass> ApplyAllStyles(Dictionary<IElemen
 			return elementDictionary;
 		}
 
-		private static IElement ApplyStyles(IElement domElement, StyleClass clazz)
-		{
-			var styles = CssElementStyleResolver.GetAllStyles(domElement, clazz);
-
-			foreach (var attributeToCss in styles)
-			{
-				SetAttribute(domElement, attributeToCss);
-			}
+	private static IElement ApplyStyles(IElement domElement, StyleClass clazz)
+	{
+		var styles = CssElementStyleResolver.GetAllStyles(domElement, clazz);
 
-			var styleAttr = domElement.Attributes["style"];
-			if (styleAttr == null || string.IsNullOrEmpty(styleAttr.Value))
-			{
-				domElement.RemoveAttribute("style");
-			}
+		foreach (var attributeToCss in styles)
+		{
+			SetAttribute(domElement, attributeToCss);
+		}
 
-			return domElement;
+		var styleAttr = domElement.Attributes["style"];
+		if (styleAttr == null || string.IsNullOrEmpty(styleAttr.Value))
+		{
+			domElement.RemoveAttribute("style");
 		}
 
+		return domElement;
+	}
+
 		private static void SetAttribute(IElement domElement, AttributeToCss attributeToCss)
 		{
 			string name = attributeToCss.AttributeName;
@@ -56,4 +56,4 @@ private static void SetAttribute(IElement domElement, AttributeToCss attributeTo
 			domElement.SetAttribute(name, value);
 		}
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -537,4 +537,4 @@ public void Dispose() @@
     			_document.Dispose();
     		}
     	}
-    }
+    }