Set logical parent

wieslawsoltes · Oct 24, 2024 · 46b4ced · 46b4ced
1 parent 4595ed2
commit 46b4ced
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs b/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
 using Avalonia.Reactive;
 
 namespace Avalonia.Xaml.Interactivity;
@@ -63,6 +64,12 @@ public void Attach(AvaloniaObject? associatedObject)
 
         _dataContextDisposable = SynchronizeDataContext(associatedObject);
 
+        if (associatedObject is StyledElement styledElement)
+        {
+            ((ISetLogicalParent)this).SetParent(null);
+            ((ISetLogicalParent)this).SetParent(styledElement);
+        }
+
         OnAttached();
     }
 
@@ -73,6 +80,12 @@ public void Detach()
     {
         OnDetaching();
         _dataContextDisposable?.Dispose();
+
+        if (AssociatedObject is StyledElement)
+        {
+            ((ISetLogicalParent)this).SetParent(null);
+        }
+
         AssociatedObject = null;
     }