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 : Disposer.Dispose(this); } - public void Activate(Func aggregateDelegate, + public void Activate(Func activateDelegate, bool reset = false) { if (reset) @@ -359,8 +359,8 @@ public partial class ObservableCollection : Clear(); } - ActivationBuilder expression = aggregateDelegate.Invoke(); - Publisher.Publish(expression.Value, expression.Key); + ActivationBuilder builder = activateDelegate.Invoke(); + Publisher.Publish(builder.Value, builder.Key); } public IEnumerator 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 SelectedIndexProperty = AvaloniaProperty.Register(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 {