InputType; diff --git a/src/MudBlazor/Components/Input/MudInputAdornment.razor b/src/MudBlazor/Components/Input/MudInputAdornment.razor index 3eedade1fdb3..00e5c944c8fc 100644 --- a/src/MudBlazor/Components/Input/MudInputAdornment.razor +++ b/src/MudBlazor/Components/Input/MudInputAdornment.razor @@ -14,7 +14,7 @@ { @if (AdornmentClick.HasDelegate) { - void IActivatable.Activate(object activator, MouseEventArgs args) { - _ = ToggleMenuAsync(args); + if (activator is MudBaseButton activatorButton && + (activatorButton.Class?.Contains("mud-no-activator") ?? false)) + { + return; + } + ToggleMenuAsync(args).CatchAndLog(); } + ///

/// Disposes managed and unmanaged resources. ///

diff --git a/src/MudBlazor/Components/Select/MudSelect.razor b/src/MudBlazor/Components/Select/MudSelect.razor index 5d6e828b6b27..865e66b85c82 100644 --- a/src/MudBlazor/Components/Select/MudSelect.razor +++ b/src/MudBlazor/Components/Select/MudSelect.razor @@ -3,7 +3,7 @@ @inherits MudBaseInput -

Date: Sun, 30 Mar 2025 16:50:02 +0200 Subject: [PATCH 20/22] Update dependency ReportGenerator to 5.4.5 (#11079) --- src/MudBlazor.UnitTests.Docs/MudBlazor.UnitTests.Docs.csproj | 2 +- src/MudBlazor.UnitTests/MudBlazor.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MudBlazor.UnitTests.Docs/MudBlazor.UnitTests.Docs.csproj b/src/MudBlazor.UnitTests.Docs/MudBlazor.UnitTests.Docs.csproj index e7a372cd1255..dad4dd97875a 100644 --- a/src/MudBlazor.UnitTests.Docs/MudBlazor.UnitTests.Docs.csproj +++ b/src/MudBlazor.UnitTests.Docs/MudBlazor.UnitTests.Docs.csproj @@ -67,7 +67,7 @@ - + diff --git a/src/MudBlazor.UnitTests/MudBlazor.UnitTests.csproj b/src/MudBlazor.UnitTests/MudBlazor.UnitTests.csproj index 310e20ceeb6c..6eee73c9de8f 100644 --- a/src/MudBlazor.UnitTests/MudBlazor.UnitTests.csproj +++ b/src/MudBlazor.UnitTests/MudBlazor.UnitTests.csproj @@ -28,7 +28,7 @@ - + From a9f0fda5aba1c54426ada06a48aa04015757528b Mon Sep 17 00:00:00 2001 From: masonwheeler Date: Sun, 30 Mar 2025 08:52:59 -0600 Subject: [PATCH 21/22] MudTreeViewItem: Fix NullReferenceException (#11108) --- .../TreeView/TreeViewHeterogeneous.razor | 6 ++++++ src/MudBlazor.UnitTests/Components/TreeViewTests.cs | 9 +++++++++ .../Components/TreeView/MudTreeViewItem.razor.cs | 12 ++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 src/MudBlazor.UnitTests.Viewer/TestComponents/TreeView/TreeViewHeterogeneous.razor diff --git a/src/MudBlazor.UnitTests.Viewer/TestComponents/TreeView/TreeViewHeterogeneous.razor b/src/MudBlazor.UnitTests.Viewer/TestComponents/TreeView/TreeViewHeterogeneous.razor new file mode 100644 index 000000000000..99793bf9ad68 --- /dev/null +++ b/src/MudBlazor.UnitTests.Viewer/TestComponents/TreeView/TreeViewHeterogeneous.razor @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/MudBlazor.UnitTests/Components/TreeViewTests.cs b/src/MudBlazor.UnitTests/Components/TreeViewTests.cs index b884ccc078b5..2aafad19930b 100644 --- a/src/MudBlazor.UnitTests/Components/TreeViewTests.cs +++ b/src/MudBlazor.UnitTests/Components/TreeViewTests.cs @@ -1286,5 +1286,14 @@ public void TreeView_ClickItemWhileDisabled_DoesNotChangeSelectionAndExpanded() parentItemButton.Click(); GetItemExpandedValue().Should().Be(false); } + + [Test] + public void TreeView_ClickHeterogeneousTreeElement_ShouldNotThrow() + { + var comp = Context.RenderComponent(); + var l2 = comp.Find(".L2 > div.mud-treeview-item-content"); + var act = () => l2.Click(); + act.Should().NotThrow(); + } } } diff --git a/src/MudBlazor/Components/TreeView/MudTreeViewItem.razor.cs b/src/MudBlazor/Components/TreeView/MudTreeViewItem.razor.cs index 584c9f6607af..a90040c2dbf7 100644 --- a/src/MudBlazor/Components/TreeView/MudTreeViewItem.razor.cs +++ b/src/MudBlazor/Components/TreeView/MudTreeViewItem.razor.cs @@ -438,8 +438,10 @@ private async Task OnItemClickedAsync(MouseEventArgs ev) } if (!GetReadOnly()) { - Debug.Assert(MudTreeRoot != null); - await MudTreeRoot.OnItemClickAsync(this); + if (MudTreeRoot is not null) + { + await MudTreeRoot.OnItemClickAsync(this); + } } await OnClick.InvokeAsync(ev); } @@ -457,8 +459,10 @@ private async Task OnItemDoubleClickedAsync(MouseEventArgs ev) } if (!GetReadOnly()) { - Debug.Assert(MudTreeRoot != null); - await MudTreeRoot.OnItemClickAsync(this); + if (MudTreeRoot is not null) + { + await MudTreeRoot.OnItemClickAsync(this); + } } await OnDoubleClick.InvokeAsync(ev); } From dd76e577f0758b3c9eb1bd4c7f88d509c70d9cb1 Mon Sep 17 00:00:00 2001 From: Versile Johnson II <148913404+versile2@users.noreply.github.com> Date: Sun, 30 Mar 2025 10:48:59 -0500 Subject: [PATCH 22/22] MudDataGrid - Preserve Selection with ParameterState (#11032) --- .../DataGrid/DataGridEventCallbacksTest.razor | 31 +++++--- .../DataGrid/DataGridEventSelectionTest.razor | 39 ++++++++++ .../TestComponents/_README.txt | 2 +- .../Components/DataGridTests.cs | 73 +++++++++++++++++++ .../Components/DataGrid/MudDataGrid.razor.cs | 72 ++++++++---------- 5 files changed, 163 insertions(+), 54 deletions(-) create mode 100644 src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventSelectionTest.razor diff --git a/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventCallbacksTest.razor b/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventCallbacksTest.razor index 66d1f955e8a0..0238423d5501 100644 --- a/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventCallbacksTest.razor +++ b/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventCallbacksTest.razor @@ -1,29 +1,33 @@ - + + RowClick="@OnRowClick" + RowContextMenuClick="@OnRowContextMenuClick" + SelectedItemChanged="@OnSelectedItemChanged" + SelectedItemsChanged="@OnSelectedItemsChanged" + CommittedItemChanges="@OnCommittedItemChanges" + StartedEditingItem="@OnStartedEditingItem" + CanceledEditingItem="@OnCanceledEditingItem" + ReadOnly="false"> @code { + public static string __description__ = "Used for Unit Tests to verify SelectedItem/SelectedItems Changed"; + private IEnumerable _items = new List() { - new Item("A"), - new Item("B"), + new Item("A"), + new Item("B"), new Item("C") }; public bool RowClicked { get; set; } public bool RowContextMenuClicked { get; set; } public bool SelectedItemChanged { get; set; } + public bool SelectedItemsChanged { get; set; } public bool CommittedItemChanges { get; set; } public bool StartedEditingItem { get; set; } public bool CanceledEditingItem { get; set; } @@ -32,7 +36,7 @@ { RowClicked = true; } - + private void OnRowContextMenuClick(DataGridRowClickEventArgs args) { RowContextMenuClicked = true; @@ -43,6 +47,11 @@ SelectedItemChanged = true; } + private void OnSelectedItemsChanged(HashSet items) + { + SelectedItemsChanged = true; + } + private void OnCommittedItemChanges(Item item) { CommittedItemChanges = true; diff --git a/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventSelectionTest.razor b/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventSelectionTest.razor new file mode 100644 index 000000000000..b648e63d4c36 --- /dev/null +++ b/src/MudBlazor.UnitTests.Viewer/TestComponents/DataGrid/DataGridEventSelectionTest.razor @@ -0,0 +1,39 @@ + + + + + + + + + + @_message + + +@code { +#nullable enable + public static string __description__ = "A test viewer for visibility testing of row Selection"; + private List _selectedDocuments = []; + private string _message = "Click select column to select the item"; + + private void OnSelectedItemsChanged(HashSet documents) + { + _selectedDocuments = documents.ToList(); + _message = "OnSelectedItemsChanged was called. " + _selectedDocuments.Count() + " items selected"; + } + + private static Task> ServerReload(GridState state) + { + List items = + [ + new("1", "Test"), + new("2", "Test2") + ]; + + return Task.FromResult(new GridData { Items = items, TotalItems = items.Count }); + } + + public record DocumentChecklistItem(string Id, string Name); +} diff --git a/src/MudBlazor.UnitTests.Viewer/TestComponents/_README.txt b/src/MudBlazor.UnitTests.Viewer/TestComponents/_README.txt index b8b67a4c02d6..76f5386c7830 100644 --- a/src/MudBlazor.UnitTests.Viewer/TestComponents/_README.txt +++ b/src/MudBlazor.UnitTests.Viewer/TestComponents/_README.txt @@ -5,5 +5,5 @@ It is advised to name the test component exactly the same as the bUnit testcase In order to have the test description show up, make sure the component implements a static field __description__ in the @code section: @code { - public static string __description__ = " ... "; + public static string __description__ = "..."; } \ No newline at end of file diff --git a/src/MudBlazor.UnitTests/Components/DataGridTests.cs b/src/MudBlazor.UnitTests/Components/DataGridTests.cs index 408a51609d29..3e07b0a7750d 100644 --- a/src/MudBlazor.UnitTests/Components/DataGridTests.cs +++ b/src/MudBlazor.UnitTests/Components/DataGridTests.cs @@ -5103,5 +5103,78 @@ public async Task DataGrid_TwoWayBind_SelectedItem_SelectedItems() selectedItems.Count().Should().Be(2); selectedItem.Should().Be(4); } + + [Test] + public async Task DataGridSelectedItemEventsTest() + { + var comp = Context.RenderComponent(); + var dataGrid = comp.FindComponent>(); + + // Test single selection mode + dataGrid.SetParam(x => x.MultiSelection, false); + comp.Render(); + + // Select an item + var firstItem = dataGrid.Instance.Items.First(); + await comp.InvokeAsync(async () => await dataGrid.Instance.SetSelectedItemAsync(true, firstItem)); + + // Verify events + comp.Instance.SelectedItemChanged.Should().BeTrue(); + comp.Instance.SelectedItemsChanged.Should().BeTrue(); + + // Reset event flags + comp.Instance.SelectedItemChanged = false; + comp.Instance.SelectedItemsChanged = false; + + // Deselect the item + await comp.InvokeAsync(async () => await dataGrid.Instance.SetSelectedItemAsync(false, firstItem)); + + // Verify events for deselection + comp.Instance.SelectedItemChanged.Should().BeTrue(); + comp.Instance.SelectedItemsChanged.Should().BeTrue(); + + // Reset event flags + comp.Instance.SelectedItemChanged = false; + comp.Instance.SelectedItemsChanged = false; + + // Test multi-selection mode + dataGrid.SetParam(x => x.MultiSelection, true); + comp.Render(); + + // Select all items + await comp.InvokeAsync(async () => await dataGrid.Instance.SetSelectAllAsync(true)); + + // Verify events + comp.Instance.SelectedItemChanged.Should().BeFalse(); + comp.Instance.SelectedItemsChanged.Should().BeTrue(); + + // Reset event flags + comp.Instance.SelectedItemChanged = false; + comp.Instance.SelectedItemsChanged = false; + + // Deselect all items + await comp.InvokeAsync(async () => await dataGrid.Instance.SetSelectAllAsync(false)); + + // Verify events for deselection + comp.Instance.SelectedItemChanged.Should().BeFalse(); + comp.Instance.SelectedItemsChanged.Should().BeTrue(); + + // Reset event flags + comp.Instance.SelectedItemChanged = false; + comp.Instance.SelectedItemsChanged = false; + + // Test row click select + // find first mud-table-row and second mud-table-cell + var firstRow = dataGrid.FindAll(".mud-table-row")[1]; + firstRow.Click(); + + // Verify events for row click + comp.WaitForAssertion(() => comp.Instance.SelectedItemChanged.Should().BeTrue()); + comp.Instance.SelectedItemsChanged.Should().BeTrue(); + + // Reset event flags + comp.Instance.SelectedItemChanged = false; + comp.Instance.SelectedItemsChanged = false; + } } } diff --git a/src/MudBlazor/Components/DataGrid/MudDataGrid.razor.cs b/src/MudBlazor/Components/DataGrid/MudDataGrid.razor.cs index 24186d8b8b1e..88ebfdf74f6d 100644 --- a/src/MudBlazor/Components/DataGrid/MudDataGrid.razor.cs +++ b/src/MudBlazor/Components/DataGrid/MudDataGrid.razor.cs @@ -1269,6 +1269,8 @@ private async Task OnSelectedItemChangedAsync(ParameterChangedEventArgs args) } await _selectedItemsState.SetValueAsync(Selection); + // doesn't fire due to hashset reference not changing, so fire it manually + await SelectedItemsChanged.InvokeAsync(Selection); } private void OnSelectedItemsChanged(ParameterChangedEventArgs> args) @@ -1529,11 +1531,31 @@ internal async Task SetSelectedItemAsync(bool value, T item) } await _selectedItemsState.SetValueAsync(Selection); + // manually invoke due to ParameterState not seeing state change with HashSet + await InvokeAsync(async () => await SelectedItemsChanged.InvokeAsync(Selection)); await InvokeAsync(() => SelectedItemsChangedEvent?.Invoke(Selection)); await InvokeAsync(StateHasChanged); } + ///

+ /// Set the currently selected item in the data grid. + ///

+ /// The item to select. + /// + /// When is true and is true, the are updated. The is also updated. + /// + public Task SetSelectedItemAsync(T item) + { + if (!SelectOnRowClick) + { + return Task.CompletedTask; + } + + var isSelected = Selection.Contains(item); + return SetSelectedItemAsync(!isSelected, item); + } + internal async Task SetSelectAllAsync(bool value) { // nothing should happen if multiselection is false @@ -1544,12 +1566,15 @@ internal async Task SetSelectAllAsync(bool value) ? ServerItems : FilteredItems; + Selection.Clear(); if (value) - Selection = new HashSet(items, Comparer); - else - Selection.Clear(); + { + Selection.UnionWith(items); + } await InvokeAsync(async () => await _selectedItemsState.SetValueAsync(Selection)); + // manually invoke due to ParameterState not seeing state change with HashSet + await InvokeAsync(async () => await SelectedItemsChanged.InvokeAsync(Selection)); await InvokeAsync(() => SelectedItemsChangedEvent?.Invoke(Selection)); await InvokeAsync(() => SelectedAllItemsChangedEvent?.Invoke(value)); @@ -1636,9 +1661,9 @@ internal async Task OnRowClickedAsync(MouseEventArgs args, T item, int rowIndex) await SetSelectedItemAsync(item); } - internal async Task OnContextMenuClickedAsync(MouseEventArgs args, T item, int rowIndex) + internal Task OnContextMenuClickedAsync(MouseEventArgs args, T item, int rowIndex) { - await RowContextMenuClick.InvokeAsync(new DataGridRowClickEventArgs(args, item, rowIndex)); + return RowContextMenuClick.InvokeAsync(new DataGridRowClickEventArgs(args, item, rowIndex)); } ///

@@ -1831,43 +1856,6 @@ private void VirtualItemsProviderInitialize() }; } - ///

- /// Set the currently selected item in the data grid. - ///

- /// The item to select. - /// - /// When is true and is true, the are updated. The is also updated. - /// - public async Task SetSelectedItemAsync(T item) - { - if (!SelectOnRowClick) - return; - - // this is toggle logic (unselect if selected) - if (!Selection.Remove(item)) - { - Selection.Add(item); - } - else if (!MultiSelection) - { - await _selectedItemState.SetValueAsync(default); - return; - } - - if (MultiSelection) - { - await _selectedItemsState.SetValueAsync(Selection); - SelectedItemsChangedEvent?.Invoke(Selection); - } - else - { - Selection.Remove(_selectedItemState.Value); - } - - await _selectedItemState.SetValueAsync(item); - await _selectedItemsState.SetValueAsync(Selection); - } - ///

/// Starts editing for the specified item. ///