Merge pull request #75 from Blazored/vnext

Next Release 3.0.0
Blazored · Dec 6, 2019 · caa3875 · caa3875
2 parents 6d05827 + ec912e4
commit caa3875
Show file tree

Hide file tree

Showing 24 changed files with 128 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ Add the `<BlazoredModal />` tag into your applications *MainLayout.razor*.
 
 ### 4. Add reference to style sheet
 
-Add the following line to the `head` tag of your `_Host.cshtml` (Blazor Server app).
+Add the following line to the `head` tag of your `_Host.cshtml` (Blazor Server) or `index.html` (Blazor WebAssembly).
 
 ```html
 <link href="_content/Blazored.Modal/blazored-modal.css" rel="stylesheet" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ steps:
 - task: DotNetCoreInstaller@0
   displayName: 'Installing .NET Core SDK...'
   inputs:
-    version: 3.0.100
+    version: 3.1.100
 
 - task: NuGetToolInstaller@0
   displayName: 'Installing Nuget Tools...'

diff --git a/samples/BlazorSample/BlazorSample.csproj b/samples/BlazorSample/BlazorSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RestoreAdditionalProjectSources>
       https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
       https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview3.19555.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview3.19555.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview3.19555.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview4.19579.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview4.19579.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/BlazorSample/Pages/BackGroundCancel.razor b/samples/BlazorSample/Pages/BackGroundCancel.razor
@@ -20,7 +20,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { DisableBackgroundCancel = false };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 
     void BackgroundCancelDisabled()
@@ -29,7 +29,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { DisableBackgroundCancel = true };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/BlazorSample/Pages/CustomStyle.razor b/samples/BlazorSample/Pages/CustomStyle.razor
@@ -28,7 +28,7 @@
         parameters.Add("FormId", 11);
 
         Modal.OnClose += ModalClosed;
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters);
     }
 
     void ShowModalCustomStyle()
@@ -37,7 +37,7 @@
         var options = new ModalOptions() { Style = "blazored-prompt-modal" };
 
         Modal.OnClose += ModalClosed;
-        Modal.Show("Delete record?", typeof(YesNoPrompt), options);
+        Modal.Show<YesNoPrompt>("Delete record?", options);
     }
 
 

diff --git a/samples/BlazorSample/Pages/HideCloseButton.razor b/samples/BlazorSample/Pages/HideCloseButton.razor
@@ -21,7 +21,7 @@
         parameters.Add("FormId", 11);
 
         var options = new ModalOptions() { HideCloseButton = false };
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 
     void CloseButtonHidden()
@@ -30,7 +30,7 @@
         parameters.Add("FormId", 11);
 
         var options = new ModalOptions() { HideCloseButton = true };
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/BlazorSample/Pages/Index.razor b/samples/BlazorSample/Pages/Index.razor
@@ -20,7 +20,7 @@
         parameters.Add("FormId", 11);
 
         Modal.OnClose += ModalClosed;
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters);
     }
 
     void ModalClosed(ModalResult modalResult)

diff --git a/samples/BlazorSample/Pages/Position.razor b/samples/BlazorSample/Pages/Position.razor
@@ -24,7 +24,7 @@
         var parameters = new ModalParameters();
         parameters.Add("FormId", 11);
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters);
     }
 
     void PositionCustom(string position)
@@ -33,7 +33,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { Position = position };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/BlazorSample/Shared/SurveyPrompt.razor b/samples/BlazorSample/Shared/SurveyPrompt.razor
diff --git a/samples/BlazorSample/wwwroot/index.html b/samples/BlazorSample/wwwroot/index.html
@@ -6,6 +6,7 @@
     <title>Blazored Modal</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="_content/Blazored.Modal/blazored-modal.css" rel="stylesheet" />
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>

diff --git a/samples/ServerSideblazor/Pages/BackGroundCancel.razor b/samples/ServerSideblazor/Pages/BackGroundCancel.razor
@@ -20,7 +20,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { DisableBackgroundCancel = false };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 
     void BackgroundCancelDisabled()
@@ -29,7 +29,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { DisableBackgroundCancel = true };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/ServerSideblazor/Pages/CustomStyle.razor b/samples/ServerSideblazor/Pages/CustomStyle.razor
@@ -28,7 +28,7 @@
         parameters.Add("FormId", 11);
 
         Modal.OnClose += ModalClosed;
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters);
     }
 
     void ShowModalCustomStyle()
@@ -37,7 +37,7 @@
         var options = new ModalOptions() { Style = "blazored-prompt-modal" };
 
         Modal.OnClose += ModalClosed;
-        Modal.Show("Delete record?", typeof(YesNoPrompt), options);
+        Modal.Show<YesNoPrompt>("Delete record?", options);
     }
 
 

diff --git a/samples/ServerSideblazor/Pages/HideCloseButton.razor b/samples/ServerSideblazor/Pages/HideCloseButton.razor
@@ -21,7 +21,7 @@
         parameters.Add("FormId", 11);
 
         var options = new ModalOptions() { HideCloseButton = false };
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 
     void CloseButtonHidden()
@@ -30,7 +30,7 @@
         parameters.Add("FormId", 11);
 
         var options = new ModalOptions() { HideCloseButton = true };
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/ServerSideblazor/Pages/Position.razor b/samples/ServerSideblazor/Pages/Position.razor
@@ -24,7 +24,7 @@
         var parameters = new ModalParameters();
         parameters.Add("FormId", 11);
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters);
     }
 
     void PositionCustom(string position)
@@ -33,7 +33,7 @@
         parameters.Add("FormId", 11);
         var options = new ModalOptions() { Position = position };
 
-        Modal.Show("Sign Up Form", typeof(SignUpForm), parameters, options);
+        Modal.Show<SignUpForm>("Sign Up Form", parameters, options);
     }
 }
 
diff --git a/samples/ServerSideblazor/Pages/SignUpForm.razor b/samples/ServerSideblazor/Pages/SignUpForm.razor
@@ -29,6 +29,7 @@ else
 @code {
 
     [CascadingParameter] ModalParameters Parameters { get; set; }
+    [CascadingParameter] BlazoredModal BlazoredModal { get; set; }
 
     bool ShowForm { get; set; } = true;
     string FirstName { get; set; }
@@ -38,6 +39,7 @@ else
     protected override void OnInitialized()
     {
         FormId = Parameters.Get<int>("FormId");
+        BlazoredModal.SetTitle("Sheep");
     }
 
     void SubmitForm()

diff --git a/samples/ServerSideblazor/Pages/_Host.cshtml b/samples/ServerSideblazor/Pages/_Host.cshtml
@@ -14,7 +14,9 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<App>(RenderMode.Server))</app>
+    <app>
+        <component type="typeof(App)" render-mode="ServerPrerendered" />
+    </app>
 
     <script src="_framework/blazor.server.js"></script>
 </body>

diff --git a/samples/ServerSideblazor/ServerSideblazor.csproj b/samples/ServerSideblazor/ServerSideblazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 

diff --git a/src/Blazored.Modal/Blazored.Modal.csproj b/src/Blazored.Modal/Blazored.Modal.csproj
@@ -16,20 +16,13 @@
     <PackageTags>Blazored Blazor Razor Components Modal Dialogue</PackageTags>
     <Description>A JavaScript free modal library for Blazor and Razor Components applications.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.3.0</Version>
+    <Version>3.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- .js/.css files will be referenced via <script>/<link> tags; other content files will just be included in the app's 'dist' directory without any tags referencing them -->
-    <EmbeddedResource Include="wwwroot\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
-    <EmbeddedResource Include="wwwroot\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
-    <EmbeddedResource Include="wwwroot\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Blazored.Modal/BlazoredModal.razor b/src/Blazored.Modal/BlazoredModal.razor
@@ -1,24 +1,28 @@
-@inherits BlazoredModalBase
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
 
-<div class="blazored-modal-container @ComponentPosition @(IsVisible ? "blazored-modal-active" : string.Empty)">
+<div @onkeyup="@((args) =>Console.WriteLine(args.Key))" tabindex="1" class="blazored-modal-container @ComponentPosition @(IsVisible ? "blazored-modal-active" : string.Empty)">
 
     <div class="blazored-modal-overlay" @onclick="HandleBackgroundClick"></div>
 
     <div class="blazored-modal-wrapper">
         <div class="@ComponentStyle">
-            <div class="blazored-modal-header">
-                <h3 class="blazored-modal-title">@Title</h3>
-                @if (!ComponentHideCloseButton)
-                {
-                    <button type="button" class="blazored-modal-close" @onclick="@(() => ModalService.Cancel())">
-                        <span>&times;</span>
-                    </button>
-                }
-            </div>
+            @if (!ComponentHideHeader)
+            {
+                <div class="blazored-modal-header">
+                    <h3 class="blazored-modal-title">@Title</h3>
+                    @if (!ComponentHideCloseButton)
+                    {
+                        <button type="button" class="blazored-modal-close" @onclick="@(() => ModalService.Cancel())">
+                            <span>&times;</span>
+                        </button>
+                    }
+                </div>
+            }
             <div class="blazored-modal-content">
-                <CascadingValue Value="@Parameters">
-                    @Content
+                <CascadingValue Value="this">
+                    <CascadingValue Value="@Parameters">
+                        @Content
+                    </CascadingValue>
                 </CascadingValue>
             </div>
         </div>