Address PR feedback: Move !important preservation logic to CssElementStyleResolver

Co-Authored-By: m@martinnormark.com <m@martinnormark.com>

Author: devin-ai-integration[bot]

PreMailer.Net/PreMailer.Net/CssElementStyleResolver.cs

@@ -8,20 +8,44 @@ public static class CssElementStyleResolver
 	{
 		private const string premailerAttributePrefix = "-premailer-";
 
-		public static IEnumerable<AttributeToCss> GetAllStyles(IElement domElement, StyleClass styleClass)
-		{
-			var attributeCssList = new List<AttributeToCss>();
+	public static IEnumerable<AttributeToCss> GetAllStyles(IElement domElement, StyleClass styleClass)
+	{
+		var attributeCssList = new List<AttributeToCss>();
+		var originalStyleAttr = domElement.Attributes["style"];
+		var hasImportantInOriginalStyle = originalStyleAttr != null && originalStyleAttr.Value.Contains("!important");
 
-			AddSpecialPremailerAttributes(attributeCssList, styleClass);
+		AddSpecialPremailerAttributes(attributeCssList, styleClass);
 
-			if (styleClass.Attributes.Count > 0)
-				attributeCssList.Add(new AttributeToCss { AttributeName = "style", CssValue = styleClass.ToString(emitImportant: true) });
+		if (styleClass.Attributes.Count > 0)
+			attributeCssList.Add(new AttributeToCss { AttributeName = "style", CssValue = styleClass.ToString(emitImportant: true) });
 
-			attributeCssList.AddRange(CssStyleEquivalence.FindEquivalent(domElement, styleClass));
+		attributeCssList.AddRange(CssStyleEquivalence.FindEquivalent(domElement, styleClass));
 
-			return attributeCssList;
+		if (hasImportantInOriginalStyle)
+		{
+			var styleAttr = attributeCssList.FirstOrDefault(a => a.AttributeName == "style");
+			if (styleAttr != null && !styleAttr.CssValue.Contains("!important"))
+			{
+				var parser = new CssParser();
+				var originalStyleClass = parser.ParseStyleClass("inline", originalStyleAttr.Value);
+				
+				var currentStyleClass = parser.ParseStyleClass("inline", styleAttr.CssValue);
+				
+				foreach (var attr in originalStyleClass.Attributes)
+				{
+					if (attr.Important && !currentStyleClass.Attributes.ContainsKey(attr.Style))
+					{
+						currentStyleClass.Attributes.Merge(attr);
+					}
+				}
+				
+				styleAttr.CssValue = currentStyleClass.ToString(emitImportant: true);
+			}
 		}
 
+		return attributeCssList;
+	}
+
 		private static void AddSpecialPremailerAttributes(List<AttributeToCss> attributeCssList, StyleClass styleClass)
 		{
 			while (true)

PreMailer.Net/PreMailer.Net/StyleClassApplier.cs

@@ -17,38 +17,13 @@ public static Dictionary<IElement, StyleClass> ApplyAllStyles(Dictionary<IElemen
 
 	private static IElement ApplyStyles(IElement domElement, StyleClass clazz)
 	{
-		var originalStyleAttr = domElement.Attributes["style"];
-		var hasImportantInOriginalStyle = originalStyleAttr != null && originalStyleAttr.Value.Contains("!important");
-		
 		var styles = CssElementStyleResolver.GetAllStyles(domElement, clazz);
 
 		foreach (var attributeToCss in styles)
 		{
 			SetAttribute(domElement, attributeToCss);
 		}
 
-		if (hasImportantInOriginalStyle)
-		{
-			var currentStyleAttr = domElement.Attributes["style"];
-			if (currentStyleAttr != null && !currentStyleAttr.Value.Contains("!important"))
-			{
-				var parser = new CssParser();
-				var originalStyleClass = parser.ParseStyleClass("inline", originalStyleAttr.Value);
-				
-				var currentStyleClass = parser.ParseStyleClass("inline", currentStyleAttr.Value);
-				
-				foreach (var attr in originalStyleClass.Attributes)
-				{
-					if (attr.Important && !currentStyleClass.Attributes.ContainsKey(attr.Style))
-					{
-						currentStyleClass.Attributes.Merge(attr);
-					}
-				}
-				
-				domElement.SetAttribute("style", currentStyleClass.ToString(emitImportant: true));
-			}
-		}
-
 		var styleAttr = domElement.Attributes["style"];
 		if (styleAttr == null || string.IsNullOrEmpty(styleAttr.Value))
 		{