From e2bcc7027cc1f44d7bf7928db8f4c8ec8179958a Mon Sep 17 00:00:00 2001
From: Stephan Steiger <stephan.steiger@fhnw.ch>
Date: Tue, 8 Apr 2025 13:40:10 +0200
Subject: [PATCH] prevent blank lines when html tags have attributes

---
 .../Model/SharePoint/Pages/Internal/PageText.cs    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/PageText.cs b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/PageText.cs
index 065bede4d9..b244b749c4 100644
--- a/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/PageText.cs
+++ b/src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/PageText.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 
 namespace PnP.Core.Model.SharePoint
 {
@@ -135,18 +136,11 @@ public override string ToHtml(float controlIndex)
             catch { }
 
             StringBuilder html = new StringBuilder();
-            html.Append($@"<div {CanvasControlAttribute}=""{CanvasControlData}"" {CanvasDataVersionAttribute}=""{ DataVersion}""  {ControlDataAttribute}=""{jsonControlData.Replace("\"", "&quot;")}"">");
+            html.Append($@"<div {CanvasControlAttribute}=""{CanvasControlData}"" {CanvasDataVersionAttribute}=""{DataVersion}""  {ControlDataAttribute}=""{jsonControlData.Replace("\"", "&quot;")}"">");
             html.Append($@"<div {TextRteAttribute}=""{Rte}"">");
             if (!string.IsNullOrEmpty(Text))
             {
-                if (Text.Trim().StartsWith("<p>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<h1>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<h2>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<h3>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<h4>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<ul>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<blockquote>", StringComparison.InvariantCultureIgnoreCase) ||
-                    Text.Trim().StartsWith("<pre>", StringComparison.InvariantCultureIgnoreCase))
+                if (Regex.IsMatch(Text.Trim(), @"^<(p|h1|h2|h3|h4|ul|blockquote|pre)(\s+[^>]*)?>\s*", RegexOptions.IgnoreCase))
                 {
                     html.Append(Text);
                 }
@@ -158,7 +152,7 @@ public override string ToHtml(float controlIndex)
             html.Append("</div>");
             html.Append("</div>");
             return html.ToString();
-        }        
+        }
         #endregion
 
         #region Internal and private methods