Make the toolbar menu items support the support space key. (#11520)

* Add Space key to ToolStripMenuItem to keep the same behavior with ToolStripButton

* Make the Enter key only close the dropdown strip

* Support space key to ToolStripMenuItem

* Fix accessibility bug

* Optimized code

---------

Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) <[email protected]>

Author: SimonZhao888

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripDropDown.cs

@@ -1253,6 +1253,7 @@ protected override void OnItemClicked(ToolStripItemClickedEventArgs e)
                    || !(dismissingItem.HasDropDownItems))
                 {    // clicking on a item w/dropdown does not dismiss window
                     Close(ToolStripDropDownCloseReason.ItemClicked);
+                    SelectPreviousToolStrip();
                 }
             }
         }
@@ -1359,7 +1360,7 @@ internal void SelectPreviousToolStrip()
     {
         // snap the owner item before calling hide as non-auto created dropdowns will
         // exit menu mode if there's no OwnerItem.
-        ToolStripItem? itemOnPreviousMenuToSelect = OwnerItem;
+        ToolStripItem? itemOnPreviousMenuToSelect = GetToplevelOwnerItem();
         Hide();
 
         if (itemOnPreviousMenuToSelect is not null)

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs

@@ -146,6 +146,22 @@ internal override void Toggle()
                 _ => ToggleState.ToggleState_Indeterminate
             };
 
+        internal void OnCheckStateChanged(CheckState oldValue, CheckState newValue)
+        {
+            RaiseAutomationPropertyChangedEvent(
+                UIA_PROPERTY_ID.UIA_ToggleToggleStatePropertyId,
+                (VARIANT)(int)CheckStateToToggleState(oldValue),
+                (VARIANT)(int)CheckStateToToggleState(newValue));
+        }
+
+        private static ToggleState CheckStateToToggleState(CheckState checkState)
+            => checkState switch
+            {
+                CheckState.Checked => ToggleState.ToggleState_On,
+                CheckState.Unchecked => ToggleState.ToggleState_Off,
+                _ => ToggleState.ToggleState_Indeterminate
+            };
+
         #endregion
     }
 }

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs

@@ -19,6 +19,7 @@ namespace System.Windows.Forms;
     $"System.ComponentModel.Design.Serialization.CodeDomSerializer, {AssemblyRef.SystemDesign}")]
 public partial class ToolStripMenuItem : ToolStripDropDownItem
 {
+    private CheckState _prevCheckState = CheckState.Unchecked;
     private static readonly MenuTimer s_menuTimer = new();
 
     private static readonly int s_propShortcutKeys = PropertyStore.CreateKey();
@@ -311,6 +312,7 @@ public CheckState CheckState
 
             if (value != CheckState)
             {
+                _prevCheckState = CheckState;
                 Properties.SetInteger(s_propCheckState, (int)value);
                 OnCheckedChanged(EventArgs.Empty);
                 OnCheckStateChanged(EventArgs.Empty);
@@ -820,6 +822,13 @@ protected virtual void OnCheckedChanged(EventArgs e)
     protected virtual void OnCheckStateChanged(EventArgs e)
     {
         AccessibilityNotifyClients(AccessibleEvents.StateChange);
+
+        if (IsAccessibilityObjectCreated &&
+            AccessibilityObject is ToolStripMenuItemAccessibleObject accessibilityObject)
+        {
+            accessibilityObject.OnCheckStateChanged(_prevCheckState, CheckState);
+        }
+
         ((EventHandler?)Events[s_eventCheckStateChanged])?.Invoke(this, e);
     }
 
@@ -1047,8 +1056,14 @@ protected override void OnPaint(PaintEventArgs e)
 
     protected internal override bool ProcessCmdKey(ref Message m, Keys keyData)
     {
-        if (Enabled && ShortcutKeys == keyData && !HasDropDownItems)
+        if (Enabled && !HasDropDownItems && (ShortcutKeys == keyData || keyData == Keys.Space))
         {
+            if (keyData is Keys.Space)
+            {
+                Checked = CheckOnClick ? !Checked : Checked;
+                return true;
+            }
+
             FireEvent(ToolStripItemEventType.Click);
             return true;
         }