Restore focus after selecting dashboard menu items

src/Aspire.Dashboard/Components/Controls/AspireMenu.razor.cs

@@ -114,16 +114,19 @@ public async Task OpenAsync(int screenWidth, int screenHeight, int clientX, int
 
     private async Task HandleItemClicked(MenuButtonItem item)
     {
-        if (item.OnClick is {} onClick)
-        {
-            await onClick();
-        }
         await SetOpenAsync(false);
 
         if (RestoreFocusOnItemClick && !string.IsNullOrEmpty(Anchor))
         {
             await JS.InvokeVoidAsync("focusElement", Anchor);
         }
+
+        // Item callbacks can move focus to a dialog or another control, so restore the
+        // menu trigger first to avoid stealing focus back after the callback completes.
+        if (item.OnClick is {} onClick)
+        {
+            await onClick();
+        }
     }
 
     private async Task OnOpenChanged(bool open)

src/Aspire.Dashboard/Components/Controls/AspireMenuButton.razor.cs

@@ -55,11 +55,10 @@ public partial class AspireMenuButton : FluentComponentBase
     /// Gets or sets a value indicating whether focus should return to this menu button after a menu item is clicked.
     /// </summary>
     /// <remarks>
-    /// Use this for button-anchored menus because the underlying menu anchor is the element that opened the menu.
-    /// Do not use this behavior for cursor-positioned or context menus where the anchor is only used for positioning.
+    /// Focus restoration is enabled by default because the underlying menu anchor is the button that opened the menu.
     /// </remarks>
     [Parameter]
-    public bool RestoreFocusOnItemClick { get; set; }
+    public bool RestoreFocusOnItemClick { get; set; } = true;
 
     protected override void OnParametersSet()
     {

tests/Aspire.Dashboard.Components.Tests/Controls/AspireMenuTests.cs

@@ -50,7 +50,7 @@ public async Task DisposeAsync_RemovesFluentMenuFromMenuProvider()
     }
 
     [Fact]
-    public void ClickItem_RestoreFocusOnItemClickTrue_FocusesAnchor()
+    public void ClickItem_MenuButton_FocusesAnchorBeforeOnClick()
     {
         FluentUISetupHelpers.AddCommonDashboardServices(this);
         FluentUISetupHelpers.SetupFluentUIComponents(this);
@@ -61,18 +61,15 @@ public void ClickItem_RestoreFocusOnItemClickTrue_FocusesAnchor()
         var anchor = "view-options-button";
         var itemClicked = false;
         var focusElementInvocationHandler = JSInterop.SetupVoid("focusElement", anchor);
-        var focusElementInvocationsDuringOnClick = -1;
+        focusElementInvocationHandler.SetVoidResult();
         var items = new List<MenuButtonItem>
         {
             new()
             {
                 Text = "Show hidden resources",
                 OnClick = () =>
                 {
-                    focusElementInvocationsDuringOnClick = focusElementInvocationHandler.Invocations.Count;
-                    Assert.True(
-                        focusElementInvocationsDuringOnClick == 0,
-                        $"Focus should not be restored until item OnClick completes. Actual focusElement invocations during OnClick: {focusElementInvocationsDuringOnClick}.");
+                    Assert.Single(focusElementInvocationHandler.Invocations);
                     itemClicked = true;
 
                     return Task.CompletedTask;
@@ -88,24 +85,20 @@ public void ClickItem_RestoreFocusOnItemClickTrue_FocusesAnchor()
             builder.AddAttribute(2, nameof(AspireMenuButton.MenuButtonId), anchor);
             builder.AddAttribute(3, nameof(AspireMenuButton.Title), "View options");
             builder.AddAttribute(4, nameof(AspireMenuButton.Items), items);
-            builder.AddAttribute(5, nameof(AspireMenuButton.RestoreFocusOnItemClick), true);
             builder.CloseComponent();
         });
 
         cut.Find($"#{anchor}").Click();
         cut.WaitForElement("fluent-menu-item").Click();
 
         Assert.True(itemClicked);
-        Assert.True(
-            focusElementInvocationsDuringOnClick == 0,
-            $"Expected zero focusElement invocations during item OnClick, but captured {focusElementInvocationsDuringOnClick}.");
         var invocation = Assert.Single(focusElementInvocationHandler.Invocations);
         Assert.Collection(invocation.Arguments,
             argument => Assert.Equal(anchor, Assert.IsType<string>(argument)));
     }
 
     [Fact]
-    public void ClickItem_RestoreFocusOnItemClickFalse_DoesNotFocusAnchor()
+    public void ClickItem_MenuButtonWithFocusRestorationDisabled_DoesNotFocusAnchor()
     {
         FluentUISetupHelpers.AddCommonDashboardServices(this);
         FluentUISetupHelpers.SetupFluentUIComponents(this);
@@ -136,6 +129,7 @@ public void ClickItem_RestoreFocusOnItemClickFalse_DoesNotFocusAnchor()
             builder.AddAttribute(2, nameof(AspireMenuButton.MenuButtonId), anchor);
             builder.AddAttribute(3, nameof(AspireMenuButton.Title), "View options");
             builder.AddAttribute(4, nameof(AspireMenuButton.Items), items);
+            builder.AddAttribute(5, nameof(AspireMenuButton.RestoreFocusOnItemClick), false);
             builder.CloseComponent();
         });