prevent multiple enumerations

dotnet · Jan 19, 2024 · 529a500 · 529a500
1 parent 5d2ac90
commit 529a500
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Core/src/Core/Extensions/VisualTreeElementExtensions.cs b/src/Core/src/Core/Extensions/VisualTreeElementExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Maui.Graphics;
@@ -145,11 +145,14 @@ static List<IVisualTreeElement> GetVisualTreeElementsWindowsInternal(IVisualTree
 
 			if (uiElement != null)
 			{
-				var uniqueElements = findChildren(uiElement).Distinct();
-				var viewTree = visualElement.GetVisualTreeDescendants().Where(n => n is IView view && view.Handler is not null).Select(n => new Tuple<IView, object?>((IView)n, ((IView)n).ToPlatform()));
-				var testList = viewTree.Where(n => uniqueElements.Contains(n.Item2)).Select(n => n.Item1);
-				if (testList != null && testList.Any())
-					visualElements.AddRange(testList.Select(n => (IVisualTreeElement)n));
+				var uniqueElements = findChildren(uiElement).ToHashSet();
+
+				var testList = visualElement.GetVisualTreeDescendants()
+					.Where(n => n is IView view && view.Handler is not null && uniqueElements.Contains(view.ToPlatform()))
+					.ToList();
+
+				if (testList.Count > 0)
+					visualElements.AddRange(testList);
 			}
 
 			visualElements.Reverse();