Tabview: Fix issue with newly added items not behaving according to T…

…abViews WidthMode (#2752) * Fix old test that already should have caught this error * Fix bug with Compact sizing not being applied to newly added items * Remove unused import
microsoft · Jun 25, 2020 · 865e4fc · 865e4fc
1 parent 1c67178
commit 865e4fc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/dev/TabView/APITests/TabViewTests.cs b/dev/TabView/APITests/TabViewTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using MUXControlsTestApp.Utilities;
@@ -46,9 +46,16 @@ public void VerifyCompactTabWidthVisualStates()
                 tabView.SelectedItem = tabView.TabItems[0];
                 (tabView.SelectedItem as TabViewItem).IsSelected = true;
                 Verify.AreEqual("Item 0", (tabView.SelectedItem as TabViewItem).Header);
-                tabView.TabWidthMode = TabViewWidthMode.Compact;
                 Content.UpdateLayout();
             });
+            // Waiting for layout
+            IdleSynchronizer.Wait();
+
+            RunOnUIThread.Execute(() =>
+            {
+                // Now set tab width mode
+                tabView.TabWidthMode = TabViewWidthMode.Compact;
+            });
 
             IdleSynchronizer.Wait();
 
@@ -82,14 +89,23 @@ private static void VerifyTabWidthVisualStates(IList<object> items, bool isCompa
             foreach (var item in items)
             {
                 var tabItem = item as TabViewItem;
-                if (tabItem.IsSelected || !isCompact)
-                {
-                    VisualStateHelper.ContainsVisualState(tabItem, "StandardWidth");
-                }
-                else
+                var rootGrid = VisualTreeHelper.GetChild(tabItem, 0) as FrameworkElement;
+
+                foreach (var group in VisualStateManager.GetVisualStateGroups(rootGrid))
                 {
-                    VisualStateHelper.ContainsVisualState(tabItem, "Compact");
+                    if (group.Name == "TabWidthModes")
+                    {
+                        if(tabItem.IsSelected || !isCompact)
+                        {
+                            Verify.AreEqual("StandardWidth", group.CurrentState.Name, "Verify that this tab item is rendering in standard width");
+                        }
+                        else
+                        {
+                            Verify.AreEqual("Compact", group.CurrentState.Name, "Verify that this tab item is rendering in compact width");
+                        }
+                    }
                 }
+
             }
         }
 

diff --git a/dev/TabView/TabView.cpp b/dev/TabView/TabView.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 #include "pch.h"
@@ -635,6 +635,10 @@ void TabView::OnItemsChanged(winrt::IInspectable const& item)
         }
         else
         {
+            if (const auto newItem = TabItems().GetAt(args.Index()).try_as<TabViewItem>())
+            {
+                newItem->OnTabViewWidthModeChanged(TabWidthMode());
+            }
             UpdateTabWidths();
         }
     }

diff --git a/dev/TabView/TabViewItem.cpp b/dev/TabView/TabViewItem.cpp
@@ -88,6 +88,7 @@ void TabViewItem::OnApplyTemplate()
     }
 
     UpdateCloseButton();
+    UpdateWidthModeVisualState();
 }
 
 void TabViewItem::OnIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args)
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,7 @@ void TabViewItem::OnApplyTemplate() @@
         }
         UpdateCloseButton();
+        UpdateWidthModeVisualState();
     }
     void TabViewItem::OnIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args)
@@ Expand Down @@