Merge pull request #15 from 0phois/MudBlazor-v8-preview

Update MudBlazor to v8-preview-4
0phois · Nov 15, 2024 · 5cd59d1 · 5cd59d1
2 parents cc2d160 + b5f0317
commit 5cd59d1
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 21 deletions.
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.7" />
-	<PackageReference Include="MudBlazor" Version="7.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+	<PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.10" />
   </ItemGroup>
 
 </Project>
diff --git a/demo/StaticSample/StaticSample/StaticSample.csproj b/demo/StaticSample/StaticSample/StaticSample.csproj
@@ -9,14 +9,15 @@
 
   <ItemGroup>
     <PackageReference Include="Blazr.RenderState.Server" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Components/MudStaticCheckBox.razor b/src/Components/MudStaticCheckBox.razor
@@ -5,7 +5,7 @@
 <MudInputControl Class="@Classname" Style="@Style" Error="@HasErrors" ErrorText="@GetErrorText()" Required="@Required">
     <InputContent>
         <label class="@LabelClassname" id="@($"checkbox-container-{_elementId}")" @onclick:stopPropagation="@StopClickPropagation">
-            <span tabindex="0" class="@CheckBoxClassname">
+            <span tabindex="0" class="@IconClassname">
                 <input type="hidden" id="@($"empty-checkbox-{_elementId}")" name="@(_checkboxValue ? "" : _name)" value="False" />
                 <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-checkbox-input" name="@(_checkboxValue ? _name : "")" 
                        value="True" aria-checked="@_checkboxValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"

diff --git a/src/Components/MudStaticSwitch.razor b/src/Components/MudStaticSwitch.razor
@@ -9,10 +9,11 @@
             <span class="@SpanClassname">
                 <span tabindex="0" class="@SwitchClassname" id="@($"switch-container-{_elementId}")">
                     <span class="mud-switch-button">
-                        <input type="hidden" id="@($"empty-switch-{_elementId}")" name="@(_switchValue ? "" : _name)" value="False" />
+                        <input type="hidden" id="@($"empty-switch-{_elementId}")" name="@(_switchValue ? "" : _name)" value="False" aria-required="@Required.ToString().ToLowerInvariant()" />
                         <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-switch-input" name="@(_switchValue ? _name : "")" 
                                value="True" aria-checked="@_switchValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"
-                               id="@($"static-switch-{_elementId}")" disabled="@GetDisabledState()" @onclick:preventDefault="@GetReadOnlyState()"/>
+                               id="@($"static-switch-{_elementId}")" disabled="@GetDisabledState()" @onclick:preventDefault="@GetReadOnlyState()"
+                               aria-required="@Required.ToString().ToLowerInvariant()" />
                         <span class="@ThumbClassname">
                             @if (!string.IsNullOrEmpty(ThumbIcon))
                             {
@@ -25,13 +26,13 @@
             </span>
             @if (!string.IsNullOrEmpty(Label))
             {
-                <MudText Class="@(Typo is null ? SwitchLabelClassname : $"mud-typography-{Typo.Value.ToDescriptionString()}")" Color="HasErrors ? Color.Error : Color.Inherit">
+                <MudText Class="@(Typo is null ? LabelClassname : $"mud-typography-{Typo.Value.ToDescriptionString()}")" Color="HasErrors ? Color.Error : Color.Inherit">
                     @Label
                 </MudText>
             }
             @if (ChildContent != null)
             {
-                <MudText Class="@(Typo is null ? SwitchLabelClassname : $"mud-typography-{Typo.Value.ToDescriptionString()}")"  Color="HasErrors ? Color.Error : Color.Inherit">
+                <MudText Class="@(Typo is null ? LabelClassname : $"mud-typography-{Typo.Value.ToDescriptionString()}")"  Color="HasErrors ? Color.Error : Color.Inherit">
                     @ChildContent
                 </MudText>
             }

diff --git a/src/MudBlazor.StaticInput.csproj b/src/MudBlazor.StaticInput.csproj
@@ -21,7 +21,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MudBlazor" Version="7.*" />
+        <PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
     </ItemGroup>
 
     <ItemGroup>

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" LabelPlacement="Placement.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" LabelPlacement="Placement.Start" />
         <MudStaticButton FormAction="FormAction.Submit" Color="Color.Primary" Variant="Variant.Filled">Submit</MudStaticButton>
     </MudStack>
 </EditForm>

diff --git a/tests/StaticInput.UnitTests.Viewer/StaticInput.UnitTests.Viewer.csproj b/tests/StaticInput.UnitTests.Viewer/StaticInput.UnitTests.Viewer.csproj
@@ -6,6 +6,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\MudBlazor.StaticInput.csproj" />
   </ItemGroup>

diff --git a/tests/StaticInput.UnitTests/StaticInput.UnitTests.csproj b/tests/StaticInput.UnitTests/StaticInput.UnitTests.csproj
@@ -10,19 +10,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="bunit" Version="1.29.5" />
+    <PackageReference Include="bunit" Version="1.33.3" />
     <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="FluentAssertions" Version="6.12.1" />
     <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.10.0" />
-    <PackageReference Include="Microsoft.Playwright" Version="1.44.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.48.0" />
+    <PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>