From 936d4c3448108f793002adb87f09f1eede21dbb1 Mon Sep 17 00:00:00 2001
From: Dmitry Zhelnin <d.zhelnin@of-group.ru>
Date: Thu, 2 Feb 2023 18:15:35 +0300
Subject: [PATCH] Animatable: handle transitions subscription when contol is
 added or removed from visual tree

---
 src/Avalonia.Base/Animation/Animatable.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
index edaa76233e..eddb89c3e8 100644
--- a/src/Avalonia.Base/Animation/Animatable.cs
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -27,6 +27,7 @@ namespace Avalonia.Animation
             AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
 
         private bool _transitionsEnabled = true;
+        private bool _isSubscribedToTransitionsCollection = false;
         private Dictionary<ITransition, TransitionState>? _transitionState;
 
         /// <summary>
@@ -62,6 +63,11 @@ namespace Avalonia.Animation
 
                 if (Transitions is object)
                 {
+                    if (!_isSubscribedToTransitionsCollection)
+                    {
+                        _isSubscribedToTransitionsCollection = true;
+                        Transitions.CollectionChanged += TransitionsCollectionChanged;
+                    }
                     AddTransitions(Transitions);
                 }
             }
@@ -72,7 +78,7 @@ namespace Avalonia.Animation
         /// </summary>
         /// <remarks>
         /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
+        /// when a control is removed from the visual tree.
         /// </remarks>
         protected void DisableTransitions()
         {
@@ -82,6 +88,11 @@ namespace Avalonia.Animation
 
                 if (Transitions is object)
                 {
+                    if (_isSubscribedToTransitionsCollection)
+                    {
+                        _isSubscribedToTransitionsCollection = false;
+                        Transitions.CollectionChanged -= TransitionsCollectionChanged;
+                    }
                     RemoveTransitions(Transitions);
                 }
             }
@@ -110,6 +121,7 @@ namespace Avalonia.Animation
                     }
 
                     newTransitions.CollectionChanged += TransitionsCollectionChanged;
+                    _isSubscribedToTransitionsCollection = true;
                     AddTransitions(toAdd);
                 }