From b127453467de56a94524c9a10019e275612e1d86 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 21 Jan 2023 14:37:52 +0100
Subject: [PATCH] Remove hack from ItemsControl.

---
 src/Avalonia.Controls/ItemsControl.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
index 6e89a4eb1d..fee394fe08 100644
--- a/src/Avalonia.Controls/ItemsControl.cs
+++ b/src/Avalonia.Controls/ItemsControl.cs
@@ -90,7 +90,6 @@ namespace Avalonia.Controls
         private EventHandler<ChildIndexChangedEventArgs>? _childIndexChanged;
         private EventHandler<EventArgs>? _totalCountChanged;
         private IDataTemplate? _displayMemberItemTemplate;
-        private Tuple<int, Control>? _containerBeingPrepared;
         private ScrollViewer? _scrollViewer;
 
         /// <summary>
@@ -527,10 +526,7 @@ namespace Avalonia.Controls
 
         internal void ItemContainerPrepared(Control container, object? item, int index)
         {
-            _containerBeingPrepared = new(index, container);
             _childIndexChanged?.Invoke(this, new ChildIndexChangedEventArgs(container, index));
-            _containerBeingPrepared = null;
-
             _scrollViewer?.RegisterAnchorCandidate(container);
         }
 
@@ -668,9 +664,6 @@ namespace Avalonia.Controls
 
         int IChildIndexProvider.GetChildIndex(ILogical child)
         {
-            if (_containerBeingPrepared?.Item2 == child)
-                return _containerBeingPrepared.Item1;
-
             return child is Control container ? IndexFromContainer(container) : -1;
         }