Compability to Mud Core 6.2.1 (#178)

mckaragoz · web-flow · commit eeb748eece9e · 2023-04-13T14:18:12.000+03:00
diff --git a/CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs b/CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs
@@ -292,14 +292,14 @@ protected virtual Task UpdateTextPropertyAsync(bool updateValue)
 
         protected bool _isFocused;
 
-        protected internal virtual void OnBlurred(FocusEventArgs obj)
+        protected internal virtual async Task OnBlurredAsync(FocusEventArgs obj)
         {
             _isFocused = false;
 
             if (!OnlyValidateIfDirty || _isDirty)
             {
                 Touched = true;
-                BeginValidateAfter(OnBlur.InvokeAsync(obj));
+                await BeginValidationAfterAsync(OnBlur.InvokeAsync(obj));
             }
         }
 
@@ -383,7 +383,7 @@ protected virtual async Task SetValueAsync(T value, bool updateText = true, bool
                 if (updateText)
                     await UpdateTextPropertyAsync(false);
                 await ValueChanged.InvokeAsync(Value);
-                BeginValidate();
+                await BeginValidateAsync();
                 FieldChanged(Value);
             }
         }
@@ -457,10 +457,10 @@ protected override async Task OnInitializedAsync()
                 Label = For.GetLabelString();
         }
 
-        public virtual void ForceRender(bool forceTextUpdate)
+        public virtual async Task ForceRender(bool forceTextUpdate)
         {
             _forceTextUpdate = true;
-            UpdateTextPropertyAsync(false).AndForget();
+            await UpdateTextPropertyAsync(false);
             StateHasChanged();
         }
 
diff --git a/CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj b/CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj
@@ -24,7 +24,7 @@
 	<ItemGroup>
 		<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
 		<PackageReference Include="CsvHelper" Version="30.0.1" />
-		<PackageReference Include="MudBlazor" Version="6.1.9" />
+		<PackageReference Include="MudBlazor" Version="6.2.1" />
 		<PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.3" />
 		<PackageReference Include="ZXing.Net" Version="0.16.9" />
 		<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.13" />
diff --git a/CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudInputExtended.razor b/CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudInputExtended.razor
@@ -25,7 +25,7 @@
               inputmode="@InputMode.ToString()"
               @oninput="OnInputHandler"
               @onchange="OnChangeHandler"
-              @onblur="@OnBlurred"
+              @onblur="@OnBlurredAsync"
               @onkeydown="@InvokeKeyDown"
               @onkeypress="@InvokeKeyPress"
               @onkeyup="@InvokeKeyUp"
@@ -61,7 +61,7 @@
            placeholder="@Placeholder"
            disabled=@Disabled
            readonly="@ReadOnly"
-           @onblur="@OnBlurred"
+           @onblur="@OnBlurredAsync"
            inputmode="@InputMode.ToString()"
            pattern="@Pattern"
            @onkeydown="@InvokeKeyDown"
@@ -84,7 +84,7 @@
     *@
             <div class="@InputClassname"
                 style="@($"display:{(InputType == InputType.Hidden && ChildContent != null ? "inline" : "none")}; {MockInputStyle}")"
-                 @onblur="@OnBlurred" @ref="@_elementReference1">
+                 @onblur="@OnBlurredAsync" @ref="@_elementReference1">
                     @ChildContent
             </div>
         }
@@ -94,7 +94,7 @@
             <div class="@InputClassname"
                  style="@($"display:{(InputType == InputType.Hidden && ChildContent != null ? "inline" : "none")}; {MockInputStyle}")"
                  tabindex="@(InputType == InputType.Hidden && ChildContent != null ? 0 : -1)"
-                 @onblur="@OnBlurred" @ref="@_elementReference1">
+                 @onblur="@OnBlurredAsync" @ref="@_elementReference1">
                     @ChildContent
             </div>
         }
diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor
@@ -19,7 +19,7 @@
                      ForId="@FieldId">
         <InputContent>
             <CascadingValue Name="Standalone" Value="false" IsFixed="true">
-                    <MudInput T="string"
+                    <MudInputExtended T="string"
                               @ref="InputReference"
                               @attributes="UserAttributes"
                               InputType="@_passwordInput"
@@ -44,7 +44,7 @@
                               ErrorId="@ErrorId"
                               Immediate="@Immediate"
                               Margin="@Margin"
-                              OnBlur="@OnBlurred"
+                              OnBlur="@OnBlurredAsync"
                               OnKeyDown="@InvokeKeyDown"
                               OnInternalInputChanged="OnChange"
                               OnKeyPress="@InvokeKeyPress"
diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs
@@ -15,7 +15,7 @@ public partial class MudPasswordField<T> : MudDebouncedInput<T>
            .AddClass(Class)
            .Build();
 
-        public MudInput<string> InputReference { get; private set; }
+        public MudInputExtended<string> InputReference { get; private set; }
         InputType _passwordInput = InputType.Password;
         string _passwordIcon = Icons.Material.Filled.VisibilityOff;
         bool _passwordMode = true;
diff --git a/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs
@@ -821,7 +821,7 @@ protected internal async void HandleKeyUp(KeyboardEventArgs obj)
             await OnKeyUp.InvokeAsync(obj);
         }
 
