Merge branch 'master' into fixes/gpu-interop-memory-usage

samples/RenderDemo/Pages/CustomStringAnimator.cs

@@ -1,9 +1,10 @@
-using Avalonia.Animation;
+using System;
+using Avalonia.Animation;
 using Avalonia.Animation.Animators;
 
 namespace RenderDemo.Pages
 {
-    public class CustomStringAnimator : CustomAnimatorBase<string>
+    public class CustomStringAnimator : InterpolatingAnimator<string>
     {
         public override string Interpolate(double progress, string oldValue, string newValue)
         {

src/Avalonia.Base/Animation/Animation.AnimatorRegistry.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using Avalonia.Animation.Animators;
+using Avalonia.Media;
+
+namespace Avalonia.Animation;
+
+partial class Animation
+{
+    /// <summary>
+    /// Sets the value of the Animator attached property for a setter.
+    /// </summary>
+    /// <param name="setter">The animation setter.</param>
+    /// <param name="value">The property animator value.</param>
+    [Obsolete("CustomAnimatorBase will be removed before 11.0, use InterpolatingAnimator<T>", true)]
+    public static void SetAnimator(IAnimationSetter setter, CustomAnimatorBase value)
+    {
+        s_animators[setter] = (value.WrapperType, value.CreateWrapper);
+    }
+
+    /// <summary>
+    /// Sets the value of the Animator attached property for a setter.
+    /// </summary>
+    /// <param name="setter">The animation setter.</param>
+    /// <param name="value">The property animator value.</param>
+    public static void SetAnimator(IAnimationSetter setter, ICustomAnimator value)
+    {
+        s_animators[setter] = (value.WrapperType, value.CreateWrapper);
+    }
+
+    private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator, Func<IAnimator> Factory)>
+        Animators = new()
+        {
+            (prop =>(typeof(double).IsAssignableFrom(prop.PropertyType) && typeof(Transform).IsAssignableFrom(prop.OwnerType)),
+                typeof(TransformAnimator), () => new TransformAnimator()),
+            (prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator), () => new BoolAnimator()),
+            (prop => typeof(byte).IsAssignableFrom(prop.PropertyType), typeof(ByteAnimator), () => new ByteAnimator()),
+            (prop => typeof(Int16).IsAssignableFrom(prop.PropertyType), typeof(Int16Animator), () => new Int16Animator()),
+            (prop => typeof(Int32).IsAssignableFrom(prop.PropertyType), typeof(Int32Animator), () => new Int32Animator()),
+            (prop => typeof(Int64).IsAssignableFrom(prop.PropertyType), typeof(Int64Animator), () => new Int64Animator()), 
+            (prop => typeof(UInt16).IsAssignableFrom(prop.PropertyType), typeof(UInt16Animator), () => new UInt16Animator()), 
+            (prop => typeof(UInt32).IsAssignableFrom(prop.PropertyType), typeof(UInt32Animator), () => new UInt32Animator()), 
+            (prop => typeof(UInt64).IsAssignableFrom(prop.PropertyType), typeof(UInt64Animator), () => new UInt64Animator()),
+            (prop => typeof(float).IsAssignableFrom(prop.PropertyType), typeof(FloatAnimator), () => new FloatAnimator()), 
+            (prop => typeof(double).IsAssignableFrom(prop.PropertyType), typeof(DoubleAnimator), () => new DoubleAnimator()), 
+            (prop => typeof(decimal).IsAssignableFrom(prop.PropertyType), typeof(DecimalAnimator), () => new DecimalAnimator()),
+        };
+
+    static Animation()
+    {
+        RegisterAnimator<IEffect?, EffectAnimator>();
+        RegisterAnimator<BoxShadow, BoxShadowAnimator>();
+        RegisterAnimator<BoxShadows, BoxShadowsAnimator>();
+        RegisterAnimator<IBrush?, BaseBrushAnimator>();
+        RegisterAnimator<CornerRadius, CornerRadiusAnimator>();
+        RegisterAnimator<Color, ColorAnimator>();
+        RegisterAnimator<Vector, VectorAnimator>();
+        RegisterAnimator<Point, PointAnimator>();
+        RegisterAnimator<Rect, RectAnimator>();
+        RegisterAnimator<RelativePoint, RelativePointAnimator>();
+        RegisterAnimator<Size, SizeAnimator>();
+        RegisterAnimator<Thickness, ThicknessAnimator>();
+    }
+
+    /// <summary>
+    /// Registers a <see cref="Animator{T}"/> that can handle
+    /// a value type that matches the specified condition.
+    /// </summary>
+    static void RegisterAnimator<T, TAnimator>()
+        where TAnimator : Animator<T>, new()
+    {
+        Animators.Insert(0,
+            (prop => typeof(T).IsAssignableFrom(prop.PropertyType), typeof(TAnimator), () => new TAnimator()));
+    }
+
+    public static void RegisterCustomAnimator<T, TAnimator>() where TAnimator : InterpolatingAnimator<T>, new()
+    {
+        Animators.Insert(0, (prop => typeof(T).IsAssignableFrom(prop.PropertyType),
+            typeof(InterpolatingAnimator<T>.AnimatorWrapper), () => new TAnimator().CreateWrapper()));
+    }
+
+    private static (Type Type, Func<IAnimator> Factory)? GetAnimatorType(AvaloniaProperty property)
+    {
+        foreach (var (condition, type, factory) in Animators)
+        {
+            if (condition(property))
+            {
+                return (type, factory);
+            }
+        }
+
+        return null;
+    }
+}

src/Avalonia.Base/Animation/Animation.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Avalonia.Reactive;
 using System.Threading;
 using System.Threading.Tasks;
-
-using Avalonia.Animation.Animators;
 using Avalonia.Animation.Easings;
 using Avalonia.Data;
 using Avalonia.Metadata;
@@ -16,7 +13,7 @@ namespace Avalonia.Animation
     /// <summary>
     /// Tracks the progress of an animation.
     /// </summary>
-    public sealed class Animation : AvaloniaObject, IAnimation
+    public sealed partial class Animation : AvaloniaObject, IAnimation
     {
         /// <summary>
         /// Defines the <see cref="Duration"/> property.
@@ -195,60 +192,6 @@ namespace Avalonia.Animation
             return null;
         }
 
-        /// <summary>
-        /// Sets the value of the Animator attached property for a setter.
-        /// </summary>
-        /// <param name="setter">The animation setter.</param>
-        /// <param name="value">The property animator value.</param>
-        public static void SetAnimator(IAnimationSetter setter, CustomAnimatorBase value)
-        {
-            s_animators[setter] = (value.WrapperType, value.CreateWrapper);
-        }
-
-        private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator, Func<IAnimator> Factory)> Animators = new()
-        {
-            ( prop => typeof(bool).IsAssignableFrom(prop.PropertyType), typeof(BoolAnimator), () => new BoolAnimator() ),
-            ( prop => typeof(byte).IsAssignableFrom(prop.PropertyType), typeof(ByteAnimator), () => new ByteAnimator() ),
-            ( prop => typeof(Int16).IsAssignableFrom(prop.PropertyType), typeof(Int16Animator), () => new Int16Animator() ),
-            ( prop => typeof(Int32).IsAssignableFrom(prop.PropertyType), typeof(Int32Animator), () => new Int32Animator() ),
-            ( prop => typeof(Int64).IsAssignableFrom(prop.PropertyType), typeof(Int64Animator), () => new Int64Animator() ),
-            ( prop => typeof(UInt16).IsAssignableFrom(prop.PropertyType), typeof(UInt16Animator), () => new UInt16Animator() ),
-            ( prop => typeof(UInt32).IsAssignableFrom(prop.PropertyType), typeof(UInt32Animator), () => new UInt32Animator() ),
-            ( prop => typeof(UInt64).IsAssignableFrom(prop.PropertyType), typeof(UInt64Animator), () => new UInt64Animator() ),
-            ( prop => typeof(float).IsAssignableFrom(prop.PropertyType), typeof(FloatAnimator), () => new FloatAnimator() ),
-            ( prop => typeof(double).IsAssignableFrom(prop.PropertyType), typeof(DoubleAnimator), () => new DoubleAnimator() ),
-            ( prop => typeof(decimal).IsAssignableFrom(prop.PropertyType), typeof(DecimalAnimator), () => new DecimalAnimator() ),
-        };
-
-        /// <summary>
-        /// Registers a <see cref="Animator{T}"/> that can handle
-        /// a value type that matches the specified condition.
-        /// </summary>
-        /// <param name="condition">
-        /// The condition to which the <see cref="Animator{T}"/>
-        /// is to be activated and used.
-        /// </param>
-        /// <typeparam name="TAnimator">
-        /// The type of the animator to instantiate.
-        /// </typeparam>
-        internal static void RegisterAnimator<TAnimator>(Func<AvaloniaProperty, bool> condition)
-            where TAnimator : IAnimator, new()
-        {
-            Animators.Insert(0, (condition, typeof(TAnimator), () => new TAnimator()));
-        }
-
-        private static (Type Type, Func<IAnimator> Factory)? GetAnimatorType(AvaloniaProperty property)
-        {
-            foreach (var (condition, type, factory) in Animators)
-            {
-                if (condition(property))
-                {
-                    return (type, factory);
-                }
-            }
-            return null;
-        }
-
         private (IList<IAnimator> Animators, IList<IDisposable> subscriptions) InterpretKeyframes(Animatable control)
         {
             var handlerList = new Dictionary<(Type type, AvaloniaProperty Property), Func<IAnimator>>();

src/Avalonia.Base/Animation/ICustomAnimator.cs

@@ -1,14 +1,15 @@
 using System;
 using Avalonia.Animation.Animators;
-
 namespace Avalonia.Animation;
 
+[Obsolete("This class will be removed before 11.0, use InterpolatingAnimator<T>", true)]
 public abstract class CustomAnimatorBase
 {
     internal abstract IAnimator CreateWrapper();
     internal abstract Type WrapperType { get; }
 }
 
+[Obsolete("This class will be removed before 11.0, use InterpolatingAnimator<T>", true)]
 public abstract class CustomAnimatorBase<T> : CustomAnimatorBase
 {
     public abstract T Interpolate(double progress, T oldValue, T newValue);
@@ -25,6 +26,33 @@ public abstract class CustomAnimatorBase<T> : CustomAnimatorBase
             _parent = parent;
         }
         
+        public override T Interpolate(double progress, T oldValue, T newValue) => _parent.Interpolate(progress, oldValue, newValue);
+    }
+}
+
+public interface ICustomAnimator
+{
+    internal IAnimator CreateWrapper();
+    internal Type WrapperType { get; }
+}
+
+public abstract class InterpolatingAnimator<T> : ICustomAnimator
+{
+    public abstract T Interpolate(double progress, T oldValue, T newValue);
+
+    Type ICustomAnimator.WrapperType => typeof(AnimatorWrapper);
+    IAnimator ICustomAnimator.CreateWrapper() => new AnimatorWrapper(this);
+    internal IAnimator CreateWrapper() => new AnimatorWrapper(this);
+
+    internal class AnimatorWrapper : Animator<T>
+    {
+        private readonly InterpolatingAnimator<T> _parent;
+
+        public AnimatorWrapper(InterpolatingAnimator<T> parent)
+        {
+            _parent = parent;
+        }
+        
         public override T Interpolate(double progress, T oldValue, T newValue) => _parent.Interpolate(progress, oldValue, newValue);
     }
 }

