Upgrade Mud Core 7.0.0-preview.3 (#397)

* Upgrade Mud Core 7.0.0-preview.3 * More Fixes * Fix Tests
CodeBeamOrg · May 16, 2024 · 4de4602 · 4de4602
1 parent 51d5adc
commit 4de4602
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 46 deletions.
diff --git a/CodeBeam.MudBlazor.Extensions.Docs/CodeBeam.MudBlazor.Extensions.Docs.csproj b/CodeBeam.MudBlazor.Extensions.Docs/CodeBeam.MudBlazor.Extensions.Docs.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.*" />
-    <PackageReference Include="MudBlazor" Version="7.0.0-preview.1" />
+    <PackageReference Include="MudBlazor" Version="7.0.0-preview.3" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/CodeBeam.MudBlazor.Extensions.Docs/Components/CodeBlock.razor b/CodeBeam.MudBlazor.Extensions.Docs/Components/CodeBlock.razor
@@ -1,7 +1,7 @@
 @inherits MudComponentBase
 @namespace MudExtensions.Docs.Components
 
-<MudText Inline="true" Class="px-2" Typo="Typo.body2" Style="background-color: #ff4081; color: white; border-radius: 20px">@ChildContent</MudText>
+<MudText HtmlTag="span" Class="px-2" Typo="Typo.body2" Style="background-color: #ff4081; color: white; border-radius: 20px">@ChildContent</MudText>
 
 @code{
     [Parameter]

diff --git a/...eam.MudBlazor.Extensions.Docs/Pages/Components/ChipField/Examples/ChipFieldExample1.razor b/...eam.MudBlazor.Extensions.Docs/Pages/Components/ChipField/Examples/ChipFieldExample1.razor
@@ -12,7 +12,7 @@
             <MudText>Values:
                 @foreach (var item in _values ?? new List<string>())
                 {
-                    <MudText Inline="true"> @(" " + item + " ") </MudText>
+                    <MudText HtmlTag="span"> @(" " + item + " ") </MudText>
                 }
             </MudText>
             <MudTextField @bind-Value="@_delimiter" Immediate="true" Label="Delimiter" Variant="Variant.Outlined" Margin="Margin.Dense" />

diff --git a/CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs b/CodeBeam.MudBlazor.Extensions/Base/MudBaseInputExtended.cs
@@ -476,7 +476,7 @@ protected override bool SetConverter(MudBlazor.Converter<T, string> value)
         {
             var changed = base.SetConverter(value);
             if (changed)
-                UpdateTextPropertyAsync(false).AndForget();      // refresh only Text property from current Value
+                UpdateTextPropertyAsync(false).CatchAndLog();      // refresh only Text property from current Value
 
             return changed;
         }
@@ -490,7 +490,7 @@ protected override bool SetCulture(CultureInfo value)
         {
             var changed = base.SetCulture(value);
             if (changed)
-                UpdateTextPropertyAsync(false).AndForget();      // refresh only Text property from current Value
+                UpdateTextPropertyAsync(false).CatchAndLog();      // refresh only Text property from current Value
 
             return changed;
         }
@@ -517,7 +517,7 @@ protected virtual bool SetFormat(string? value)
             if (changed)
             {
                 ((Converter<T>)Converter).Format = value;
-                UpdateTextPropertyAsync(false).AndForget();      // refresh only Text property from current Value
+                UpdateTextPropertyAsync(false).CatchAndLog();      // refresh only Text property from current Value
             }
             return changed;
         }

diff --git a/CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj b/CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj
@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
 		<PackageReference Include="CsvHelper" Version="31.0.3" />
-		<PackageReference Include="MudBlazor" Version="7.0.0-preview.1" />
+		<PackageReference Include="MudBlazor" Version="7.0.0-preview.3" />
 		<PackageReference Include="ZXing.Net" Version="0.16.9" />
 	</ItemGroup>
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/CodeInput/MudCodeInput.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/CodeInput/MudCodeInput.razor.cs
@@ -66,7 +66,7 @@ public T? Value
                     return;
                 }
                 _theValue = value;
-                SetValueFromOutside(_theValue).AndForget();
+                SetValueFromOutside(_theValue).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs
@@ -644,8 +644,8 @@ public IEnumerable<T?> SelectedValues
 
                 _selectedValues = new HashSet<T?>(set, _comparer);
 
-                SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer)).AndForget();
-                ForceUpdateItems().AndForget();
+                SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer)).CatchAndLog();
+                ForceUpdateItems().CatchAndLog();
                 //Console.WriteLine("SelectedValues setter ended");
             }
         }
