Skip to content

Commit

Permalink
prevent multiple enumerations
Browse files Browse the repository at this point in the history
  • Loading branch information
Edward Miller committed Jan 19, 2024
1 parent 5d2ac90 commit 447d33e
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/Core/src/Core/Extensions/VisualTreeElementExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Maui.Graphics;
Expand Down Expand Up @@ -145,11 +145,13 @@ 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()));

if (testList.Any())
visualElements.AddRange(testList);
}

visualElements.Reverse();
Expand Down

0 comments on commit 447d33e

Please sign in to comment.