Merge branch 'v2_develop' of tig:gui-cs/Terminal.Gui into v2_develop

Author: tig

Terminal.Gui/Views/Menu/MenuBar.cs

@@ -743,6 +743,11 @@ internal void NextMenu (bool isSubMenu = false, bool ignoreUseSubMenusSingleFram
                     return;
                 }
 
+                if (_selected == -1)
+                {
+                    return;
+                }
+
                 OpenMenu (_selected);
 
                 SelectEnabledItem (
@@ -984,6 +989,11 @@ internal void PreviousMenu (bool isSubMenu = false, bool ignoreUseSubMenusSingle
                     return;
                 }
 
+                if (_selected == -1)
+                {
+                    return;
+                }
+
                 OpenMenu (_selected);
 
                 if (!SelectEnabledItem (

Tests/UnitTests/Views/ContextMenuTests.cs

@@ -2105,4 +2105,34 @@ public void Mouse_Pressed_Released_Clicked (int button)
 
         top.Dispose ();
     }
+
+    [Fact]
+    [AutoInitShutdown]
+    public void Menu_Without_SubMenu_Is_Closed_When_Pressing_Key_Right_Or_Key_Left ()
+    {
+        var cm = new ContextMenu ();
+
+        var menuItems = new MenuBarItem (
+                                         [
+                                             new ("_New", string.Empty, null),
+                                             new ("_Save", string.Empty, null)
+                                         ]
+                                        );
+        var top = new Toplevel ();
+        Application.Begin (top);
+
+        cm.Show (menuItems);
+        Assert.True (cm.MenuBar!.IsMenuOpen);
+
+        Assert.True (Application.RaiseKeyDownEvent (Key.CursorRight));
+        Assert.False (cm.MenuBar!.IsMenuOpen);
+
+        cm.Show (menuItems);
+        Assert.True (cm.MenuBar!.IsMenuOpen);
+
+        Assert.True (Application.RaiseKeyDownEvent (Key.CursorLeft));
+        Assert.False (cm.MenuBar!.IsMenuOpen);
+
+        top.Dispose ();
+    }
 }