@@ -775,7 +775,7 @@ protected override void OnInitialized()
             else if (MultiSelection && SelectedValues != null)
             {
                 // TODO: Check this line again
-                SetValueAsync(SelectedValues.FirstOrDefault()).AndForget();
+                SetValueAsync(SelectedValues.FirstOrDefault()).CatchAndLog();
             }
 
         }

diff --git a/CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudDebouncedInputExtended.cs b/CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudDebouncedInputExtended.cs
@@ -108,7 +108,7 @@ private void SetTimer()
 
         private void OnTimerTick(object? sender, ElapsedEventArgs e)
         {
-            InvokeAsync(OnTimerTickGuiThread).AndForget();
+            InvokeAsync(OnTimerTickGuiThread).CatchAndLog();
         }
 
         private async Task OnTimerTickGuiThread()
@@ -127,7 +127,7 @@ private void ClearTimer(bool suppressTick = false)
             _timer.Dispose();
             _timer = null;
             if (wasEnabled && !suppressTick)
-                OnTimerTickGuiThread().AndForget();
+                OnTimerTickGuiThread().CatchAndLog();
         }
 
         /// <summary>

diff --git a/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs
@@ -535,7 +535,7 @@ public T? SelectedValue
 
                 _selectedValue = value;
                 HandleCentralValueCommander(nameof(SelectedValue));
-                SelectedValueChanged.InvokeAsync(_selectedValue).AndForget();
+                SelectedValueChanged.InvokeAsync(_selectedValue).CatchAndLog();
             }
         }
 
@@ -588,7 +588,7 @@ public IEnumerable<T?>? SelectedValues
                     return;
                 }
                 HandleCentralValueCommander(nameof(SelectedValues));
-                SelectedValuesChanged.InvokeAsync(SelectedValues == null ? null : new HashSet<T?>(SelectedValues, _comparer)).AndForget();
+                SelectedValuesChanged.InvokeAsync(SelectedValues == null ? null : new HashSet<T?>(SelectedValues, _comparer)).CatchAndLog();
             }
         }
 
@@ -617,7 +617,7 @@ public MudListItemExtended<T?>? SelectedItem
                     return;
                 }
                 HandleCentralValueCommander(nameof(SelectedItem));
-                SelectedItemChanged.InvokeAsync(_selectedItem).AndForget();
+                SelectedItemChanged.InvokeAsync(_selectedItem).CatchAndLog();
             }
         }
 
@@ -652,7 +652,7 @@ public IEnumerable<MudListItemExtended<T?>>? SelectedItems
                     return;
                 }
                 HandleCentralValueCommander(nameof(SelectedItems));
-                SelectedItemsChanged.InvokeAsync(_selectedItems).AndForget();
+                SelectedItemsChanged.InvokeAsync(_selectedItems).CatchAndLog();
             }
         }
 
@@ -716,7 +716,7 @@ public override Task SetParametersAsync(ParameterView parameters)
                 return Task.CompletedTask;
             }
 
-            base.SetParametersAsync(parameters).AndForget();
+            base.SetParametersAsync(parameters).CatchAndLog();
 
             _setParametersDone = true;
             return Task.CompletedTask;

diff --git a/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListItemExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListItemExtended.razor.cs
@@ -399,7 +399,7 @@ protected void OnClickHandler(MouseEventArgs ev)
 
             if (OnClickHandlerPreventDefault)
             {
-                OnClick.InvokeAsync(ev).AndForget();
+                OnClick.InvokeAsync(ev).CatchAndLog();
                 return;
             }
 
@@ -410,13 +410,13 @@ protected void OnClickHandler(MouseEventArgs ev)
             else if (Href != null)
             {
                 MudListExtended?.SetSelectedValue(this);
-                OnClick.InvokeAsync(ev).AndForget();
+                OnClick.InvokeAsync(ev).CatchAndLog();
                 NavigationManager?.NavigateTo(Href, ForceLoad);
             }
             else if (MudListExtended?.Clickable == true || MudListExtended?.MultiSelection == true)
             {
                 MudListExtended?.SetSelectedValue(this);
-                OnClick.InvokeAsync(ev).AndForget();
+                OnClick.InvokeAsync(ev).CatchAndLog();
             }
         }
 
