Merge pull request #84 from MADE-Apps/feature/richedittoolbar-customo…

…ptionfix #66 - Added change to ensure that custom options for RichEditToolbar are cleared properly
MADE-Apps · May 28, 2022 · 23be8a2 · 23be8a2
2 parents ffe53f2 + b4d6195
commit 23be8a2
Showing 1 changed file with 11 additions and 0 deletions.
diff --git 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)