Improve support of table alignment #187

Author: onizet

src/Html2OpenXml/Expressions/BlockElementExpression.cs

@@ -27,6 +27,7 @@ class BlockElementExpression: PhrasingElementExpression
 {
     private readonly OpenXmlLeafElement[]? defaultStyleProperties;
     protected readonly ParagraphProperties paraProperties = new();
+    protected TableProperties? tableProperties;
     // some style attributes, such as borders or bgcolor, will convert this node to a framed container
     protected bool renderAsFramed;
     private HtmlBorder styleBorder;
@@ -115,22 +116,44 @@ protected override IEnumerable<OpenXmlElement> Interpret (
     public override void CascadeStyles(OpenXmlElement element)
     {
         base.CascadeStyles(element);
-        if (!paraProperties.HasChildren || element is not Paragraph paragraph)
+        if (!paraProperties.HasChildren)
             return;
 
-        paragraph.ParagraphProperties ??= new ParagraphProperties();
-
-        var knownTags = new HashSet<string>();
-        foreach (var prop in paragraph.ParagraphProperties)
+        if (element is Paragraph paragraph)
         {
-            if (!knownTags.Contains(prop.LocalName))
-                knownTags.Add(prop.LocalName);
-        }
+            paragraph.ParagraphProperties ??= new ParagraphProperties();
 
-        foreach (var prop in paraProperties)
+            var knownTags = new HashSet<string>();
+            foreach (var prop in paragraph.ParagraphProperties)
+            {
+                if (!knownTags.Contains(prop.LocalName))
+                    knownTags.Add(prop.LocalName);
+            }
+
+            foreach (var prop in paraProperties)
+            {
+                if (!knownTags.Contains(prop.LocalName))
+                    paragraph.ParagraphProperties.AddChild(prop.CloneNode(true));
+            }
+        }
+        else if (tableProperties != null && element is Table table)
         {
-            if (!knownTags.Contains(prop.LocalName))
-                paragraph.ParagraphProperties.AddChild(prop.CloneNode(true));
+            var props = table.GetFirstChild<TableProperties>();
+            if (props is null)
+                return;
+
+            var knownTags = new HashSet<string>();
+            foreach (var prop in props)
+            {
+                if (!knownTags.Contains(prop.LocalName))
+                    knownTags.Add(prop.LocalName);
+            }
+
+            foreach (var prop in tableProperties)
+            {
+                if (!knownTags.Contains(prop.LocalName))
+                    props.AddChild(prop.CloneNode(true));
+            }
         }
     }
 
@@ -170,9 +193,12 @@ protected override void ComposeStyles (ParsingContext context)
 
         JustificationValues? align = Converter.ToParagraphAlign(styleAttributes!["text-align"]);
         if (!align.HasValue) align = Converter.ToParagraphAlign(node.GetAttribute("align"));
+        if (!align.HasValue) align = Converter.ToParagraphAlign(styleAttributes["justify-content"]);
         if (align.HasValue)
         {
             paraProperties.Justification = new() { Val = align };
+            tableProperties ??= new();
+            tableProperties.TableJustification = new() { Val = align.Value.ToTableRowAlignment() };
         }
 
 
@@ -194,7 +220,7 @@ protected override void ComposeStyles (ParsingContext context)
         }
 
         var margin = styleAttributes.GetMargin("margin");
-         Indentation? indentation = null;
+        Indentation? indentation = null;
         if (!margin.IsEmpty)
         {
             if (margin.Top.IsFixed || margin.Bottom.IsFixed)

src/Html2OpenXml/Expressions/Table/TableExpression.cs

@@ -199,6 +199,8 @@ protected override void ComposeStyles (ParsingContext context)
         }
 
         var align = Converter.ToParagraphAlign(tableNode.GetAttribute("align"));
+        if (!align.HasValue)
+            align = Converter.ToParagraphAlign(styleAttributes["justify-self"]);
         if (align.HasValue)
             tableProperties.TableJustification = new() { Val = align.Value.ToTableRowAlignment() };
 

test/HtmlToOpenXml.Tests/TableTests.cs

@@ -330,9 +330,9 @@ public void TableCaption_ReturnsPositionedParagraph(string position, int caption
             });
         }
 
-        [TestCase("right", "right")]
-        [TestCase("", "center")]
-        public void TableCaptionAlign_ReturnsPositionedParagraph_AlignedWithTable(string alignment, string expectedAlign)
+        [TestCase("right", ExpectedResult = "right")]
+        [TestCase("", ExpectedResult = "center")]
+        public string? TableCaptionAlign_ReturnsPositionedParagraph_AlignedWithTable(string alignment)
         {
             var elements = converter.Parse(@$"<table align=""center"">
                     <caption align=""{alignment}"">Some table caption</caption>
@@ -341,7 +341,33 @@ public void TableCaptionAlign_ReturnsPositionedParagraph_AlignedWithTable(string
 
             Assert.That(elements, Has.Count.EqualTo(2));
             var caption = (Paragraph) elements[1];
-            Assert.That(caption.ParagraphProperties?.Justification?.Val?.ToString(), Is.EqualTo(expectedAlign));
+            return caption.ParagraphProperties?.Justification?.Val?.ToString();
+        }
+
+        [TestCase("align='right'", ExpectedResult = "right")]
+        [TestCase("style='justify-self:center'", ExpectedResult = "center")]
+        public string? TableAlign_ReturnsTableJustification(string style)
+        {
+            var elements = converter.Parse(@$"<table {style}>
+                    <tr><td>Cell 1.1</td></tr>
+                </table>");
+
+            Assert.That(elements, Has.Count.EqualTo(1));
+            return elements[0].GetFirstChild<TableProperties>()?.TableJustification?.Val?.ToString();
+        }
+
+        [TestCase("", ExpectedResult = "right")]
+        [TestCase("justify-self:center", ExpectedResult = "center")]
+        public string? NestedTableAlign_ReturnsTableOrParentJustification(string tableStyle)
+        {
+            var elements = converter.Parse(@$"<div style='justify-content: right'>
+                <table style='{tableStyle}'>
+                    <tr><td>Cell 1.1</td></tr>
+                </table>
+                </div>");
+
+            Assert.That(elements, Has.Count.EqualTo(1));
+            return elements[0].GetFirstChild<TableProperties>()?.TableJustification?.Val?.ToString();
         }
 
         [Test]