2.2.0.2

Jurioli · Jun 25, 2022 · 0bf5632 · 0bf5632
1 parent 8e14978
commit 0bf5632
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/Blazor.WebForm.Components.2.2.0.1.nupkg b/Blazor.WebForm.Components.2.2.0.1.nupkg
diff --git a/Blazor.WebForm.Components.2.2.0.2.nupkg b/Blazor.WebForm.Components.2.2.0.2.nupkg
diff --git a/Blazor.WebForm.Components/Base/ControlComponentBase.cs b/Blazor.WebForm.Components/Base/ControlComponentBase.cs
@@ -352,7 +352,7 @@ private RenderFragment RenderWithCascading<TValue>(TValue control) where TValue
             return this.Render(control);
         }
 
-        protected RenderFragment RenderWithCascading<TValue>(TValue control, RenderFragment childContent, int childLevel = 0) where TValue : Control
+        protected RenderFragment RenderWithCascading<TValue>(TValue control, RenderFragment childContent = null, int childLevel = 0) where TValue : Control
         {
             if (!_renderedWithCascading)
             {

diff --git a/Blazor.WebForm.Components/Blazor.WebForm.Components.csproj b/Blazor.WebForm.Components/Blazor.WebForm.Components.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Blazor.WebForm.Components.pfx</AssemblyOriginatorKeyFile>
-    <Version>2.2.0.1</Version>
+    <Version>2.2.0.2</Version>
     <RootNamespace>asp</RootNamespace>
     <Copyright>Jurio li</Copyright>
     <AssemblyName>Blazor.WebForm.Components</AssemblyName>
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Applied" Version="1.2.1.6" />
-    <PackageReference Include="Blazor.WebForm.UI" Version="2.2.0.1" />
+    <PackageReference Include="Blazor.WebForm.UI" Version="2.2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.6" />
   </ItemGroup>
 

diff --git a/Blazor.WebForm.Components/Inner/Base/DataControlField/DataControlFieldPropertyComponent.cs b/Blazor.WebForm.Components/Inner/Base/DataControlField/DataControlFieldPropertyComponent.cs
@@ -60,7 +60,7 @@ protected internal override void SetInnerProperty(IReadOnlyDictionary<string, ob
             }
             else
             {
-                this.Owner.Add(this.Field);
+                this.RenderWithCascading(this.Field);
             }
         }
 

diff --git a/Blazor.WebForm.Components/Inner/Base/PropertyComponent.cs b/Blazor.WebForm.Components/Inner/Base/PropertyComponent.cs
@@ -209,7 +209,7 @@ private void RenderWithCascading()
             this.OnAfterRenderInternal();
         }
 
-        protected void RenderWithCascading<TValue>(TValue property, RenderFragment childContent, int childLevel = 0)
+        protected void RenderWithCascading<TValue>(TValue property, RenderFragment childContent = null, int childLevel = 0)
         {
             if (_initialized)
             {

diff --git a/Blazor.WebForm.Components/Utilities/CascadingChildContent.cs b/Blazor.WebForm.Components/Utilities/CascadingChildContent.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 
 namespace Blazor.WebForm.UI
-
 {
     internal abstract class CascadingChildContentBase
     {

diff --git a/Blazor.WebForm.Components/Utilities/ValueChildContentPair.cs b/Blazor.WebForm.Components/Utilities/ValueChildContentPair.cs
@@ -15,6 +15,7 @@ internal abstract class ValueChildContentPair
 
     internal class ValueChildContentPair<TValue> : ValueChildContentPair
     {
+        private static readonly RenderFragment EmptyChildContent = builder => { };
         public TValue Value { get; }
         public RenderFragment ChildContent { get; }
         public ValueChildContentPair(TValue value, RenderFragment childContent)
@@ -28,7 +29,7 @@ internal override void AddChildContent(RenderTreeBuilder builder, int sequence)
             builder.AddAttribute(sequence + 1, "Value", this.Value);
             builder.AddAttribute(sequence + 2, "ChildContent", (RenderFragment)(builder2 =>
             {
-                builder2.AddContent(sequence + 3, this.ChildContent);
+                builder2.AddContent(sequence + 3, this.ChildContent ?? EmptyChildContent);
             }));
             builder.CloseComponent();
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    this.Owner.Add(this.Field);
+                    this.RenderWithCascading(this.Field);
                 }
             }
@@ Expand Down @@