diff --git a/docs/CodeBeam.MudBlazor.Extensions.Docs/Pages/Components/SelectExtended/Examples/SelectExtendedExample9.razor b/docs/CodeBeam.MudBlazor.Extensions.Docs/Pages/Components/SelectExtended/Examples/SelectExtendedExample9.razor index db6fff9e..b9a5c82d 100644 --- a/docs/CodeBeam.MudBlazor.Extensions.Docs/Pages/Components/SelectExtended/Examples/SelectExtendedExample9.razor +++ b/docs/CodeBeam.MudBlazor.Extensions.Docs/Pages/Components/SelectExtended/Examples/SelectExtendedExample9.razor @@ -1,29 +1,45 @@ -@namespace MudExtensions.Docs.Examples +@namespace MudExtensions.Docs.Examples - - - - - - - - + + + Both selects offer 1,000 options, but virtualization renders only the visible options. + Values near the end of the collection are already selected. + + + + + + + + Selected items: @(string.Join(", ", _selectedValues ?? [])) + - - - - + @code { - private bool _multiselection = true; - private bool _clearable = false; - private string[] _collection = new string[] { "Foo", "Bar", "Fizz", "Buzz" }; - private IEnumerable _values = new List() { "Foo" }; -} \ No newline at end of file + private readonly string[] _items = Enumerable.Range(1, 1_000) + .Select(index => $"Item {index:0000}") + .ToArray(); + + private string? _selectedValue = "Item 0950"; + private IEnumerable _selectedValues = ["Item 0005", "Item 0950"]; + private bool _clearable; +} diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs b/src/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs index c465e73e..1bd3d70f 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs +++ b/src/CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs @@ -704,22 +704,16 @@ public IEnumerable>? SelectedItems /// /// /// - public override Task SetParametersAsync(ParameterView parameters) + public override async Task SetParametersAsync(ParameterView parameters) { if (_centralCommanderIsProcessing) - { - return Task.CompletedTask; - } - - if (MudSelectExtended != null || MudAutocomplete != null) - { - return Task.CompletedTask; - } - - base.SetParametersAsync(parameters).CatchAndLog(); + return; + // Hosted lists still need normal Blazor parameter flow. Previously every parameter set + // after the select/autocomplete cascade became available was discarded, freezing + // ItemCollection and all other parent-driven parameters while the popover was open. + await base.SetParametersAsync(parameters); _setParametersDone = true; - return Task.CompletedTask; } /// diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/IMudSelectExtended.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/IMudSelectExtended.cs index b20653a9..44b7f59b 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/IMudSelectExtended.cs +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/IMudSelectExtended.cs @@ -6,8 +6,4 @@ internal interface IMudSelectExtended void CheckGenericTypeMatch(object select_item); bool MultiSelection { get; set; } } - - internal interface IMudShadowSelectExtended - { - } } diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.PresentationState.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.PresentationState.cs new file mode 100644 index 00000000..25feeab5 --- /dev/null +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.PresentationState.cs @@ -0,0 +1,111 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.AspNetCore.Components; + +namespace MudExtensions +{ + public partial class MudSelectExtended + { + private bool ValuesEqual(T? left, T? right) + => (_comparer ?? EqualityComparer.Default).Equals(left, right); + + internal bool PresentationValuesEqual(T? left, T? right) + => ValuesEqual(left, right); + + private bool TryGetCollectionValue(T? value, out T? collectionValue) + { + if (ItemCollection != null) + { + foreach (var item in ItemCollection) + { + if (ValuesEqual(item, value)) + { + collectionValue = item; + return true; + } + } + } + + collectionValue = default; + return false; + } + + private MudSelectItemExtended? FindRegisteredItem(T? value) + => Items?.FirstOrDefault(item => ValuesEqual(item.Value, value)); + + internal bool IsSelectedPresentationValue(T? value) + => MultiSelection + ? SelectedValues?.Contains(value, _comparer) == true + : ValuesEqual(ReadValue, value); + + private bool _declarativePresentationDirty; + + internal void MarkDeclarativePresentationDirty() + => _declarativePresentationDirty = true; + + /// + /// Resolves the selected option for ItemContent presentation without requiring that + /// option to have a currently rendered list-item component. + /// + private MudListItemExtended? GetSelectedPresentationItem() + { + if (ItemCollection != null) + { + if (!TryGetCollectionValue(ReadValue, out var collectionValue)) + return null; + + return CreatePresentationItem( + collectionValue, + ToStringFunc?.Invoke(collectionValue) ?? collectionValue?.ToString(), + childContent: null, + disabled: ItemDisabledFunc?.Invoke(collectionValue) == true); + } + + var registeredItem = FindRegisteredItem(ReadValue); + if (registeredItem != null) + { + return CreatePresentationItem( + registeredItem.Value, + registeredItem.Text, + registeredItem.ChildContent, + ItemDisabledFunc?.Invoke(registeredItem.Value) ?? registeredItem.Disabled, + registeredItem.IsFunctional, + registeredItem.Href, + registeredItem.Class, + registeredItem.Style); + } + + return SelectedListItem != null && ValuesEqual(SelectedListItem.Value, ReadValue) + ? SelectedListItem + : null; + } + +#pragma warning disable BL0005 // Parameters are populated on an unrendered context object for ItemTemplate. + private static MudListItemExtended CreatePresentationItem( + T? value, + string? text, + RenderFragment? childContent, + bool disabled, + bool isFunctional = false, + string? href = null, + string? @class = null, + string? style = null) + { + var item = new MudListItemExtended + { + Value = value, + Text = text, + ChildContent = childContent, + Disabled = disabled, + IsFunctional = isFunctional, + Href = href, + Class = @class, + Style = style + }; + + item.SetSelected(true, forceRender: false); + return item; + } +#pragma warning restore BL0005 + } +} diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.SelectionText.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.SelectionText.cs new file mode 100644 index 00000000..2f2c5d61 --- /dev/null +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.SelectionText.cs @@ -0,0 +1,20 @@ +namespace MudExtensions +{ + public partial class MudSelectExtended + { + /// + protected override async Task OnParametersSetAsync() + { + await base.OnParametersSetAsync(); + + // Reconcile collection-backed presentation after the complete parameter set has + // been applied. ItemCollection and the selected values are authoritative, so display + // text is derived from their current state rather than retained item components. + // + // This also covers mutable selected objects whose display representation changes + // without replacing the collection or selected-value reference. + if (ItemCollection is not null) + await UpdateTextPropertyAsync(false); + } + } +} diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.ShadowItems.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.ShadowItems.cs deleted file mode 100644 index 078ee741..00000000 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.ShadowItems.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace MudExtensions -{ - public partial class MudSelectExtended - { - /// - /// Returns the values that must be materialized by the hidden list. - /// Non-virtualized selects preserve the existing full item registry behavior; - /// virtualized selects only materialize selected values that exist in the current item collection. - /// - protected ICollection? GetShadowItemCollection() - { - if (ItemCollection == null || !Virtualize) - { - return ItemCollection; - } - - var selectedValues = SelectedValues?.ToHashSet(_comparer) ?? new HashSet(_comparer); - return [.. ItemCollection.Where(selectedValues.Contains)]; - } - } -} diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.VirtualizedSelectionText.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.VirtualizedSelectionText.cs deleted file mode 100644 index 3261f851..00000000 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.VirtualizedSelectionText.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace MudExtensions -{ - public partial class MudSelectExtended - { - protected override async Task OnParametersSetAsync() - { - await base.OnParametersSetAsync(); - - // SelectedValues is a synchronous parameter setter. Its existing async text - // updates cannot be awaited there, so reconcile the displayed text once - // the incoming parameter set has been applied. Do not depend on the newly - // selected shadow item having rendered yet. - if (Virtualize && MultiSelection && ItemCollection is not null) - { - await UpdateTextPropertyAsync(false); - } - } - } -} diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor index 482cc2ff..70c476a0 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor @@ -74,14 +74,14 @@ @if (ItemCollection != null) { - foreach (var item in ItemCollection.Where(x => SelectedValues?.Contains(x) == true)) + foreach (var item in ItemCollection.Where(x => SelectedValues?.Contains(x, _comparer) == true)) { } } else { - foreach (var item in Items?.Where(x => SelectedValues?.Contains(x.Value) == true) ?? new List>()) + foreach (var item in Items?.Where(x => SelectedValues?.Contains(x.Value, _comparer) == true) ?? new List>()) { } @@ -90,25 +90,19 @@ } else if (ValuePresenter == ValuePresenter.ItemContent) { - if (SelectedListItem == null) + var selectedPresentationItem = GetSelectedPresentationItem(); + + if (selectedPresentationItem == null) { @Placeholder - } else if (ItemTemplate != null) { - if (SelectedListItem != null && SelectedListItem.Value != null) - { - @ItemTemplate(SelectedListItem) - } - else if (!string.IsNullOrEmpty(Placeholder)) - { - @Placeholder - } + @ItemTemplate(selectedPresentationItem) } - else if (SelectedListItem.ChildContent != null) + else if (selectedPresentationItem.ChildContent != null) { - @SelectedListItem.ChildContent + @selectedPresentationItem.ChildContent } else { @@ -159,26 +153,15 @@ - @*The hidden list only materializes selected ItemCollection values. It keeps selected item components available for presenters without defeating virtualization.*@ - -
- - - @ChildContent - + @* Declarative child items are registered once as metadata so selected text/content is + available while the popover is closed. Collection-backed selects are value-driven and + do not need a hidden item tree. *@ + @if (ItemCollection == null && ChildContent != null) + { + + @ChildContent -
- - - - - @ChildContent - + } diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs index 838e5710..baaefa11 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs @@ -11,7 +11,7 @@ namespace MudExtensions /// Select component with advanced features. /// /// - public partial class MudSelectExtended : MudBaseInputExtended, IMudSelectExtended, IMudShadowSelectExtended + public partial class MudSelectExtended : MudBaseInputExtended, IMudSelectExtended { #region Constructor, Injected Services, Parameters, Fields @@ -46,18 +46,12 @@ public MudSelectExtended() /// /// /// - protected Dictionary> _valueLookup = new(); - /// - /// - /// - protected Dictionary> _shadowLookup = new(); private MudInputExtended _elementReference = new(); internal bool _isOpen; /// /// /// protected internal string? _currentIcon { get; set; } - internal event Action>? SelectionChangedFromOutside; /// /// @@ -578,7 +572,6 @@ public IEnumerable? SelectedValues } _selectedValuesSetterStarted = true; _selectedValues = new HashSet(set, _comparer); - SelectionChangedFromOutside?.Invoke(new HashSet(_selectedValues, _comparer)); if (!MultiSelection) { SetValueAndUpdateTextAsync(_selectedValues.FirstOrDefault()).CatchAndLog(); @@ -694,34 +687,43 @@ protected override Task UpdateValuePropertyAsync(bool updateText) /// protected override Task UpdateTextPropertyAsync(bool updateValue) { - List textList = new List(); - if (Items != null && Items.Any()) + List textList = new(); + + if (ItemCollection != null) { - if (ItemCollection != null) + foreach (var selectedValue in SelectedValues ?? []) { - foreach (var val in SelectedValues ?? new List()) + if (TryGetCollectionValue(selectedValue, out var collectionValue)) { - var collectionValue = ItemCollection.FirstOrDefault(x => x != null && (Comparer != null ? Comparer.Equals(x, val) : x.Equals(val))); - if (collectionValue != null) - { - textList.Add(ConvertSet(collectionValue)); - } + textList.Add(ConvertSet(collectionValue)); + } + else if (!Strict) + { + textList.Add(ConvertSet(selectedValue)); } } - else + } + else if (Items is { Count: > 0 }) + { + foreach (var selectedValue in SelectedValues ?? []) { - foreach (var val in SelectedValues ?? new List()) + // Preserve the existing declarative-item behavior: when a non-strict external + // selection is represented by a different object instance, present that selected + // value through the converter even if the custom comparer maps it to an item. + if (!Strict && !Items.Select(item => item.Value).Contains(selectedValue)) { - if (!Strict && !Items.Select(x => x.Value).Contains(val)) - { - textList.Add(ToStringFunc != null ? ToStringFunc(val) : ConvertSet(val)); - continue; - } - var item = Items.FirstOrDefault(x => x != null && (x.Value == null ? val == null : Comparer != null ? Comparer.Equals(x.Value, val) : x.Value.Equals(val))); - if (item != null) - { - textList.Add(!string.IsNullOrEmpty(item.Text) ? item.Text : ConvertSet(item.Value)); - } + textList.Add(ConvertSet(selectedValue)); + continue; + } + + var item = FindRegisteredItem(selectedValue); + if (item != null) + { + textList.Add(!string.IsNullOrEmpty(item.Text) ? item.Text : ConvertSet(item.Value)); + } + else if (!Strict) + { + textList.Add(ConvertSet(selectedValue)); } } } @@ -736,20 +738,23 @@ protected override Task UpdateTextPropertyAsync(bool updateValue) selectedConvertedValues: SelectedValues?.ToList(), multiSelectionTextFunc: MultiSelectionTextFunc, updateValue: updateValue); } - else - { - return SetTextAndUpdateValueAsync(string.Join(Delimiter, textList), updateValue: updateValue); - } + + return SetTextAndUpdateValueAsync(string.Join(Delimiter, textList), updateValue: updateValue); } - else + + if (ItemCollection != null) { - var item = Items?.FirstOrDefault(x => ReadValue == null ? x.Value == null : Comparer != null ? Comparer.Equals(ReadValue, x.Value) : ReadValue.Equals(x.Value)); - if (item == null) - { - return SetTextAndUpdateValueAsync(ConvertSet(ReadValue), false); - } - return SetTextAndUpdateValueAsync((!string.IsNullOrEmpty(item.Text) ? item.Text : ConvertSet(item.Value)), updateValue: updateValue); + return TryGetCollectionValue(ReadValue, out var collectionValue) + ? SetTextAndUpdateValueAsync(ConvertSet(collectionValue), updateValue: updateValue) + : SetTextAndUpdateValueAsync(ConvertSet(ReadValue), false); } + + var registeredItem = FindRegisteredItem(ReadValue); + return registeredItem == null + ? SetTextAndUpdateValueAsync(ConvertSet(ReadValue), false) + : SetTextAndUpdateValueAsync( + !string.IsNullOrEmpty(registeredItem.Text) ? registeredItem.Text : ConvertSet(registeredItem.Value), + updateValue: updateValue); } private string? GetSelectTextPresenter() @@ -824,10 +829,17 @@ protected override async Task OnAfterRenderAsync(bool firstRender) await KeyInterceptorService.SubscribeAsync(_elementId, options, keyDown: HandleKeyDownAsync, keyUp: HandleKeyUpAsync); await UpdateTextPropertyAsync(false); + _declarativePresentationDirty = false; _list?.ForceUpdateItems(); - SelectedListItem = Items.FirstOrDefault(x => x.Value != null && ReadValue != null && x.Value.Equals(ReadValue))?.ListItem; StateHasChanged(); } + else if (_declarativePresentationDirty) + { + _declarativePresentationDirty = false; + await UpdateTextPropertyAsync(false); + StateHasChanged(); + } + //Console.WriteLine("Select rendered"); await base.OnAfterRenderAsync(firstRender); } @@ -1072,12 +1084,37 @@ public async Task CloseMenu() /// public async Task SelectOption(int index) { + if (ItemCollection != null) + { + if (AddNullItem) + { + if (index == 0) + { + await SelectOption(default(T)); + return; + } + + index--; + } + + if (index < 0 || index >= ItemCollection.Count) + { + if (!MultiSelection) + await CloseMenu(); + return; + } + + await SelectOption(ItemCollection.ElementAt(index)); + return; + } + if (index < 0 || index >= _items.Count) { if (!MultiSelection) await CloseMenu(); return; } + await SelectOption(_items[index].Value); } @@ -1136,24 +1173,18 @@ protected internal bool Add(MudSelectItemExtended? item) { if (item == null) return false; - bool? result = null; - if (!_items.Select(x => x.Value).Contains(item.Value)) + + var isSelected = IsSelectedPresentationValue(item.Value); + + if (!_items.Contains(item) && FindRegisteredItem(item.Value) == null) { _items.Add(item); - if (item.Value != null) - { - _valueLookup[item.Value] = item; - if (item.Value.Equals(ReadValue) && !MultiSelection) - result = true; - } - } - //UpdateSelectAllChecked(); - if (!result.HasValue) - { - result = item.Value?.Equals(ReadValue); + if (isSelected) + MarkDeclarativePresentationDirty(); } - return result == true; + + return ValuesEqual(item.Value, ReadValue); } /// @@ -1163,34 +1194,12 @@ protected internal bool Add(MudSelectItemExtended? item) protected internal void Remove(MudSelectItemExtended? item) { if (item == null) - { return; - } - _items.Remove(item); - if (item.Value != null) - _valueLookup.Remove(item.Value); - } - /// - /// - /// - /// - public void RegisterShadowItem(MudSelectItemExtended? item) - { - if (item == null || item.Value == null) - return; - _shadowLookup[item.Value] = item; - } + var wasSelected = IsSelectedPresentationValue(item.Value); - /// - /// - /// - /// - public void UnregisterShadowItem(MudSelectItemExtended? item) - { - if (item == null || item.Value == null) - return; - _shadowLookup.Remove(item.Value); + if (_items.Remove(item) && wasSelected) + MarkDeclarativePresentationDirty(); } #endregion @@ -1248,15 +1257,11 @@ protected bool IsValueInList { if (Value == null) return false; - //return _shadowLookup.TryGetValue(Value, out var _); - foreach (var value in Items?.Select(x => x.Value) ?? new List()) - { - if (Comparer != null ? Comparer.Equals(value, Value) : value?.Equals(Value) == true) //(Converter.Set(item.Value) == Converter.Set(Value)) - { - return true; - } - } - return false; + + if (ItemCollection != null) + return ItemCollection.Any(item => ValuesEqual(item, Value)); + + return Items?.Any(item => ValuesEqual(item.Value, Value)) == true; } } diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs index a74395f3..c91ba142 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemExtended.razor.cs @@ -15,40 +15,33 @@ public partial class MudSelectItemExtended : MudComponentBase, IDisposable .Build(); private IMudSelectExtended? _parent; - internal MudSelectExtended? MudSelectExtended => (MudSelectExtended?)IMudSelectExtended; + private MudSelectExtended? _registeredSelect; + private bool _hasRegisteredPresentationMetadata; + private T? _registeredValue; + private string? _registeredDisplayString; + private bool _registeredDisabled; + private bool _registeredIsFunctional; + private string? _registeredHref; + private string? _registeredClass; + private string? _registeredStyle; + + internal MudSelectExtended? MudSelectExtended => (MudSelectExtended?)_parent; + /// /// /// public MudListItemExtended ListItem { get; set; } = new(); internal string ItemId { get; } = Identifier.Create("selectItem_"); - private IMudShadowSelectExtended? _shadowParent; /// - /// The parent select component + /// The parent select component. Registration is reconciled in OnParametersSet so all + /// cascading parameters (including HideContent) have been applied before side effects run. /// [CascadingParameter] internal IMudSelectExtended? IMudSelectExtended { get => _parent; - set - { - _parent = value; - if (_parent == null) - return; - _parent.CheckGenericTypeMatch(this); - if (MudSelectExtended == null) - return; - bool isSelected = MudSelectExtended.Add(this); - if (_parent.MultiSelection) - { - MudSelectExtended.SelectionChangedFromOutside += OnUpdateSelectionStateFromOutside; - InvokeAsync(() => OnUpdateSelectionStateFromOutside(MudSelectExtended.SelectedValues)); - } - else - { - IsSelected = isSelected; - } - } + set => _parent = value; } /// @@ -72,16 +65,6 @@ internal IMudSelectExtended? IMudSelectExtended [CascadingParameter(Name = "HideContent")] internal bool HideContent { get; set; } - private void OnUpdateSelectionStateFromOutside(IEnumerable? selection) - { - if (selection == null) - return; - var old_is_selected = IsSelected; - IsSelected = selection.Contains(Value); - if (old_is_selected != IsSelected) - InvokeAsync(StateHasChanged); - } - /// /// A user-defined option that can be selected /// @@ -131,18 +114,6 @@ protected bool MultiSelection public bool Disabled { get; set; } - private bool _isSelected; - internal bool IsSelected - { - get => _isSelected; - set - { - if (_isSelected == value) - return; - _isSelected = value; - } - } - /// /// /// @@ -191,6 +162,76 @@ protected bool GetDisabledStatus() return Disabled; } + /// + protected override void OnParametersSet() + { + base.OnParametersSet(); + + _parent?.CheckGenericTypeMatch(this); + var select = MudSelectExtended; + + // Declarative ChildContent uses a metadata-only pass (HideContent=true). Collection- + // backed items are always transient view components; ItemCollection and selected values + // are authoritative regardless of whether the visible list itself is virtualized. + var shouldRegister = select != null && select.ItemCollection == null && HideContent; + var previousValue = _registeredValue; + var presentationMetadataChanged = HasRegisteredPresentationMetadataChanged(select); + + if (!shouldRegister || !ReferenceEquals(_registeredSelect, select)) + { + _registeredSelect?.Remove(this); + _registeredSelect = null; + _hasRegisteredPresentationMetadata = false; + } + + if (shouldRegister && _registeredSelect == null) + { + select!.Add(this); + _registeredSelect = select; + CaptureRegisteredPresentationMetadata(); + } + else if (shouldRegister && presentationMetadataChanged) + { + CaptureRegisteredPresentationMetadata(); + + if (select!.IsSelectedPresentationValue(previousValue) || + select.IsSelectedPresentationValue(Value)) + { + select.MarkDeclarativePresentationDirty(); + } + } + } + + private bool HasRegisteredPresentationMetadataChanged(MudSelectExtended? select) + { + if (!_hasRegisteredPresentationMetadata) + return false; + + var valueChanged = select == null + ? !EqualityComparer.Default.Equals(_registeredValue, Value) + : !select.PresentationValuesEqual(_registeredValue, Value); + + return valueChanged + || _registeredDisplayString != DisplayString + || _registeredDisabled != Disabled + || _registeredIsFunctional != IsFunctional + || _registeredHref != Href + || _registeredClass != Class + || _registeredStyle != Style; + } + + private void CaptureRegisteredPresentationMetadata() + { + _registeredValue = Value; + _registeredDisplayString = DisplayString; + _registeredDisabled = Disabled; + _registeredIsFunctional = IsFunctional; + _registeredHref = Href; + _registeredClass = Class; + _registeredStyle = Style; + _hasRegisteredPresentationMetadata = true; + } + /// /// /// @@ -198,13 +239,8 @@ public void Dispose() { try { - if (MudSelectExtended is { } select) - { - select.SelectionChangedFromOutside -= OnUpdateSelectionStateFromOutside; - select.Remove(this); - } - - ((MudSelectExtended?)_shadowParent)?.UnregisterShadowItem(this); + _registeredSelect?.Remove(this); + _registeredSelect = null; } catch (Exception) { } } diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemGroupExtended.razor b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemGroupExtended.razor index 5b91949b..fc37e94d 100644 --- a/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemGroupExtended.razor +++ b/src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectItemGroupExtended.razor @@ -2,19 +2,21 @@ @typeparam T @inherits MudComponentBase -@if (!HideContent) +@if (HideContent) { - if (Nested) - { - - - @ChildContent - - - } - else - { - @Text - @ChildContent - } -} \ No newline at end of file + @* Preserve declarative child-item metadata without materializing list/group UI. *@ + @ChildContent +} +else if (Nested) +{ + + + @ChildContent + + +} +else +{ + @Text + @ChildContent +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/MutableSelectItem.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/MutableSelectItem.cs new file mode 100644 index 00000000..35fc8de7 --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/MutableSelectItem.cs @@ -0,0 +1,14 @@ +namespace MudExtensions.UnitTests.TestComponents; + +public sealed class MutableSelectItem +{ + public MutableSelectItem(int id, string name) + { + Id = id; + Name = name; + } + + public int Id { get; } + + public string Name { get; set; } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectDeclarativeSelectedItemMutationTest.razor b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectDeclarativeSelectedItemMutationTest.razor new file mode 100644 index 00000000..0cbac5df --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectDeclarativeSelectedItemMutationTest.razor @@ -0,0 +1,20 @@ +@namespace MudExtensions.UnitTests.TestComponents + + + + + + + +@code { + private const string ItemValue = "one"; + + public string Selected { get; } = ItemValue; + public string ItemText { get; private set; } = "One"; + + public void RenameSelectedItem(string text) + { + ItemText = text; + StateHasChanged(); + } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectItemCollectionRefreshTest.razor b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectItemCollectionRefreshTest.razor new file mode 100644 index 00000000..76e26dfd --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectItemCollectionRefreshTest.razor @@ -0,0 +1,18 @@ +@namespace MudExtensions.UnitTests.TestComponents + + + + + +@code { + public List Items { get; } = Enumerable.Range(1, 5) + .Select(value => $"Item {value}") + .ToList(); + + public void AddMore() + { + var next = Items.Count + 1; + Items.AddRange(Enumerable.Range(next, 5).Select(value => $"Item {value}")); + StateHasChanged(); + } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectSingleItemCollectionMutationTest.razor b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectSingleItemCollectionMutationTest.razor new file mode 100644 index 00000000..19cc2d96 --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectSingleItemCollectionMutationTest.razor @@ -0,0 +1,32 @@ +@namespace MudExtensions.UnitTests.TestComponents + + + + + +@code { + public List Items { get; } = + [ + new(1, "One"), + new(2, "Two"), + new(3, "Three") + ]; + + public MutableSelectItem Selected { get; } + + public SelectSingleItemCollectionMutationTest() + { + Selected = Items[1]!; + } + + private static string? Format(MutableSelectItem? item) => item?.Name; + + public void RenameSelected(string name) + { + Selected.Name = name; + StateHasChanged(); + } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectTextValueTest.razor b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectTextValueTest.razor index 4bd03a54..865de861 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectTextValueTest.razor +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer/TestComponents/SelectExtended/SelectTextValueTest.razor @@ -1,4 +1,6 @@ @namespace MudExtensions.UnitTests.TestComponents + + diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedItemCollectionRefreshTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedItemCollectionRefreshTests.cs new file mode 100644 index 00000000..8f68e716 --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedItemCollectionRefreshTests.cs @@ -0,0 +1,27 @@ +using AwesomeAssertions; +using Bunit; +using MudExtensions.UnitTests.TestComponents; + +namespace MudExtensions.UnitTests.Components +{ + [TestFixture] + public class SelectExtendedItemCollectionRefreshTests : BunitTest + { + [Test] + public async Task ItemCollectionMutation_WhileOpen_RendersNewItemsWithoutReopening() + { + var cut = Context.Render(); + + cut.Find("div.mud-input-control").Click(); + cut.WaitForAssertion(() => + cut.FindAll("div.mud-list-item-extended").Should().HaveCount(5)); + + await cut.InvokeAsync(cut.Instance.AddMore); + + // The same ItemCollection instance was mutated while the popover remained open. + // Hosted MudListExtended previously discarded this parameter update entirely (#645). + cut.WaitForAssertion(() => + cut.FindAll("div.mud-list-item-extended").Should().HaveCount(10)); + } + } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedPresentationStateTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedPresentationStateTests.cs new file mode 100644 index 00000000..914b5933 --- /dev/null +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedPresentationStateTests.cs @@ -0,0 +1,77 @@ +using AwesomeAssertions; +using Bunit; +using Microsoft.AspNetCore.Components; +using MudExtensions.UnitTests.TestComponents; + +namespace MudExtensions.UnitTests.Components +{ + [TestFixture] + public class SelectExtendedPresentationStateTests : BunitTest + { + [Test] + public void DeclarativeItems_RegisterMetadataWithoutHiddenList() + { + RenderFragment childContent = builder => + { + builder.OpenComponent>(0); + builder.AddAttribute(1, nameof(MudSelectItemExtended.Value), "two"); + builder.AddAttribute(2, nameof(MudSelectItemExtended.Text), "Friendly two"); + builder.CloseComponent(); + }; + + var cut = Context.Render>(parameters => parameters + .Add(x => x.Value, "two") + .Add(x => x.ChildContent, childContent)); + + cut.WaitForAssertion(() => + cut.Find("input").Attributes["value"]?.Value.Should().Be("Friendly two")); + + cut.Instance.Items.Should().ContainSingle(); + cut.FindComponents>().Should().BeEmpty(); + cut.FindComponents>().Should().ContainSingle(); + } + + + [Test] + public async Task ItemCollection_SelectedObjectMutation_RefreshesClosedPresentation() + { + var cut = Context.Render(); + + cut.Find("input").GetAttribute("value").Should().Be("Two"); + + await cut.InvokeAsync(() => cut.Instance.RenameSelected("Two updated")); + + cut.WaitForAssertion(() => + cut.Find("input").GetAttribute("value").Should().Be("Two updated")); + } + + [Test] + public async Task DeclarativeSelectedItemTextMutation_RefreshesClosedPresentation() + { + var cut = Context.Render(); + + cut.Find("input").GetAttribute("value").Should().Be("One"); + + await cut.InvokeAsync(() => cut.Instance.RenameSelectedItem("One updated")); + + cut.WaitForAssertion(() => + cut.Find("input").GetAttribute("value").Should().Be("One updated")); + } + + [Test] + public async Task ItemCollection_SelectOptionByIndex_UsesLogicalCollection() + { + var items = new List { "one", "two", "three" }; + + var cut = Context.Render>(parameters => parameters + .Add(x => x.ItemCollection, items) + .Add(x => x.Virtualize, true)); + + await cut.InvokeAsync(() => cut.Instance.SelectOption(1)); + + cut.WaitForAssertion(() => + cut.Find("input").Attributes["value"]?.Value.Should().Be("two")); + cut.Instance.Items.Should().BeEmpty(); + } + } +} diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedTests.cs index 42aeabed..735456cc 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedTests.cs +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedTests.cs @@ -548,8 +548,8 @@ public void Disabled_SelectItem_Should_Be_Respected() var selectElement = comp.Find("div.mud-input-control"); selectElement.Click(); - // Disabled item found twice because we have 2 shadow lists. Need to be discussed later - comp.WaitForAssertion(() => comp.FindAll("div.mud-list-item-disabled-extended").Count.Should().Be(2)); + // The disabled option should exist once in the visible list; there is no hidden duplicate tree. + comp.WaitForAssertion(() => comp.FindAll("div.mud-list-item-disabled-extended").Count.Should().Be(1)); comp.FindAll("div.mud-list-item-disabled-extended")[0].Click(); comp.WaitForAssertion(() => select.Instance.GetState(x => x.Value).Should().BeNull()); } @@ -946,7 +946,7 @@ public void Select_Should_HilightInitiallySelectedValue() //Console.WriteLine(comp.Markup); comp.WaitForAssertion(() => comp.Find("div.mud-popover").ClassList.Should().Contain("mud-popover-open")); // Nr 2 should be hilited - comp.WaitForAssertion(() => comp.FindAll("div.mud-selected-item").Count.Should().Be(2)); + comp.WaitForAssertion(() => comp.FindAll("div.mud-selected-item").Count.Should().Be(1)); comp.FindAll("div.mud-list-item-extended")[1].ToMarkup().Should().Contain("mud-selected-item"); // now click an item and see the value change comp.FindAll("div.mud-list-item-extended")[0].Click(); @@ -956,7 +956,7 @@ public void Select_Should_HilightInitiallySelectedValue() comp.Find("div.mud-input-control").Click(); comp.WaitForAssertion(() => comp.Find("div.mud-popover").ClassList.Should().Contain("mud-popover-open")); // Nr 1 should be hilited - comp.WaitForAssertion(() => comp.FindAll("div.mud-selected-item").Count.Should().Be(2)); + comp.WaitForAssertion(() => comp.FindAll("div.mud-selected-item").Count.Should().Be(1)); comp.FindAll("div.mud-list-item-extended")[0].ToMarkup().Should().Contain("mud-selected-item"); comp.Find("div.mud-input-control").Click(); comp.WaitForAssertion(() => comp.Find("div.mud-popover").ClassList.Should().NotContain("mud-popover-open")); diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationScaleTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationScaleTests.cs index 1d43e2ac..611bf280 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationScaleTests.cs +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationScaleTests.cs @@ -10,7 +10,7 @@ public class SelectExtendedVirtualizationScaleTests : BunitTest [TestCase(100)] [TestCase(1_000)] [TestCase(4_000)] - public void ShadowItemCount_IsBoundedBySelection_NotCollectionSize(int itemCount) + public void VirtualizedItemCollection_DoesNotMaterializeShadowList(int itemCount) { var items = Enumerable.Range(1, itemCount).Select(value => (int?)value).ToList(); var selectedValues = new int?[] { 1, itemCount }; @@ -21,12 +21,16 @@ public void ShadowItemCount_IsBoundedBySelection_NotCollectionSize(int itemCount .Add(x => x.MultiSelection, true) .Add(x => x.SelectedValues, selectedValues)); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(2); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); + cut.Instance.SelectedValues.Should().BeEquivalentTo(selectedValues); + + cut.WaitForAssertion(() => + cut.Find("input").Attributes["value"]?.Value.Should().Be($"1, {itemCount}")); } [Test] - public void NonVirtualizedItemCollection_PreservesFullRegisteredItemSet() + public void NonVirtualizedItemCollection_IsAlsoValueDrivenWhileClosed() { var items = Enumerable.Range(1, 100).Select(value => (int?)value).ToList(); var selectedValues = new int?[] { 1, 100 }; @@ -37,7 +41,10 @@ public void NonVirtualizedItemCollection_PreservesFullRegisteredItemSet() .Add(x => x.MultiSelection, true) .Add(x => x.SelectedValues, selectedValues)); - cut.Instance.Items.Should().HaveCount(items.Count); + cut.Instance.Items.Should().BeEmpty(); + cut.FindComponents>().Should().BeEmpty(); + cut.WaitForAssertion(() => + cut.Find("input").Attributes["value"]?.Value.Should().Be("1, 100")); } } } diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationSingleSelectionTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationSingleSelectionTests.cs index ab6a51c8..0fdc0dc3 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationSingleSelectionTests.cs +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationSingleSelectionTests.cs @@ -9,7 +9,7 @@ namespace MudExtensions.UnitTests.Components public class SelectExtendedVirtualizationSingleSelectionTests : BunitTest { [Test] - public void VirtualizedItemCollection_InitializedSingleSelectionUsesOneShadowItem() + public void VirtualizedItemCollection_InitializedSingleSelectionDoesNotNeedShadowItem() { var items = Enumerable.Range(1, 4_000).Select(value => (int?)value).ToList(); @@ -21,8 +21,8 @@ public void VirtualizedItemCollection_InitializedSingleSelectionUsesOneShadowIte cut.WaitForAssertion(() => cut.Find("input").Attributes["value"]?.Value.Should().Be("3999")); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(1); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); } [Test] @@ -42,8 +42,8 @@ public void VirtualizedItemCollection_OffscreenValueSupportsItemContentPresenter cut.WaitForAssertion(() => cut.Markup.Should().Contain("Selected item 3999")); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(1); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); } } } diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationStrictTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationStrictTests.cs index 83a959b3..8c3d1675 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationStrictTests.cs +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationStrictTests.cs @@ -20,12 +20,12 @@ public void StrictMode_ValidOffscreenInitialValue_RemainsRepresentable() cut.WaitForAssertion(() => cut.Find("input").Attributes["value"]?.Value.Should().Be("3999")); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(1); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); } [Test] - public void StrictMode_ValueOutsideItemCollection_IsNotAddedToShadowList() + public void StrictMode_ValueOutsideItemCollection_RemainsUnrepresentableWithoutShadowList() { var items = Enumerable.Range(1, 100).Select(value => (int?)value).ToList(); @@ -35,8 +35,9 @@ public void StrictMode_ValueOutsideItemCollection_IsNotAddedToShadowList() .Add(x => x.Strict, true) .Add(x => x.Value, 999)); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Should().BeEmpty(); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); + cut.Find("input").GetAttribute("value").Should().BeNullOrEmpty(); } } } diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationTests.cs index 1c0337c7..62f327b5 100644 --- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationTests.cs +++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/SelectExtendedVirtualizationTests.cs @@ -7,7 +7,7 @@ namespace MudExtensions.UnitTests.Components public class SelectExtendedVirtualizationTests : BunitTest { [Test] - public void VirtualizedItemCollection_ShadowListContainsOnlySelectedItems() + public void VirtualizedItemCollection_SelectionDoesNotRequireHiddenItems() { var items = Enumerable.Range(1, 4_000).Select(value => (int?)value).ToList(); var selectedValues = new int?[] { 17, 3_999 }; @@ -18,8 +18,8 @@ public void VirtualizedItemCollection_ShadowListContainsOnlySelectedItems() .Add(x => x.MultiSelection, true) .Add(x => x.SelectedValues, selectedValues)); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(2); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); cut.Instance.SelectedValues.Should().BeEquivalentTo(selectedValues); } @@ -40,7 +40,7 @@ public void VirtualizedItemCollection_InitializedMultiSelectionStillProducesText } [Test] - public void VirtualizedItemCollection_ChangedSelectionReplacesShadowItems() + public void VirtualizedItemCollection_ChangedSelectionUpdatesTextWithoutShadowItems() { var items = Enumerable.Range(1, 4_000).Select(value => (int?)value).ToList(); @@ -59,25 +59,18 @@ public void VirtualizedItemCollection_ChangedSelectionReplacesShadowItems() .Add(x => x.MultiSelection, true) .Add(x => x.SelectedValues, new int?[] { 3_999 })); - // Assert each layer independently so failures identify whether parameters, hidden - // components or the input presenter stopped following the selection. cut.WaitForAssertion(() => cut.Instance.SelectedValues.Should().BeEquivalentTo(new int?[] { 3_999 })); - cut.WaitForAssertion(() => - { - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(1); - shadowList.TextContent.Should().Contain("3999"); - shadowList.TextContent.Should().NotContain("17"); - }); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); cut.WaitForAssertion(() => cut.Find("input").Attributes["value"]?.Value.Should().Be("3999")); } [Test] - public void VirtualizedItemCollection_ShadowListRespectsComparer() + public void VirtualizedItemCollection_ValuePresentationRespectsComparer() { var items = new List { @@ -95,9 +88,10 @@ public void VirtualizedItemCollection_ShadowListRespectsComparer() .Add(x => x.Comparer, new TestValueComparer()) .Add(x => x.ToStringFunc, value => value?.Name)); - var shadowList = cut.Find("div[style='display: none']"); - shadowList.QuerySelectorAll("div.mud-list-item-extended").Count().Should().Be(1); - shadowList.TextContent.Should().Contain("Two"); + cut.FindComponents>().Should().BeEmpty(); + cut.Instance.Items.Should().BeEmpty(); + cut.WaitForAssertion(() => + cut.Find("input").Attributes["value"]?.Value.Should().Be("Two")); } private sealed record TestValue(int Id, string Name);