wpf: Implement colspan and rowspan support for table cells

Esri · Jul 11, 2023 · cf0ee21 · cf0ee21
1 parent 02db273
commit cf0ee21
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs
@@ -153,6 +153,14 @@ private static Block VisitBlock(MarkupNode node)
                         {
                             var cell = new TableCell();
                             ApplyStyle(cell, cellNode);
+
+                            // Apply colspan and rowspan, for non-uniform tables
+                            var attr = HtmlUtility.ParseAttributes(cellNode.Token?.Attributes);
+                            if (attr.TryGetValue("colspan", out var colSpanStr) && byte.TryParse(colSpanStr, out var colSpan))
+                                cell.ColumnSpan = colSpan;
+                            if (attr.TryGetValue("rowspan", out var rowSpanStr) && byte.TryParse(rowSpanStr, out var rowSpan))
+                                cell.RowSpan = rowSpan;
+
                             cell.Blocks.AddRange(VisitAndAddBlocks(cellNode.Children));
                             row.Cells.Add(cell);
                         }