Add constructor to componentasdialogoptions

stavroskasidis · stavroskasidis · commit b2bd24375697 · 2023-07-12T23:22:32.000+03:00
diff --git a/BlazorDialog.sln b/BlazorDialog.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		build.ps1 = build.ps1
+		Directory.Build.props = Directory.Build.props
 		global.json = global.json
 		README.md = README.md
 	EndProjectSection
diff --git a/BlazorDialog/IBlazorDialogStore.cs b/BlazorDialog/IBlazorDialogStore.cs
@@ -8,10 +8,15 @@ namespace BlazorDialog
 {
     public class ComponentAsDialogOptions
     {
+        public ComponentAsDialogOptions(Type componentType)
+        {
+            ComponentType = componentType;
+        }
+
         /// <summary>
         /// The type of the rendered component
         /// </summary>
-        public Type ComponentType { get; set; }
+        public Type ComponentType { get; protected set; }
 
         /// <summary>
         /// The parameters of the rendered component.
@@ -41,7 +46,7 @@ public class ComponentAsDialogOptions
         /// <summary>
         /// Adds a custom css class to the wrapper of the dialog.
         /// </summary>
-        public string CssClass { get; set; }
+        public string? CssClass { get; set; }
 
         /// <summary>
         /// Allows you to set the dialog size. Ignored when the dialog is <see cref="Dialog.IsCustom" />.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
+  <PropertyGroup>
+	  <TargetFramework>net7.0</TargetFramework>
+	  <MSPackagesVersion>7.0.0</MSPackagesVersion>
+	  <Nullable>enable</Nullable>
+	  <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+</Project>
diff --git a/TestApps/BlazorDialog.TestAppsCommon/BlazorDialog.TestAppsCommon.csproj b/TestApps/BlazorDialog.TestAppsCommon/BlazorDialog.TestAppsCommon.csproj
@@ -1,15 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
 
 	<ItemGroup>
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(MSPackagesVersion)" />
   </ItemGroup>
 
 
diff --git a/TestApps/BlazorDialog.TestAppsCommon/ComponentDialog.razor b/TestApps/BlazorDialog.TestAppsCommon/ComponentDialog.razor
@@ -42,13 +42,12 @@
     private string dialogResult;
     protected async Task ShowInputDialog()
     {
-        dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions
+        dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions(typeof(ComponentDialogInput))
+        {
+            Parameters = new()
             {
-                ComponentType = typeof(ComponentDialogInput),
-                Parameters = new()
-                {
-                    { nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}
-                }
-            });
+                { nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}
+            }
+        });
     }
 }
diff --git a/TestApps/BlazorDialog.TestAppsCommon/ComponentDialogInput.razor b/TestApps/BlazorDialog.TestAppsCommon/ComponentDialogInput.razor
@@ -14,13 +14,12 @@
 
     protected async Task ShowInputDialog()
     {
-        await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions
+        await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions(typeof(ComponentDialog))
             {
-                ComponentType = typeof(ComponentDialog),
                 Parameters = new()
-            {
-                { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }
-            }
+                {
+                    { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }
+                }
             });
     }
 }
