DisplayAsync to return actual pre-rendered IHtmlContent

src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DefaultHtmlDisplay.cs

@@ -47,6 +47,12 @@ public async Task<IHtmlContent> ExecuteAsync(DisplayContext context)
                 return HtmlString.Empty;
             }
 
+            // Check if the shape is Position Wrapper
+            if(shape is PositionWrapper wrapper)
+            {
+                return PositionWrapper.UnWrap(wrapper);
+            }
+
             // Check if the shape is pre-rendered.
             if (shape is IHtmlContent htmlContent)
             {

src/OrchardCore/OrchardCore.DisplayManagement/Implementation/DisplayHelper.cs

@@ -72,6 +72,12 @@ public Task<IHtmlContent> ShapeExecuteAsync(IShape shape)
                 return Task.FromResult<IHtmlContent>(HtmlString.Empty);
             }
 
+            // Check if the shape is wrapper, return underlying IHtmlContent
+            if( shape is PositionWrapper wrapper)
+            {
+                return Task.FromResult(PositionWrapper.UnWrap(wrapper));
+            }
+
             // Check if the shape is pre-rendered.
             if (shape is IHtmlContent htmlContent)
             {

src/OrchardCore/OrchardCore.DisplayManagement/PositionWrapper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Encodings.Web;
@@ -8,7 +9,7 @@
 
 namespace OrchardCore.DisplayManagement
 {
-    public class PositionWrapper : IHtmlContent, IPositioned, IShape
+    public sealed class PositionWrapper : IHtmlContent, IPositioned, IShape
     {
         private readonly IHtmlContent _value;
         public string Position { get; set; }
@@ -29,13 +30,13 @@ public class PositionWrapper : IHtmlContent, IPositioned, IShape
 
         public IReadOnlyList<IPositioned> Items => throw new System.NotImplementedException();
 
-        public PositionWrapper(IHtmlContent value, string position)
+        private PositionWrapper(IHtmlContent value, string position)
         {
             _value = value;
             Position = position;
         }
 
-        public PositionWrapper(string value, string position)
+        private PositionWrapper(string value, string position)
         {
             _value = new HtmlContentString(value);
             Position = position;
@@ -50,5 +51,24 @@ public ValueTask<IShape> AddAsync(object item, string position)
         {
             throw new System.NotImplementedException();
         }
+
+        public static PositionWrapper TryWrap(object value, string position)
+        {
+            if (value is PositionWrapper wrapper)
+            {
+                // Update the new Position
+                wrapper.Position = position;
+                return wrapper;
+            }
+            else if (value is IHtmlContent content)
+                return new PositionWrapper(content, position);
+            else if (value is string stringContent)
+                return new PositionWrapper(stringContent, position);
+            else
+                throw new System.NotSupportedException($"Type of {nameof(value)} must be either {nameof(String)}, {nameof(IHtmlContent)} or {nameof(PositionWrapper)}.");
+        }
+
+        public static IHtmlContent UnWrap(PositionWrapper wrapper)
+            => wrapper._value;
     }
 }

src/OrchardCore/OrchardCore.DisplayManagement/Shapes/Shape.cs

@@ -65,13 +65,13 @@ public virtual ValueTask<IShape> AddAsync(object item, string position)
 
             _items ??= [];
 
-            if (item is IHtmlContent)
+            if (item is IHtmlContent htmlContent)
             {
-                _items.Add(new PositionWrapper((IHtmlContent)item, position));
+                _items.Add(PositionWrapper.TryWrap(htmlContent, position));
             }
-            else if (item is string)
+            else if (item is string stringContent)
             {
-                _items.Add(new PositionWrapper((string)item, position));
+                _items.Add(PositionWrapper.TryWrap(stringContent, position));
             }
             else
             {

src/OrchardCore/OrchardCore.DisplayManagement/Theming/ThemeLayout.cs

@@ -27,7 +27,7 @@ public override async Task ExecuteAsync()
                 await ThemeLayout.Zones["Content"].AddAsync(body);
 
                 // Pre-render all shapes and replace the zone content with it.
-                ThemeLayout.Zones["Content"] = new PositionWrapper(await DisplayAsync(ThemeLayout.Zones["Content"]), "");
+                ThemeLayout.Zones["Content"] = PositionWrapper.TryWrap(await DisplayAsync(ThemeLayout.Zones["Content"]), "");
 
                 // Render each layout zone.
                 foreach (var zone in ThemeLayout.Properties.ToArray())
@@ -46,7 +46,7 @@ public override async Task ExecuteAsync()
                             continue;
                         }
 
-                        ThemeLayout.Zones[zone.Key] = new PositionWrapper(await DisplayAsync(shape), "");
+                        ThemeLayout.Zones[zone.Key] = PositionWrapper.TryWrap(await DisplayAsync(shape), "");
                     }
                 }
 

src/OrchardCore/OrchardCore.DisplayManagement/Views/ShapeViewModel.cs

@@ -81,13 +81,13 @@ public ValueTask<IShape> AddAsync(object item, string position)
             _sorted = false;
             _items ??= [];
 
-            if (item is IHtmlContent)
+            if (item is IHtmlContent htmlContent)
             {
-                _items.Add(new PositionWrapper((IHtmlContent)item, position));
+                _items.Add(PositionWrapper.TryWrap(htmlContent, position));
             }
-            else if (item is string)
+            else if (item is string stringContent)
             {
-                _items.Add(new PositionWrapper((string)item, position));
+                _items.Add(PositionWrapper.TryWrap(stringContent, position));
             }
             else
             {