* Rename FindElementOfTypeInSubtree -> FindVisualChildByType (#3438)

* FindVisualChildByName() now an extension method * internal code cleanup
microsoft · Oct 29, 2020 · 4d7abe1 · 4d7abe1
1 parent 4becbf5
commit 4d7abe1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -221,7 +221,7 @@ private void TimePickerDensityTest_Click(object sender, RoutedEventArgs e)
 
         private void ListViewItemDensityTest_Click(object sender, RoutedEventArgs e)
         {
-            var item = ListView1.FindElementOfTypeInSubtree<ListViewItem>();
+            var item = ListView1.FindVisualChildByType<ListViewItem>();
             SimpleVerify simpleVerify = new SimpleVerify();
             if (item != null)
             {

diff --git a/dev/CommonStyles/TestUI/CompactPage.xaml.cs b/dev/CommonStyles/TestUI/CompactPage.xaml.cs
@@ -70,9 +70,9 @@ private FrameworkElement GetChild(FrameworkElement item, string childXName)
         private void RunTest_Click(object sender, RoutedEventArgs e)
         {           
             SimpleVerify simpleVerify = new SimpleVerify();
-            FrameworkElement item = ListView.FindElementOfTypeInSubtree<ListViewItem>();
+            FrameworkElement item = ListView.FindVisualChildByType<ListViewItem>();
             VerifyHeight(simpleVerify, item, 32, "ListViewItem");
-            item = TreeView.FindElementOfTypeInSubtree<TreeViewItem>();
+            item = TreeView.FindVisualChildByType<TreeViewItem>();
             VerifyHeight(simpleVerify, item, 24, "TreeViewItem");
 
             VerifyHeight(simpleVerify, NavItem1, 32, "NavigationViewItem");

diff --git a/dev/Repeater/TestUI/Samples/LayoutSamples/NestedLayoutSamples/ItemsViewWithDataPage.xaml.cs b/dev/Repeater/TestUI/Samples/LayoutSamples/NestedLayoutSamples/ItemsViewWithDataPage.xaml.cs
@@ -239,7 +239,7 @@ private void OnScrollButtonClicked(object sender, RoutedEventArgs e)
 
                 if (i < indexPath.Length - 1)
                 {
-                    repeater = container.FindElementOfTypeInSubtree<ItemsRepeater>();
+                    repeater = container.FindVisualChildByType<ItemsRepeater>();
                 }
                 else
                 {

diff --git a/dev/TabView/TestUI/TabViewTabItemsSourcePage.xaml.cs b/dev/TabView/TestUI/TabViewTabItemsSourcePage.xaml.cs
@@ -39,7 +39,7 @@ private void TabViewItemsSourceSample_TabItemsChanged(TabView sender, IVectorCha
 
         private void TabViewTabItemsSourcePage_Loaded(object sender, RoutedEventArgs e)
         {
-            innerListView = TabViewItemsSourceSample.FindElementOfTypeInSubtree<ListView>();
+            innerListView = TabViewItemsSourceSample.FindVisualChildByType<ListView>();
 
             for (int tabIndex = 0; tabIndex < initialTabsCount; tabIndex++)
             {

diff --git a/test/MUXControlsTestApp/Utilities/VisualTreeUtils.cs b/test/MUXControlsTestApp/Utilities/VisualTreeUtils.cs
@@ -8,23 +8,23 @@ namespace MUXControlsTestApp.Utilities
 {
     public static class VisualTreeUtils
     {
-        public static T FindElementOfTypeInSubtree<T>(this DependencyObject element)
+        public static T FindVisualChildByType<T>(this DependencyObject element)
             where T : DependencyObject
         {
             if (element == null)
             {
                 return null;
             }
 
-            if (element is T)
+            if (element is T elementAsT)
             {
-                return (T)element;
+                return elementAsT;
             }
 
             int childrenCount = VisualTreeHelper.GetChildrenCount(element);
             for (int i = 0; i < childrenCount; i++)
             {
-                var result = FindElementOfTypeInSubtree<T>(VisualTreeHelper.GetChild(element, i));
+                var result = VisualTreeHelper.GetChild(element, i).FindVisualChildByType<T>();
                 if (result != null)
                 {
                     return result;
@@ -34,27 +34,25 @@ public static T FindElementOfTypeInSubtree<T>(this DependencyObject element)
             return null;
         }
 
-        public static DependencyObject FindVisualChildByName(FrameworkElement parent, string name)
+        public static FrameworkElement FindVisualChildByName(this DependencyObject element, string name)
         {
-            if (parent.Name == name)
+            if (element == null || string.IsNullOrWhiteSpace(name))
             {
-                return parent;
+                return null;
             }
 
-            int childrenCount = VisualTreeHelper.GetChildrenCount(parent);
+            if (element is FrameworkElement elementAsFE && elementAsFE.Name == name)
+            {
+                return elementAsFE;
+            }
 
+            int childrenCount = VisualTreeHelper.GetChildrenCount(element);
             for (int i = 0; i < childrenCount; i++)
             {
-                FrameworkElement childAsFE = VisualTreeHelper.GetChild(parent, i) as FrameworkElement;
-
-                if (childAsFE != null)
+                var result = VisualTreeHelper.GetChild(element, i).FindVisualChildByName(name);
+                if (result != null)
                 {
-                    DependencyObject result = FindVisualChildByName(childAsFE, name);
-
-                    if (result != null)
-                    {
-                        return result;
-                    }
+                    return result;
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up @@
                     if (i < indexPath.Length - 1)
                     {
-                        repeater = container.FindElementOfTypeInSubtree<ItemsRepeater>();
+                        repeater = container.FindVisualChildByType<ItemsRepeater>();
                     }
                     else
                     {
@@ Expand Down @@