diff --git a/TestApps/BlazorDialog.TestAppsCommon/ComponentsAsDialogsCommon.razor b/TestApps/BlazorDialog.TestAppsCommon/ComponentsAsDialogsCommon.razor
@@ -39,27 +39,25 @@
 
     async Task SimpleDialogOnClick()
     {
-        await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions
+        await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions(typeof(ComponentDialog))
             {
                 Animation = animation,
                 Size = size,
                 Centered = isCentered,
-                ComponentType = typeof(ComponentDialog),
                 Parameters = new()
-            {
-                { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }
-            }
+                {
+                    { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }
+                }
             });
     }
 
     async Task SimpleDialogWithResultOnClick()
     {
-        dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions
+        dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions(typeof(ComponentDialogInput))
         {
             Animation = animation,
             Size = size,
             Centered = isCentered,
-            ComponentType = typeof(ComponentDialogInput),
             Parameters = new()
             {
                 { nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}
diff --git a/TestApps/Server/BlazorDialog.BlazorServerTestApp/BlazorDialog.BlazorServerTestApp.csproj b/TestApps/Server/BlazorDialog.BlazorServerTestApp/BlazorDialog.BlazorServerTestApp.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\BlazorDialog\BlazorDialog.csproj" />
     <ProjectReference Include="..\..\BlazorDialog.TestAppsCommon\BlazorDialog.TestAppsCommon.csproj" />
diff --git a/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/BlazorDialog.BlazorTestApp.Client.csproj b/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/BlazorDialog.BlazorTestApp.Client.csproj
@@ -1,14 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-	  <Nullable>enable</Nullable>
-	  <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
   <ItemGroup>
-	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MSPackagesVersion)" />
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MSPackagesVersion)" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/Pages/ComponentsAsDialogs.razor b/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/Pages/ComponentsAsDialogs.razor
@@ -2,4 +2,4 @@
 
 <ComponentsAsDialogsCommon />
 
-<BlazorDialog.Components.ComponentDialogsOutput />
+<DialogOutput />
diff --git a/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/Program.cs b/TestApps/Wasm/BlazorDialog.BlazorTestApp.Client/Program.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
 using BlazorDialog.BlazorTestApp.Client;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
diff --git a/TestApps/Wasm/BlazorDialog.BlazorTestApp.Server/BlazorDialog.BlazorTestApp.Server.csproj b/TestApps/Wasm/BlazorDialog.BlazorTestApp.Server/BlazorDialog.BlazorTestApp.Server.csproj
@@ -1,13 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-	  <Nullable>enable</Nullable>
-	  <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
   <ItemGroup>
-	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.0" />
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(MSPackagesVersion)" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,12 @@`
`42`	`42`	`private string dialogResult;`
`43`	`43`	`protected async Task ShowInputDialog()`
`44`	`44`	`{`
`45`		`- dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions`
	`45`	`+ dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions(typeof(ComponentDialogInput))`
	`46`	`+ {`
	`47`	`+ Parameters = new()`
`46`	`48`	`{`
`47`		`- ComponentType = typeof(ComponentDialogInput),`
`48`		`- Parameters = new()`
`49`		`- {`
`50`		`- { nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}`
`51`		`- }`
`52`		`- });`
	`49`	`+ { nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}`
	`50`	`+ }`
	`51`	`+ });`
`53`	`52`	`}`
`54`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,12 @@`
`14`	`14`
`15`	`15`	`protected async Task ShowInputDialog()`
`16`	`16`	`{`
`17`		`- await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions`
	`17`	`+ await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions(typeof(ComponentDialog))`
`18`	`18`	`{`
`19`		`- ComponentType = typeof(ComponentDialog),`
`20`	`19`	`Parameters = new()`
`21`		`- {`
`22`		`- { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }`
`23`		`- }`
	`20`	`+ {`
	`21`	`+ { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }`
	`22`	`+ }`
`24`	`23`	`});`
`25`	`24`	`}`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,27 +39,25 @@`
`39`	`39`
`40`	`40`	`async Task SimpleDialogOnClick()`
`41`	`41`	`{`
`42`		`- await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions`
	`42`	`+ await dialogService.ShowComponentAsDialog(new ComponentAsDialogOptions(typeof(ComponentDialog))`
`43`	`43`	`{`
`44`	`44`	`Animation = animation,`
`45`	`45`	`Size = size,`
`46`	`46`	`Centered = isCentered,`
`47`		`- ComponentType = typeof(ComponentDialog),`
`48`	`47`	`Parameters = new()`
`49`		`- {`
`50`		`- { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }`
`51`		`- }`
	`48`	`+ {`
	`49`	`+ { nameof(ComponentDialog.Input), "(Simple Dialog) Are you sure?" }`
	`50`	`+ }`
`52`	`51`	`});`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`async Task SimpleDialogWithResultOnClick()`
`56`	`55`	`{`
`57`		`- dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions`
	`56`	`+ dialogResult = await dialogService.ShowComponentAsDialog<string>(new ComponentAsDialogOptions(typeof(ComponentDialogInput))`
`58`	`57`	`{`
`59`	`58`	`Animation = animation,`
`60`	`59`	`Size = size,`
`61`	`60`	`Centered = isCentered,`
`62`		`- ComponentType = typeof(ComponentDialogInput),`
`63`	`61`	`Parameters = new()`
`64`	`62`	`{`
`65`	`63`	`{ nameof(ComponentDialogInput.Input), "(Simple Dialog Large) Are you sure?"}`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`<ComponentsAsDialogsCommon />`
`4`	`4`
`5`		`-<BlazorDialog.Components.ComponentDialogsOutput />`
	`5`	`+<DialogOutput />`