Add liquidTemplate rendering in HtmlField.

src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/HtmlFieldDriver.cs

@@ -1,18 +1,38 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
+using Fluid;
 using OrchardCore.ContentFields.ViewModels;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentManagement.Display.Models;
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
+using OrchardCore.Liquid;
 
 namespace OrchardCore.ContentFields.Fields
 {
     public class HtmlFieldDisplayDriver : ContentFieldDisplayDriver<HtmlField>
     {
+        private readonly ILiquidTemplateManager _liquidTemplatemanager;
+
+        public HtmlFieldDisplayDriver(ILiquidTemplateManager liquidTemplatemanager)
+        {
+            _liquidTemplatemanager = liquidTemplatemanager;
+        }
+
         public override IDisplayResult Display(HtmlField field, BuildFieldDisplayContext context)
         {
-            return Shape<DisplayHtmlFieldViewModel>("HtmlField", model =>
+            return Shape<DisplayHtmlFieldViewModel>("HtmlField", async model =>
             {
+                var templateContext = new TemplateContext();
+                templateContext.SetValue("ContentItem", field.ContentItem);
+                templateContext.MemberAccessStrategy.Register<DisplayHtmlFieldViewModel>();
+
+                using (var writer = new StringWriter())
+                {
+                    await _liquidTemplatemanager.RenderAsync(field.Html, writer, NullEncoder.Default, templateContext);
+                    model.Html = writer.ToString();
+                }
+
                 model.Field = field;
                 model.Part = context.ContentPart;
                 model.PartFieldDefinition = context.PartFieldDefinition;

src/OrchardCore.Modules/OrchardCore.ContentFields/OrchardCore.ContentFields.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.Liquid.Abstractions\OrchardCore.Liquid.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.Abstractions\OrchardCore.ContentManagement.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.Display\OrchardCore.ContentManagement.Display.csproj" />

src/OrchardCore.Modules/OrchardCore.ContentFields/ViewModels/DisplayHtmlFieldViewModel.cs

@@ -1,11 +1,12 @@
-using OrchardCore.ContentFields.Fields;
+using OrchardCore.ContentFields.Fields;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 
 namespace OrchardCore.ContentFields.ViewModels
 {
     public class DisplayHtmlFieldViewModel
     {
+        public string Html { get; set; }
         public HtmlField Field { get; set; }
         public ContentPart Part { get; set; }
         public ContentPartFieldDefinition PartFieldDefinition { get; set; }

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/HtmlField.cshtml

@@ -6,5 +6,5 @@
 }
 
 <div class="field field-type-htmlfield field-name-@name">
-    @Html.Raw(Model.Field.Html)
+    @Html.Raw(Model.Html)
 </div>