Fix issue with invoke pattern being provided for top navview item (mi…

…crosoft/microsoft-ui-xaml#2819)
Kinnara · Jul 26, 2020 · 8e0b6ed · 8e0b6ed
1 parent bad9003
commit 8e0b6ed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
@@ -220,7 +220,7 @@ void UpdateCompactPaneLength()
             }
         }
 
-        void UpdateIsClosedCompact()
+        internal void UpdateIsClosedCompact()
         {
             if (GetSplitView() is { } splitView)
             {

diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItemAutomationPeer.cs b/ModernWpf.Controls/NavigationView/NavigationViewItemAutomationPeer.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
 using System.Windows;
 using System.Windows.Automation;
 using System.Windows.Automation.Peers;
@@ -48,7 +47,6 @@ protected override string GetNameCore()
         public override object GetPattern(PatternInterface pattern)
         {
             if (pattern == PatternInterface.SelectionItem ||
-                pattern == PatternInterface.Invoke ||
                 // Only provide expand collapse pattern if we have children!
                 (pattern == PatternInterface.ExpandCollapse && HasChildren()))
             {

diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItemPresenter.cs b/ModernWpf.Controls/NavigationView/NavigationViewItemPresenter.cs
@@ -105,7 +105,7 @@ public override void OnApplyTemplate()
                     InputHelper.AddTappedHandler(expandCollapseChevron, navigationViewItem.OnExpandCollapseChevronTapped);
                 }
                 navigationViewItem.UpdateVisualStateNoTransition();
-
+                navigationViewItem.UpdateIsClosedCompact();
 
                 // We probably switched displaymode, so restore width now, otherwise the next time we will restore is when the CompactPaneLength changes
                 if (navigationViewItem.GetNavigationView() is { } navigationView)

diff --git a/test/ModernWpfTestApp/ApiTests/NavigationViewTests.cs b/test/ModernWpfTestApp/ApiTests/NavigationViewTests.cs
@@ -530,13 +530,15 @@ public void VerifyNavigationItemUIAType()
                 Verify.AreEqual(
                     AutomationControlType.ListItem,
                     NavigationViewItemAutomationPeer.CreatePeerForElement(menuItem1).GetAutomationControlType());
+                Verify.IsNull(NavigationViewItemAutomationPeer.CreatePeerForElement(menuItem1).GetPattern(PatternInterface.Invoke));
 
                 navView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
                 Content.UpdateLayout();
                 Verify.AreEqual(
                     AutomationControlType.TabItem,
                     NavigationViewItemAutomationPeer.CreatePeerForElement(menuItem1).GetAutomationControlType());
-
+                // Tabs should only provide SelectionItem pattern but not Invoke pattern
+                Verify.IsNull(NavigationViewItemAutomationPeer.CreatePeerForElement(menuItem1).GetPattern(PatternInterface.Invoke));
             });
         }