Fix arrow left on all-disabled submenu closing menu

4 years ago · ace7787526
1 changed files with 5 additions and 1 deletions
--- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
+++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
@ -175,7 +175,11 @@ namespace Avalonia.Controls.Platform

                case Key.Left:
                {
-                    if (item?.Parent is IMenuItem parent && !parent.IsTopLevel && parent.IsSubMenuOpen)
+                    if (item is { IsSubMenuOpen: true, SelectedItem: null })
+                    {
+                        item.Close();
+                    }
+                    else if (item?.Parent is IMenuItem { IsTopLevel: false, IsSubMenuOpen: true } parent)
                    {
                        parent.Close();
                        parent.Focus();