From 0c16cac27fee476e4e68a2c04a7316759b2099b4 Mon Sep 17 00:00:00 2001 From: Rob Earlam Date: Thu, 12 Jun 2025 11:55:59 +1000 Subject: [PATCH 1/2] Changed text based TagHelpers to rendering Chromes with internal span not div --- .../TagHelpers/Fields/RichTextTagHelper.cs | 4 ++-- .../TagHelpers/Fields/TextFieldTagHelper.cs | 4 ++-- .../TagHelpers/Fields/RichTextTagHelperFixture.cs | 8 +++++--- .../TagHelpers/Fields/TextFieldTagHelperFixture.cs | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs index da91a54..7d057ce 100644 --- a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs +++ b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/RichTextTagHelper.cs @@ -55,7 +55,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) if (Editable && richTextField.OpeningChrome != null) { html += _chromeRenderer.Render(richTextField.OpeningChrome); - html += "
"; + html += ""; } bool outputEditableMarkup = Editable && !string.IsNullOrEmpty(richTextField.EditableMarkup); @@ -65,7 +65,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) if (Editable && richTextField.ClosingChrome != null) { - html += "
"; + html += ""; html += _chromeRenderer.Render(richTextField.ClosingChrome); } diff --git a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs index e803b53..789fd65 100644 --- a/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs +++ b/src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/TextFieldTagHelper.cs @@ -51,7 +51,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) if (Editable && field.OpeningChrome != null) { html += _chromeRenderer.Render(field.OpeningChrome); - html += "
"; + html += ""; isHtml = true; } @@ -67,7 +67,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) if (Editable && field.ClosingChrome != null) { - html += "
"; + html += ""; html += _chromeRenderer.Render(field.ClosingChrome); } diff --git a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs index dde4261..36b9664 100644 --- a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs +++ b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs @@ -1,6 +1,4 @@ -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using AutoFixture; +using AutoFixture; using AutoFixture.Idioms; using FluentAssertions; using Microsoft.AspNetCore.Mvc.ModelBinding; @@ -14,6 +12,9 @@ using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields; using Sitecore.AspNetCore.SDK.RenderingEngine.Rendering; using Sitecore.AspNetCore.SDK.RenderingEngine.TagHelpers.Fields; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using System.Text.Encodings.Web; using Xunit; namespace Sitecore.AspNetCore.SDK.RenderingEngine.Tests.TagHelpers.Fields; @@ -733,6 +734,7 @@ public void Process_RenderingChromesAreNotNull_ChromesAreOutput( // Assert chromeRenderer.Received().Render(openingChrome); chromeRenderer.Received().Render(closingChrome); + tagHelperOutput.Content.GetContent().Should().Be($"{chromeRenderer.Render(openingChrome)}{TestHtml}{chromeRenderer.Render(closingChrome)}"); } private static ModelExpression GetModelExpression(Field model) diff --git a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs index c0e4619..e4c223c 100644 --- a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs +++ b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/TextFieldTagHelperFixture.cs @@ -214,6 +214,7 @@ public void Process_RenderingChromesAreNotNull_ChromesAreOutput( // Assert chromeRenderer.Received().Render(openingChrome); chromeRenderer.Received().Render(closingChrome); + tagHelperOutput.Content.GetContent().Should().Be($"{chromeRenderer.Render(openingChrome)}{TestText}{chromeRenderer.Render(closingChrome)}"); } private static IEnumerable GetModelExpressionTestData() From baf226d4f50f269cc1ceab2f507f10965050aad2 Mon Sep 17 00:00:00 2001 From: Rob Earlam Date: Thu, 12 Jun 2025 15:08:19 +1000 Subject: [PATCH 2/2] fixed using warnings --- .../TagHelpers/Fields/RichTextTagHelperFixture.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs index 36b9664..6c112e9 100644 --- a/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs +++ b/tests/Sitecore.AspNetCore.SDK.RenderingEngine.Tests/TagHelpers/Fields/RichTextTagHelperFixture.cs @@ -1,4 +1,6 @@ -using AutoFixture; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; +using AutoFixture; using AutoFixture.Idioms; using FluentAssertions; using Microsoft.AspNetCore.Mvc.ModelBinding; @@ -12,9 +14,6 @@ using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields; using Sitecore.AspNetCore.SDK.RenderingEngine.Rendering; using Sitecore.AspNetCore.SDK.RenderingEngine.TagHelpers.Fields; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Text.Encodings.Web; using Xunit; namespace Sitecore.AspNetCore.SDK.RenderingEngine.Tests.TagHelpers.Fields;