diff --git a/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs b/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs index 75f27f6..a97a678 100644 --- a/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs +++ b/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs @@ -51,6 +51,7 @@ public partial class RichEditToolbar : Control, IRichEditToolbar public RichEditToolbar() { this.DefaultStyleKey = typeof(RichEditToolbar); + this.Unloaded += OnUnloaded; } #if WINDOWS_UWP @@ -167,6 +168,16 @@ private void SetupCustomOptions() } } + private void OnUnloaded(object sender, RoutedEventArgs e) + { + this.ClearCustomOptions(); + } + + private void ClearCustomOptions() + { + this.CustomOptions?.Clear(); + } + private void ResetCustomOptions() { if (this.Toolbar == null || this.CustomOptions == null)