[DataGrid] Fix issue #5026 (from Aspire)

examples/Demo/Shared/Pages/DataGrid/Examples/DataGridTypical.razor

@@ -15,20 +15,20 @@
                     RowStyle="@rowStyle"
                     HeaderCellAsButtonWithMenu="true"
                     ColumnResizeLabels="@resizeLabels">
-        <TemplateColumn Tooltip="true" TooltipText="@(c => "Flag of " + c.Name)" Title="Rank" SortBy="@rankSort" Align="Align.Center" InitialSortDirection="SortDirection.Ascending" IsDefaultSortColumn=true>
+        <TemplateColumn Tooltip="true" TooltipText="@(c => "Flag of " + c.Name)" HeaderTooltip="Column options for rank" Title="Rank" SortBy="@rankSort" Align="Align.Center" InitialSortDirection="SortDirection.Ascending" IsDefaultSortColumn=true>
             <img class="flag" src="_content/FluentUI.Demo.Shared/flags/@(context.Code).svg" alt="Flag of @(context.Code)" />
         </TemplateColumn>
-        <PropertyColumn Property="@(c => c.Name)" Sortable="true" Filtered="!string.IsNullOrWhiteSpace(nameFilter)" Tooltip="true" Title="Name of the country">
+        <PropertyColumn Property="@(c => c.Name)" Sortable="true" Filtered="!string.IsNullOrWhiteSpace(nameFilter)" Tooltip="true" HeaderTooltip="Column options for country" Title="Name of the country">
             <ColumnOptions>
                 <div class="search-box">
                     <FluentSearch Autofocus=true @bind-Value=nameFilter @oninput="HandleCountryFilter" @onkeydown="HandleCloseFilterAsync" @bind-Value:after="HandleClear" Placeholder="Country name..." Style="width: 100%;" Label="Filter" />
                 </div>
             </ColumnOptions>
         </PropertyColumn>
-        <PropertyColumn Property="@(c => c.Medals.Gold)" Sortable="true" Align="Align.Start" Tooltip="true" TooltipText="@(c => "That is " + c.Medals.Gold + " x GOLD!!")" />
-        <PropertyColumn Property="@(c => c.Medals.Silver)" Sortable="true" Align="Align.Center" Tooltip="true" />
-        <PropertyColumn Property="@(c => c.Medals.Bronze)" Sortable="false" Align="Align.End" />
-        <PropertyColumn Property="@(c => c.Medals.Total)" Sortable="true" Filtered="@(minMedals != 0 || maxMedals != 130)" Align="Align.End" Tooltip="true">
+        <PropertyColumn Property="@(c => c.Medals.Gold)" Sortable="true" Align="Align.Start" Tooltip="true" TooltipText="@(c => "That is " + c.Medals.Gold + " x GOLD!!")" HeaderTooltip="Column options for gold" />
+        <PropertyColumn Property="@(c => c.Medals.Silver)" Sortable="true" Align="Align.Center" Tooltip="true" HeaderTooltip="Column options for silver" />
+        <PropertyColumn Property="@(c => c.Medals.Bronze)" Sortable="false" Align="Align.End" HeaderTooltip="Adjust column width for bronze" />
+        <PropertyColumn Property="@(c => c.Medals.Total)" Sortable="true" Filtered="@(minMedals != 0 || maxMedals != 130)" Align="Align.End" Tooltip="true" HeaderTooltip="Column options for total">
             <ColumnOptions>
                 <div style="width: 100%; height: 150px;">
                     <FluentSlider Label="@($"Min ({minMedals})")" Min="0" Max="150" Step="1" Orientation="Orientation.Horizontal" @bind-Value=minMedals Immediate="true" Style="width: 100%;">

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

@@ -25,18 +25,35 @@
         {
             @HeaderCellItemTemplate(this)
         }
-        else if (Grid.HeaderCellAsButtonWithMenu)
-        {
-            string? tooltip = Tooltip ? (HeaderTooltip ?? Title) : null;
-
-            <FluentKeyCode  Only="@(new[] { KeyCode.KeyR })"  OnKeyDown="HandleKeyDown" class="keycapture" style="width: 100%;" StopPropagation="true" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
+            else if (Grid.HeaderCellAsButtonWithMenu)
+            {
+                string? tooltip = Tooltip ? (HeaderTooltip ?? Title) : null;
 
-                @if (AnyColumnActionEnabled)
+                // Ensure the accessible name (aria-label) is anchored to the visible Title
+                // and optionally prepend HeaderTooltip when it differs. Use HeaderTooltip
+                // as the mouse tooltip (Title attribute) when provided.
+                string? ariaLabel = null;
+                if (!string.IsNullOrEmpty(Title))
                 {
-                    <FluentButton Disabled="@(!AnyColumnActionEnabled)" Id="@_columnId" Appearance="Appearance.Stealth" 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>
+                    ariaLabel = Title;
+                    if (!string.IsNullOrEmpty(HeaderTooltip) && HeaderTooltip != Title)
+                    {
+                        ariaLabel = $"{HeaderTooltip} - {ariaLabel}";
+                    }
+                }
+                else
+                {
+                    ariaLabel = HeaderTooltip ?? tooltip;
+                }
+
+                <FluentKeyCode  Only="@(new[] { KeyCode.KeyR })"  OnKeyDown="HandleKeyDown" class="keycapture" style="width: 100%;" StopPropagation="true" @oncontextmenu="@(() => Grid.RemoveSortByColumnAsync(this))">
+
+                    @if (AnyColumnActionEnabled)
+                    {
+                    <FluentButton Disabled="@(!AnyColumnActionEnabled)" Id="@_columnId" Appearance="Appearance.Stealth" Class="col-sort-button" Style="width: calc(100% - 10px);" @onclick="@HandleColumnHeaderClickedAsync" aria-label="@ariaLabel" Title="@(HeaderTooltip ?? Title)" aria-haspopup="menu">
+                            <div class="col-title-text" title="@tooltip">
+                                @HeaderTitleContent
+                            </div>
 
                         @if (Grid.SortByAscending.HasValue && IsActiveSortColumn)
                         {

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

@@ -1019,7 +1019,7 @@ private async ValueTask<GridItemsProviderResult<TGridItem>> ResolveItemsRequestA
         return GridItemsProviderResult.From(Array.Empty<TGridItem>(), 0);
     }
 
-    private string AriaSortValue(ColumnBase<TGridItem> column)
+    private string? AriaSortValue(ColumnBase<TGridItem> column)
          => _sortByColumn == column
              ? (_sortByAscending ? "ascending" : "descending")
              : "none";

src/Core/Components/Menu/FluentMenu.razor.js

@@ -38,6 +38,10 @@ export async function initialize(anchorId, menuId, menuOpen, anchoredRegionModul
     // Dispose existing listeners if any
     dispose(anchorId);
 
+    if (anchorId && menuId) {
+        document.getElementById(anchorId)?.setAttribute("aria-expanded", menuOpen);
+    }
+
     if (!menuId || !menuOpen) {
         return;
     }