Add Tests

examples/Demo/FluentUI.Demo.Client/Documentation/Components/DataGrid/Examples/DataGridMultiSelect.razor

@@ -1,6 +1,6 @@
-<FluentStack VerticalAlignment="VerticalAlignment.Center">
+<FluentStack VerticalAlignment="VerticalAlignment.Center" HorizontalGap="5">
     <FluentSelect Items="@(Enum.GetValues<DataGridSelectMode>())"
-                  @bind-SelectedOption="@Mode" />
+                  @bind-Value="@Mode" />
     <FluentCheckbox @bind-Value="@UseSelectedItems"
                     @bind-Value:after="@(() => ResetSelectItems())"
                     Label="Use `SelectedItems` property" />
@@ -28,7 +28,7 @@
         <PropertyColumn Width="150px" Property="@(p => p.BirthDate)" Format="yyyy-MM-dd" Sortable="true" />
     </FluentDataGrid>
 
-    <div style="margin-top: 0.5rem;">
+    <div style="margin-top: 1rem;">
         <b>SelectedItems:</b>
         @String.Join("; ", SelectedItems.Select(p => p.Name))
     </div>
@@ -52,8 +52,8 @@ else
         <PropertyColumn Width="150px" Property="@(p => p.BirthDate)" Format="yyyy-MM-dd" Sortable="true" />
     </FluentDataGrid>
 
-    <div>
-        <b>Peoples:</b>
+    <div style="margin-top: 1rem;">
+        <b>Persons:</b>
         @String.Join("; ", People.Where(p => p.Selected).Select(p => p.Name))
     </div>
 }

examples/Demo/FluentUI.Demo.Client/Documentation/Components/DataGrid/FluentDataGrid.md

@@ -25,6 +25,6 @@ Pressing enter finishes the filter action by the current input to filter on and
 The resize options UI is using a customized string for the label ('Width (+/- 10px)' instead of the normal 'Column width'). This is done through
 the custom localizer which is registered in the Server project's `Program.cs` file.
 
-{{ DataGridTypical }}
+
 
 {{ DataGridMultiSelect }}

spelling.dic

@@ -86,3 +86,5 @@ gridcell
 Voituron
 beforetoggle
 resx
+yyyy
+Langa

src/Core/Components/DataGrid/Columns/SelectColumn.cs

@@ -17,15 +17,15 @@ public class SelectColumn<TGridItem> : ColumnBase<TGridItem>
     /// <summary>
     /// List of keys to press, to select/unselect a row.
     /// </summary>
-#pragma warning disable MA0018 // Do not declare static members on generic types (deprecated; use CA1000 instead)
-    public static readonly string[] KEYBOARD_SELECT_KEYS = ["Enter", "NumpadEnter"];
-#pragma warning restore MA0018 // Do not declare static members on generic types (deprecated; use CA1000 instead)
 
-    private readonly Icon IconUnselectedMultiple = new CoreIcons.Regular.Size20.CheckboxUnchecked().WithColor(Color.Lightweight);
-    private readonly Icon IconSelectedMultiple = new CoreIcons.Filled.Size20.CheckboxChecked();
-    private readonly Icon IconUnselectedSingle = new CoreIcons.Regular.Size20.RadioButton().WithColor(Color.Lightweight);
-    private readonly Icon IconSelectedSingle = new CoreIcons.Filled.Size20.RadioButton();
+    internal static readonly string[] KEYBOARD_SELECT_KEYS = ["Enter", "NumpadEnter"];
 
+    private readonly Icon IconUnselectedMultiple = new CoreIcons.Regular.Size20.CheckboxUnchecked();
+    private readonly Icon IconSelectedMultiple = new CoreIcons.Filled.Size20.CheckboxChecked().WithColor(Color.Primary);
+    private readonly Icon IconUnselectedSingle = new CoreIcons.Regular.Size20.RadioButton();
+    private readonly Icon IconSelectedSingle = new CoreIcons.Filled.Size20.RadioButton().WithColor(Color.Primary);
+
+    private DataGridSelectMode _selectMode = DataGridSelectMode.Single;
     private readonly List<TGridItem> _selectedItems = [];
 
     /// <summary>
