Fixed OptionSelector focus bug

Author: tig

Terminal.Gui/Views/Selectors/OptionSelector.cs

@@ -57,6 +57,7 @@ protected override bool OnHandlingHotKey (CommandEventArgs args)
                 {
                     return true;
                 }
+                SetFocus ();
                 Value = Values? [0];
                 return true;
             }

Tests/UnitTests/View/ViewCommandTests.cs

@@ -5,7 +5,7 @@ namespace Terminal.Gui.ViewTests;
 public class ViewCommandTests
 {
     [Fact]
-    public void Command_Accept_Handled_Stops_Propagation_To_IsDefault_Button_Peer ()
+    public void Command_Accept_Handled_Stops_Propagation_To_IsDefaultAcceptView_Button_Peer ()
     {
         var acceptOk = 0;
         var acceptCancel = 0;
@@ -28,7 +28,7 @@ public void Command_Accept_Handled_Stops_Propagation_To_IsDefault_Button_Peer ()
     }
 
     [Fact]
-    public void Command_Accept_Not_Handled_Propagates_To_IsDefault_Button_Peer ()
+    public void Command_Accept_Not_Handled_Propagates_To_IsDefaultAcceptView_Button_Peer ()
     {
         var acceptOk = 0;
         var acceptCancel = 0;
@@ -48,9 +48,76 @@ public void Command_Accept_Not_Handled_Propagates_To_IsDefault_Button_Peer ()
         Assert.Equal (1, acceptCancel);
     }
 
+    [Fact]
+    public void Command_Accept_Handled_Stops_Propagation_To_Not_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = false };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                                   e.Handled = true;
+                               };
+
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (0, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    [Fact]
+    public void Command_Accept_Not_Handled_Propagates_To_Not_IsDefaultAcceptView_Button_Peer ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "btnOk", Text = "Ok", IsDefaultAcceptView = false };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "btnCancel", Text = "Cancel", IsDefaultAcceptView = false };
+
+        btnCancel.Accepting += (s, e) =>
+                               {
+                                   acceptCancel++;
+                               };
+        View superView = new View () { Id = "superView" };
+        superView.Add (btnOk, btnCancel);
+
+        btnCancel.InvokeCommand (Command.Accept);
+        Assert.Equal (0, acceptOk);
+        Assert.Equal (1, acceptCancel);
+    }
+
+    [Fact]
+    [AutoInitShutdown]
+    public void HotKey_From_Non_IsDefaultAcceptView_Button_Raises_Accept_In_The_Default_Button ()
+    {
+        var acceptOk = 0;
+        var acceptCancel = 0;
+        Button btnOk = new () { Id = "Ok", Text = "_Ok", IsDefaultAcceptView = true };
+        btnOk.Accepting += (s, e) => acceptOk++;
+        Button btnCancel = new () { Id = "Cancel", Y = 1, Text = "_Cancel" };
+        btnCancel.Accepting += (s, e) => acceptCancel++;
+        Application.Top = new ();
+        Application.Top.Add (btnOk, btnCancel);
+        var rs = Application.Begin (Application.Top);
+
+        Application.RaiseKeyDownEvent(Key.C);
+        Assert.Equal (1, acceptOk);
+        Assert.Equal (1, acceptCancel);
+
+        Application.End (rs);
+        Application.Top.Dispose ();
+        Application.ResetState ();
+    }
+
     // See https://github.com/gui-cs/Terminal.Gui/issues/3913
     [Fact]
-    public void Button_IsDefault_Raises_Accepted_Correctly ()
+    public void Button_IsDefaultAcceptView_Raises_Accepted_Correctly ()
     {
         var aAcceptedCount = 0;
         var aCancelAccepting = false;

Tests/UnitTestsParallelizable/Views/OptionSelectorTests.cs

@@ -130,7 +130,7 @@ public void HotKey_No_SelectedItem_Selects_First ()
 
         var selector = new OptionSelector
         {
-            Title = "Radio_Group",
+            HotKey = Key.G.WithAlt,
             RadioLabels = ["_Left", "_Right", "Cen_tered", "_Justified"]
         };
         selector.SelectedItem = -1;
@@ -143,7 +143,7 @@ public void HotKey_No_SelectedItem_Selects_First ()
         selector.NewKeyDownEvent (Key.G.WithAlt);
 
         Assert.Equal (0, selector.SelectedItem);
-        Assert.True (selector.HasFocus);
+        Assert.Equal (selector.SubViews.OfType<CheckBox> ().First (), superView.MostFocused);
     }
 
     [Fact]