Fixed NavigationView on launch pane state (#1439)

* fixed bug, added tests * addressed comments, fixed test * addressed comment
microsoft · Oct 16, 2019 · ab66b66 · ab66b66
1 parent 94002c4
commit ab66b66
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 22 deletions.
diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
@@ -584,8 +584,10 @@ void NavigationView::UpdateAdaptiveLayout(double width, bool forceSetDisplayMode
     {
         MUX_FAIL_FAST();
     }
+
     if (!forceSetDisplayMode && m_InitialNonForcedModeUpdate) {
-        if (displayMode == winrt::NavigationViewDisplayMode::Minimal && PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Auto) {
+        if (displayMode == winrt::NavigationViewDisplayMode::Minimal ||
+            displayMode == winrt::NavigationViewDisplayMode::Compact) {
             ClosePane();
         }
         m_InitialNonForcedModeUpdate = false;

diff --git a/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_ApiTests/NavigationViewTests.cs
@@ -319,6 +319,7 @@ public void VerifySettingsItemToolTip()
 
                 navView.IsSettingsVisible = true;
                 navView.IsPaneOpen = true;
+                navView.PaneDisplayMode = NavigationViewPaneDisplayMode.Left;
                 MUXControlsTestApp.App.TestContentRoot = navView;
             });
 

diff --git a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
@@ -445,18 +445,25 @@ public void PaneOpenForceCloseTest()
 
         [TestMethod]
         [TestProperty("TestSuite", "A")]
-        public void PaneClosedWhenAutoAndNarrow()
+        public void PaneClosedUponLaunch()
         {
             var testScenarios = RegressionTestScenario.BuildLeftNavRegressionTestScenarios();
             foreach (var testScenario in testScenarios)
             {
                 using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "Navigation Minimal Test" }))
                 {
-
-                    CheckBox isPaneOpenCheckBox = new CheckBox(FindElement.ById("IsAutoPaneOpenCheckBox"));
-                    Log.Comment("Checking that a NavigationView with displaymode set to 'Auto' and a narrow width does not display pane");
+                    Log.Comment("Verify that NavigationView with DisplayMode set to 'Auto' and a narrow width does not display pane on load.");
+                    CheckBox isAutoPaneOpenCheckBox = new CheckBox(FindElement.ById("IsAutoPaneOpenCheckBox"));
                     Wait.ForIdle();
-                    Verify.IsTrue(isPaneOpenCheckBox.ToggleState == ToggleState.Off);
+                    Verify.IsTrue(isAutoPaneOpenCheckBox.ToggleState == ToggleState.Off);
+
+                    Log.Comment("Verify that NavigationView with DisplayMode set to 'LeftMinimal' does not display pane on load.");
+                    CheckBox isLeftMinimalPaneOpenCheckBox = new CheckBox(FindElement.ById("IsLeftMinimalPaneOpenCheckBox"));
+                    Verify.IsTrue(isLeftMinimalPaneOpenCheckBox.ToggleState == ToggleState.Off);
+
+                    Log.Comment("Verify that NavigationView with DisplayMode set to 'LeftCompact' does not display pane on load.");
+                    CheckBox isLeftCompactPaneOpenCheckBox = new CheckBox(FindElement.ById("IsLeftCompactPaneOpenCheckBox"));
+                    Verify.IsTrue(isLeftCompactPaneOpenCheckBox.ToggleState == ToggleState.Off);
                 }
 
             }

diff --git a/dev/NavigationView/TestUI/NavigationViewMinimalPage.xaml b/dev/NavigationView/TestUI/NavigationViewMinimalPage.xaml
@@ -11,21 +11,38 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 <!-- This page contains a NavigationView control that is in LeftMinimal mode on initial load -->
     <StackPanel>
-        <muxcontrols:NavigationView x:Name="NavView" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavView"
-                                    IsBackEnabled="True" Header="Minimal Test Page" PaneDisplayMode="LeftMinimal">
-            <StackPanel>
-                <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult"/>
-                <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
-            </StackPanel>
-        </muxcontrols:NavigationView>
-        <muxcontrols:NavigationView x:Name="NavViewAuto" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavView"
-                                    IsBackEnabled="True" Header="Minimal Test Page" Width="250" Height="300" >
-            <StackPanel>
-            </StackPanel>
-        </muxcontrols:NavigationView>
-        <CheckBox
-            IsChecked="{Binding IsPaneOpen, ElementName=NavViewAuto, Mode=TwoWay}"
-            x:Name="IsAutoPaneOpenCheckBox"
-            AutomationProperties.Name="IsPaneOpenCheckBox" >Toggle auto pane open</CheckBox>
+        <StackPanel Orientation="Horizontal">
+            <muxcontrols:NavigationView x:Name="NavView" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavView"
+                                            IsBackEnabled="True" Header="LeftMinimal" PaneDisplayMode="LeftMinimal">
+                <StackPanel>
+                    <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult"/>
+                    <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
+                </StackPanel>
+            </muxcontrols:NavigationView>
+            <muxcontrols:NavigationView x:Name="NavViewLeftCompact" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavViewLeftCompact"
+                                            IsBackEnabled="True" Header="LeftCompact" PaneDisplayMode="LeftCompact">
+                <StackPanel>
+                </StackPanel>
+            </muxcontrols:NavigationView>
+            <muxcontrols:NavigationView x:Name="NavViewAuto" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavView"
+                                        IsBackEnabled="True" Header="Auto" Width="250" Height="300" >
+                <StackPanel>
+                </StackPanel>
+            </muxcontrols:NavigationView>
+        </StackPanel>
+        <StackPanel>
+            <CheckBox
+                IsChecked="{Binding IsPaneOpen, ElementName=NavView, Mode=TwoWay}"
+                x:Name="IsLeftMinimalPaneOpenCheckBox"
+                AutomationProperties.Name="IsLeftMinimalPaneOpenCheckBox" >Toggle LeftMinimal pane open</CheckBox>
+            <CheckBox
+                IsChecked="{Binding IsPaneOpen, ElementName=NavViewLeftCompact, Mode=TwoWay}"
+                x:Name="IsLeftCompactPaneOpenCheckBox"
+                AutomationProperties.Name="IsLeftCompactPaneOpenCheckBox" >Toggle LeftCompact pane open</CheckBox>
+            <CheckBox
+                IsChecked="{Binding IsPaneOpen, ElementName=NavViewAuto, Mode=TwoWay}"
+                x:Name="IsAutoPaneOpenCheckBox"
+                AutomationProperties.Name="IsPaneOpenCheckBox" >Toggle auto pane open</CheckBox>
+        </StackPanel>
     </StackPanel>
 </local:TestPage>