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

tom-made · web-flow · commit 23be8a208f34 · 2022-05-28T17:18:47.000+01:00
#66 - Added change to ensure that custom options for RichEditToolbar are cleared properly
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)

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public partial class RichEditToolbar : Control, IRichEditToolbar`
`51`	`51`	`public RichEditToolbar()`
`52`	`52`	`{`
`53`	`53`	`this.DefaultStyleKey = typeof(RichEditToolbar);`
	`54`	`+ this.Unloaded += OnUnloaded;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`#if WINDOWS_UWP`
`@@ -167,6 +168,16 @@ private void SetupCustomOptions()`
`167`	`168`	`}`
`168`	`169`	`}`
`169`	`170`
	`171`	`+ private void OnUnloaded(object sender, RoutedEventArgs e)`
	`172`	`+ {`
	`173`	`+ this.ClearCustomOptions();`
	`174`	`+ }`
	`175`	`+`
	`176`	`+ private void ClearCustomOptions()`
	`177`	`+ {`
	`178`	`+ this.CustomOptions?.Clear();`
	`179`	`+ }`
	`180`	`+`
`170`	`181`	`private void ResetCustomOptions()`
`171`	`182`	`{`
`172`	`183`	`if (this.Toolbar == null \|\| this.CustomOptions == null)`