Fix inner border. Closes #204

SebastianStehle · Sep 26, 2024 · 43a0147 · 43a0147
1 parent 4aa0c64
commit 43a0147
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,6 +12,6 @@
     <RepositoryUrl>https://github.com/SebastianStehle/mjml-net.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>4.3.0</Version>
+    <Version>4.4.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/Mjml.Net.Generator/TemplateField.cs b/Mjml.Net.Generator/TemplateField.cs
@@ -16,7 +16,7 @@ internal sealed record TemplateField
 
     public bool IsText { get; set; }
 
-    public bool IsBorder => Attribute == "border";
+    public bool IsBorder => Attribute is "border" or "inner-border";
 
     public bool IsCustom => CustomType != null;
 }
diff --git a/Mjml.Net.PostProcessors/InlineCssPostProcessor.cs b/Mjml.Net.PostProcessors/InlineCssPostProcessor.cs
@@ -1,5 +1,6 @@
 using AngleSharp;
 using AngleSharp.Css;
+using AngleSharp.Css.Dom;
 using AngleSharp.Dom;
 
 namespace Mjml.Net;
@@ -36,12 +37,17 @@ private static void InlineStyle(IElement element)
     {
         var currentStyle = element.Owner!.DefaultView.GetStyleCollection().GetDeclarations(element);
 
-        if (currentStyle.Any())
+        if (!currentStyle.Any())
         {
-            var css = currentStyle.ToCss();
-
-            element.SetAttribute(TagNames.Style, css);
+            return;
         }
+
+        var cuirrent = element.GetStyle();
+        var x = element.GetStyleSheets();
+
+        var css = currentStyle.ToCss();
+
+        element.SetAttribute(TagNames.Style, css);
     }
 
     private static void RenameNonInline(IElement element, IDocument document)

diff --git a/Tests/Components/ColumnTests.cs b/Tests/Components/ColumnTests.cs
@@ -86,4 +86,19 @@ public void Should_render_column_one_with_padding()
 
         AssertHelpers.HtmlFileAssert("Components.Outputs.ColumnOneWithPadding.html", result);
     }
+
+    [Fact]
+    public void Should_render_column_one_inner_border()
+    {
+        var source = @"
+<mj-column padding=""0"" inner-border=""1px solid red"">
+    <mj-text>
+          Hello World!
+     </mj-text>
+</mj-column>";
+
+        var (result, _) = TestHelper.Render(source);
+
+        AssertHelpers.HtmlFileAssert("Components.Outputs.ColumnOneWithInnerBorder.html", result);
+    }
 }
diff --git a/Tests/Components/StyleTests.cs b/Tests/Components/StyleTests.cs
@@ -40,16 +40,12 @@ public async Task Should_render_inline()
 <mjml-test>
   <mj-head>
     <mj-style inline=""inline"">
-      .red-text div {
-        color: red !important;
-        font-size: 1.5rem;
-      }
     </mj-style>
   </mj-head>
   <mj-body>
     <mj-raw>
       <div class=""red-text"">
-        <div style=""font-weight: bold""></div>
+        <div style=""word-break: break-word; font-weight: bold; font-style: abc;""></div>
       </div>
     </mj-raw>
   </mj-body>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -39,6 +39,7 @@
     <None Remove="Components\Outputs\CarouselImageWithHref.html" />
     <None Remove="Components\Outputs\CarouselThumbnailWidth.html" />
     <None Remove="Components\Outputs\ColumnClass.html" />
+    <None Remove="Components\Outputs\ColumnOneWithInnerBorder.html" />
     <None Remove="Components\Outputs\Comments.html" />
     <None Remove="Components\Outputs\DividerWithoutWidthUnit.html" />
     <None Remove="Components\Outputs\FontUbuntu2.html" />
@@ -102,6 +103,7 @@
     <EmbeddedResource Include="Components\Outputs\CarouselThumbnailWidth.html" />
     <EmbeddedResource Include="Components\Outputs\AccordionEmptyElements.html" />
     <EmbeddedResource Include="Components\Outputs\Accordion.html" />
+    <EmbeddedResource Include="Components\Outputs\ColumnOneWithInnerBorder.html" />
     <EmbeddedResource Include="Components\Outputs\HtmlAttributeInvalid.html" />
     <EmbeddedResource Include="Components\Outputs\HtmlAttributesNoProcessor.html" />
     <EmbeddedResource Include="Components\Outputs\List.html" />