From b1ca75a30b9cda3f91dbd9af4c2d89246d52b66f Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 3 Feb 2023 16:13:12 +0100
Subject: [PATCH] fix: Address review

---
 src/Avalonia.Base/Animation/Animatable.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
index 50d9a48e9e..6a05dfbe6d 100644
--- a/src/Avalonia.Base/Animation/Animatable.cs
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -29,12 +29,9 @@ namespace Avalonia.Animation
         private bool _transitionsEnabled = true;
         private bool _isSubscribedToTransitionsCollection = false;
         private Dictionary<ITransition, TransitionState>? _transitionState;
-        readonly NotifyCollectionChangedEventHandler _collectionChanged;
-
-        public Animatable()
-        {
-            _collectionChanged = TransitionsCollectionChanged;
-        }
+        private NotifyCollectionChangedEventHandler _collectionChanged;
+        private NotifyCollectionChangedEventHandler TransitionsCollectionChangedHandler => 
+            _collectionChanged ??= TransitionsCollectionChanged;
 
         /// <summary>
         /// Gets or sets the clock which controls the animations on the control.
@@ -72,7 +69,7 @@ namespace Avalonia.Animation
                     if (!_isSubscribedToTransitionsCollection)
                     {
                         _isSubscribedToTransitionsCollection = true;
-                        transitions.CollectionChanged += _collectionChanged;
+                        transitions.CollectionChanged += TransitionsCollectionChangedHandler;
                     }
                     AddTransitions(transitions);
                 }
@@ -97,7 +94,7 @@ namespace Avalonia.Animation
                     if (_isSubscribedToTransitionsCollection)
                     {
                         _isSubscribedToTransitionsCollection = false;
-                        transitions.CollectionChanged -= _collectionChanged;
+                        transitions.CollectionChanged -= TransitionsCollectionChangedHandler;
                     }
                     RemoveTransitions(transitions);
                 }
@@ -126,7 +123,7 @@ namespace Avalonia.Animation
                         toAdd = newTransitions.Except(oldTransitions).ToList();
                     }
 
-                    newTransitions.CollectionChanged += _collectionChanged;
+                    newTransitions.CollectionChanged += TransitionsCollectionChangedHandler;
                     _isSubscribedToTransitionsCollection = true;
                     AddTransitions(toAdd);
                 }
@@ -140,7 +137,7 @@ namespace Avalonia.Animation
                         toRemove = oldTransitions.Except(newTransitions).ToList();
                     }
 
-                    oldTransitions.CollectionChanged -= _collectionChanged;
+                    oldTransitions.CollectionChanged -= TransitionsCollectionChangedHandler;
                     RemoveTransitions(toRemove);
                 }
             }