@@ -66,7 +66,21 @@ public SelectColumn()
     /// Gets or sets the list of selected items.
     /// </summary>
     [Parameter]
-    public IEnumerable<TGridItem> SelectedItems { get; set; } = [];
+#pragma warning disable BL0007 // Component parameters should be auto properties
+    public IEnumerable<TGridItem> SelectedItems
+#pragma warning restore BL0007 // Component parameters should be auto properties
+    {
+        get => _selectedItems;
+        set
+        {
+            if (_selectedItems != value)
+            {
+                _selectedItems.Clear();
+                _selectedItems.AddRange(value);
+                SelectAll = false;
+            }
+        }
+    }
 
     /// <summary>
     /// Gets or sets a callback when list of selected items changed.
@@ -78,7 +92,23 @@ public SelectColumn()
     /// Gets or sets the selection mode (Single, SingleSticky or Multiple).
     /// </summary>
     [Parameter]
-    public DataGridSelectMode SelectMode { get; set; } = DataGridSelectMode.Single;
+#pragma warning disable BL0007 // Component parameters should be auto properties
+    public DataGridSelectMode SelectMode
+#pragma warning restore BL0007 // Component parameters should be auto properties
+    {
+        get => _selectMode;
+        set
+        {
+            _selectMode = value;
+
+            if (value is DataGridSelectMode.Single or DataGridSelectMode.SingleSticky)
+            {
+                _ = KeepOnlyFirstSelectedItemAsync();
+            }
+
+            RefreshHeaderContent();
+        }
+    }
 
     /// <summary>
     /// Gets or sets the Icon to be rendered when the row is non selected.
@@ -111,7 +141,7 @@ public SelectColumn()
     /// Only when <see cref="SelectMode"/> is Multiple.
     /// </summary>
     [Parameter]
-    public Icon? IconIndeterminate { get; set; } = new CoreIcons.Filled.Size20.CheckboxIndeterminate();
+    public Icon? IconIndeterminate { get; set; } = new CoreIcons.Filled.Size20.CheckboxIndeterminate().WithColor(Color.Primary);
 
     /// <summary>
     /// Gets or sets the Icon title display as a tooltip and used with Accessibility.
@@ -178,8 +208,6 @@ public SelectColumn()
     public void ClearSelection()
     {
         _selectedItems.Clear();
-        SelectedItems = _selectedItems;
-
         RefreshHeaderContent();
     }
 
@@ -258,38 +286,27 @@ protected internal override Task OnCellKeyDownAsync(FluentDataGridCell<TGridItem
         return Task.CompletedTask;
     }
 
