Merge branch 'master' into Feature/Playwright_ExtentedSupport

Ginger-Automation · Nov 29, 2024 · 0bbe924 · 0bbe924
2 parents 9a7811a + 9ab9464
commit 0bbe924
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/UCTreeView.xaml.cs b/Ginger/Ginger/UserControlsLib/UCTreeView/UCTreeView.xaml.cs
@@ -782,11 +782,18 @@ private bool FilterItemsByTextNew(IEnumerable<ITreeViewItem> items, string text)
                     wasFound = true;
                 }
 
-                if (FilterItemsByTextNew(item.Childrens(), text))
+                bool foundMatchInChildren = FilterItemsByTextNew(item.Childrens(), text);
+                if (foundMatchInChildren)
                 {
                     wasFound = true;
                     itemBase.Visibility = Visibility.Visible;
                 }
+
+                bool canExpand = item.IsExpandable() && itemBase.TreeViewItem != null;
+                if (foundMatchInChildren && canExpand)
+                {
+                    itemBase.TreeViewItem!.IsExpanded = true;
+                }
             }
 
             return wasFound;