NavigationViewItem input handling fixes (microsoft/microsoft-ui-xaml#…

…2625)
Kinnara · Jun 12, 2020 · 924d5e9 · 924d5e9
1 parent 91f5bb6
commit 924d5e9
Show file tree

Hide file tree

Showing 11 changed files with 431 additions and 87 deletions.
diff --git a/ModernWpf.Controls/Common/Utils.cs b/ModernWpf.Controls/Common/Utils.cs
@@ -25,7 +25,7 @@ public static VisualStateGroup GetVisualStateGroup(FrameworkElement control, str
         }
         */
 
-        public static void GotToStateIfGroupExists(Control control, string groupName, string stateName, bool useTransitions)
+        public static void GoToStateIfGroupExists(Control control, string groupName, string stateName, bool useTransitions)
         {
             //var visualStateGroup = GetVisualStateGroup(control, groupName);
             //if (visualStateGroup != null)

diff --git a/ModernWpf.Controls/Flyout/EventRevokers.cs b/ModernWpf.Controls/Flyout/EventRevokers.cs
@@ -0,0 +1,19 @@
+namespace ModernWpf.Controls.Primitives
+{
+    internal class FlyoutBaseClosingRevoker : EventRevoker<FlyoutBase, TypedEventHandler<FlyoutBase, FlyoutBaseClosingEventArgs>>
+    {
+        public FlyoutBaseClosingRevoker(FlyoutBase source, TypedEventHandler<FlyoutBase, FlyoutBaseClosingEventArgs> handler) : base(source, handler)
+        {
+        }
+
+        protected override void AddHandler(FlyoutBase source, TypedEventHandler<FlyoutBase, FlyoutBaseClosingEventArgs> handler)
+        {
+            source.Closing += handler;
+        }
+
+        protected override void RemoveHandler(FlyoutBase source, TypedEventHandler<FlyoutBase, FlyoutBaseClosingEventArgs> handler)
+        {
+            source.Closing -= handler;
+        }
+    }
+}