fix expander in popup bug

Author: mou-haz

source/iNKORE.UI.WPF.Modern/Controls/Helpers/ExpanderAnimationsHelper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Media;
@@ -17,11 +16,51 @@ public static string GetToAnimateControlName(Expander element) =>
         public static void SetToAnimateControlName(Expander element, string value) =>
             element.SetValue(ToAnimateControlNameProperty, value);
 
+        private const string DefaultAnimationTargetPartName = "ExpanderContent";
         public static readonly DependencyProperty ToAnimateControlNameProperty = DependencyProperty.RegisterAttached(
             "ToAnimateControlName",
             typeof(string),
             typeof(ExpanderAnimationsHelper),
-            new PropertyMetadata("ExpanderContent"));
+            new PropertyMetadata(DefaultAnimationTargetPartName, OnToAnimateControlNameChanged));
+
+        private static void OnToAnimateControlNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is Expander expander)
+            {
+                expander.SetValue(CachedToAnimateControlProperty, null);
+            }
+        }
+
+        #endregion
+
+        #region CachedToAnimateControl
+
+        private static FrameworkElement GetAnimationTarget(Expander expander)
+        {
+            if (expander.GetValue(CachedToAnimateControlProperty) is FrameworkElement target)
+            {
+                return target;
+            }
+
+            var animationTargetName = GetToAnimateControlName(expander);
+
+            if (expander.Template?.FindName(animationTargetName, expander) is not FrameworkElement toAnimateControl)
+            {
+                expander.ApplyTemplate();
+                toAnimateControl = expander.Template?.FindName(animationTargetName, expander) as FrameworkElement ??
+                    throw new ArgumentNullException("ToAnimateControl", $"Couldn't find the Border part to animate either update the ExpanderAnimationsHelper.ToAnimateControlName or rename the animation target part to default: {DefaultAnimationTargetPartName}");
+            }
+
+            expander.SetValue(CachedToAnimateControlProperty, toAnimateControl);
+            return toAnimateControl;
+        }
+
+        private static readonly DependencyProperty CachedToAnimateControlProperty =
+            DependencyProperty.RegisterAttached(
+                "CachedToAnimateControl",
+                typeof(FrameworkElement),
+                typeof(ExpanderAnimationsHelper),
+                new PropertyMetadata(null));
 
         #endregion
 
@@ -132,7 +171,7 @@ private static void InitializeExpanderState(Expander expander)
         {
             // On initial load, set the content to the appropriate state immediately
             // without animation to avoid a visual flash
-            var toAnimateControl = GetToAnimateControl(expander);
+            var toAnimateControl = GetAnimationTarget(expander);
             if (toAnimateControl == null)
             {
                 return;
@@ -174,8 +213,10 @@ private static void RunExpanderAnimation(Expander expander)
 
         private static void AnimateExpand(Expander expander)
         {
-            var toAnimateControl = GetToAnimateControl(expander);
+            var toAnimateControl = GetAnimationTarget(expander);
             toAnimateControl.BeginAnimation(UIElement.VisibilityProperty, null);
+            toAnimateControl.Visibility = Visibility.Visible;
+
             UpdateLayout(toAnimateControl);
 
             if (toAnimateControl.RenderTransform is not TranslateTransform translateTransform)
@@ -189,7 +230,7 @@ private static void AnimateExpand(Expander expander)
 
         private static void AnimateCollapse(Expander expander)
         {
-            var toAnimateControl = GetToAnimateControl(expander);
+            var toAnimateControl = GetAnimationTarget(expander);
             var animationDuration = GetCollapseAnimationDuration(expander);
 
             var visibilityAnimation = new ObjectAnimationUsingKeyFrames
@@ -269,8 +310,5 @@ private static void UpdateLayout(FrameworkElement contentControl)
             contentControl.Measure(new Size(contentControl.MaxWidth, contentControl.MaxHeight));
             contentControl.UpdateLayout();
         }
-
-        private static FrameworkElement GetToAnimateControl(Expander expander) =>
-            expander.Template?.FindName(GetToAnimateControlName(expander), expander) as FrameworkElement;
     }
 }