- More tests

- Fix ToDo items
- Misc code changes

spelling.dic

@@ -99,3 +99,5 @@ eventargs
 Subscribable
 colspan
 Voituron
+firstname
+lastname

src/Core/Components/DataGrid/Columns/ColumnBase.razor

@@ -29,70 +29,68 @@
         {
             string? tooltip = Tooltip ? (HeaderTooltip ?? Title) : null;
 
-            <FluentKeyCode Only="@(new[] { KeyCode.KeyR })" OnKeyDown="HandleKeyDownAsync" class="keycapture" style="width: 100%;" StopPropagation="true" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
-
-                @if (AnyColumnActionEnabled)
-                {
-                    <FluentButton Disabled="@(!AnyColumnActionEnabled)" Id="@_columnId" Appearance="ButtonAppearance.Subtle" Class="col-sort-button" Style="width: calc(100% - 10px);" @onclick="@HandleColumnHeaderClickedAsync" aria-label="@tooltip" title="@tooltip">
-                        <div class="col-title-text" title="@tooltip">
-                            @HeaderTitleContent
-                        </div>
+            @if (AnyColumnActionEnabled)
+            {
+                <FluentButton Id="@_columnId" Appearance="ButtonAppearance.Subtle" Class="col-sort-button" Style="width: calc(100% - 10px);" @onclick="@HandleColumnHeaderClickedAsync" aria-label="@tooltip" title="@tooltip" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
+                    <div class="col-title-text" title="@tooltip">
+                        @HeaderTitleContent
+                    </div>
 
-                        @if (Grid.SortByAscending.HasValue && IsActiveSortColumn)
+                    @if (Grid.SortByAscending.HasValue && IsActiveSortColumn)
+                    {
+                        if (Grid.SortByAscending == true)
                         {
-                            if (Grid.SortByAscending == true)
-                            {
-                                <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortUp())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
-                            }
-                            else
-                            {
-                                <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortDown())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
-                            }
+                            <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortUp())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
                         }
-                        @if (ColumnOptions is not null && Filtered.GetValueOrDefault())
+                        else
                         {
-                            <FluentIcon Value="@(new CoreIcons.Regular.Size20.Filter())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
+                            <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortDown())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
                         }
-                    </FluentButton>
-                }
-                else
-                {
-                    <div class="col-title">
-                        <div class="col-title-text" title="@tooltip">
-                            @HeaderTitleContent
-                        </div>
+                    }
+                    @if (ColumnOptions is not null && Filtered.GetValueOrDefault())
+                    {
+                        <FluentIcon Value="@(new CoreIcons.Regular.Size20.Filter())" Slot="@(Align == HorizontalAlignment.End ? "start" : "end")" Style="opacity: var(--fluent-data-grid-header-opacity);" />
+                    }
+                </FluentButton>
+            }
+            else
+            {
+                <div class="col-title">
+                    <div class="col-title-text" title="@tooltip">
+                        @HeaderTitleContent
                     </div>
-                }
-                <FluentMenu @ref="@_menu" Trigger="@_columnId">
-                    <FluentMenuList>
-                        @if (Sortable.HasValue ? Sortable.Value : IsSortableByDefault())
-                        {
-                            <FluentMenuItem OnClick="@(async () => await Grid.SortByColumnAsync(this))" @onkeydown="HandleSortMenuKeyDownAsync"
-                                            IconStart="@(Grid.ColumnSortUISettings.Icon is not null && Grid.ColumnSortUISettings.IconPositionStart ? Grid.ColumnSortUISettings.Icon : null)"
-                                            IconEnd="@(Grid.ColumnSortUISettings.Icon is not null && !Grid.ColumnSortUISettings.IconPositionStart ? Grid.ColumnSortUISettings.Icon : null)">
-                                @GetSortOptionText()
+                </div>
+            }
+            <FluentMenu @ref="@_menu" Trigger="@_columnId">
+                <FluentMenuList>
+                    @if (Sortable.HasValue ? Sortable.Value : IsSortableByDefault())
+                    {
+                        <FluentMenuItem OnClick="@(async () => await Grid.SortByColumnAsync(this))" @onkeydown="HandleSortMenuKeyDownAsync"
+                                        IconStart="@(Grid.ColumnSortUISettings.Icon is not null && Grid.ColumnSortUISettings.IconPositionStart ? Grid.ColumnSortUISettings.Icon : null)"
+                                        IconEnd="@(Grid.ColumnSortUISettings.Icon is not null && !Grid.ColumnSortUISettings.IconPositionStart ? Grid.ColumnSortUISettings.Icon : null)">
+                            @GetSortOptionText()
+
+                        </FluentMenuItem>
+                    }
+                    @if (Grid.ResizeType is not null && Grid.ResizableColumns)
+                    {
+                        <FluentMenuItem OnClick="@(async () => await Grid.ShowColumnResizeAsync(this))" @onkeydown="HandleResizeMenuKeyDownAsync"
+                                        IconStart="@(Grid.ColumnResizeUISettings.Icon is not null && Grid.ColumnResizeUISettings.IconPositionStart ? Grid.ColumnResizeUISettings.Icon : null)"
+                                        IconEnd="@(Grid.ColumnResizeUISettings.Icon is not null && !Grid.ColumnResizeUISettings.IconPositionStart ? Grid.ColumnResizeUISettings.Icon : null)">
+                            @Localizer[Localization.LanguageResource.DataGrid_ResizeMenu]
+                        </FluentMenuItem>
+                    }
+                    @if (ColumnOptions is not null)
+                    {
+                        <FluentMenuItem OnClick="@(async () => await Grid.ShowColumnOptionsAsync(this))" @onkeydown="HandleOptionsMenuKeyDownAsync"
+                                        IconStart="@(Grid.ColumnOptionsUISettings.Icon is not null && Grid.ColumnOptionsUISettings.IconPositionStart ? Grid.ColumnOptionsUISettings.Icon : null)"
+                                        IconEnd="@(Grid.ColumnOptionsUISettings.Icon is not null && !Grid.ColumnOptionsUISettings.IconPositionStart ? Grid.ColumnOptionsUISettings.Icon : null)">
+                            @Localizer[Localization.LanguageResource.DataGrid_OptionsMenu]
+                        </FluentMenuItem>
+                    }
+                </FluentMenuList>
+            </FluentMenu>
 