-    //private void UpdateSelectedItems(IEnumerable<TGridItem> value)
-    //{
-    //    if (_selectedItems != value)
-    //    {
-    //        _selectedItems.Clear();
-    //        _selectedItems.AddRange(value);
-    //        SelectAll = false;
-
-    //        SelectedItems = _selectedItems;
-    //    }
-    //}
-
     /// <summary />
     private async Task AddOrRemoveSelectedItemAsync(TGridItem? item)
     {
         if (item != null && (Selectable == null || Selectable.Invoke(item)))
         {
-            if (SelectMode is DataGridSelectMode.SingleSticky && SelectedItems.Contains(item))
+            if (SelectMode is DataGridSelectMode.SingleSticky && _selectedItems.Contains(item))
             {
                 return;
             }
 
-            if (_selectedItems.Remove(item))
+            if (SelectedItems.Contains(item))
             {
+                _selectedItems.Remove(item);
                 SelectAll = false;
                 await CallOnSelectAsync(item, isSelected: false);
             }
             else
             {
                 if (SelectMode is DataGridSelectMode.Single or DataGridSelectMode.SingleSticky)
                 {
-                    foreach (var previous in SelectedItems)
+                    foreach (var previous in _selectedItems)
                     {
                         await CallOnSelectAsync(previous, isSelected: false);
                     }
@@ -301,7 +318,6 @@ private async Task AddOrRemoveSelectedItemAsync(TGridItem? item)
                 await CallOnSelectAsync(item, isSelected: true);
             }
 
-            SelectedItems = _selectedItems;
             if (SelectedItemsChanged.HasDelegate)
             {
                 await SelectedItemsChanged.InvokeAsync(SelectedItems);
@@ -338,34 +354,34 @@ private Icon GetIcon(bool? selected)
         };
     }
 
-    //private async Task KeepOnlyFirstSelectedItemAsync()
-    //{
-    //    if (SelectedItems.Count <= 1)
-    //    {
-    //        return;
-    //    }
-
-    //    // Unselect all except the first
-    //    foreach (var item in SelectedItems.Skip(1))
-    //    {
-    //        await OnSelect.InvokeAsync((item, false));
-    //    }
-
-    //    // Keep the first selected item
-    //    SelectedItems.RemoveRange(1, SelectedItems.Count - 1);
-
-    //    if (SelectedItemsChanged.HasDelegate)
-    //    {
-    //        await SelectedItemsChanged.InvokeAsync(SelectedItems);
-    //    }
-
-    //    // Indeterminate
-    //    SelectAll = null;
-    //    if (SelectAllChanged.HasDelegate)
-    //    {
-    //        await SelectAllChanged.InvokeAsync(SelectAll);
-    //    }
-    //}
+    private async Task KeepOnlyFirstSelectedItemAsync()
+    {
+        if (_selectedItems.Count <= 1)
+        {
+            return;
+        }
+
+        // Unselect all except the first
+        foreach (var item in _selectedItems.Skip(1))
+        {
+            await OnSelect.InvokeAsync((item, false));
+        }
+
+        // Keep the first selected item
+        _selectedItems.RemoveRange(1, _selectedItems.Count - 1);
+
+        if (SelectedItemsChanged.HasDelegate)
+        {
+            await SelectedItemsChanged.InvokeAsync(_selectedItems);
+        }
+
+        // Indeterminate
+        SelectAll = null;
+        if (SelectAllChanged.HasDelegate)
+        {
+            await SelectAllChanged.InvokeAsync(SelectAll);
+        }
+    }
 
     /// <summary />
     private RenderFragment<TGridItem> GetDefaultChildContent()
@@ -377,7 +393,7 @@ private RenderFragment<TGridItem> GetDefaultChildContent()
                 return;
             }
 
-            var selected = SelectedItems.Contains(item) || Property.Invoke(item);
+            var selected = _selectedItems.Contains(item) || Property.Invoke(item);
 
             // Sync with SelectedItems list
             if (selected && !_selectedItems.Contains(item))
@@ -390,12 +406,6 @@ private RenderFragment<TGridItem> GetDefaultChildContent()
                 _selectedItems.Remove(item);
             }
 
-            SelectedItems = _selectedItems;
-            if (SelectedItemsChanged.HasDelegate)
-            {
-                _ = SelectedItemsChanged.InvokeAsync(SelectedItems);
-            }
-
             builder.OpenComponent<FluentIcon<Icon>>(0);
             builder.AddAttribute(1, "Value", GetIcon(selected));
             builder.AddAttribute(2, "Title", selected ? TitleChecked : TitleUnchecked);
@@ -535,10 +545,9 @@ internal async Task OnClickAllAsync(MouseEventArgs e)
             );
         }
 
-        SelectedItems = _selectedItems;
         if (SelectedItemsChanged.HasDelegate)
         {
-            await SelectedItemsChanged.InvokeAsync(_selectedItems);
+            await SelectedItemsChanged.InvokeAsync(SelectedItems);
         }
 
         RefreshHeaderContent();
@@ -555,9 +564,10 @@ internal async Task OnKeyAllAsync(KeyboardEventArgs e)
 }
 
 /// <summary>
