Fix NavigationViewItem attempting to go to a non existant reveal stat…

…e. (#6317) Tested by changing the MuxControlsTestApp FocusVisualKind to reveal, noting the broken visualization. Implementing the fix and noting the fix.
microsoft · Nov 16, 2021 · 2562ac6 · 2562ac6
1 parent f904131
commit 2562ac6
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp
@@ -359,8 +359,8 @@ void NavigationViewItem::UpdateVisualStateForNavigationViewPositionChange()
     case NavigationViewRepeaterPosition::LeftFooter:
         if (SharedHelpers::IsRS4OrHigher() && winrt::Application::Current().FocusVisualKind() == winrt::FocusVisualKind::Reveal)
         {
-            // OnLeftNavigationReveal is introduced in RS6. 
-            // Will fallback to stateName for the customer who re-template rs5 NavigationViewItem
+            // OnLeftNavigationReveal is introduced in RS6 and only in the V1 style.
+            // Fallback to OnLeftNavigation for other styles.
             if (winrt::VisualStateManager::GoToState(*this, c_OnLeftNavigationReveal, false /*useTransitions*/))
             {
                 handled = true;
@@ -369,13 +369,15 @@ void NavigationViewItem::UpdateVisualStateForNavigationViewPositionChange()
         break;
     case NavigationViewRepeaterPosition::TopPrimary:
     case NavigationViewRepeaterPosition::TopFooter:
+        stateName = c_OnTopNavigationPrimary;
         if (SharedHelpers::IsRS4OrHigher() && winrt::Application::Current().FocusVisualKind() == winrt::FocusVisualKind::Reveal)
         {
-            stateName = c_OnTopNavigationPrimaryReveal;
-        }
-        else
-        {
-            stateName = c_OnTopNavigationPrimary;
+            // OnTopNavigationPrimaryReveal is introduced in RS6 and only in the V1 style.
+            // Fallback to c_OnTopNavigationPrimary for other styles.
+            if (winrt::VisualStateManager::GoToState(*this, c_OnTopNavigationPrimaryReveal, false /*useTransitions*/))
+            {
+                handled = true;
+            }
         }
         break;
     case NavigationViewRepeaterPosition::TopOverflow: