Properly reset SelectedIndex after the DataContext changed

7 years ago · b42126b9e3
1 changed files with 5 additions and 1 deletions
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@ -1082,7 +1082,11 @@ namespace Avalonia.Controls.Primitives
            }
            else
            {
-                if (ItemCount > 0)
+                if (ItemCount == 0 && SelectedIndex != -1)
+                {
+                    SelectedIndex = -1;
+                }
+                else
                {
                    SelectedIndex = _updateSelectedIndex != int.MinValue ? _updateSelectedIndex : 0;
                }