From 84dd710fc184c322a59f4f8a650d5573f2ba18de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 16 Jun 2021 13:53:35 +0200
Subject: [PATCH] Use attached property

---
 .../RenderDemo/Pages/CustomAnimatorPage.xaml   |  4 ++--
 src/Avalonia.Animation/Animation.cs            | 18 +++++++++++++++++-
 src/Avalonia.Animation/IAnimationSetter.cs     |  1 -
 src/Avalonia.Styling/Styling/Setter.cs         |  5 -----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
index 6abb9a1217..b386636cae 100644
--- a/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
+++ b/samples/RenderDemo/Pages/CustomAnimatorPage.xaml
@@ -11,10 +11,10 @@
           <Style.Animations>
             <Animation Duration="0:0:1" IterationCount="Infinite">
               <KeyFrame Cue="0%">
-                <Setter Property="Text" Value="" Animator="{x:Type pages:CustomStringAnimator}"/>
+                <Setter Property="Text" Value="" Animation.Animator="{x:Type pages:CustomStringAnimator}"/>
               </KeyFrame>
               <KeyFrame Cue="100%">
-                <Setter Property="Text" Value="0123456789" Animator="{x:Type pages:CustomStringAnimator}"/>
+                <Setter Property="Text" Value="0123456789" Animation.Animator="{x:Type pages:CustomStringAnimator}"/>
               </KeyFrame>
             </Animation>
           </Style.Animations>
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 07b8c1a54e..76fbfafaa5 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -194,6 +194,22 @@ namespace Avalonia.Animation
         [Content]
         public KeyFrames Children { get; } = new KeyFrames();
 
+        private static readonly Dictionary<object, Type> s_animators = new Dictionary<object, Type>();
+
+        public static Type GetAnimator(object obj)
+        {
+            if (s_animators.TryGetValue(obj, out var type))
+            {
+                return type;
+            }
+            return null;
+        }
+
+        public static void SetAnimator(object obj, Type value)
+        {
+            s_animators[obj] = value;
+        }
+
         private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator)> Animators = new List<(Func<AvaloniaProperty, bool>, Type)>
         {
             ( prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator) ),
@@ -248,7 +264,7 @@ namespace Avalonia.Animation
             {
                 foreach (var setter in keyframe.Setters)
                 {
-                    var handler = setter.Animator ?? GetAnimatorType(setter.Property);
+                    var handler = Animation.GetAnimator(setter) ?? GetAnimatorType(setter.Property);
 
                     if (handler == null)
                     {
diff --git a/src/Avalonia.Animation/IAnimationSetter.cs b/src/Avalonia.Animation/IAnimationSetter.cs
index 072d7096ae..d916f19370 100644
--- a/src/Avalonia.Animation/IAnimationSetter.cs
+++ b/src/Avalonia.Animation/IAnimationSetter.cs
@@ -6,6 +6,5 @@ namespace Avalonia.Animation
     {
         AvaloniaProperty Property { get; set; }
         object Value { get; set; }
-        Type Animator { get; set; }
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 114a97dbb6..1f3d6335a9 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -59,11 +59,6 @@ namespace Avalonia.Styling
             }
         }
 
-        /// <summary>
-        /// Gets or sets the property animator.
-        /// </summary>
-        public Type? Animator { get; set; }
-
         public ISetterInstance Instance(IStyleable target)
         {
             target = target ?? throw new ArgumentNullException(nameof(target));