-                            </FluentMenuItem>
-                        }
-                        @if (Grid.ResizeType is not null && Grid.ResizableColumns)
-                        {
-                            <FluentMenuItem OnClick="@(async () => await Grid.ShowColumnResizeAsync(this))" @onkeydown="HandleResizeMenuKeyDownAsync"
-                                            IconStart="@(Grid.ColumnResizeUISettings.Icon is not null && Grid.ColumnResizeUISettings.IconPositionStart ? Grid.ColumnResizeUISettings.Icon : null)"
-                                            IconEnd="@(Grid.ColumnResizeUISettings.Icon is not null && !Grid.ColumnResizeUISettings.IconPositionStart ? Grid.ColumnResizeUISettings.Icon : null)">
-                                @Localizer[Localization.LanguageResource.DataGrid_ResizeMenu]
-                            </FluentMenuItem>
-                        }
-                        @if (ColumnOptions is not null)
-                        {
-                            <FluentMenuItem OnClick="@(async () => await Grid.ShowColumnOptionsAsync(this))" @onkeydown="HandleOptionsMenuKeyDownAsync"
-                                            IconStart="@(Grid.ColumnOptionsUISettings.Icon is not null && Grid.ColumnOptionsUISettings.IconPositionStart ? Grid.ColumnOptionsUISettings.Icon : null)"
-                                            IconEnd="@(Grid.ColumnOptionsUISettings.Icon is not null && !Grid.ColumnOptionsUISettings.IconPositionStart ? Grid.ColumnOptionsUISettings.Icon : null)">
-                                @Localizer[Localization.LanguageResource.DataGrid_OptionsMenu]
-                            </FluentMenuItem>
-                        }
-                    </FluentMenuList>
-                </FluentMenu>
-            </FluentKeyCode>
         }
         else
         {
@@ -127,29 +125,29 @@
 
                 @if (Sortable.HasValue ? Sortable.Value : IsSortableByDefault())
                 {
-                    <FluentKeyCode Only="new[] { KeyCode.Ctrl, KeyCode.Enter }" OnKeyDown="HandleKeyDownAsync" class="keycapture" style="width: 100%;" StopPropagation="true" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
-                        <FluentButton Appearance="ButtonAppearance.Subtle" Class="col-sort-button" Style="@($"width: calc(100% - {wdelta});")" @onclick="@(() => Grid.SortByColumnAsync(this))" aria-label="@tooltip" title="@tooltip">
-                            <div class="col-title-text" title="@tooltip">
-                                @HeaderTitleContent
-                            </div>
 
-                            @if (Grid.SortByAscending.HasValue && IsActiveSortColumn)
+                    <FluentButton Appearance="ButtonAppearance.Subtle" Class="col-sort-button" Style="@($"width: calc(100% - {wdelta});")" @onclick="@(() => Grid.SortByColumnAsync(this))" aria-label="@tooltip" title="@tooltip" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
+                        <div class="col-title-text" title="@tooltip">
+                            @HeaderTitleContent
+                        </div>
+
+                        @if (Grid.SortByAscending.HasValue && IsActiveSortColumn)
+                        {
+                            if (Grid.SortByAscending == true)
                             {
-                                if (Grid.SortByAscending == true)
-                                {
-                                    <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortUp())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
-                                }
-                                else
-                                {
-                                    <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortDown())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
-                                }
+                                <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortUp())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
                             }
