Ecs to unfocus

Author: 0x5bfa

src/Files.App.Controls/Omnibar/Omnibar.Events.cs

@@ -14,6 +14,14 @@ private void Omnibar_SizeChanged(object sender, SizeChangedEventArgs e)
 			_textBoxSuggestionsContainerBorder.Width = ActualWidth;
 		}
 
+		private void AutoSuggestBox_GettingFocus(UIElement sender, GettingFocusEventArgs args)
+		{
+			if (args.OldFocusedElement is null)
+				return;
+
+			_previouslyFocusedElement = new(args.OldFocusedElement as UIElement);
+		}
+
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
 		{
 			IsFocused = true;
@@ -65,12 +73,20 @@ private void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
 					ChooseSuggestionItem(_textBoxSuggestionsListView.SelectedItem);
 				}
 			}
-			else if (e.Key == VirtualKey.Escape && _textBoxSuggestionsPopup.IsOpen)
+			else if (e.Key == VirtualKey.Escape)
 			{
 				e.Handled = true;
 
-				RevertTextToUserInput();
-				_textBoxSuggestionsPopup.IsOpen = false;
+				if (_textBoxSuggestionsPopup.IsOpen)
+				{
+					RevertTextToUserInput();
+					_textBoxSuggestionsPopup.IsOpen = false;
+				}
+				else
+				{
+					_previouslyFocusedElement.TryGetTarget(out var previouslyFocusedElement);
+					previouslyFocusedElement?.Focus(FocusState.Programmatic);
+				}
 			}
 			else
 			{

src/Files.App.Controls/Omnibar/Omnibar.cs

@@ -31,6 +31,8 @@ public partial class Omnibar : Control
 		private string _userInput = string.Empty;
 		private OmnibarTextChangeReason _textChangeReason = OmnibarTextChangeReason.None;
 
+		private WeakReference<UIElement?> _previouslyFocusedElement = new(null);
+
 		// Events
 
 		public event TypedEventHandler<Omnibar, OmnibarQuerySubmittedEventArgs>? QuerySubmitted;
@@ -67,6 +69,7 @@ protected override void OnApplyTemplate()
 			PopulateModes();
 
 			SizeChanged += Omnibar_SizeChanged;
+			_textBox.GettingFocus += AutoSuggestBox_GettingFocus;
 			_textBox.GotFocus += AutoSuggestBox_GotFocus;
 			_textBox.LostFocus += AutoSuggestBox_LostFocus;
 			_textBox.KeyDown += AutoSuggestBox_KeyDown;