Open/Close ComboBox drop-down with Enter and Space

3 years ago · 6497e49c26
1 changed files with 6 additions and 1 deletions
--- a/src/Avalonia.Controls/ComboBox.cs
+++ b/src/Avalonia.Controls/ComboBox.cs
@ -213,7 +213,12 @@ namespace Avalonia.Controls
                IsDropDownOpen = false;
                e.Handled = true;
            }
-            else if (IsDropDownOpen && e.Key == Key.Enter)
+            else if (!IsDropDownOpen && (e.Key == Key.Enter || e.Key == Key.Space))
+            {
+                IsDropDownOpen = true;
+                e.Handled = true;
+            }
+            else if (IsDropDownOpen && (e.Key == Key.Enter || e.Key == Key.Space))
            {
                SelectFocusedItem();
                IsDropDownOpen = false;