More selection edge cases fixed

2024-05-21 22:38:11 +01:00
parent fda5e7db6c
commit 4c2bc8e628
5 changed files with 32 additions and 14 deletions
@@ -29,7 +29,8 @@ public partial class ObservableCollection<TItem> :
    INotificationHandler<InsertEventArgs<TItem>>,
    INotificationHandler<MoveEventArgs<TItem>>,
    INotificationHandler<MoveToEventArgs<TItem>>,
-    INotificationHandler<ReplaceEventArgs<TItem>>
+    INotificationHandler<ReplaceEventArgs<TItem>>,
+    INotificationHandler<SelectionEventArgs<TItem>>
    where TItem :
    IDisposable
 {
@@ -43,6 +44,9 @@ public partial class ObservableCollection<TItem> :
    [ObservableProperty]
    private int selectedIndex = 0;

+    [ObservableProperty]
+    private TItem? selectedItem;
+
    public ObservableCollection(IServiceProvider provider,
        IServiceFactory factory,
        IMediator mediator,
@@ -279,6 +283,15 @@ public partial class ObservableCollection<TItem> :
        if (args.Value is TItem item)
        {
            Insert(args.Index, item);
+
+            if (item is ISelectable selectable)
+            {
+                if (selectable.Selected)
+                {
+                    SelectedItem = item;
+                    SelectedIndex = this.IndexOf(item);
+                }
+            }
        }

        return Task.CompletedTask;
@@ -487,6 +500,11 @@ public partial class ObservableCollection<TItem> :
            added.Selected = true;
        }
    }
+
+    public Task Handle(SelectionEventArgs<TItem> args)
+    {
+        return Task.CompletedTask;
+    }
 }

 public partial class ObservableCollection<TValue, TViewModel>(IServiceProvider provider,