fix render sequence issue

loresoft · Apr 12, 2024 · 3ce92d5 · 3ce92d5
1 parent f6a9948
commit 3ce92d5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/samples/Sample.ClientSide/Sample.ClientSide.csproj b/samples/Sample.ClientSide/Sample.ClientSide.csproj
@@ -7,8 +7,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
 		<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
 	</ItemGroup>

diff --git a/samples/Sample.Core/Sample.Core.csproj b/samples/Sample.Core/Sample.Core.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="35.4.1" />
+    <PackageReference Include="Bogus" Version="35.5.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/LoreSoft.Blazor.Controls/Conditional.cs b/src/LoreSoft.Blazor.Controls/Conditional.cs
@@ -28,12 +28,12 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             }
             else if (ChildContent != null)
             {
-                builder.AddContent(1, ChildContent);
+                builder.AddContent(2, ChildContent);
             }
         }
         else if (Failed != null)
         {
-            builder.AddContent(1, Failed);
+            builder.AddContent(3, Failed);
         }
     }
 

diff --git a/src/LoreSoft.Blazor.Controls/LoreSoft.Blazor.Controls.csproj b/src/LoreSoft.Blazor.Controls/LoreSoft.Blazor.Controls.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/LoreSoft.Blazor.Controls/Repeater.cs b/src/LoreSoft.Blazor.Controls/Repeater.cs
@@ -5,8 +5,6 @@ namespace LoreSoft.Blazor.Controls;
 
 public class Repeater<TItem> : ComponentBase
 {
-    private int _sequence = 0;
-
     [Parameter, EditorRequired]
     public IEnumerable<TItem> Items { get; set; }
 
@@ -23,15 +21,13 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
         {
             foreach (var item in Items)
             {
-                builder.AddContent(Next(), Row, item);
+                builder.AddContent(1, Row, item);
+                builder.SetKey(item);
             }
         }
         else if (Empty != null)
         {
-            builder.AddContent(Next(), Empty);
+            builder.AddContent(2, Empty);
         }
     }
-
-    protected int Next() => _sequence++;
-
 }
diff --git a/src/LoreSoft.Blazor.Controls/StateProvider.razor.cs b/src/LoreSoft.Blazor.Controls/StateProvider.razor.cs
@@ -1,3 +1,5 @@
+#nullable enable
+
 using Microsoft.AspNetCore.Components;
 
 namespace LoreSoft.Blazor.Controls;
@@ -7,17 +9,17 @@ public partial class StateProvider<TState>
     [Parameter]
     public required RenderFragment ChildContent { get; set; }
 
-    public event Action<object> OnStateChange;
+    public event Action<object?>? OnStateChange;
 
     public TState? State { get; protected set; }
 
-    public virtual void Set(TState model)
+    public virtual void Set(TState? model)
     {
         State = model;
         NotifyStateChanged(this);
     }
 
-    public void NotifyStateChanged(object sender = null)
+    public void NotifyStateChanged(object? sender = null)
     {
         StateHasChanged();
         OnStateChange?.Invoke(sender);