@@ -426,7 +426,7 @@ protected void OnClickHandler(MouseEventArgs ev)
         /// <param name="ev"></param>
         protected void OnlyOnClick(MouseEventArgs ev)
         {
-            OnClick.InvokeAsync(ev).AndForget();
+            OnClick.InvokeAsync(ev).CatchAndLog();
         }
 
         private Typo _textTypo;

diff --git a/CodeBeam.MudBlazor.Extensions/Components/Loading/MudLoading.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/Loading/MudLoading.razor.cs
@@ -33,7 +33,7 @@ public bool Loading
                     return;
                 }
                 _loading = value;
-                LoadingChanged.InvokeAsync(_loading).AndForget();
+                LoadingChanged.InvokeAsync(_loading).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/LoadingButton/MudLoadingButton.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/LoadingButton/MudLoadingButton.razor.cs
@@ -26,7 +26,7 @@ public bool Loading
                     return;
                 }
                 _loading = value;
-                LoadingChanged.InvokeAsync(_loading).AndForget();
+                LoadingChanged.InvokeAsync(_loading).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs
@@ -173,7 +173,7 @@ public bool PasswordMode
                     _passwordIcon = Icons.Material.Filled.Visibility;
                 }
 
-                PasswordModeChanged.InvokeAsync(value).AndForget();
+                PasswordModeChanged.InvokeAsync(value).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/Popup/MudPopup.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/Popup/MudPopup.razor.cs
@@ -55,7 +55,7 @@ public bool Open
                     return;
                 }
                 _open = value;
-                OpenChanged.InvokeAsync(_open).AndForget();
+                OpenChanged.InvokeAsync(_open).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs
@@ -440,7 +440,7 @@ public bool MultiSelection
                 if (value != _multiSelection)
                 {
                     _multiSelection = value;
-                    UpdateTextPropertyAsync(false).AndForget();
+                    UpdateTextPropertyAsync(false).CatchAndLog();
                 }
             }
         }
@@ -544,15 +544,15 @@ public IEnumerable<T?>? SelectedValues
                 SelectionChangedFromOutside?.Invoke(new HashSet<T?>(_selectedValues, _comparer));
                 if (!MultiSelection)
                 {
-                    SetValueAsync(_selectedValues.FirstOrDefault()).AndForget();
+                    SetValueAsync(_selectedValues.FirstOrDefault()).CatchAndLog();
                 }
                 else
                 {
-                    SetValueAsync(_selectedValues.LastOrDefault(), false).AndForget();
-                    UpdateTextPropertyAsync(false).AndForget();
+                    SetValueAsync(_selectedValues.LastOrDefault(), false).CatchAndLog();
+                    UpdateTextPropertyAsync(false).CatchAndLog();
                 }
 
-                SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer)).AndForget();
+                SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer)).CatchAndLog();
                 _selectedValuesSetterStarted = false;
                 //Console.WriteLine("SelectedValues setter ended");
             }
@@ -646,7 +646,7 @@ protected override Task UpdateValuePropertyAsync(bool updateText)
         {
             // For MultiSelection of non-string T's we don't update the Value!!!
             //if (typeof(T) == typeof(string) || !MultiSelection)
-            base.UpdateValuePropertyAsync(updateText).AndForget();
+            base.UpdateValuePropertyAsync(updateText).CatchAndLog();
             return Task.CompletedTask;
         }
 
@@ -739,7 +739,7 @@ protected override void OnInitialized()
             else if (MultiSelection && SelectedValues != null)
             {
                 // TODO: Check this line again
-                SetValueAsync(SelectedValues.FirstOrDefault()).AndForget();
+                SetValueAsync(SelectedValues.FirstOrDefault()).CatchAndLog();
             }
         }
 
@@ -1073,7 +1073,7 @@ public async Task SelectOption(object? obj)
 
                 await SetValueAsync(value);
                 //await UpdateTextPropertyAsync(false);
-                _elementReference.SetText(Text).AndForget();
+                _elementReference.SetText(Text).CatchAndLog();
                 //_selectedValues.Clear();
                 //_selectedValues.Add(value);
             }

diff --git a/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs
@@ -145,17 +145,17 @@ protected string? DisplayString
         protected void HandleOnClick()
         {
             // Selection works on list. We arrange only popover state and some minor arrangements on click.
-            MudSelectExtended?.SelectOption(Value).AndForget();
+            MudSelectExtended?.SelectOption(Value).CatchAndLog();
             InvokeAsync(StateHasChanged);
             if (!MultiSelection)
             {
-                MudSelectExtended?.CloseMenu().AndForget();
+                MudSelectExtended?.CloseMenu().CatchAndLog();
             }
             else
             {
-                MudSelectExtended?.FocusAsync().AndForget();
+                MudSelectExtended?.FocusAsync().CatchAndLog();
             }
-            OnClick.InvokeAsync().AndForget();
+            OnClick.InvokeAsync().CatchAndLog();
         }
 
         /// <summary>

