Component lifecycle fixes

sample/BitzArt.Blazor.MVVM.SampleApp/BitzArt.Blazor.MVVM.SampleApp.Client/Pages/TestPage.razor

@@ -0,0 +1,9 @@
+@page "/test"
+@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: true))
+@inherits PageBase<TestPageViewModel>
+
+<h3>TestPage</h3>
+
+<p>@ViewModel.State?.Text</p>
+
+<ComponentStateContainer ViewModel="ViewModel" />

sample/BitzArt.Blazor.MVVM.SampleApp/BitzArt.Blazor.MVVM.SampleApp.Client/ViewModels/TestPageViewModel.cs

@@ -0,0 +1,19 @@
+namespace BitzArt.Blazor.MVVM.SampleApp;
+
+public class TestPageViewModel : ViewModel<TestPageState>
+{
+    protected override void OnDependenciesInjected()
+    {
+        OnStateInitializedAsync += async (_) =>
+        {
+            await Task.Delay(2000);
+            State.Text = "Test Page State initialized";
+            ComponentStateHasChanged();
+        };
+    }
+}
+
+public class TestPageState : ComponentState
+{
+    public string Text { get; set; } = "Test Page State not initialized";
+}

sample/BitzArt.Blazor.MVVM.SampleApp/BitzArt.Blazor.MVVM.SampleApp/Components/Layout/NavMenu.razor

@@ -25,6 +25,12 @@
                 <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
             </NavLink>
         </div>
+
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="test">
+                <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Test
+            </NavLink>
+        </div>
     </nav>
 </div>
 

src/BitzArt.Blazor.MVVM/Components/ComponentBase{TViewModel}.cs

@@ -40,12 +40,13 @@ public abstract class ComponentBase<TViewModel> : ComponentBase, IStateComponent
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        ViewModel.OnComponentStateChanged += async (_) =>
+        await SetupStateAsync();
+
+        ViewModel.OnComponentStateChanged += (_) =>
         {
-            await InvokeAsync(StateHasChanged);
+            InvokeAsync(StateHasChanged);
         };
-
-        await SetupStateAsync();
+        await InvokeAsync(StateHasChanged);
     }
 
     private async Task SetupStateAsync()
@@ -70,7 +71,8 @@ protected virtual async Task InitializeStateAsync()
         statefulViewModel.State.IsInitialized = true;
 
         statefulViewModel.OnStateInitialized?.Invoke(ViewModel);
-        statefulViewModel.OnStateInitializedAsync?.Invoke(ViewModel);
+        if (statefulViewModel.OnStateInitializedAsync is not null)
+            await statefulViewModel.OnStateInitializedAsync!.Invoke(ViewModel);
 
         StateHasChanged();
         ViewModel.ComponentStateContainer?.NotifyStateChanged();

src/BitzArt.Blazor.MVVM/Components/PageBase{TViewModel}.cs

@@ -24,6 +24,11 @@ public abstract class PageBase<TViewModel> : ComponentBase<TViewModel>, IStateCo
     protected override async Task RestoreStateAsync()
     {
         var state = await Js.InvokeAsync<string?>("getInnerText", [StateKey]);
+        if (state is null)
+        {
+            PageStateDictionaryContainer.MarkConfigured();
+            return;
+        }
         var buffer = Convert.FromBase64String(state!);
         var json = Encoding.UTF8.GetString(buffer);
 

src/BitzArt.Blazor.MVVM/Factory/ViewModelFactory.cs

@@ -49,7 +49,6 @@ public ViewModel Create(IServiceProvider serviceProvider, Type viewModelType, Co
         viewModel.OnComponentStateChanged += (sender) =>
         {
             viewModel.ComponentStateContainer?.NotifyStateChanged();
-            return Task.CompletedTask;
         };
 
         foreach (var injection in viewModelMap.Injections)

src/BitzArt.Blazor.MVVM/Models/ViewModel.cs

@@ -36,7 +36,7 @@ protected TViewModel CreateNestedViewModel<TViewModel>()
         return ViewModelFactory.Create<TViewModel>(ServiceProvider, nestedSignature);
     }
 
-    public delegate Task ComponentStateHasChangedHandler(object sender);
+    public delegate void ComponentStateHasChangedHandler(object sender);
     public ComponentStateHasChangedHandler? OnComponentStateChanged { get; set; }
 
     /// <summary>

src/BitzArt.Blazor.MVVM/Services/BlazorViewModelStateManager.cs

@@ -18,7 +18,7 @@ internal class BlazorViewModelStateManager(IViewModelFactory viewModelFactory)
     {
         var injectionMap = _viewModelFactory.GetInjectionMap(viewModel.GetType());
         var state = GetState(viewModel, injectionMap);
-        if (state is null) return null;
+        state ??= [];
 
         return JsonSerializer.SerializeToUtf8Bytes(state, StateJsonOptionsProvider.Options);
     }
@@ -31,14 +31,6 @@ internal class BlazorViewModelStateManager(IViewModelFactory viewModelFactory)
         {
             var nodeJson = (JsonObject)JsonSerializer.SerializeToNode(statefulViewModel.State, statefulViewModel.State.GetType(), StateJsonOptionsProvider.Options)!;
             foreach (var node in nodeJson) state.Add(node.Key, node.Value);
-
-            //var nodeState = JsonSerializer.Deserialize<IDictionary<string, object>>(json, StateJsonOptionsProvider.Options)!;
-            //foreach (var item in nodeState) state.Add(item.Key, item.Value);
-
-            /*foreach (var property in statefulViewModel.StateType.GetProperties())
-            {
-                state.Add(property.Name, property.GetValue(statefulViewModel.State));
-            }*/
         }
 
         foreach (var injection in injectionMap.Injections.Where(x => x.IsNestedViewModelInjection))