Code tweaks (#311)

Added IDisposable to MudComboBox

Author: Yomodo

CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor

@@ -157,6 +157,4 @@
 
 </CascadingValue>
 <!-- mousedown instead of click needed to close the menu before OnLostFocus runs -->
-<MudOverlay Visible="_isOpen" @onmousedown="@(() => CloseMenu())" LockScroll="@LockScroll" />
-
-
+<MudOverlay Visible="@_isOpen" @onmousedown="@CloseMenu" LockScroll="@LockScroll" />

CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

@@ -10,7 +10,7 @@
 
 namespace MudExtensions
 {
-    public partial class MudComboBox<T> : MudBaseInputExtended<T>
+    public partial class MudComboBox<T> : MudBaseInputExtended<T>, IDisposable
     {
         #region Constructor, Injected Services, Parameters, Fields
 
@@ -31,7 +31,7 @@ protected internal void SetSearchString(T value)
         }
 
         internal string _searchString { get; set; }
-        private string multiSelectionText;
+        private readonly string multiSelectionText;
         private IKeyInterceptor _keyInterceptor;
 
         public List<MudComboBoxItem<T>> Items { get; set; } = new();
@@ -65,8 +65,8 @@ protected internal void SetSearchString(T value)
             .AddStyle("display", "inline", Value != null || SelectedValues.Any())
             .Build();
 
-        private string _elementId = string.Concat("combobox_", Guid.NewGuid().ToString().AsSpan(0, 8));
-        private string _popoverId = string.Concat("comboboxpopover_", Guid.NewGuid().ToString().AsSpan(0, 8));
+        private readonly string _elementId = string.Concat("combobox_", Guid.NewGuid().ToString().AsSpan(0, 8));
+        private readonly string _popoverId = string.Concat("comboboxpopover_", Guid.NewGuid().ToString().AsSpan(0, 8));
 
         /// <summary>
         /// If true, combobox goes to autocomplete mode.
@@ -535,7 +535,7 @@ public IEnumerable<T> SelectedValues
 
         protected Task UpdateDataVisualiserTextAsync()
         {
-            List<string> textList = new List<string>();
+            var textList = new List<string>();
             if (Items != null && Items.Any())
             {
                 if (false) // ItemCollection != null
@@ -1032,7 +1032,7 @@ protected internal async Task ToggleOption(MudComboBoxItem<T> item, bool selecte
                 {
                     if (ToggleSelection)
                     {
-                        await UpdateComboBoxValueAsync(default(T), updateText: true, updateSearchString: true);
+                        await UpdateComboBoxValueAsync(default, updateText: true, updateSearchString: true);
                         item.Selected = false;
                     }
                 }
@@ -1115,14 +1115,7 @@ public async Task BeginValidatePublic()
             return result;
         }
 
-        protected internal void Remove(MudComboBoxItem<T> item)
-        {
-            if (Items == null)
-            {
-                return;
-            }
-            Items.Remove(item);
-        }
+        protected internal void RemoveItem(MudComboBoxItem<T> item) => Items.Remove(item);
 
         #endregion
 
@@ -1134,7 +1127,7 @@ protected internal void Remove(MudComboBoxItem<T> item)
         /// </summary>
         protected async ValueTask ClearButtonClickHandlerAsync(MouseEventArgs e)
         {
-            await UpdateComboBoxValueAsync(default(T));
+            await UpdateComboBoxValueAsync(default);
             _searchString = null;
             await SetTextAsync(default, false);
             _selectedValues.Clear();
@@ -1313,7 +1306,6 @@ protected void DeactiveAllItems()
             }
         }
 
-#pragma warning disable BL0005
         public async Task ActiveFirstItem(string startChar = null)
         {
             if (Items == null || Items.Count == 0 || Items[0].Disabled)
@@ -1407,7 +1399,6 @@ public async Task ActiveLastItem()
             if (_lastActivatedItem is not null)
                 await ScrollToMiddleAsync(_lastActivatedItem);
         }
-#pragma warning restore BL0005
 
         #endregion
 
@@ -1439,5 +1430,11 @@ protected Typo GetTypo()
 
         protected internal ValueTask ScrollToMiddleAsync(MudComboBoxItem<T> item) =>
             item is not null ? ScrollManagerExtended.ScrollToMiddleAsync(_popoverId, item.ItemId) : ValueTask.CompletedTask;
+
+
+        public void Dispose()
+        {
+            Items.Clear();
+        }
     }
 }

CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor

@@ -3,21 +3,24 @@
 @inherits MudBaseSelectItem
 @typeparam T
 
-<div tabindex="0" @attributes="UserAttributes" id="@ItemId" class="@Classname" @onclick="HandleOnClick" @onclick:stopPropagation="true" style="@Style">
-    
-    @if (MudComboBox != null && MudComboBox.MultiSelection == true && MudComboBox.ShowCheckbox == true)
-    {
-        <MudCheckBox Class="me-4" Color="@MudComboBox.Color" Disabled="@Disabled" @bind-Checked="Selected" @onclick="HandleOnClick" Dense="true" />
-    }
+@if (MudComboBox is not null)
+{
+    <div tabindex="0" @attributes="@UserAttributes" id="@ItemId" class="@Classname" @onclick="@HandleOnClick" @onclick:stopPropagation="true" style="@Style">
 
-    <MudText Typo="GetTypo()">
-        @if (ChildContent != null && MudComboBox?.ItemPresenter == ValuePresenter.ItemContent)
+        @if (MudComboBox.MultiSelection && MudComboBox.ShowCheckbox)
         {
-            @ChildContent
+            <MudCheckBox Class="me-4" Color="@MudComboBox.Color" Disabled="@Disabled" @bind-Checked="@Selected" @onclick="@HandleOnClick" Dense="true" />
         }
-        else
-        {
-            <MudHighlighter Text="@DisplayString" HighlightedText="@(MudComboBox.Highlight == false ? null : MudComboBox?.GetSearchString())" Class="@HighlighterClassname" />
-        }
-    </MudText>
-</div>
+
+        <MudText Typo="GetTypo()">
+            @if (ChildContent != null && MudComboBox.ItemPresenter == ValuePresenter.ItemContent)
+            {
+                @ChildContent
+            }
+            else
+            {
+                <MudHighlighter Text="@DisplayString" HighlightedText="@(MudComboBox.Highlight ? MudComboBox.GetSearchString() : null)" Class="@HighlighterClassname" />
+            }
+        </MudText>
+    </div>
+}

CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBoxItem.razor.cs

@@ -28,7 +28,7 @@ public partial class MudComboBoxItem<T> : MudBaseSelectItem, IDisposable
             .AddClass(MudComboBox?.HighlightClass)
             .Build();
 
-        internal string ItemId { get; } = "_" + Guid.NewGuid().ToString().Substring(0, 8);
+        internal string ItemId { get; } = string.Concat("_", Guid.NewGuid().ToString().AsSpan(0, 8));
 
         /// <summary>
         /// The parent select component
@@ -119,11 +119,11 @@ protected override void OnInitialized()
             MudComboBox?.Add(this);
         }
 
-        bool? _oldMultiselection;
-        bool? _oldSelected;
+        //bool? _oldMultiselection;
+        //bool? _oldSelected;
         bool _selectedChanged = false;
-        bool? _oldEligible = true;
-        bool _eligibleChanged = false;
+        //bool? _oldEligible = true;
+        //bool _eligibleChanged = false;
         protected override void OnParametersSet()
         {
             base.OnParametersSet();
@@ -238,9 +238,9 @@ public void Dispose()
         {
             try
             {
-                MudComboBox?.Remove(this);
+                MudComboBox?.RemoveItem(this);
             }
-            catch (Exception) { }
+            catch { }
         }
     }
 }