diff --git a/CodeBeam.MudBlazor.Extensions/Components/StepperExtended/MudStepExtended.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/StepperExtended/MudStepExtended.razor.cs
@@ -71,7 +71,7 @@ public StepStatus Status
                     return;
                 }
                 _status = value;
-                StatusChanged.InvokeAsync(_status).AndForget();
+                StatusChanged.InvokeAsync(_status).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/Toggle/MudToggle.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/Toggle/MudToggle.razor.cs
@@ -51,7 +51,7 @@ public bool Toggled
                     return;
                 }
                 _toggled = value;
-                ToggledChanged.InvokeAsync().AndForget();
+                ToggledChanged.InvokeAsync().CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Components/Watch/MudWatch.razor b/CodeBeam.MudBlazor.Extensions/Components/Watch/MudWatch.razor
@@ -28,7 +28,7 @@
     }
     else
     {
-        <MudText Typo="@Typo" Color="@Color" Align="Align.Center">@GetWatchText() <MudText Inline="true" Typo="@TypoMillisecond">@($"{(ShowMillisecond ? _milliSecond.ToString("D3") : null)}")</MudText></MudText>
+        <MudText Typo="@Typo" Color="@Color" Align="Align.Center">@GetWatchText() <MudText HtmlTag="span" Typo="@TypoMillisecond">@($"{(ShowMillisecond ? _milliSecond.ToString("D3") : null)}")</MudText></MudText>
     }
 </div>
 
diff --git a/CodeBeam.MudBlazor.Extensions/Components/Watch/MudWatch.razor.cs b/CodeBeam.MudBlazor.Extensions/Components/Watch/MudWatch.razor.cs
@@ -43,7 +43,7 @@ protected override void OnInitialized()
 
             if (Mode == WatchMode.Watch)
             {
-                SetWatchMode(Mode).AndForget();
+                SetWatchMode(Mode).CatchAndLog();
                 Start();
             }
             if (Mode == WatchMode.StopWatch)
@@ -69,7 +69,7 @@ public TimeSpan Value
                     return;
                 }
                 _value = value;
-                InvokeAsync(() => ValueChanged.InvokeAsync(_value)).AndForget();
+                InvokeAsync(() => ValueChanged.InvokeAsync(_value)).CatchAndLog();
                 SetInternalValues();
             }
         }
@@ -110,7 +110,7 @@ public WatchMode Mode
                     return;
                 }
                 _watchMode = value;
-                SetWatchMode(_watchMode).AndForget();
+                SetWatchMode(_watchMode).CatchAndLog();
             }
         }
 

diff --git a/CodeBeam.MudBlazor.Extensions/Styles/Components/_typographym3.scss b/CodeBeam.MudBlazor.Extensions/Styles/Components/_typographym3.scss
@@ -13,3 +13,7 @@ $typography-sizes: ("large", "medium", "small");
         }
     }
 }
+
+.mud-typography-display-inline {
+    display: inline;
+}
diff --git a/CodeBeam.MudBlazor.Extensions/Styles/MudExtensions.css b/CodeBeam.MudBlazor.Extensions/Styles/MudExtensions.css
@@ -781,6 +781,9 @@
   letter-spacing: var(--mud-typographym3-label-small-tracking);
   font-weight: var(--mud-typographym3-label-small-weight); }
 
+.mud-typography-display-inline {
+  display: inline; }
+
 /*@import '../abstracts/variables';*/
 .mud-list-extended {
   margin: 0;

diff --git a/CodeBeam.MudBlazor.Extensions/Styles/MudExtensions.min.css b/CodeBeam.MudBlazor.Extensions/Styles/MudExtensions.min.css
diff --git a/CodeBeam.MudBlazor.Extensions/wwwroot/MudExtensions.min.css b/CodeBeam.MudBlazor.Extensions/wwwroot/MudExtensions.min.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ public T? Value @@
                         return;
                     }
                     _theValue = value;
-                    SetValueFromOutside(_theValue).AndForget();
+                    SetValueFromOutside(_theValue).CatchAndLog();
                 }
             }
@@ Expand Down @@