Skip to content

prevent blank lines when html tags have attributes #1636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jansenbe merged 1 commit into from
Apr 15, 2025
Merged

prevent blank lines when html tags have attributes #1636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/sdk/PnP.Core/Model/SharePoint/Pages/Internal/PageText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Linq;
using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions;

namespace PnP.Core.Model.SharePoint
{
Expand Down Expand Up @@ -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);
}
Expand All @@ -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
Expand Down