-/// Represents the arguments for the SelectAll template.
+/// Represents the arguments for selecting all items in a template.
 /// </summary>
-/// <param name="AllSelected"></param>
+/// <param name="AllSelected">A nullable boolean indicating whether all items are selected.  <see langword="true"/> if all items are selected;
+/// <see langword="false"/> if not;  <see langword="null"/> if the selection state is undefined.</param>
 #pragma warning disable MA0048 // File name must match type name
 public record SelectAllTemplateArgs(bool? AllSelected) { }
 #pragma warning restore MA0048 // File name must match type name

src/Core/Components/DataGrid/FluentDataGrid.razor.cs

@@ -1048,14 +1048,6 @@ public async Task UpdateItemsPerPageAsync(int visibleRows)
         }
 
         await Pagination.SetItemsPerPageAsync(visibleRows - 1); // subtract 1 for the table header
-
-        //if (Pagination.CurrentPageIndex > Pagination.LastPageIndex && Pagination.LastPageIndex.HasValue && Pagination.LastPageIndex.Value > 0)
-        //{
-        //    await Pagination.SetCurrentPageIndexAsync(Pagination.LastPageIndex.Value);
-        //}
-
-        //await RefreshDataAsync();
-        //StateHasChanged();
     }
 
     //public void SetPageReference(Type page)

src/Core/Components/DataGrid/FluentDataGridCell.razor.cs

@@ -81,9 +81,9 @@ public FluentDataGridCell(LibraryConfiguration configuration) : base(configurati
         .AddStyle("grid-column", GridColumn.ToString(CultureInfo.InvariantCulture), () => !Grid.EffectiveLoadingValue && (Grid.Items is not null || Grid.ItemsProvider is not null) && Grid.DisplayMode == DataGridDisplayMode.Grid)
         .AddStyle("text-align", "center", Column is SelectColumn<TGridItem>)
         .AddStyle("align-content", "center", Column is SelectColumn<TGridItem>)
-        .AddStyle("padding-inline-start", "calc(((var(--design-unit)* 3) + var(--focus-stroke-width) - var(--stroke-width))* 1px)", Column is SelectColumn<TGridItem> && Owner.RowType == DataGridRowType.Default)
-        .AddStyle("padding-top", "calc(var(--design-unit) * 2.5px)", Column is SelectColumn<TGridItem> && (Grid.RowSize == DataGridRowSize.Medium || Owner.RowType == DataGridRowType.Header))
-        .AddStyle("padding-top", "calc(var(--design-unit) * 1.5px)", Column is SelectColumn<TGridItem> && Grid.RowSize == DataGridRowSize.Small && Owner.RowType == DataGridRowType.Default)
+        //.AddStyle("padding-inline-start", "calc(((var(--design-unit)* 3) + var(--focus-stroke-width) - var(--stroke-width))* 1px)", Column is SelectColumn<TGridItem> && Owner.RowType == DataGridRowType.Default)
+        .AddStyle("padding-top", "10px", Column is SelectColumn<TGridItem> && (Grid.RowSize == DataGridRowSize.Medium || Owner.RowType == DataGridRowType.Header))
+        .AddStyle("padding-top", "6px", Column is SelectColumn<TGridItem> && Grid.RowSize == DataGridRowSize.Small && Owner.RowType == DataGridRowType.Default)
         .AddStyle("width", Column?.Width, !string.IsNullOrEmpty(Column?.Width) && Grid.DisplayMode == DataGridDisplayMode.Table)
         .AddStyle("height", $"{Grid.ItemSize.ToString(CultureInfo.InvariantCulture):0}px", () => !Grid.EffectiveLoadingValue && Grid.Virtualize)
         .AddStyle("height", $"{((int)Grid.RowSize).ToString(CultureInfo.InvariantCulture)}px", () => !Grid.EffectiveLoadingValue && !Grid.Virtualize && !Grid.MultiLine && (Grid.Items is not null || Grid.ItemsProvider is not null))