Fixed implicit animations reset by setting null

CommunityToolkit · Sep 24, 2021 · f84a747 · f84a747
1 parent d775ea4
commit f84a747
Showing 1 changed file with 42 additions and 24 deletions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs
@@ -53,7 +53,7 @@ public static ImplicitAnimationSet GetShowAnimations(UIElement element)
 
             if (collection is null)
             {
-                element.SetValue(ShowAnimationsProperty, collection = new());
+                element.SetValue(ShowAnimationsProperty, collection = new ImplicitAnimationSet());
             }
 
             return collection;
@@ -80,7 +80,7 @@ public static ImplicitAnimationSet GetHideAnimations(UIElement element)
 
             if (collection is null)
             {
-                element.SetValue(HideAnimationsProperty, collection = new());
+                element.SetValue(HideAnimationsProperty, collection = new ImplicitAnimationSet());
             }
 
             return collection;
@@ -107,7 +107,7 @@ public static ImplicitAnimationSet GetAnimations(UIElement element)
 
             if (collection is null)
             {
-                element.SetValue(AnimationsProperty, collection = new());
+                element.SetValue(AnimationsProperty, collection = new ImplicitAnimationSet());
             }
 
             return collection;
@@ -145,15 +145,21 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 oldCollection.AnimationsChanged -= OnAnimationsChanged;
             }
 
-            if (d is UIElement element &&
-                e.NewValue is ImplicitAnimationSet collection)
+            if (d is UIElement element)
             {
-                collection.ParentReference = new(element);
-                collection.AnimationsChanged -= OnAnimationsChanged;
-                collection.AnimationsChanged += OnAnimationsChanged;
+                if (e.NewValue is ImplicitAnimationSet collection)
+                {
+                    collection.ParentReference = new(element);
+                    collection.AnimationsChanged -= OnAnimationsChanged;
+                    collection.AnimationsChanged += OnAnimationsChanged;
 
-                ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
+                    ElementCompositionPreview.SetIsTranslationEnabled(element, true);
+                    ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
+                }
+                else
+                {
+                    ElementCompositionPreview.SetImplicitShowAnimation(element, null);
+                }
             }
         }
 
@@ -179,15 +185,21 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 oldCollection.AnimationsChanged -= OnAnimationsChanged;
             }
 
-            if (d is UIElement element &&
-                e.NewValue is ImplicitAnimationSet collection)
+            if (d is UIElement element)
             {
-                collection.ParentReference = new(element);
-                collection.AnimationsChanged -= OnAnimationsChanged;
-                collection.AnimationsChanged += OnAnimationsChanged;
+                if (e.NewValue is ImplicitAnimationSet collection)
+                {
+                    collection.ParentReference = new(element);
+                    collection.AnimationsChanged -= OnAnimationsChanged;
+                    collection.AnimationsChanged += OnAnimationsChanged;
 
-                ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
+                    ElementCompositionPreview.SetIsTranslationEnabled(element, true);
+                    ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
+                }
+                else
+                {
+                    ElementCompositionPreview.SetImplicitHideAnimation(element, null);
+                }
             }
         }
 
@@ -213,15 +225,21 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 oldCollection.AnimationsChanged -= OnAnimationsChanged;
             }
 
-            if (d is UIElement element &&
-                e.NewValue is ImplicitAnimationSet collection)
+            if (d is UIElement element)
             {
-                collection.ParentReference = new(element);
-                collection.AnimationsChanged -= OnAnimationsChanged;
-                collection.AnimationsChanged += OnAnimationsChanged;
+                if (e.NewValue is ImplicitAnimationSet collection)
+                {
+                    collection.ParentReference = new(element);
+                    collection.AnimationsChanged -= OnAnimationsChanged;
+                    collection.AnimationsChanged += OnAnimationsChanged;
 
-                ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
+                    ElementCompositionPreview.SetIsTranslationEnabled(element, true);
+                    ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
+                }
+                else
+                {
+                    ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = null;
+                }
             }
         }
     }