Menu and Menuitem should provide child items if grouping is active

As for ContextMenuAutomationPeer the same has to be done for MenuAutomationPeer
and MenuItemAutomation peer.

Fix #6530

Author: RonHeck

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/UIElementAutomationPeer.cs

@@ -540,7 +540,7 @@ override protected void SetFocusCore()
                 throw new InvalidOperationException(SR.Get(SRID.SetFocusFailed));
         }
 
-        private UIElement _owner;
+        private readonly UIElement _owner;
         private SynchronizedInputAdaptor _synchronizedInputPattern;
     }
 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuAutomationPeer.cs

@@ -21,7 +21,7 @@
 namespace System.Windows.Automation.Peers
 {
     /// 
-    public class MenuAutomationPeer : FrameworkElementAutomationPeer
+    public class MenuAutomationPeer : ItemsControlAutomationPeer
     {
         ///
         public MenuAutomationPeer(Menu owner): base(owner)
@@ -46,6 +46,11 @@ protected override bool IsContentElementCore()
         {
             return false;
         }
+
+        protected override ItemAutomationPeer CreateItemAutomationPeer(object item)
+        {
+            return new MenuItemDataAutomationPeer(item, this);
+        }
     }
 }
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs

@@ -21,13 +21,18 @@
 namespace System.Windows.Automation.Peers
 {
     ///
-    public class MenuItemAutomationPeer : FrameworkElementAutomationPeer, IExpandCollapseProvider, IInvokeProvider, IToggleProvider
+    public class MenuItemAutomationPeer : ItemsControlAutomationPeer, IExpandCollapseProvider, IInvokeProvider, IToggleProvider
     {
         ///
         public MenuItemAutomationPeer(MenuItem owner): base(owner)
         {
         }
 
+        override protected ItemAutomationPeer CreateItemAutomationPeer(object item)
+        {
+            return new MenuItemDataAutomationPeer(item, this);
+        }
+
         ///
         override protected string GetClassNameCore()
         {
@@ -173,16 +178,14 @@ override protected string GetAccessKeyCore()
         ///
         protected override List<AutomationPeer> GetChildrenCore()
         {
-            List<AutomationPeer> children = base.GetChildrenCore();
-
             if (ExpandCollapseState.Expanded == ((IExpandCollapseProvider)this).ExpandCollapseState)
             {
                 ItemsControl owner = (ItemsControl)Owner;
                 ItemCollection items = owner.Items;
 
                 if (items.Count > 0)
                 {
-                    children = new List<AutomationPeer>(items.Count);
+                    List<AutomationPeer> children = new List<AutomationPeer>(items.Count);
                     for (int i = 0; i < items.Count; i++)
                     {
                         UIElement uiElement = owner.ItemContainerGenerator.ContainerFromIndex(i) as UIElement;
@@ -195,12 +198,65 @@ protected override List<AutomationPeer> GetChildrenCore()
                                 children.Add(peer);
                         }
                     }
+
+                    return children;
                 }
             }
 
+            return GetChildrenFromVisualTree();
+        }
+
+        private List<AutomationPeer> GetChildrenFromVisualTree()
+        {
+            List<AutomationPeer> children = null;
+
+            iterate(Owner, ref children);
             return children;
         }
 
+        private static bool AddPeerToList(AutomationPeer peer, ref List<AutomationPeer> children)
+        {
+            if (children == null)
+                children = new List<AutomationPeer>();
+
+            children.Add(peer);
+            return false;
+        }
+
+        private static bool iterate(DependencyObject parent, ref List<AutomationPeer> children)
+        {
+            bool done = false;
+
+            if (parent != null)
+            {
+                AutomationPeer peer = null;
+                int count = VisualTreeHelper.GetChildrenCount(parent);
+                for (int i = 0; i < count && !done; i++)
+                {
+                    DependencyObject child = VisualTreeHelper.GetChild(parent, i);
+
+                    if (child != null
+                        && child is UIElement
+                        && (peer = CreatePeerForElement((UIElement)child)) != null)
+                    {
+                        done = AddPeerToList(peer, ref children);
+                    }
+                    else if (child != null
+                        && child is UIElement3D
+                        && (peer = UIElement3DAutomationPeer.CreatePeerForElement(((UIElement3D)child))) != null)
+                    {
+                        done = AddPeerToList(peer, ref children);
+                    }
+                    else
+                    {
+                        done = iterate(child, ref children);
+                    }
+                }
+            }
+
+            return done;
+        }
+
         ///
         void IExpandCollapseProvider.Expand()
         {

src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework.cs

@@ -2886,12 +2886,13 @@ public MediaElementAutomationPeer(System.Windows.Controls.MediaElement owner) :
         protected override System.Windows.Automation.Peers.AutomationControlType GetAutomationControlTypeCore() { throw null; }
         protected override string GetClassNameCore() { throw null; }
     }
-    public partial class MenuAutomationPeer : System.Windows.Automation.Peers.FrameworkElementAutomationPeer
+    public partial class MenuAutomationPeer : System.Windows.Automation.Peers.ItemsControlAutomationPeer
     {
-        public MenuAutomationPeer(System.Windows.Controls.Menu owner) : base (default(System.Windows.FrameworkElement)) { }
+        public MenuAutomationPeer(System.Windows.Controls.Menu owner) : base (default(System.Windows.Controls.ItemsControl)) { }
         protected override System.Windows.Automation.Peers.AutomationControlType GetAutomationControlTypeCore() { throw null; }
         protected override string GetClassNameCore() { throw null; }
         protected override bool IsContentElementCore() { throw null; }
+        override protected System.Windows.Automation.Peers.ItemAutomationPeer CreateItemAutomationPeer(object item) { throw null; }
     }
 
     public partial class MenuItemDataAutomationPeer : System.Windows.Automation.Peers.ItemAutomationPeer, System.Windows.Automation.Provider.IExpandCollapseProvider, System.Windows.Automation.Provider.IInvokeProvider, System.Windows.Automation.Provider.IToggleProvider
@@ -2907,11 +2908,12 @@ void System.Windows.Automation.Provider.IExpandCollapseProvider.Collapse() { }
         void System.Windows.Automation.Provider.IToggleProvider.Toggle() { throw null; }
     }
 
-    public partial class MenuItemAutomationPeer : System.Windows.Automation.Peers.FrameworkElementAutomationPeer, System.Windows.Automation.Provider.IExpandCollapseProvider, System.Windows.Automation.Provider.IInvokeProvider, System.Windows.Automation.Provider.IToggleProvider
+    public partial class MenuItemAutomationPeer : System.Windows.Automation.Peers.ItemsControlAutomationPeer, System.Windows.Automation.Provider.IExpandCollapseProvider, System.Windows.Automation.Provider.IInvokeProvider, System.Windows.Automation.Provider.IToggleProvider
     {
-        public MenuItemAutomationPeer(System.Windows.Controls.MenuItem owner) : base (default(System.Windows.FrameworkElement)) { }
+        public MenuItemAutomationPeer(System.Windows.Controls.MenuItem owner) : base (default(System.Windows.Controls.ItemsControl)) { }
         System.Windows.Automation.ExpandCollapseState System.Windows.Automation.Provider.IExpandCollapseProvider.ExpandCollapseState { get { throw null; } }
         System.Windows.Automation.ToggleState System.Windows.Automation.Provider.IToggleProvider.ToggleState { get { throw null; } }
+        override protected System.Windows.Automation.Peers.ItemAutomationPeer CreateItemAutomationPeer(object item) { throw null; }
         protected override string GetAccessKeyCore() { throw null; }
         protected override System.Windows.Automation.Peers.AutomationControlType GetAutomationControlTypeCore() { throw null; }
         protected override System.Collections.Generic.List<System.Windows.Automation.Peers.AutomationPeer> GetChildrenCore() { throw null; }