Codemaid

Toolkit.Foundation/ObservableCollection.cs

@@ -365,9 +365,29 @@ public partial class ObservableCollection<TItem> :
 
         TItem item = this[oldIndex];
 
+        bool selected = false;
+        if (item is ISelectable selectable)
+        {
+            selected = selectable.Selected;
+
+            SelectedItem = default;
+            SelectedIndex = -1;
+        }
+
         RemoveItem(oldIndex);
         Insert(newIndex, item);
 
+        if (selected)
+        {
+            SelectedIndex = newIndex;
+            SelectedItem = item;
+
+            if (item is ISelectable selectable2)
+            {
+                selectable2.Selected = true;
+            }
+        }
+
         return true;
     }
 
@@ -493,14 +513,6 @@ public partial class ObservableCollection<TItem> :
             added.Selected = true;
         }
     }
-
-    partial void OnSelectedItemChanged(TItem? oldValue, TItem? newValue)
-    {
-        if (oldValue is ISelectable selectable)
-        {
-            selectable.Selected = false;
-        }
-    }
 }
 
 public partial class ObservableCollection<TValue, TViewModel>(IServiceProvider provider,