Set logical parent or visual tree attachment/detachment if Associated…

…Object was set
wieslawsoltes · Oct 30, 2024 · 39e8326 · 39e8326
1 parent 165614d
commit 39e8326
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs b/src/Avalonia.Xaml.Interactivity/StyledElementBehavior.cs
@@ -95,19 +95,31 @@ protected virtual void OnDetaching()
     {
     }
 
-    void IBehaviorEventsHandler.AttachedToVisualTreeEventHandler() => OnAttachedToVisualTree();
+    void IBehaviorEventsHandler.AttachedToVisualTreeEventHandler()
+    {
+        AttachBehaviorToLogicalTree();
+
+        OnAttachedToVisualTree();
+    }
 
-    void IBehaviorEventsHandler.DetachedFromVisualTreeEventHandler() => OnDetachedFromVisualTree();
+    void IBehaviorEventsHandler.DetachedFromVisualTreeEventHandler()
+    {
+        DetachBehaviorFromLogicalTree();
+
+        OnDetachedFromVisualTree();
+    }
 
     void IBehaviorEventsHandler.AttachedToLogicalTreeEventHandler()
     {
-        AttachToLogicalTree();
+        AttachBehaviorToLogicalTree();
+
         OnAttachedToLogicalTree();
     }
 
     void IBehaviorEventsHandler.DetachedFromLogicalTreeEventHandler()
     {
-        DetachFromLogicalTree();
+        DetachBehaviorFromLogicalTree();
+
         OnDetachedFromLogicalTree();
     }
 
@@ -175,18 +187,21 @@ protected virtual void OnUnloaded()
     {
     }
 
-    private void AttachToLogicalTree()
+    private void AttachBehaviorToLogicalTree()
     {
         if (AssociatedObject is not StyledElement styledElement)
         {
             return;
         }
 
-        ((ISetLogicalParent)this).SetParent(null);
-        ((ISetLogicalParent)this).SetParent(styledElement);
+        if (styledElement.Parent is not null)
+        {
+            ((ISetLogicalParent)this).SetParent(null);
+            ((ISetLogicalParent)this).SetParent(styledElement);
+        }
     }
 
-    private void DetachFromLogicalTree()
+    private void DetachBehaviorFromLogicalTree()
     {
         ((ISetLogicalParent)this).SetParent(null);
     }