diff --git a/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj b/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj
index 61872eb..95d5126 100644
--- a/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj
+++ b/samples/MADE.Samples/MADE.Samples.Droid/MADE.Samples.Droid.csproj
@@ -64,19 +64,19 @@
7.1.2
- 10.4.0
+ 11.0.1
-
-
-
+
+
+
- 1.6.0-preview2
+ 1.6.0
-
-
-
-
-
+
+
+
+
+
5.0.2
@@ -95,12 +95,12 @@
7.1.11
-
+
- 4.2.6
+ 4.3.6
-
-
+
+
diff --git a/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj b/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj
index 8808328..aaeab5f 100644
--- a/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj
+++ b/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj
@@ -9,19 +9,19 @@
7.1.2
- 10.4.0
+ 11.0.1
-
-
-
+
+
+
- 1.6.0-preview2
+ 1.6.0
-
-
-
-
-
+
+
+
+
+
5.0.2
@@ -49,7 +49,7 @@
4.0.1
- 4.2.6
+ 4.3.6
diff --git a/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj b/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj
index 9b389b4..e6c72e0 100644
--- a/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj
+++ b/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj
@@ -42,25 +42,25 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj b/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj
index 4940f62..08cbe36 100644
--- a/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj
+++ b/samples/MADE.Samples/MADE.Samples.iOS/MADE.Samples.iOS.csproj
@@ -119,19 +119,19 @@
7.1.2
- 10.4.0
+ 11.0.1
-
-
-
+
+
+
- 1.6.0-preview2
+ 1.6.0
-
-
-
-
-
+
+
+
+
+
5.0.2
@@ -145,16 +145,16 @@
2.1.0-uno.36
- 1.3.0
+ 1.4.0
7.1.11
-
+
- 4.2.6
+ 4.3.6
-
+
diff --git a/src/MADE.Media.Image/MADE.Media.Image.csproj b/src/MADE.Media.Image/MADE.Media.Image.csproj
index a330706..492b693 100644
--- a/src/MADE.Media.Image/MADE.Media.Image.csproj
+++ b/src/MADE.Media.Image/MADE.Media.Image.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/MADE.UI.Controls.ChipBox/MADE.UI.Controls.ChipBox.csproj b/src/MADE.UI.Controls.ChipBox/MADE.UI.Controls.ChipBox.csproj
index cbf42d5..f920ed2 100644
--- a/src/MADE.UI.Controls.ChipBox/MADE.UI.Controls.ChipBox.csproj
+++ b/src/MADE.UI.Controls.ChipBox/MADE.UI.Controls.ChipBox.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/src/MADE.UI.Controls.DropDownList/MADE.UI.Controls.DropDownList.csproj b/src/MADE.UI.Controls.DropDownList/MADE.UI.Controls.DropDownList.csproj
index 8083024..81cf156 100644
--- a/src/MADE.UI.Controls.DropDownList/MADE.UI.Controls.DropDownList.csproj
+++ b/src/MADE.UI.Controls.DropDownList/MADE.UI.Controls.DropDownList.csproj
@@ -14,12 +14,12 @@
-
+
-
-
+
+
diff --git a/src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj b/src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj
index fcc9f80..f0ca28b 100644
--- a/src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj
+++ b/src/MADE.UI.Controls.FilePicker/MADE.UI.Controls.FilePicker.csproj
@@ -14,11 +14,11 @@
-
+
-
+
diff --git a/src/MADE.UI.Controls.RichEditToolbar/MADE.UI.Controls.RichEditToolbar.csproj b/src/MADE.UI.Controls.RichEditToolbar/MADE.UI.Controls.RichEditToolbar.csproj
index d0f5e4e..097bb12 100644
--- a/src/MADE.UI.Controls.RichEditToolbar/MADE.UI.Controls.RichEditToolbar.csproj
+++ b/src/MADE.UI.Controls.RichEditToolbar/MADE.UI.Controls.RichEditToolbar.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs b/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs
index 99a9d41..75f27f6 100644
--- a/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs
+++ b/src/MADE.UI.Controls.RichEditToolbar/RichEditToolbar.cs
@@ -4,6 +4,7 @@
namespace MADE.UI.Controls
{
using System.Collections.Generic;
+ using System.Linq;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Automation.Peers;
using Windows.UI.Xaml.Controls;
@@ -82,6 +83,7 @@ public IList CustomOptions
///
protected override void OnApplyTemplate()
{
+ this.ResetCustomOptions();
this.ResetFontSizeOptions();
this.ResetFontStyleOptions();
this.ResetTextColorOptions();
@@ -164,5 +166,21 @@ private void SetupCustomOptions()
}
}
}
+
+ private void ResetCustomOptions()
+ {
+ if (this.Toolbar == null || this.CustomOptions == null)
+ {
+ return;
+ }
+
+ foreach (var option in this.CustomOptions)
+ {
+ if (this.Toolbar.PrimaryCommands.Contains(option))
+ {
+ this.Toolbar.PrimaryCommands.Remove(option);
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj b/src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj
index 339d628..d942004 100644
--- a/src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj
+++ b/src/MADE.UI.Controls.Validator/MADE.UI.Controls.Validator.csproj
@@ -14,11 +14,11 @@
-
+
-
+
diff --git a/src/MADE.UI.Data.Converters/MADE.UI.Data.Converters.csproj b/src/MADE.UI.Data.Converters/MADE.UI.Data.Converters.csproj
index 6433aa5..5ada9c0 100644
--- a/src/MADE.UI.Data.Converters/MADE.UI.Data.Converters.csproj
+++ b/src/MADE.UI.Data.Converters/MADE.UI.Data.Converters.csproj
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/src/MADE.UI.Styling/MADE.UI.Styling.csproj b/src/MADE.UI.Styling/MADE.UI.Styling.csproj
index 2039ad1..cd164d3 100644
--- a/src/MADE.UI.Styling/MADE.UI.Styling.csproj
+++ b/src/MADE.UI.Styling/MADE.UI.Styling.csproj
@@ -14,7 +14,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
diff --git a/src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj b/src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj
index b0cc238..0454c41 100644
--- a/src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj
+++ b/src/MADE.UI.ViewManagement/MADE.UI.ViewManagement.csproj
@@ -14,11 +14,11 @@
-
+
-
+
diff --git a/src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj b/src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj
index 25c0b72..fd627d7 100644
--- a/src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj
+++ b/src/MADE.UI.Views.Dialogs/MADE.UI.Views.Dialogs.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/MADE.UI.Views.Navigation.Mvvm/MADE.UI.Views.Navigation.Mvvm.csproj b/src/MADE.UI.Views.Navigation.Mvvm/MADE.UI.Views.Navigation.Mvvm.csproj
index f794a6d..50cc198 100644
--- a/src/MADE.UI.Views.Navigation.Mvvm/MADE.UI.Views.Navigation.Mvvm.csproj
+++ b/src/MADE.UI.Views.Navigation.Mvvm/MADE.UI.Views.Navigation.Mvvm.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/MADE.UI.Views.Navigation/MADE.UI.Views.Navigation.csproj b/src/MADE.UI.Views.Navigation/MADE.UI.Views.Navigation.csproj
index 8a5fd62..513c859 100644
--- a/src/MADE.UI.Views.Navigation/MADE.UI.Views.Navigation.csproj
+++ b/src/MADE.UI.Views.Navigation/MADE.UI.Views.Navigation.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/MADE.UI/MADE.UI.csproj b/src/MADE.UI/MADE.UI.csproj
index 4f1c939..0c33202 100644
--- a/src/MADE.UI/MADE.UI.csproj
+++ b/src/MADE.UI/MADE.UI.csproj
@@ -15,7 +15,7 @@
-
+