Merge pull request #15 from chris579/master

v1.1.4

README.md

@@ -86,6 +86,29 @@ public int CurrentCount
 #### Lifecycle methods
 View models have access to the same lifecycle methods as a component when they are set as a binding context. They are documented [here](https://docs.microsoft.com/en-us/aspnet/core/blazor/components?view=aspnetcore-3.0#lifecycle-methods).
 
+#### Parameters
+Parameters are automatically populated to the view model. Declare a parameter in your component
+
+```csharp
+@code {
+    [Parameter]
+    public string Name { get; set; }
+}
+```
+
+and declare the same parameter in your view model
+
+```csharp
+class ViewModel: ViewModelBase
+{
+    [Parameter]
+    public string Name { get; set; }
+}
+```
+
+The parameter will be passed before `OnInitialized` and `OnInitializedAsync` are invoked. Therefore, the parameters are available from any lifecycle method.
+You can't access them in your constructor and you're not supposed to do that either.
+
 #### Dispose
 View models are implementing the [`IDisposable` pattern of Blazor](https://docs.microsoft.com/en-us/aspnet/core/blazor/components?view=aspnetcore-3.0#component-disposal-with-idisposable). Inside ViewModels, Disposing is achieved by overriding the `Dispose(bool disposing)` method.
 

samples/BlazorSample/Client/BlazorSample.Client.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>

samples/BlazorSample/Client/Pages/Clock.razor

@@ -1,5 +1,4 @@
 @page "/clock"
-@using System.Globalization
 @inherits MvvmComponentBase<ClockViewModel>
 
 <h1>Clock</h1>

samples/BlazorSample/Client/Pages/FetchData.razor

@@ -3,7 +3,7 @@
 @inherits MvvmComponentBase<FetchDataViewModel>
 
 <h1>Weather forecast</h1>
- 
+
 <div class="alert alert-primary" role="alert">
     To use a view model with your component simply inherit from the base class
     <pre style="display: inline">MvvmComponentBase</pre> and specify your view model type for this component as a generic argument.

samples/BlazorSample/Client/Pages/Parameters.razor

@@ -0,0 +1,27 @@
+@page "/parameters/{name}"
+@inherits MvvmComponentBase<ParametersViewModel>
+
+<h1>Clock</h1>
+
+<div class="alert alert-primary" role="alert">
+    You can also pass down parameters to your view model. If you set a binding context you can
+    declare your parameters just as you would before but you also declare them in your view model.
+    They will be passed down to it automatically.
+</div>
+
+<p>My Name is @Bind(x => x.Name).</p>
+
+<form class="form-inline">
+    <div class="form-group mx-sm-3 mb-2">
+        <label for="newName" class="sr-only">New name</label>
+        <input class="form-control" id="newName" @bind="@BindingContext.NewName"/>
+               </div>
+               <button type="button" class="btn btn-primary mb-2" @onclick="@BindingContext.NavigateToNewName">Navigate</button>
+                       </form>
+
+                       @code {
+
+                           [Parameter]
+                           public string Name { get; set; }
+
+                       }

samples/BlazorSample/Client/Shared/NavMenu.razor

@@ -27,6 +27,11 @@
                                  <span class="oi oi-clock" aria-hidden="true"></span> Clock
                              </NavLink>
                          </li>
+                         <li class="nav-item px-3">
+                             <NavLink class="nav-link" href="parameters/Max Foobar">
+                                 <span class="oi oi-link-intact" aria-hidden="true"></span> Parameters
+                             </NavLink>
+                         </li>
                      </ul>
                  </div>
 

samples/BlazorSample/Client/Startup.cs

@@ -19,6 +19,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<FetchDataViewModel>();
             services.AddTransient<CounterViewModel>();
             services.AddTransient<ClockViewModel>();
+            services.AddTransient<ParametersViewModel>();
         }
 
         public void Configure(IComponentsApplicationBuilder app)

samples/BlazorSample/Client/ViewModel/ClockViewModel.cs

@@ -29,7 +29,7 @@ private void TimerOnElapsed(object sender, ElapsedEventArgs e)
 
         protected override void Dispose(bool disposing)
         {
-            if(disposing)
+            if (disposing)
                 _timer.Dispose();
         }
     }

samples/BlazorSample/Client/ViewModel/ParametersViewModel.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Components;
+using MvvmBlazor.ViewModel;
+
+namespace BlazorSample.Client.ViewModel
+{
+    public class ParametersViewModel : ViewModelBase
+    {
+        private readonly NavigationManager _navigationManager;
+
+        public ParametersViewModel(NavigationManager navigationManager)
+        {
+            _navigationManager = navigationManager;
+        }
+
+        [Parameter] public string Name { get; set; }
+
+        public string NewName { get; set; }
+
+        public void NavigateToNewName()
+        {
+            if (string.IsNullOrEmpty(NewName))
+                return;
+
+            _navigationManager.NavigateTo($"/parameters/{NewName}");
+        }
+    }
+}

samples/BlazorServersideSample/Pages/Parameters.razor

@@ -0,0 +1,27 @@
+@page "/parameters/{name}"
+@inherits MvvmComponentBase<ParametersViewModel>
+
+<h1>Clock</h1>
+
+<div class="alert alert-primary" role="alert">
+    You can also pass down parameters to your view model. If you set a binding context you can 
+    declare your parameters just as you would before but you also declare them in your view model.
+    They will be passed down to it automatically.
+</div>
+
+<p>My Name is @Bind(x => x.Name).</p>
+
+<form class="form-inline">
+    <div class="form-group mx-sm-3 mb-2">
+        <label for="newName" class="sr-only">New name</label>
+        <input class="form-control" id="newName" @bind="@BindingContext.NewName" />
+    </div>
+    <button type="button" class="btn btn-primary mb-2" @onclick="@BindingContext.NavigateToNewName">Navigate</button>
+</form>
+
+@code {
+
+    [Parameter]
+    public string Name { get; set; }
+
+}

