Ensure selected DropDownItem is visible when dropdown is open

8 years ago · cd7c5eb762
1 changed files with 7 additions and 0 deletions
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@ -246,6 +246,13 @@ namespace Avalonia.Controls
            if (IsDropDownOpen && selectedIndex != -1)
            {
                var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+
+                if(container == null && SelectedItems.Count > 0)
+                {
+                    ScrollIntoView(SelectedItems[0]);
+                    container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
+                }
+
                if (container != null && CanFocus(container))
                {
                    container.Focus();