From fc7caf2762a6eb56b39b44f61f6c4fe00d00aefe Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Tue, 14 May 2024 19:49:28 +0100
Subject: [PATCH] Fixed edge cases with selections

---
 Bitvault.Avalonia/ContainerView.axaml | 5 +++--
 Bitvault/ItemNavigationViewModel.cs   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 7caa6c6..5be41e2 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -22,10 +22,11 @@
             Margin="2,-1,0,0"
             ItemTemplate="{ReflectionBinding Template}"
             ItemsSource="{Binding}"
-            SelectionMode="AlwaysSelected">
+            SelectedIndex="{Binding SelectedIndex}"
+            SelectionMode="Single">
             <ListBox.Styles>
                 <Style Selector="ListBoxItem">
-                    <Setter Property="IsSelected" Value="{ReflectionBinding Selected}" />
+                    <Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
                 </Style>
             </ListBox.Styles>
         </ListBox>
diff --git a/Bitvault/ItemNavigationViewModel.cs b/Bitvault/ItemNavigationViewModel.cs
index bdedb1a..34532b2 100644
--- a/Bitvault/ItemNavigationViewModel.cs
+++ b/Bitvault/ItemNavigationViewModel.cs
@@ -17,6 +17,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     bool selected) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
     INotificationHandler<ArchiveEventArgs<Item>>,
+    ISelectable,
     IRemovable
 {
     [ObservableProperty]