Invoke base lifecycle methods in component (#84)

klemmchr · Mar 5, 2022 · 851b783 · 851b783
1 parent 69050e0
commit 851b783
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/MvvmBlazor.CodeGenerators/Components/MvvmComponentGenerator.cs b/src/MvvmBlazor.CodeGenerators/Components/MvvmComponentGenerator.cs
@@ -312,56 +312,61 @@ protected internal TValue Bind<TValue>(Expression<Func<T, TValue>> property)
         /// <inheritdoc />
         protected override void OnInitialized()
         {{
-            base.OnInitialized();
             SetBindingContext();
+            base.OnInitialized();
             BindingContext?.OnInitialized();
         }}
 
         /// <inheritdoc />
-        protected override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {{
-            return BindingContext?.OnInitializedAsync() ?? Task.CompletedTask;
+            await base.OnInitializedAsync();
+            await BindingContext!.OnInitializedAsync();
         }}
 
         /// <inheritdoc />
         protected override void OnParametersSet()
         {{
             SetParameters();
+            base.OnParametersSet();
             BindingContext?.OnParametersSet();
         }}
 
         /// <inheritdoc />
-        protected override Task OnParametersSetAsync()
+        protected override async Task OnParametersSetAsync()
         {{
-            return BindingContext?.OnParametersSetAsync() ?? Task.CompletedTask;
+            await base.OnParametersSetAsync();
+            await BindingContext.OnParametersSetAsync();
         }}
 
         /// <inheritdoc />
         protected override bool ShouldRender()
         {{
-            return BindingContext?.ShouldRender() ?? true;
+            return BindingContext!.ShouldRender();
         }}
 
         /// <inheritdoc />
         protected override void OnAfterRender(bool firstRender)
         {{
-            BindingContext?.OnAfterRender(firstRender);
+            base.OnAfterRender(firstRender);
+            BindingContext!.OnAfterRender(firstRender);
         }}
 
         /// <inheritdoc />
-        protected override Task OnAfterRenderAsync(bool firstRender)
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {{
-            return BindingContext?.OnAfterRenderAsync(firstRender) ?? Task.CompletedTask;
+            await base.OnAfterRenderAsync(firstRender);
+            await BindingContext!.OnAfterRenderAsync(firstRender);
         }}
 
         /// <inheritdoc />
         public override async Task SetParametersAsync(ParameterView parameters)
         {{
-            await base.SetParametersAsync(parameters).ConfigureAwait(false);
+            await base.SetParametersAsync(parameters);
 
             if (BindingContext != null)
             {{
-                await BindingContext.SetParametersAsync(parameters).ConfigureAwait(false);
+                await BindingContext.SetParametersAsync(parameters);
             }}
         }}
     }}

diff --git a/src/MvvmBlazor.Tests/Components/MvvmComponentBaseTTests.cs b/src/MvvmBlazor.Tests/Components/MvvmComponentBaseTTests.cs
@@ -28,16 +28,15 @@ public void AfterRender_called_On_binding_context()
     }
 
     [Fact]
-    public void AfterRenderAsync_called_on_binding_context()
+    public async Task AfterRenderAsync_called_on_binding_context()
     {
-        var task = new Task(() => { });
+        var task = Task.CompletedTask;
         var viewModel = Services.GetMock<ViewModelBase>();
         var component = Services.GetRequiredService<MockMvvmComponentBase>();
 
         viewModel.Setup(x => x.OnAfterRenderAsync(It.IsAny<bool>())).Returns(task).Verifiable();
 
-        var res = component.AfterRenderAsync(true);
-        res.ShouldBe(task);
+        await component.AfterRenderAsync(true);
 
         viewModel.Verify();
     }
@@ -75,17 +74,16 @@ public void OnInitialized_called_on_binding_context()
     }
 
     [Fact]
-    public void OnInitializedAsync_called_on_binding_context()
+    public async Task OnInitializedAsync_called_on_binding_context()
     {
-        var task = new Task(() => { });
+        var task = Task.CompletedTask;
 
         var viewModel = Services.GetMock<ViewModelBase>();
         var component = Services.GetRequiredService<MockMvvmComponentBase>();
 
         viewModel.Setup(x => x.OnInitializedAsync()).Returns(task).Verifiable();
 
-        var res = component.InitializedAsync();
-        res.ShouldBe(task);
+        await component.InitializedAsync();
 
         viewModel.Verify();
     }
@@ -106,17 +104,16 @@ public void OnParametersSet_sets_viewmodel_parameters()
     }
 
     [Fact]
-    public void OnParametersSetAsync_called_on_binding_context()
+    public async Task OnParametersSetAsync_called_on_binding_context()
     {
-        var task = new Task(() => { });
+        var task = Task.CompletedTask;
 
         var viewModel = Services.GetMock<ViewModelBase>();
         var component = Services.GetRequiredService<MockMvvmComponentBase>();
 
         viewModel.Setup(x => x.OnParametersSetAsync()).Returns(task).Verifiable();
 
-        var res = component.ParametersSetAsync();
-        res.ShouldBe(task);
+        await component.ParametersSetAsync();
 
         viewModel.Verify();
     }