Fix newlines not rendering in markdown blocks

bloxstraplabs · Jul 5, 2024 · 0aaeb9d · 0aaeb9d
1 parent 289b9de
commit 0aaeb9d
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs b/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs
@@ -17,7 +17,10 @@ namespace Bloxstrap.UI.Elements.Controls
     [Localizability(LocalizationCategory.Text)]
     class MarkdownTextBlock : TextBlock
     {
-        private static MarkdownPipeline _markdownPipeline;
+        private static readonly MarkdownPipeline _markdownPipeline = new MarkdownPipelineBuilder()
+                .UseEmphasisExtras(Markdig.Extensions.EmphasisExtras.EmphasisExtraOptions.Marked) // enable '==' support
+                .UseSoftlineBreakAsHardlineBreak()
+                .Build();
 
         public static readonly DependencyProperty MarkdownTextProperty = 
             DependencyProperty.Register(nameof(MarkdownText), typeof(string), typeof(MarkdownTextBlock),
@@ -70,9 +73,7 @@ public string MarkdownText
                 var textInline = linkInline.FirstChild;
 
                 if (string.IsNullOrEmpty(url))
-                {
                     return GetWpfInlineFromMarkdownInline(textInline);
-                }
 
                 var childInline = GetWpfInlineFromMarkdownInline(textInline);
 
@@ -82,14 +83,19 @@ public string MarkdownText
                     CommandParameter = url
                 };
             }
+            else if (inline is LineBreakInline)
+            {
+                return new LineBreak();
+            }
 
             return null;
         }
 
         private void AddMarkdownInline(Markdig.Syntax.Inlines.Inline? inline)
         {
             var wpfInline = GetWpfInlineFromMarkdownInline(inline);
-            if (wpfInline != null)
+
+            if (wpfInline is not null)
                 Inlines.Add(wpfInline);
         }
 
@@ -101,26 +107,28 @@ private static void OnTextMarkdownChanged(DependencyObject dependencyObject, Dep
             if (dependencyPropertyChangedEventArgs.NewValue is not string rawDocument)
                 return;
 
-            MarkdownDocument document = Markdown.Parse(rawDocument, _markdownPipeline);
+            var document = Markdown.Parse(rawDocument, _markdownPipeline);
 
             markdownTextBlock.Inlines.Clear();
 
-            if (document.FirstOrDefault() is not ParagraphBlock paragraphBlock || paragraphBlock.Inline == null)
-                return;
+            var lastBlock = document.Last();
 
-            for (int i = 0; i < paragraphBlock.Inline.Count(); i++)
+            // matt was evidently very tired on the night he was first writing this
+            // https://github.com/pizzaboxer/bloxstrap/blob/289b9dec77cf35b2cc6504019bc9c7701626be1f/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs#L111
+            foreach (var block in document)
             {
-                var inline = paragraphBlock.Inline.ElementAt(i);
+                if (block is not ParagraphBlock paragraphBlock || paragraphBlock.Inline is null)
+                    continue;
 
-                markdownTextBlock.AddMarkdownInline(inline);
-            }
-        }
+                foreach (var inline in paragraphBlock.Inline)
+                    markdownTextBlock.AddMarkdownInline(inline);
 
-        static MarkdownTextBlock()
-        {
-            _markdownPipeline = new MarkdownPipelineBuilder()
-                .UseEmphasisExtras(Markdig.Extensions.EmphasisExtras.EmphasisExtraOptions.Marked) // enable '==' support
-                .Build();
+                if (block != lastBlock)
+                {
+                    markdownTextBlock.AddMarkdownInline(new LineBreakInline());
+                    markdownTextBlock.AddMarkdownInline(new LineBreakInline());
+                }
+            }
         }
     }
 }