From 3e81ed8fbca08a36eeec53db5792a31440283d2f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 15 Feb 2023 11:04:03 +0100
Subject: [PATCH] Revert to LocalValue when animation completes.

Fixes #10255 .
---
 src/Avalonia.Base/PropertyStore/ValueStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/PropertyStore/ValueStore.cs b/src/Avalonia.Base/PropertyStore/ValueStore.cs
index 8b702665f8..7734369ff0 100644
--- a/src/Avalonia.Base/PropertyStore/ValueStore.cs
+++ b/src/Avalonia.Base/PropertyStore/ValueStore.cs
@@ -799,7 +799,7 @@ namespace Avalonia.PropertyStore
                     // - The value is a non-animation value and its priority is higher than the current
                     //   effective value's base priority
                     var isRelevantPriority = current is null ||
-                        priority < current.Priority ||
+                        (priority < current.Priority && priority < current.BasePriority) ||
                         (priority > BindingPriority.Animation && priority < current.BasePriority);
 
                     if (foundEntry && isRelevantPriority && entry!.HasValue)