More bug fixes

2024-07-10 22:18:32 +01:00
parent d87fa37d09
commit 129efe8b2b
3 changed files with 106 additions and 6 deletions
@@ -1,8 +1,39 @@
-namespace Toolkit.UI.Controls.Avalonia;
+using FluentAvalonia.UI.Controls;
+using System.Reflection;
+
+namespace Toolkit.UI.Controls.Avalonia;

 public class NavigationView :
    FluentAvalonia.UI.Controls.NavigationView
 {
+    public NavigationView()
+    {
+        ItemInvoked += OnItemInvoked;
+    }
+
    protected override Type StyleKeyOverride =>
        typeof(FluentAvalonia.UI.Controls.NavigationView);
+
+    private void ApplyNavigationFix()
+    {
+        if (typeof(FluentAvalonia.UI.Controls.NavigationView)
+            .GetField("_shouldRaiseItemInvokedAfterSelection",
+                BindingFlags.NonPublic | BindingFlags.Instance)
+                is FieldInfo shouldRaiseItemInvokedAfterSelectionFieldInfo)
+        {
+            if (shouldRaiseItemInvokedAfterSelectionFieldInfo.GetValue(this) is bool value)
+            {
+                if (value)
+                {
+                    shouldRaiseItemInvokedAfterSelectionFieldInfo.SetValue(this, false);
+                }
+            }
+        };
+    }
+
+    private void OnItemInvoked(object? sender,
+        NavigationViewItemInvokedEventArgs args)
+    {
+        ApplyNavigationFix();
+    }
 }