samples/BlazorServersideSample/Shared/NavMenu.razor

@@ -27,6 +27,11 @@
                                  <span class="oi oi-clock" aria-hidden="true"></span> Clock
                              </NavLink>
                          </li>
+                         <li class="nav-item px-3">
+                             <NavLink class="nav-link" href="parameters/Max Foobar">
+                                 <span class="oi oi-link-intact" aria-hidden="true"></span> Parameters
+                             </NavLink>
+                         </li>
                      </ul>
                  </div>
 

samples/BlazorServersideSample/Startup.cs

@@ -33,6 +33,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<FetchDataViewModel>();
             services.AddTransient<CounterViewModel>();
             services.AddTransient<ClockViewModel>();
+            services.AddTransient<ParametersViewModel>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -53,7 +54,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseStaticFiles();
 
             app.UseRouting();
-            
+
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapBlazorHub();

samples/BlazorServersideSample/ViewModel/ClockViewModel.cs

@@ -29,7 +29,7 @@ private void TimerOnElapsed(object sender, ElapsedEventArgs e)
 
         protected override void Dispose(bool disposing)
         {
-            if(disposing)
+            if (disposing)
                 _timer.Dispose();
         }
     }

samples/BlazorServersideSample/ViewModel/ParametersViewModel.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Components;
+using MvvmBlazor.ViewModel;
+
+namespace BlazorServersideSample.ViewModel
+{
+    public class ParametersViewModel : ViewModelBase
+    {
+        private readonly NavigationManager _navigationManager;
+
+        public ParametersViewModel(NavigationManager navigationManager)
+        {
+            _navigationManager = navigationManager;
+        }
+
+        [Parameter] public string Name { get; set; }
+
+        public string NewName { get; set; }
+
+        public void NavigateToNewName()
+        {
+            if (string.IsNullOrEmpty(NewName))
+                return;
+
+            _navigationManager.NavigateTo($"/parameters/{NewName}");
+        }
+    }
+}

samples/BlazorServersideSample/_Imports.razor

@@ -4,6 +4,7 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components
 @using Microsoft.JSInterop
 @using BlazorServersideSample
 @using BlazorServersideSample.Shared

src/MvvmBlazor.Tests/Components/MvvmComponentBaseTTests.cs

@@ -4,9 +4,11 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using MvvmBlazor.Components;
 using MvvmBlazor.Internal.Bindings;
+using MvvmBlazor.Internal.Parameters;
 using MvvmBlazor.Internal.WeakEventListener;
 using MvvmBlazor.ViewModel;
 using Shouldly;
@@ -22,10 +24,13 @@ public class MvvmComponentBaseTTests
             var serviceProvider = new Mock<IServiceProvider>();
             var wemf = new Mock<IWeakEventManagerFactory>();
             var bindingFactory = new Mock<IBindingFactory>();
+            var viewModelParameterSetter = new Mock<IViewModelParameterSetter>();
             serviceProvider.Setup(x => x.GetService(typeof(ViewModelBase))).Returns(viewModel.Object);
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object);
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object);
             serviceProvider.Setup(x => x.GetService(typeof(IBindingFactory))).Returns(bindingFactory.Object);
+            serviceProvider.Setup(x => x.GetService(typeof(IViewModelParameterSetter))).Returns(viewModelParameterSetter.Object);
+            serviceProvider.Setup(x => x.GetService(typeof(Mock<IViewModelParameterSetter>))).Returns(viewModelParameterSetter);
 
             return (viewModel, serviceProvider);
         }
@@ -81,7 +86,7 @@ public Task ParametersAsync(ParameterView parameters)
         public void AfterRender_CalledOnBindingContext()
         {
             var (viewModel, serviceProvider) = GetServiceProvider();
-
+            
             var component = new MockMvvmComponentBase(serviceProvider.Object);
             component.AfterRender(true);
 
@@ -154,8 +159,6 @@ public void Dispose_DisposesBindingContext()
         [Fact]
         public void OnInitialized_CalledOnBindingContext()
         {
-            var task = new Task(() => { });
-
             var (viewModel, serviceProvider) = GetServiceProvider();
 
             var component = new MockMvvmComponentBase(serviceProvider.Object);
@@ -165,6 +168,34 @@ public void OnInitialized_CalledOnBindingContext()
             viewModel.VerifyNoOtherCalls();
         }
 
+        [Fact]
+        public void OnInitialized_SetsViewModelParameters()
+        {
+            var (viewModel, serviceProvider) = GetServiceProvider();
+            var viewModelParameterSetter =
+                serviceProvider.Object.GetRequiredService<Mock<IViewModelParameterSetter>>();
+
+            var component = new MockMvvmComponentBase(serviceProvider.Object);
+            component.Initialized();
+
+            viewModelParameterSetter.Verify(x => x.ResolveAndSet(component, viewModel.Object));
+            viewModelParameterSetter.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public void OnParametersSet_SetsViewModelParameters()
+        {
+            var (viewModel, serviceProvider) = GetServiceProvider();
+            var viewModelParameterSetter =
+                serviceProvider.Object.GetRequiredService<Mock<IViewModelParameterSetter>>();
+
+            var component = new MockMvvmComponentBase(serviceProvider.Object);
+            component.ParametersSet();
+
+            viewModelParameterSetter.Verify(x => x.ResolveAndSet(component, viewModel.Object));
+            viewModelParameterSetter.VerifyNoOtherCalls();
+        }
+
         [Fact]
         public void OnInitializedAsync_CalledOnBindingContext()
         {