From 9010b3bf3ca8ca5fd4b0e28cc3a280cfb0cf9175 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Wed, 17 Jul 2024 22:13:39 +0100
Subject: [PATCH] Improve filtering

---
 Toolkit.Foundation/ObservableCollection.cs            | 6 +++---
 Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Toolkit.Foundation/ObservableCollection.cs b/Toolkit.Foundation/ObservableCollection.cs
index 81d8977..4f8676f 100644
--- a/Toolkit.Foundation/ObservableCollection.cs
+++ b/Toolkit.Foundation/ObservableCollection.cs
@@ -351,7 +351,7 @@ public partial class ObservableCollection<TItem> :
         Disposer.Dispose(this);
     }
 
-    public void Activate(Func<ActivationBuilder> aggregateDelegate,
+    public void Activate(Func<ActivationBuilder> activateDelegate,
         bool reset = false)
     {
         if (reset)
@@ -359,8 +359,8 @@ public partial class ObservableCollection<TItem> :
             Clear();
         }
 
-        ActivationBuilder expression = aggregateDelegate.Invoke();
-        Publisher.Publish(expression.Value, expression.Key);
+        ActivationBuilder builder = activateDelegate.Invoke();
+        Publisher.Publish(builder.Value, builder.Key);
     }
 
     public IEnumerator<TItem> GetEnumerator() =>
diff --git a/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
index ef6d560..87626ee 100644
--- a/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
+++ b/Toolkit.UI.Avalonia/InvokeNavigationViewItemAction.cs
@@ -10,8 +10,6 @@ public class InvokeNavigationViewItemAction :
     AvaloniaObject,
     IAction
 {
-    private int currentIndex;
-
     public static readonly StyledProperty<int> SelectedIndexProperty =
         AvaloniaProperty.Register<InvokeNavigationViewItemAction, int>(nameof(SelectedIndex), 0);
 
@@ -32,11 +30,6 @@ public class InvokeNavigationViewItemAction :
 
     public object? Execute(object? sender, object? parameter)
     {
-        //if (SelectedIndex == currentIndex)
-        //{
-        //    return false;
-        //}
-
         if ((Target ?? sender) is NavigationViewItem navigationViewItem)
         {
             Dispatcher.UIThread.Post(() =>
@@ -60,7 +53,6 @@ public class InvokeNavigationViewItemAction :
                     if (collection is { Count: > 0 })
                     {
                         navigationView.SetValue(NavigationView.SelectedItemProperty, collection[SelectedIndex]);
-                        currentIndex = SelectedIndex;
                     }
                     else
                     {