Merge branch 'main' into alzollin/markdownFeatures

Author: azchohfi

components/MarkdownTextBlock/src/Extensions.cs

@@ -11,6 +11,7 @@
 using System.Xml.Linq;
 using System.Globalization;
 using Windows.UI.ViewManagement;
+using HtmlAgilityPack;
 
 namespace CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
 
@@ -722,4 +723,14 @@ public static SolidColorBrush GetAccentColorBrush()
 
         return accentBrush;
     }
+
+    public static string GetAttribute(this HtmlNode node, string attributeName, string defaultValue)
+    {
+        if (attributeName == null)
+        {
+            throw new ArgumentNullException(nameof(attributeName));
+        }
+
+        return node.Attributes?[attributeName]?.Value ?? defaultValue;
+    }
 }

components/MarkdownTextBlock/src/MarkdownTextBlock.xaml.cs

@@ -54,7 +54,7 @@ private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedE
     {
         if (d is MarkdownTextBlock self && e.NewValue != null)
         {
-            self.ApplyText(self.Text, true);
+            self.ApplyText(true);
         }
     }
 
@@ -87,16 +87,20 @@ private void ApplyConfig(MarkdownConfig config)
         }
     }
 
-    private void ApplyText(string text, bool rerender)
+    private void ApplyText(bool rerender)
     {
-        var markdown = Markdown.Parse(text, _pipeline);
         if (_renderer != null)
         {
             if (rerender)
             {
                 _renderer.ReloadDocument();
             }
-            _renderer.Render(markdown);
+
+            if (!string.IsNullOrEmpty(Text))
+            {
+                var markdown = Markdown.Parse(Text, _pipeline);
+                _renderer.Render(markdown);
+            }
         }
     }
 
@@ -109,7 +113,7 @@ private void Build()
                 _renderer = new WinUIRenderer(_document, Config);
             }
             _pipeline.Setup(_renderer);
-            ApplyText(Text, false);
+            ApplyText(false);
         }
     }
 }

components/MarkdownTextBlock/src/TextElements/Html/MyBlock.cs

@@ -21,7 +21,7 @@ public TextElement TextElement
     public MyBlock(HtmlNode block)
     {
         _htmlNode = block;
-        var align = _htmlNode.GetAttributeValue("align", "left");
+        var align = _htmlNode.GetAttribute("align", "left");
         _richTextBlocks = new List<RichTextBlock>();
         _paragraph = new Paragraph();
         _paragraph.TextAlignment = align switch

components/MarkdownTextBlock/src/TextElements/MyHeading.cs

@@ -36,7 +36,7 @@ public MyHeading(HtmlNode htmlNode, MarkdownConfig config)
         _paragraph = new Paragraph();
         _config = config;
 
-        var align = _htmlNode.GetAttributeValue("align", "left");
+        var align = _htmlNode.GetAttribute("align", "left");
         _paragraph.TextAlignment = align switch
         {
             "left" => TextAlignment.Left,

components/MarkdownTextBlock/src/TextElements/MyHyperlink.cs

@@ -47,7 +47,7 @@ public MyHyperlink(LinkInline linkInline, string? baseUrl)
     public MyHyperlink(HtmlNode htmlNode, string? baseUrl)
     {
         _baseUrl = baseUrl;
-        var url = htmlNode.GetAttributeValue("href", "#");
+        var url = htmlNode.GetAttribute("href", "#");
         _htmlNode = htmlNode;
         _hyperlink = new Hyperlink()
         {

components/MarkdownTextBlock/src/TextElements/MyImage.cs

@@ -50,20 +50,20 @@ public MyImage(HtmlNode htmlNode, MarkdownConfig? config)
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     {
 #pragma warning disable CS8601 // Possible null reference assignment.
-        Uri.TryCreate(htmlNode.GetAttributeValue("src", "#"), UriKind.RelativeOrAbsolute, out _uri);
+        Uri.TryCreate(htmlNode.GetAttribute("src", "#"), UriKind.RelativeOrAbsolute, out _uri);
 #pragma warning restore CS8601 // Possible null reference assignment.
         _htmlNode = htmlNode;
         _imageProvider = config?.ImageProvider;
         _svgRenderer = config?.SVGRenderer == null ? new DefaultSVGRenderer() : config.SVGRenderer;
         Init();
         int.TryParse(
-            htmlNode.GetAttributeValue("width", "0"),
+            htmlNode.GetAttribute("width", "0"),
             NumberStyles.Integer,
             CultureInfo.InvariantCulture,
             out var width
         );
         int.TryParse(
-            htmlNode.GetAttributeValue("height", "0"),
+            htmlNode.GetAttribute("height", "0"),
             NumberStyles.Integer,
             CultureInfo.InvariantCulture,
             out var height

components/MarkdownTextBlock/tests/ExampleMarkdownTextBlockTestClass.cs

@@ -131,4 +131,22 @@ public async Task ComplexAsyncLoadUIExampleWithoutDispatcherTest()
 
         Assert.IsFalse(component.IsLoaded);
     }
+
+    [UIThreadTestMethod]
+    public async Task MarkdownTextBlockEmptyTextValueTest()
+    {
+        var component = new MarkdownTextBlock
+        {
+            Config = new()
+        };
+
+        Assert.IsNotNull(component);
+        Assert.IsFalse(component.IsLoaded);
+
+        await LoadTestContentAsync(component);
+        Assert.IsTrue(component.IsLoaded);
+
+        await UnloadTestContentAsync(component);
+        Assert.IsFalse(component.IsLoaded);
+    }
 }