Minor code tweaks to parent references for implicit sets

Author: Sergio0694

Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs

@@ -136,7 +136,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
 
                 if (collection.ParentReference!.TryGetTarget(out UIElement element))
                 {
-                    ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup());
+                    ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
                 }
             }
 
@@ -153,7 +153,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 collection.AnimationsChanged += OnAnimationsChanged;
 
                 ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup());
+                ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
             }
         }
 
@@ -170,7 +170,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
 
                 if (collection.ParentReference!.TryGetTarget(out UIElement element))
                 {
-                    ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup());
+                    ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
                 }
             }
 
@@ -187,7 +187,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 collection.AnimationsChanged += OnAnimationsChanged;
 
                 ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup());
+                ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
             }
         }
 
@@ -204,7 +204,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
 
                 if (collection.ParentReference!.TryGetTarget(out UIElement element))
                 {
-                    ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection();
+                    ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
                 }
             }
 
@@ -221,7 +221,7 @@ static void OnAnimationsChanged(object sender, EventArgs e)
                 collection.AnimationsChanged += OnAnimationsChanged;
 
                 ElementCompositionPreview.SetIsTranslationEnabled(element, true);
-                ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection();
+                ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
             }
         }
     }

Microsoft.Toolkit.Uwp.UI.Animations/Xaml/ImplicitAnimationSet.cs

@@ -90,11 +90,11 @@ private void RaiseAnimationsChanged(object sender, EventArgs e)
         /// Creates a <see cref="CompositionAnimationGroup"/> for the current collection.
         /// This can be used to be assigned to show/hide implicit composition animations.
         /// </summary>
+        /// <param name="parent">The target <see cref="UIElement"/> to which the animations are being applied to.</param>
         /// <returns>The <see cref="CompositionAnimationGroup"/> instance to use.</returns>
         [Pure]
-        internal CompositionAnimationGroup GetCompositionAnimationGroup()
+        internal CompositionAnimationGroup GetCompositionAnimationGroup(UIElement parent)
         {
-            UIElement parent = GetParent();
             Compositor compositor = ElementCompositionPreview.GetElementVisual(parent).Compositor;
             CompositionAnimationGroup animations = compositor.CreateAnimationGroup();
 
@@ -110,11 +110,11 @@ internal CompositionAnimationGroup GetCompositionAnimationGroup()
         /// Creates an <see cref="ImplicitAnimationCollection"/> for the current collection.
         /// This can be used to be assigned to implicit composition animations.
         /// </summary>
+        /// <param name="parent">The target <see cref="UIElement"/> to which the animations are being applied to.</param>
         /// <returns>The <see cref="ImplicitAnimationCollection"/> instance to use.</returns>
         [Pure]
-        internal ImplicitAnimationCollection GetImplicitAnimationCollection()
+        internal ImplicitAnimationCollection GetImplicitAnimationCollection(UIElement parent)
         {
-            UIElement parent = GetParent();
             Compositor compositor = ElementCompositionPreview.GetElementVisual(parent).Compositor;
             ImplicitAnimationCollection animations = compositor.CreateImplicitAnimationCollection();
 
@@ -134,25 +134,5 @@ internal ImplicitAnimationCollection GetImplicitAnimationCollection()
 
             return animations;
         }
-
-        /// <summary>
-        /// Gets the current parent <see cref="UIElement"/> instance.
-        /// </summary>
-        /// <returns>The <see cref="UIElement"/> reference from <see cref="ParentReference"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if there is no parent available.</exception>
-        [Pure]
-        private UIElement GetParent()
-        {
-            UIElement? parent = null;
-
-            if (ParentReference?.TryGetTarget(out parent) != true)
-            {
-                ThrowInvalidOperationException();
-            }
-
-            return parent!;
-
-            static void ThrowInvalidOperationException() => throw new InvalidOperationException("The current ImplicitAnimationSet object isn't bound to a parent UIElement instance.");
-        }
     }
 }