Merge pull request #6 from 0phois/MudBlazor-v7

MudBlazor v7.0.0-rc.2
0phois · Jun 22, 2024 · 7aa293f · 7aa293f
2 parents 883eab2 + fa29b45
commit 7aa293f
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 50 deletions.
diff --git a/demo/StaticSample/StaticSample.Client/Components/MyMudProviders.razor b/demo/StaticSample/StaticSample.Client/Components/MyMudProviders.razor
@@ -1,6 +1,6 @@
 @inject ISnackbar Snackbar
 
-<MudPopoverProvider></MudPopoverProvider>
+<MudPopoverProvider />
 <MudDialogProvider />
 <MudSnackbarProvider />
 

diff --git a/demo/StaticSample/StaticSample.Client/Components/MyMudThemeProvider.razor b/demo/StaticSample/StaticSample.Client/Components/MyMudThemeProvider.razor
@@ -1,11 +1,9 @@
-<CascadingValue Value=false Name="UsePopoverProvider">
-    <MudThemeProvider Theme="MyTheme"></MudThemeProvider>
-</CascadingValue>
+<MudThemeProvider Theme="MyTheme"></MudThemeProvider>
 
 @code {
     public static MudTheme MyTheme => new()
         {
-            Palette = new PaletteLight()
+            PaletteLight = new PaletteLight()
             {
                 Primary = Colors.Teal.Default,
                 AppbarBackground = Colors.Teal.Default

diff --git a/demo/StaticSample/StaticSample.Client/StaticSample.Client.csproj b/demo/StaticSample/StaticSample.Client/StaticSample.Client.csproj
@@ -10,9 +10,9 @@
 
   <ItemGroup>
     <PackageReference Include="Blazr.RenderState.WASM" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
-	<PackageReference Include="MudBlazor" Version="6.19.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+	<PackageReference Include="MudBlazor" Version="7.0.0-rc.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/StaticSample/StaticSample/StaticSample.csproj b/demo/StaticSample/StaticSample/StaticSample.csproj
@@ -9,15 +9,14 @@
 
   <ItemGroup>
     <PackageReference Include="Blazr.RenderState.Server" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MudBlazor" Version="6.19.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Components/MudStaticButton.razor b/src/Components/MudStaticButton.razor
@@ -62,7 +62,7 @@ else
                 </button>;
     }
 
-    private RenderFragment RenderHiddenReturnUrl()
+    private RenderFragment? RenderHiddenReturnUrl()
     {
         if (!string.IsNullOrEmpty(ReturnUrl))
         {

diff --git a/src/Components/MudStaticButton.razor.cs b/src/Components/MudStaticButton.razor.cs
@@ -1,5 +1,4 @@
-using System.Windows.Input;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
 namespace MudBlazor.StaticInput;
@@ -14,10 +13,7 @@ public partial class MudStaticButton : MudButton
     protected new ButtonType ButtonType { get; set; }
     protected new string HtmlTag { get; set; } = "button";
     protected new string? Href { get; set; }
-    protected new string? Link { get; set; }
     protected new string? Target { get; set; }
-    protected new ICommand? Command { get; set; }
     protected new bool ClickPropagation { get; set; }
-    protected new object? CommandParameter { get; set; }
     protected new EventCallback<MouseEventArgs> OnClick { get; set; }
 }
diff --git a/src/Components/MudStaticCheckBox.razor b/src/Components/MudStaticCheckBox.razor
@@ -12,7 +12,7 @@
                        id="@($"static-checkbox-{_elementId}")" disabled="@GetDisabledState()" @onclick:preventDefault="@GetReadOnlyState()"/>
                 <MudIcon Icon="@CheckedIcon" Color="HasErrors ? Color.Error : this.Color" Size="@Size"
                          id="@($"check-icon-{_elementId}")" style="display: none;"/>
-                <MudIcon Icon="@UncheckedIcon" Color="HasErrors ? Color.Error : this.UnCheckedColor ?? Color.Inherit" Size="@Size"
+                <MudIcon Icon="@UncheckedIcon" Color="HasErrors ? Color.Error : this.UncheckedColor ?? Color.Inherit" Size="@Size"
                          id="@($"unchecked-icon-{_elementId}")"/>
             </span>
             @if (!string.IsNullOrEmpty(Label))

diff --git a/src/Components/MudStaticCheckBox.razor.cs b/src/Components/MudStaticCheckBox.razor.cs
@@ -8,10 +8,9 @@ public partial class MudStaticCheckBox : MudCheckBox<bool>
      * Hide these inherited properties to prevent *
      * consumers from modifying them directly.    *
      **********************************************/
-    protected new bool Checked { get; set; }
+    protected new bool Value { get; set; }
     protected new bool TriState { get; set; }
     protected new bool KeyboardEnabled { get; set; }
     protected new EventCallback<bool> ValueChanged { get; set; }
-    protected new EventCallback<bool> CheckedChanged { get; set; }
     protected new string IndeterminateIcon { get; set; } = Icons.Material.Filled.IndeterminateCheckBox;
 }
diff --git a/src/Components/MudStaticSwitch.razor b/src/Components/MudStaticSwitch.razor
@@ -84,7 +84,7 @@
             container.classList.toggle("@UncheckedHoverColor", !force)
 
             switchTrack.classList.toggle("@CheckedColor", force);
-            switchTrack.classList.toggle("@UncheckedColor", !force)
+            switchTrack.classList.toggle("@UnCheckedColor", !force)
 
             if (switchToggle.checked) {
                 emptySwitch.removeAttribute("name");

diff --git a/src/Components/MudStaticSwitch.razor.cs b/src/Components/MudStaticSwitch.razor.cs
@@ -8,21 +8,20 @@ public partial class MudStaticSwitch : MudSwitch<bool>
      * Hide these inherited properties to prevent *
      * consumers from modifying them directly.    *
      **********************************************/
-    protected new bool Checked { get; set; }
+    protected new bool Value { get; set; }
     protected new EventCallback<bool> ValueChanged { get; set; }
-    protected new EventCallback<bool> CheckedChanged { get; set; }
 
     /*
      * Options for SwitchClassname
      */
     private string CheckedTextColor => $"mud-{Color.ToDescriptionString()}-text";
     private string CheckedHoverColor => $"hover:mud-{Color.ToDescriptionString()}-hover";
-    private string UncheckedTextColor => $"mud-{UnCheckedColor.ToDescriptionString()}-text";
-    private string UncheckedHoverColor => $"hover:mud-{UnCheckedColor.ToDescriptionString()}-hover";
+    private string UncheckedTextColor => $"mud-{UncheckedColor.ToDescriptionString()}-text";
+    private string UncheckedHoverColor => $"hover:mud-{UncheckedColor.ToDescriptionString()}-hover";
 
     /*
      * Options for TrackClassname
      */
     private string CheckedColor => $"mud-{Color.ToDescriptionString()}";
-    private string UncheckedColor => $"mud-{UnCheckedColor.ToDescriptionString()}";
+    private string UnCheckedColor => $"mud-{UncheckedColor.ToDescriptionString()}";
 }
diff --git a/src/Components/MudStaticTextField.razor b/src/Components/MudStaticTextField.razor
@@ -10,16 +10,16 @@
 @code {
     [Parameter] public Expression<Func<string>>? ValueExpression { get; set; }
 
-    private string _name;
-    private string _elementId;
+    private string _name = string.Empty;
+    private string _elementId = string.Empty;
     private bool HasDefaultContent => ShrinkLabel || 
                                       HasNativeHtmlPlaceholder() ||
                                       Adornment == Adornment.Start || 
                                       !string.IsNullOrWhiteSpace(Placeholder);
 
     protected override void OnParametersSet()
     {
-        UserAttributes["id"] = _elementId;
+        UserAttributes["data-static-id"] = _elementId;
         UserAttributes["name"] = _name;
 
         base.OnParametersSet();
@@ -58,7 +58,7 @@
 
 <script>
     (function () {
-        const inputElement = document.getElementById('@_elementId');
+        const inputElement = document.querySelector('[data-static-id="@_elementId"]');
         const shrinkLabel = @HasDefaultContent.ToString().ToLower();
         const showOnFocus = @HelperTextOnFocus.ToString().ToLower();
 

diff --git a/src/Components/MudStaticTextField.razor.cs b/src/Components/MudStaticTextField.razor.cs
@@ -25,8 +25,6 @@ public partial class MudStaticTextField<T> : MudTextField<T>
     protected new EventCallback<FocusEventArgs> OnBlur { get; set; }
     protected new EventCallback<KeyboardEventArgs> OnKeyDown { get; set; }
     protected new bool KeyDownPreventDefault { get; set; }
-    protected new EventCallback<KeyboardEventArgs> OnKeyPress { get; set; }
-    protected new bool KeyPressPreventDefault { get; set; }
     protected new EventCallback<KeyboardEventArgs> OnKeyUp { get; set; }
     protected new bool KeyUpPreventDefault { get; set; }
     protected new EventCallback<T> ValueChanged { get; set; }

diff --git a/src/MudBlazor.StaticInput.csproj b/src/MudBlazor.StaticInput.csproj
@@ -21,7 +21,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MudBlazor" Version="6.19.1" />
+        <PackageReference Include="MudBlazor" Version="7.0.0-rc.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/tests/StaticInput.UnitTests.Viewer/Components/Layout/MainLayout.razor b/tests/StaticInput.UnitTests.Viewer/Components/Layout/MainLayout.razor
@@ -32,7 +32,7 @@
 @code {
     MudTheme customTheme = new MudTheme()
     {
-        Palette = new PaletteLight() 
+        PaletteLight = new PaletteLight() 
         { 
             Primary = Colors.Teal.Default
         }

diff --git a/tests/StaticInput.UnitTests.Viewer/Components/Tests/CheckBox/CheckBoxColorsTest.razor b/tests/StaticInput.UnitTests.Viewer/Components/Tests/CheckBox/CheckBoxColorsTest.razor
@@ -6,7 +6,7 @@
     <DataAnnotationsValidator />
     <MudStack Row="true" AlignItems="AlignItems.Center">
         <MudStaticCheckBox @bind-Value="Input.Confirm" Class="my-4 ml-n4" Label="Confirm" For="() => Input.Confirm"
-                           Color="Color.Primary" UnCheckedColor="Color.Error" Size="Size.Large" LabelPosition="LabelPosition.Start" />
+                           Color="Color.Primary" UncheckedColor="Color.Error" Size="Size.Large" LabelPosition="LabelPosition.Start" />
         <MudStaticButton FormAction="FormAction.Submit" Color="Color.Primary" Variant="Variant.Filled">Submit</MudStaticButton>
     </MudStack>
 </EditForm>

diff --git a/tests/StaticInput.UnitTests.Viewer/Components/Tests/Switch/SwitchColorsTest.razor b/tests/StaticInput.UnitTests.Viewer/Components/Tests/Switch/SwitchColorsTest.razor
@@ -6,7 +6,7 @@
     <DataAnnotationsValidator />
     <MudStack Row="true" AlignItems="AlignItems.Center">
         <MudStaticSwitch @bind-Value="Input.Confirm" Class="my-4 ml-n4" Label="Confirm" For="() => Input.Confirm"
-                         Color="Color.Primary" UnCheckedColor="Color.Error" Size="Size.Large" LabelPosition="LabelPosition.Start" />
+                         Color="Color.Primary" UncheckedColor="Color.Error" Size="Size.Large" LabelPosition="LabelPosition.Start" />
         <MudStaticButton FormAction="FormAction.Submit" Color="Color.Primary" Variant="Variant.Filled">Submit</MudStaticButton>
     </MudStack>
 </EditForm>

diff --git a/tests/StaticInput.UnitTests/Components/BaseComponentTest.cs b/tests/StaticInput.UnitTests/Components/BaseComponentTest.cs
@@ -18,6 +18,7 @@ protected BaseComponentTest(ContextFixture contextFixture)
             ContextFixture = contextFixture;
             Context.JSInterop.Mode = JSRuntimeMode.Loose;
             Context.Services.AddMudBlazorKeyInterceptor();
+            Context.Services.AddMudLocalization();
         }
 
         public async Task InitializeAsync()

diff --git a/tests/StaticInput.UnitTests/Components/TextFieldTests.cs b/tests/StaticInput.UnitTests/Components/TextFieldTests.cs
@@ -24,7 +24,7 @@ public void TextField_Input_Should_Shink_Label()
             var comp = Context.RenderComponent<TextFieldLabelTest>();
 
             var field = comp.FindComponents<MudStaticTextField<string>>()
-                            .First(x => x.Instance.Label.Equals("Basic Label", StringComparison.OrdinalIgnoreCase));
+                            .First(x => x.Instance.Label!.Equals("Basic Label", StringComparison.OrdinalIgnoreCase));
 
             var index = field.Markup.IndexOf("<script>");
 
@@ -41,7 +41,7 @@ public void TextField_AdonrmentStart_Should_Shink_Label()
             var comp = Context.RenderComponent<TextFieldLabelTest>();
 
             var field = comp.FindComponents<MudStaticTextField<string>>()
-                            .First(x => x.Instance.Label.Equals("Adornment Start", StringComparison.OrdinalIgnoreCase));
+                            .First(x => x.Instance.Label!.Equals("Adornment Start", StringComparison.OrdinalIgnoreCase));
 
             var index = field.Markup.IndexOf("<script>");
 
@@ -58,7 +58,7 @@ public void TextField_AdornmentEnd_Should_Not_Shink_Label()
             var comp = Context.RenderComponent<TextFieldLabelTest>();
 
             var field = comp.FindComponents<MudStaticTextField<string>>()
-                            .First(x => x.Instance.Label.Equals("Adornment End", StringComparison.OrdinalIgnoreCase));
+                            .First(x => x.Instance.Label!.Equals("Adornment End", StringComparison.OrdinalIgnoreCase));
 
             var index = field.Markup.IndexOf("<script>");
 
@@ -75,7 +75,7 @@ public void TextField_Shrink_Label_Should_Shink_Label()
             var comp = Context.RenderComponent<TextFieldLabelTest>();
 
             var field = comp.FindComponents<MudStaticTextField<string>>()
-                            .First(x => x.Instance.Label.Equals("Shrink Label", StringComparison.OrdinalIgnoreCase));
+                            .First(x => x.Instance.Label!.Equals("Shrink Label", StringComparison.OrdinalIgnoreCase));
 
             var index = field.Markup.IndexOf("<script>");
 
@@ -92,7 +92,7 @@ public void TextField_Placeholder_Should_Shink_Label()
             var comp = Context.RenderComponent<TextFieldLabelTest>();
 
             var field = comp.FindComponents<MudStaticTextField<string>>()
-                            .First(x => x.Instance.Label.Equals("Placeholder", StringComparison.OrdinalIgnoreCase));
+                            .First(x => x.Instance.Label!.Equals("Placeholder", StringComparison.OrdinalIgnoreCase));
 
             var index = field.Markup.IndexOf("<script>");
 

diff --git a/tests/StaticInput.UnitTests/StaticInput.UnitTests.csproj b/tests/StaticInput.UnitTests/StaticInput.UnitTests.csproj
@@ -10,20 +10,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.27.17" />
+    <PackageReference Include="bunit" Version="1.28.9" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Microsoft.Playwright" Version="1.42.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.44.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>