#749 [HxMessenger] AddInformation, AddError and AddWarning extension …

…methods should preserve line endings in text
havit · Feb 5, 2024 · e8182c0 · e8182c0
1 parent 26fe381
commit e8182c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/BlazorAppTest/Pages/HxMessengerTest.razor b/BlazorAppTest/Pages/HxMessengerTest.razor
@@ -1,6 +1,6 @@
 @page "/HxMessengerTest"
 
-@* <HxMessenger /> iteself is in MainLayout.razor *@
+@* <HxMessenger /> itself is in MainLayout.razor *@
 
 <h1>HxMessenger</h1>
 
@@ -26,7 +26,7 @@
 
 	private void HandleAddInformationButtonClick()
 	{
-		Messenger.AddInformation("Information", "Information button clicked.");
+		Messenger.AddInformation("Information\nmultiline", "Information button clicked.\n<b>1</b>\n2");
 	}
 
 	private void HandleAddWarningButtonClick()

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Toasts/HxMessengerServiceExtensions.cs b/Havit.Blazor.Components.Web.Bootstrap/Toasts/HxMessengerServiceExtensions.cs
@@ -1,4 +1,6 @@
-namespace Havit.Blazor.Components.Web.Bootstrap;
+using System.Net;
+
+namespace Havit.Blazor.Components.Web.Bootstrap;
 
 /// <summary>
 /// Extension methods for <see cref="IHxMessengerService"/>.
@@ -88,11 +90,16 @@ private static RenderFragment BuildContentTemplate(string title, string text)
 			{
 				builder.OpenElement(1, "div");
 				builder.AddAttribute(2, "class", "fw-bold");
-				builder.AddContent(3, title);
+				builder.AddContent(3, ProcessLineEndings(title));
 				builder.CloseElement();
 			}
 
-			builder.AddContent(10, text);
+			builder.AddContent(10, ProcessLineEndings(text));
 		};
 	}
+
+	private static MarkupString ProcessLineEndings(string text)
+	{
+		return new MarkupString(WebUtility.HtmlEncode(text)?.ReplaceLineEndings("<br />"));
+	}
 }