src/Avalonia.Base/CornerRadius.cs

@@ -15,13 +15,6 @@ namespace Avalonia
 #endif
     readonly struct CornerRadius : IEquatable<CornerRadius>
     {
-        static CornerRadius()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<CornerRadiusAnimator>(prop => typeof(CornerRadius).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         public CornerRadius(double uniformRadius)
         {
             TopLeft = TopRight = BottomLeft = BottomRight = uniformRadius;

src/Avalonia.Base/Input/TouchDevice.cs

@@ -51,7 +51,7 @@ namespace Avalonia.Input
                 pointer.Capture(hit);
             }
 
-            var target = pointer.Captured ?? args.Root;
+            var target = pointer.Captured ?? args.InputHitTestResult ?? args.Root;
             var gestureTarget = pointer.CapturedGestureRecognizer?.Target;
             var updateKind = args.Type.ToUpdateKind();
             var keyModifier = args.InputModifiers.ToKeyModifiers();

src/Avalonia.Base/Media/BoxShadow.cs

@@ -16,12 +16,6 @@ namespace Avalonia.Media
         public Color Color { get; set; }
         public bool IsInset { get; set; }
 
-        static BoxShadow()
-        {
-            Animation.Animation.RegisterAnimator<BoxShadowAnimator>(prop =>
-                typeof(BoxShadow).IsAssignableFrom(prop.PropertyType));
-        }
-        
         public bool Equals(in BoxShadow other)
         {
             return OffsetX.Equals(other.OffsetX) && OffsetY.Equals(other.OffsetY) && Blur.Equals(other.Blur) && Spread.Equals(other.Spread) && Color.Equals(other.Color);

src/Avalonia.Base/Media/BoxShadows.cs

@@ -10,12 +10,6 @@ namespace Avalonia.Media
         private readonly BoxShadow _first;
         private readonly BoxShadow[]? _list;
         public int Count { get; }
-
-        static BoxShadows()
-        {
-            Animation.Animation.RegisterAnimator<BoxShadowsAnimator>(prop =>
-                typeof(BoxShadows).IsAssignableFrom(prop.PropertyType));
-        }
         
         public BoxShadows(BoxShadow shadow)
         {

src/Avalonia.Base/Media/Brush.cs

@@ -34,11 +34,6 @@ namespace Avalonia.Media
         /// </summary>
         public static readonly StyledProperty<RelativePoint> TransformOriginProperty =
             AvaloniaProperty.Register<Brush, RelativePoint>(nameof(TransformOrigin));
-        
-        static Brush()
-        {
-            Animation.Animation.RegisterAnimator<BaseBrushAnimator>(prop => typeof(IBrush).IsAssignableFrom(prop.PropertyType));
-        }
 
         /// <summary>
         /// Gets or sets the opacity of the brush.

src/Avalonia.Base/Media/Color.cs

@@ -25,13 +25,6 @@ namespace Avalonia.Media
     {
         private const double byteToDouble = 1.0 / 255;
 
-        static Color()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<ColorAnimator>(prop => typeof(Color).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// Gets the Alpha component of the color.
         /// </summary>

src/Avalonia.Base/Media/Effects/EffectAnimator.cs

@@ -63,8 +63,6 @@ internal class EffectAnimator : Animator<IEffect?>
         if(s_Registered)
             return;
         s_Registered = true;
-        Animation.RegisterAnimator<EffectAnimator>(prop =>
-            typeof(IEffect).IsAssignableFrom(prop.PropertyType));
     }
 }
 

src/Avalonia.Base/Media/MediaContext.Clock.cs

@@ -4,6 +4,7 @@ using System.Diagnostics;
 using Avalonia.Animation;
 using Avalonia.Reactive;
 using Avalonia.Threading;
+using Avalonia.Utilities;
 
 namespace Avalonia.Media;
 
@@ -17,8 +18,12 @@ internal partial class MediaContext
     {
         private readonly MediaContext _parent;
         private List<IObserver<TimeSpan>> _observers = new();
-        public bool HasNewSubscriptions { get; set; }
-        public bool HasSubscriptions => _observers.Count > 0;
+        private List<IObserver<TimeSpan>> _newObservers = new();
+        private Queue<Action<TimeSpan>> _queuedAnimationFrames = new();
+        private Queue<Action<TimeSpan>> _queuedAnimationFramesNext = new();
+        private TimeSpan _currentAnimationTimestamp;
+        public bool HasNewSubscriptions => _newObservers.Count > 0;
+        public bool HasSubscriptions => _observers.Count > 0 || _queuedAnimationFrames.Count > 0;
 
         public MediaContextClock(MediaContext parent)
         {
@@ -29,19 +34,41 @@ internal partial class MediaContext
         {
             _parent.ScheduleRender(false);
             Dispatcher.UIThread.VerifyAccess();
-            HasNewSubscriptions = true;
             _observers.Add(observer);
+            _newObservers.Add(observer);
             return Disposable.Create(() =>
             {
                 Dispatcher.UIThread.VerifyAccess();
                 _observers.Remove(observer);
             });
         }
+        
+        public void RequestAnimationFrame(Action<TimeSpan> action)
+        {
+            _parent.ScheduleRender(false);
+            _queuedAnimationFrames.Enqueue(action);
+        }
 
         public void Pulse(TimeSpan now)
         {
+            _newObservers.Clear();
+            _currentAnimationTimestamp = now;
+            
+            // We are swapping the queues before enumeration
+            (_queuedAnimationFrames, _queuedAnimationFramesNext) = (_queuedAnimationFramesNext, _queuedAnimationFrames);
+            var animationFrames = _queuedAnimationFramesNext;
+            while (animationFrames.TryDequeue(out var callback))
+                callback(now);
+            
             foreach (var observer in _observers.ToArray())
-                observer.OnNext(now);
+                observer.OnNext(_currentAnimationTimestamp);
+        }
+        
+        public void PulseNewSubscriptions()
+        {
+            foreach (var observer in _newObservers.ToArray())
+                observer.OnNext(_currentAnimationTimestamp);
+            _newObservers.Clear();
         }
 
         public PlayState PlayState
@@ -50,4 +77,6 @@ internal partial class MediaContext
             set => throw new InvalidOperationException();
         }
     }
+
+    public void RequestAnimationFrame(Action<TimeSpan> action) => _clock.RequestAnimationFrame(action);
 }

src/Avalonia.Base/Media/MediaContext.cs

@@ -131,12 +131,11 @@ internal partial class MediaContext : ICompositorScheduler
         // We are doing several iterations when it happens
         for (var c = 0; c < 10; c++)
         {
-            _clock.HasNewSubscriptions = false;
             FireInvokeOnRenderCallbacks();
             
             if (_clock.HasNewSubscriptions)
             {
-                _clock.Pulse(now);
+                _clock.PulseNewSubscriptions();
                 continue;
             }
 

src/Avalonia.Base/Media/Transform.cs

@@ -15,12 +15,6 @@ namespace Avalonia.Media
     /// </summary>
     public abstract class Transform : Animatable, IMutableTransform, ICompositionRenderResource<ITransform>, ICompositorSerializable
     {
-        static Transform()
-        {
-            Animation.Animation.RegisterAnimator<TransformAnimator>(prop =>
-                typeof(ITransform).IsAssignableFrom(prop.OwnerType));
-        }
-
         internal Transform()
         {
             

src/Avalonia.Base/Point.cs

@@ -16,13 +16,6 @@ namespace Avalonia
 #endif
     readonly struct Point : IEquatable<Point>
     {
-        static Point()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<PointAnimator>(prop => typeof(Point).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// The X position.
         /// </summary>

src/Avalonia.Base/Rect.cs

@@ -11,11 +11,6 @@ namespace Avalonia
     /// </summary>
     public readonly struct Rect : IEquatable<Rect>
     {
-        static Rect()
-        {
-            Animation.Animation.RegisterAnimator<RectAnimator>(prop => typeof(Rect).IsAssignableFrom(prop.PropertyType));
-        }
-
         /// <summary>
         /// The X position.
         /// </summary>

src/Avalonia.Base/RelativePoint.cs

@@ -54,13 +54,6 @@ namespace Avalonia
 
         private readonly RelativeUnit _unit;
 
-        static RelativePoint()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<RelativePointAnimator>(prop => typeof(RelativePoint).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="RelativePoint"/> struct.
         /// </summary>

src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawListVisual.cs

@@ -14,7 +14,7 @@ namespace Avalonia.Rendering.Composition.Server;
 /// <summary>
 /// Server-side counterpart of <see cref="CompositionDrawListVisual"/>
 /// </summary>
-internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisual
+internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisual, IServerRenderResourceObserver
 {
 #if DEBUG
     // This is needed for debugging purposes so we could see inspect the associated visual from debugger
@@ -37,6 +37,7 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         {
             _renderCommands?.Dispose();
             _renderCommands = reader.ReadObject<ServerCompositionRenderData?>();
+            _renderCommands?.AddObserver(this);
         }
         base.DeserializeChangesCore(reader, committedAt);
     }
@@ -50,6 +51,8 @@ internal class ServerCompositionDrawListVisual : ServerCompositionContainerVisua
         base.RenderCore(canvas, currentTransformedClip);
     }
     
+    public void DependencyQueuedInvalidate(IServerRenderResource sender) => ValuesInvalidated();
+    
 #if DEBUG
     public override string ToString()
     {

src/Avalonia.Base/Rendering/Composition/Server/ServerRenderResource.cs

@@ -13,8 +13,8 @@ internal interface IServerRenderResourceObserver
 
 internal interface IServerRenderResource : IServerRenderResourceObserver
 {
-    void AddObserver(IServerRenderResource observer);
-    void RemoveObserver(IServerRenderResource observer);
+    void AddObserver(IServerRenderResourceObserver observer);
+    void RemoveObserver(IServerRenderResourceObserver observer);
     void QueuedInvalidate();
 }
 
@@ -23,7 +23,7 @@ internal class SimpleServerRenderResource : SimpleServerObject, IServerRenderRes
     private bool _pendingInvalidation;
     private bool _disposed;
     public bool IsDisposed => _disposed;
-    private RefCountingSmallDictionary<IServerRenderResource> _observers;
+    private RefCountingSmallDictionary<IServerRenderResourceObserver> _observers;
     
     public SimpleServerRenderResource(ServerCompositor compositor) : base(compositor)
     {
@@ -97,7 +97,7 @@ internal class SimpleServerRenderResource : SimpleServerObject, IServerRenderRes
         
     }
     
-    public void AddObserver(IServerRenderResource observer)
+    public void AddObserver(IServerRenderResourceObserver observer)
     {
         Debug.Assert(!_disposed);
         if(_disposed)
@@ -105,7 +105,7 @@ internal class SimpleServerRenderResource : SimpleServerObject, IServerRenderRes
         _observers.Add(observer);
     }
 
-    public void RemoveObserver(IServerRenderResource observer)
+    public void RemoveObserver(IServerRenderResourceObserver observer)
     {
         if (_disposed)
             return;

src/Avalonia.Base/Size.cs

@@ -15,13 +15,6 @@ namespace Avalonia
 #endif
     readonly struct Size : IEquatable<Size>
     {
-        static Size()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<SizeAnimator>(prop => typeof(Size).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// A size representing infinity.
         /// </summary>

src/Avalonia.Base/Thickness.cs

@@ -15,13 +15,6 @@ namespace Avalonia
 #endif
     readonly struct Thickness : IEquatable<Thickness>
     {
-        static Thickness()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<ThicknessAnimator>(prop => typeof(Thickness).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// The thickness on the left.
         /// </summary>

src/Avalonia.Base/Vector.cs

@@ -17,13 +17,6 @@ namespace Avalonia
 #endif
     readonly struct Vector : IEquatable<Vector>
     {
-        static Vector()
-        {
-#if !BUILDTASK
-            Animation.Animation.RegisterAnimator<VectorAnimator>(prop => typeof(Vector).IsAssignableFrom(prop.PropertyType));
-#endif
-        }
-
         /// <summary>
         /// The X component.
         /// </summary>

src/Avalonia.Controls.ColorPicker/ColorPalettes/FlatColorPalette.cs

@@ -266,26 +266,26 @@ namespace Avalonia.Controls
             MidnightBlue9  = 0xFF1C2833,
             MidnightBlue10 = 0xFF17202A,
 
-            Pomegranate  = Pomegranate3,
-            Alizarin     = Alizarin3,
-            Amethyst     = Amethyst3,
-            Wisteria     = Wisteria3,
-            BelizeHole   = BelizeHole3,
-            PeterRiver   = PeterRiver3,
-            Turquoise    = Turquoise3,
-            GreenSea     = GreenSea3,
-            Nephritis    = Nephritis3,
-            Emerald      = Emerald3,
-            Sunflower    = Sunflower3,
-            Orange       = Orange3,
-            Carrot       = Carrot3,
-            Pumpkin      = Pumpkin3,
-            Clouds       = Clouds3,
-            Silver       = Silver3,
-            Concrete     = Concrete3,
-            Asbestos     = Asbestos3,
-            WetAsphalt   = WetAsphalt3,
-            MidnightBlue = MidnightBlue3,
+            Pomegranate  = Pomegranate6,
+            Alizarin     = Alizarin6,
+            Amethyst     = Amethyst6,
+            Wisteria     = Wisteria6,
+            BelizeHole   = BelizeHole6,
+            PeterRiver   = PeterRiver6,
+            Turquoise    = Turquoise6,
+            GreenSea     = GreenSea6,
+            Nephritis    = Nephritis6,
+            Emerald      = Emerald6,
+            Sunflower    = Sunflower6,
+            Orange       = Orange6,
+            Carrot       = Carrot6,
+            Pumpkin      = Pumpkin6,
+            Clouds       = Clouds6,
+            Silver       = Silver6,
+            Concrete     = Concrete6,
+            Asbestos     = Asbestos6,
+            WetAsphalt   = WetAsphalt6,
+            MidnightBlue = MidnightBlue6,
         };
 
         // See: https://htmlcolorcodes.com/assets/downloads/flat-design-colors/flat-design-color-chart.png

src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs

@@ -45,7 +45,6 @@ namespace Avalonia.Controls.Primitives
 
         private bool _updatingColor = false;
         private bool _updatingHsvColor = false;
-        private bool _coercedInitialColor = false;
         private bool _isPointerPressed = false;
         private bool _shouldShowLargeSelection = false;
         private List<Hsv> _hsvValues = new List<Hsv>();
@@ -622,7 +621,7 @@ namespace Avalonia.Controls.Primitives
             // that no color has been selected by the user. Note that #00000000 is different than
             // #00FFFFFF (Transparent).
             //
-            // In this situation, the first time the user clicks on the spectrum the third
+            // In this situation, whenever the user clicks on the spectrum, the third
             // component and alpha component will remain zero. This is because the spectrum only
             // controls two components at any given time.
             //
@@ -633,16 +632,19 @@ namespace Avalonia.Controls.Primitives
             // though the desired value is simply full color.
             //
             // To work around this usability issue with an initial #00000000 color, the selected
-            // color is coerced (only the first time) into a color with maximum third component
-            // value and maximum alpha. This can only happen once and only if those two components
-            // are already zero.
+            // color is coerced into a color with maximum third component value and maximum alpha.
+            // This can only happen here in the spectrum if those two components are already zero.
+            //
+            // In the past this coercion was restricted to occur only one time. However, when
+            // ColorPicker controls are re-used or recycled #00000000 can be set multiple times.
+            // Each time needs this special logic for usability so now anytime the color is
+            // changed on the spectrum this logic will run.
             //
             // Also note this is NOT currently done for #00FFFFFF (Transparent) but based on
             // further usability study that case may need to be handled here as well. Right now
             // Transparent is treated as a normal color value with the alpha intentionally set
             // to zero so the alpha slider must still be adjusted after the spectrum.
-            if (!_coercedInitialColor &&
-                IsLoaded)
+            if (IsLoaded)
             {
                 bool isAlphaComponentZero = (alpha == 0.0);
                 bool isThirdComponentZero = false;
@@ -691,8 +693,6 @@ namespace Avalonia.Controls.Primitives
                             newHsv.H = 360.0;
                             break;
                     }
-
-                    _coercedInitialColor = true;
                 }
             }
 

src/Avalonia.Controls.DataGrid/DataGridColumn.cs

@@ -1103,6 +1103,16 @@ namespace Avalonia.Controls
             get;
             set;
         }
+
+        /// <summary>
+        /// Gets or sets an object associated with this column.
+        /// </summary>
+        public object Tag
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Holds a Comparer to use for sorting, if not using the default.
         /// </summary>

src/Avalonia.Controls/TopLevel.cs

@@ -25,6 +25,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Metadata;
 using Avalonia.Rendering.Composition;
+using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
@@ -535,7 +536,16 @@ namespace Avalonia.Controls
                     return Disposable.Create(() => { });
             }
         }
-
+        
+        /// <summary>
+        /// Enqueues a callback to be called on the next animation tick
+        /// </summary>
+        public void RequestAnimationFrame(Action<TimeSpan> action)
+        {
+            Dispatcher.UIThread.VerifyAccess();
+            MediaContext.Instance.RequestAnimationFrame(action);
+        }
+        
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             base.OnPropertyChanged(change);

src/Avalonia.Controls/TreeView.cs

@@ -84,6 +84,11 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets a value indicating whether to automatically scroll to newly selected items.
         /// </summary>
+        /// <remarks>
+        /// This property is of limited use with <see cref="TreeView"/> as it will only scroll
+        /// to realized items. To scroll to a non-expanded item, you need to ensure that its
+        /// ancestors are expanded.
+        /// </remarks>
         public bool AutoScrollToSelectedItem
         {
             get => GetValue(AutoScrollToSelectedItemProperty);
@@ -353,9 +358,13 @@ namespace Avalonia.Controls
 
                     SelectedItemsAdded(e.NewItems!.Cast<object>().ToArray());
 
-                    if (AutoScrollToSelectedItem)
+                    var selectedItem = SelectedItem;
+
+                    if (AutoScrollToSelectedItem && 
+                        selectedItem is not null &&
+                        e.NewItems![0] == selectedItem)
                     {
-                        var container = ContainerFromItem(e.NewItems![0]!);
+                        var container = TreeContainerFromItem(selectedItem);
 
                         container?.BringIntoView();
                     }
@@ -531,6 +540,12 @@ namespace Avalonia.Controls
             // The IsSelected property is not set on the container: update the container
             // selection based on the current selection as understood by this control.
             MarkContainerSelected(container, SelectedItems.Contains(item));
+
+            // If the newly realized container is the selected container, scroll to it after layout.
+            if (AutoScrollToSelectedItem && SelectedItem == item)
+            {
+                Dispatcher.UIThread.Post(container.BringIntoView, DispatcherPriority.Loaded);
+            }
         }
 
         /// <inheritdoc/>

src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs

@@ -44,6 +44,7 @@ namespace Avalonia.Diagnostics.ViewModels
             SelectedTab = 0;
             if (root is TopLevel topLevel)
             {
+                _pointerOverRoot = topLevel;
                 _pointerOverSubscription = topLevel.GetObservable(TopLevel.PointerOverElementProperty)
                     .Subscribe(x => PointerOverElement = x);