Skip to content

Commit 022b4bf

Browse files
Add unloaded event, but didn't see impact tests pass before and after for #107
1 parent 05ad5d1 commit 022b4bf

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

components/Extensions/src/Element/FrameworkElementExtensions.RelativeAncestor.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@ private static void FrameworkElement_Loaded(object sender, RoutedEventArgs e)
7878
if (sender is FrameworkElement fe)
7979
{
8080
SetAncestor(fe, fe.FindAscendant(GetAncestorType(fe))!);
81+
82+
fe.Unloaded -= FrameworkElement_Unloaded;
83+
fe.Unloaded += FrameworkElement_Unloaded;
84+
}
85+
}
86+
87+
private static void FrameworkElement_Unloaded(object sender, RoutedEventArgs e)
88+
{
89+
if (sender is FrameworkElement fe)
90+
{
91+
fe.Unloaded -= FrameworkElement_Unloaded;
92+
93+
SetAncestor(fe, null!);
8194
}
8295
}
8396
}

0 commit comments

Comments
 (0)