fix(autosuggestbox): fix keyboard navigation

jeromelaban · Oct 23, 2023 · ca7397f · ca7397f
1 parent 2af7b1a
commit ca7397f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/AutoSuggestBox/AutoSuggestBox.cs b/src/Uno.UI/UI/Xaml/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -386,6 +386,7 @@ private void OnTextBoxKeyDown(object sender, KeyRoutedEventArgs e)
 		{
 			if (e.Key == Windows.System.VirtualKey.Enter)
 			{
+				e.Handled = true;
 				if (this.Log().IsEnabled(Uno.Foundation.Logging.LogLevel.Debug))
 				{
 					this.Log().Debug($"Enter key pressed");
@@ -395,10 +396,12 @@ private void OnTextBoxKeyDown(object sender, KeyRoutedEventArgs e)
 			}
 			else if ((e.Key == Windows.System.VirtualKey.Up || e.Key == Windows.System.VirtualKey.Down) && IsSuggestionListOpen)
 			{
+				e.Handled = true;
 				HandleUpDownKeys(e);
 			}
 			else if (e.Key == Windows.System.VirtualKey.Escape && IsSuggestionListOpen)
 			{
+				e.Handled = true;
 				RevertTextToUserInput();
 				IsSuggestionListOpen = false;
 			}
@@ -451,6 +454,8 @@ internal void ChoseItem(Object o)
 			}
 
 			SuggestionChosen?.Invoke(this, new AutoSuggestBoxSuggestionChosenEventArgs(o));
+
+			_textBox?.Select(_textBox.Text.Length, 0);
 		}
 
 		private void RevertTextToUserInput()