add fix for selecting items control.

8 years ago · ae4356ef34
1 changed files with 6 additions and 0 deletions
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@ -355,6 +355,12 @@ namespace Avalonia.Controls.Primitives
                case NotifyCollectionChangedAction.Replace:
                    var selectedIndex = SelectedIndex;

+                    var items = Items?.Cast<object>();
+                    if (selectedIndex >= items.Count())
+                    {
+                        selectedIndex = SelectedIndex = items.Count() - 1;
+                    }
+
                    if (selectedIndex >= e.OldStartingIndex &&
                        selectedIndex < e.OldStartingIndex + e.OldItems.Count)
                    {