-        internal void OnLostFocus(FocusEventArgs obj)
+        protected internal async Task OnLostFocus(FocusEventArgs obj)
         {
             //if (_isOpen)
             //{
@@ -831,7 +831,7 @@ internal void OnLostFocus(FocusEventArgs obj)
             //}
             //base.OnBlur.InvokeAsync(obj).AndForget();
 
-            OnBlurred(obj);
+            await OnBlurredAsync(obj);
         }
 
         public override ValueTask FocusAsync()
diff --git a/CodeBeam.MudBlazor.Extensions/Components/TextFieldExtended/MudTextFieldExtended.razor b/CodeBeam.MudBlazor.Extensions/Components/TextFieldExtended/MudTextFieldExtended.razor
@@ -41,7 +41,7 @@
                                       ErrorId="@ErrorId"
                                       Immediate="@Immediate"
                                       Margin="@Margin"
-                                      OnBlur="@OnBlurred"
+                                      OnBlur="@OnBlurredAsync"
                                       OnKeyDown="@InvokeKeyDown"
                                       OnInternalInputChanged="OnChange"
                                       OnKeyPress="@InvokeKeyPress"
@@ -83,7 +83,7 @@
                              IconSize="@IconSize"
                              Error="@Error"
                              Immediate="@Immediate"
-                             Margin="@Margin" OnBlur="@OnBlurred"
+                             Margin="@Margin" OnBlur="@OnBlurredAsync"
                              Clearable="@Clearable"
                              OnClearButtonClick="@OnClearButtonClick"
                              AdornmentStart="@AdornmentStart"
diff --git a/ComponentViewer.Docs/ComponentViewer.Docs.csproj b/ComponentViewer.Docs/ComponentViewer.Docs.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.1" />
-    <PackageReference Include="MudBlazor" Version="6.1.9" />
+    <PackageReference Include="MudBlazor" Version="6.2.1" />
     <PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.3" />
   </ItemGroup>
 
diff --git a/ComponentViewer.Wasm/ComponentViewer.Wasm.csproj b/ComponentViewer.Wasm/ComponentViewer.Wasm.csproj
@@ -9,8 +9,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" />
-    <PackageReference Include="MudBlazor" Version="6.1.9" />
-    <PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ComponentViewer/ComponentViewer.csproj b/ComponentViewer/ComponentViewer.csproj
@@ -6,10 +6,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MudBlazor" Version="6.1.9" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\CodeBeam.MudBlazor.Extensions\CodeBeam.MudBlazor.Extensions.csproj" />
     <ProjectReference Include="..\ComponentViewer.Docs\ComponentViewer.Docs.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -292,14 +292,14 @@ protected virtual Task UpdateTextPropertyAsync(bool updateValue)`
`292`	`292`
`293`	`293`	`protected bool _isFocused;`
`294`	`294`
`295`		`- protected internal virtual void OnBlurred(FocusEventArgs obj)`
	`295`	`+ protected internal virtual async Task OnBlurredAsync(FocusEventArgs obj)`
`296`	`296`	`{`
`297`	`297`	`_isFocused = false;`
`298`	`298`
`299`	`299`	`if (!OnlyValidateIfDirty \|\| _isDirty)`
`300`	`300`	`{`
`301`	`301`	`Touched = true;`
`302`		`- BeginValidateAfter(OnBlur.InvokeAsync(obj));`
	`302`	`+ await BeginValidationAfterAsync(OnBlur.InvokeAsync(obj));`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`
`@@ -383,7 +383,7 @@ protected virtual async Task SetValueAsync(T value, bool updateText = true, bool`
`383`	`383`	`if (updateText)`
`384`	`384`	`await UpdateTextPropertyAsync(false);`
`385`	`385`	`await ValueChanged.InvokeAsync(Value);`
`386`		`- BeginValidate();`
	`386`	`+ await BeginValidateAsync();`
`387`	`387`	`FieldChanged(Value);`
`388`	`388`	`}`
`389`	`389`	`}`
`@@ -457,10 +457,10 @@ protected override async Task OnInitializedAsync()`
`457`	`457`	`Label = For.GetLabelString();`
`458`	`458`	`}`
`459`	`459`
`460`		`- public virtual void ForceRender(bool forceTextUpdate)`
	`460`	`+ public virtual async Task ForceRender(bool forceTextUpdate)`
`461`	`461`	`{`
`462`	`462`	`_forceTextUpdate = true;`
`463`		`- UpdateTextPropertyAsync(false).AndForget();`
	`463`	`+ await UpdateTextPropertyAsync(false);`
`464`	`464`	`StateHasChanged();`
`465`	`465`	`}`
`466`	`466`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ protected internal async void HandleKeyUp(KeyboardEventArgs obj)`
`821`	`821`	`await OnKeyUp.InvokeAsync(obj);`
`822`	`822`	`}`
`823`	`823`
`824`		`- internal void OnLostFocus(FocusEventArgs obj)`
	`824`	`+ protected internal async Task OnLostFocus(FocusEventArgs obj)`
`825`	`825`	`{`
`826`	`826`	`//if (_isOpen)`
`827`	`827`	`//{`
`@@ -831,7 +831,7 @@ internal void OnLostFocus(FocusEventArgs obj)`
`831`	`831`	`//}`
`832`	`832`	`//base.OnBlur.InvokeAsync(obj).AndForget();`
`833`	`833`
`834`		`- OnBlurred(obj);`
	`834`	`+ await OnBlurredAsync(obj);`
`835`	`835`	`}`
`836`	`836`
`837`	`837`	`public override ValueTask FocusAsync()`