Skip to content

Fix expander #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bober95 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix expander #412

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cbb399
Fix expander
Bober95 Dec 17, 2025
c6e377b
Update source/iNKORE.UI.WPF.Modern/Controls/Helpers/ExpanderAnimation…
NotYoojun Dec 18, 2025
33e359d
Expander with IsExpanded="True" in XAML will throw an exception
Bober95 Dec 18, 2025
bfa0eb8
Merge branch 'main' of https://github.com/Bober95/UI.WPF.Modern
Bober95 Dec 18, 2025
74a7061
Merge branch 'iNKORE-NET:main' into main
Bober95 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions source/iNKORE.UI.WPF.Modern/Controls/Helpers/ExpanderAnimationsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,26 +77,22 @@ private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyCha
return;
}

if (e.NewValue is not true)
{
expander.Expanded -= OnExpanderExpandedOrCollapsed;
expander.Collapsed -= OnExpanderExpandedOrCollapsed;
return;
}

expander.Expanded += OnExpanderExpandedOrCollapsed;
expander.Collapsed += OnExpanderExpandedOrCollapsed;

if (expander.IsLoaded)
{
InitializeExpanderState(expander);
}
else
{
expander.Loaded += TriggerExpandAnimationOnLoad;
}

void TriggerExpandAnimationOnLoad(object sender, RoutedEventArgs routedEventArgs)
if (e.NewValue is true)
{
if (expander.IsLoaded)
{
InitializeExpanderState(expander);
}
else
{
expander.Loaded += TriggerExpandAnimationOnLoad;
}
}

expander.Expanded += OnExpanderExpandedOrCollapsed;
expander.Collapsed += OnExpanderExpandedOrCollapsed;
Comment on lines +92 to +93
Copy link

Copilot AI Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Event handlers are registered unconditionally regardless of whether IsEnabled is true or false. This means handlers will be attached even when the feature is disabled, and they will be registered multiple times if the property is set repeatedly. This can lead to memory leaks and unexpected behavior. The handlers should only be registered when IsEnabled is true, and should be unregistered when IsEnabled changes to false.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member

@NotYoojun NotYoojun Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot open a new pull request to apply changes based on this feedback


void TriggerExpandAnimationOnLoad(object sender, RoutedEventArgs routedEventArgs)
{
InitializeExpanderState(expander);
expander.Loaded -= TriggerExpandAnimationOnLoad;
Expand All @@ -105,13 +101,19 @@ void TriggerExpandAnimationOnLoad(object sender, RoutedEventArgs routedEventArgs

private static void OnExpanderExpandedOrCollapsed(object sender, RoutedEventArgs e)
{
if (sender is not Expander expander)
if (sender is not Expander expander || !expander.IsLoaded)
{
return;
}

RunExpanderAnimation(expander);
}
if (GetIsEnabled(expander))
RunExpanderAnimation(expander);
else
{
var toAnimateControl = GetToAnimateControl(expander);
toAnimateControl?.Visibility = expander.IsExpanded ? Visibility.Visible : Visibility.Collapsed;
}
}

#endregion

Expand Down Expand Up @@ -176,6 +178,7 @@ private static void AnimateExpand(Expander expander)
{
var toAnimateControl = GetToAnimateControl(expander);
toAnimateControl.BeginAnimation(UIElement.VisibilityProperty, null);
toAnimateControl.Visibility = Visibility.Visible;
UpdateLayout(toAnimateControl);

if (toAnimateControl.RenderTransform is not TranslateTransform translateTransform)
Expand Down
Loading