-                            @if (ColumnOptions is not null && Filtered.GetValueOrDefault())
+                            else
                             {
-                                <FluentIcon Value="@(Grid.ColumnOptionsUISettings.Icon)" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
+                                <FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortDown())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
                             }
-                        </FluentButton>
-                    </FluentKeyCode>
+                        }
+                        @if (ColumnOptions is not null && Filtered.GetValueOrDefault())
+                        {
+                            <FluentIcon Value="@(Grid.ColumnOptionsUISettings.Icon)" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
+                        }
+                    </FluentButton>
+
                 }
                 else
                 {
@@ -185,6 +183,8 @@
         }
     }
 
+    [ExcludeFromCodeCoverage(Justification = "This method can't be tested because of Virtualization (which does not render completely under bUnit).")]
+
     internal void RenderPlaceholderContent(RenderTreeBuilder __builder, PlaceholderContext placeholderContext)
     {
         // Blank if no placeholder template was supplied, as it's enough to style with CSS by default

src/Core/Components/DataGrid/Columns/ColumnBase.razor.cs

@@ -2,6 +2,7 @@
 // MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
 // ------------------------------------------------------------------------
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Web;
@@ -247,6 +248,7 @@ protected internal virtual Task OnCellClickAsync(FluentDataGridCell<TGridItem> c
     /// <param name="cell"></param>
     /// <param name="args"></param>
     /// <returns></returns>
+    [ExcludeFromCodeCoverage(Justification = "This method is virtual. It is not called directly on this type.")]
     protected internal virtual Task OnCellKeyDownAsync(FluentDataGridCell<TGridItem> cell, KeyboardEventArgs args)
     {
         return Task.CompletedTask;
@@ -257,12 +259,14 @@ protected internal virtual Task OnCellKeyDownAsync(FluentDataGridCell<TGridItem>
     /// </summary>
     /// <param name="builder">The current <see cref="RenderTreeBuilder" />.</param>
     /// <param name="item">The data for the row being rendered.</param>
+
     protected internal abstract void CellContent(RenderTreeBuilder builder, TGridItem item);
 
     /// <summary>
     /// Overridden by derived components to provide the raw content for the column's cells.
     /// </summary>
     /// <param name="item">The data for the row being rendered.</param>
+    [ExcludeFromCodeCoverage(Justification = "This method is virtual. It is not called directly on this type.")]
     protected internal virtual string? RawCellContent(TGridItem item) => null;
 
     /// <summary>
@@ -273,23 +277,9 @@ protected internal virtual Task OnCellKeyDownAsync(FluentDataGridCell<TGridItem>
     /// Derived components may override this to implement alternative default sortabillity rules.
     /// </summary>
     /// <returns>True if the column should be sortable by default, otherwise false.</returns>
+    [ExcludeFromCodeCoverage(Justification = "This method is virtual. It is not called directly on this type.")]
     protected virtual bool IsSortableByDefault() => false;
 
-    /// <summary>
-    /// Handles the key down event and performs actions based on the key combination pressed.
-    /// </summary>
-    /// <remarks>If the <see cref="FluentKeyCodeEventArgs.ShiftKey"/> is pressed and the key is <see
-    /// cref="KeyCode.KeyR"/>,  this method triggers the removal of sorting for the associated grid column
-    /// asynchronously.</remarks>
-    /// <param name="e">The event arguments containing details about the key press, including the key code and modifier keys.</param>
-    protected async Task HandleKeyDownAsync(FluentKeyCodeEventArgs e)
-    {
-        if (e.ShiftKey && e.Key == KeyCode.KeyR)
-        {
-            await Grid.RemoveSortByColumnAsync(this);
-        }
-    }
-
     private async Task HandleColumnHeaderClickedAsync()
     {
         var hasSorting = Sortable is true || IsDefaultSortColumn;

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

@@ -1,6 +1,7 @@
 // ------------------------------------------------------------------------
 // MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
 // ------------------------------------------------------------------------
+
 namespace Microsoft.FluentUI.AspNetCore.Components;
 
 /// <summary>
@@ -10,11 +11,11 @@ namespace Microsoft.FluentUI.AspNetCore.Components;
 public sealed class ColumnKeyGridSort<TGridItem> : IGridSort<TGridItem>
 {
     private readonly string _columnKey;
-    private readonly Func<IQueryable<TGridItem>, bool, IOrderedQueryable<TGridItem>>? _sortFunction;
+    private readonly Func<IQueryable<TGridItem>, bool, IOrderedQueryable<TGridItem>> _sortFunction;
 
     internal ColumnKeyGridSort(
         string columnKey,
-        Func<IQueryable<TGridItem>, bool, IOrderedQueryable<TGridItem>>? sortFunction = null)
+        Func<IQueryable<TGridItem>, bool, IOrderedQueryable<TGridItem>> sortFunction)
     {
         _columnKey = columnKey;
         _sortFunction = sortFunction;
@@ -28,13 +29,13 @@ internal ColumnKeyGridSort(
     /// <returns> /// <returns>The ordered collection</returns></returns>
     public IOrderedQueryable<TGridItem> Apply(IQueryable<TGridItem> queryable, bool ascending)
     {
-        if (_sortFunction != null)
-        {
-            return _sortFunction(queryable, ascending);
-        }
+        //if (_sortFunction != null)
+        //{
+        return _sortFunction(queryable, ascending);
+        //}
 
         // If no sort is provided, apply a sort that has no affect in order to be able to return an IOrderedQueryable
-        return queryable.OrderBy(x => 0);
+        //return queryable.OrderBy(x => 0);
     }
 
     /// <summary>

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

@@ -261,7 +261,7 @@ private List<SortedProperty> BuildPropertyList(bool ascending)
 
     // Not sure we really want this level of complexity, but it converts expressions like @(c => c.Medals.Gold) to "Medals.Gold"
     // Makes it too complex to test, so we exclude from coverage
-    [ExcludeFromCodeCoverage(Justification = "Too complex to write test for.")]
+    [ExcludeFromCodeCoverage(Justification = "Find a way to test this at a later date.")]
 #pragma warning disable MA0015 // Specify the parameter name in ArgumentException
     private static string ToPropertyName(LambdaExpression expression)
     {
@@ -297,22 +297,25 @@ private static string ToPropertyName(LambdaExpression expression)
             }
         }
 
-        // Now construct the string
-        return string.Create(length, body, (chars, body) =>
+        return string.Create(length, body, action);
+    }
+
+    [ExcludeFromCodeCoverage(Justification = "Find a way to test this at a later date.")]
+    private static void action(Span<char> chars, MemberExpression body)
+    {
+
+        var nextPos = chars.Length;
+        while (body is not null)
         {
-            var nextPos = chars.Length;
-            while (body is not null)
+            nextPos -= body.Member.Name.Length;
+            body.Member.Name.CopyTo(chars[nextPos..]);
+            if (nextPos > 0)
             {
-                nextPos -= body.Member.Name.Length;
-                body.Member.Name.CopyTo(chars[nextPos..]);
-                if (nextPos > 0)
-                {
-                    chars[--nextPos] = '.';
-                }
-
-                body = (body.Expression as MemberExpression)!;
+                chars[--nextPos] = '.';
             }
-        });
+
+            body = (body.Expression as MemberExpression)!;
+        }
     }
 }
 #pragma warning restore MA0015 // Specify the parameter name in ArgumentException

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

@@ -200,7 +200,7 @@ public DataGridSelectMode SelectMode
 
     /// <inheritdoc />
     [Parameter]
-    public override IGridSort<TGridItem>? SortBy { get; set; }
+    public override IGridSort<TGridItem>? SortBy { get; set; } = null;
 
     /// <summary>
     /// Allows to clear the selection.
@@ -516,8 +516,10 @@ protected internal override void CellContent(RenderTreeBuilder builder, TGridIte
         return TooltipText?.Invoke(item);
     }
 
-    /// <inheritdoc />
-    protected override bool IsSortableByDefault() => SortBy is not null;
+    /// <summary >
+    /// A <see cref="FluentDataGrid{TGridItem}"/> cannot be sorted on a <see cref="SelectColumn{TGridItem}"/>.
+    /// </summary>
+    protected override bool IsSortableByDefault() => false;
 
     /// <summary />
     internal async Task OnClickAllAsync(MouseEventArgs e)