test

AvaloniaUI · Apr 20, 2024 · 6502e1d · 6502e1d
1 parent 1e223d2
commit 6502e1d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs
@@ -448,6 +448,13 @@ protected virtual void ContainerIndexChangedOverride(Control container, int oldI
         /// <param name="container">The container element.</param>
         protected internal virtual void ClearContainerForItemOverride(Control container)
         {
+            // Ensure DataContex is Clear to avoid memory leak
+            // I use SetValue instead of ClearValue to avoid DataContext inheritance
+            container.SetValue(DataContextProperty, null);
+
+            // 
+            KeyboardNavigation.SetTabOnceActiveElement(this, null);
+
             if (container is HeaderedContentControl hcc)
             {
                 hcc.ClearValue(HeaderedContentControl.ContentProperty);