Fixed unexpected visual change when right clicking on text selection

Author: 0x5bfa

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs

@@ -87,12 +87,13 @@ internal protected virtual void RaiseItemDropDownFlyoutClosed(BreadcrumbBarItem
 
 		internal protected virtual void OnLayoutUpdated()
 		{
-			if (_itemsRepeater is null)
+			if (_itemsRepeater is null || (_itemsRepeaterLayout.IndexAfterEllipsis > _itemsRepeaterLayout.VisibleItemsCount && _isEllipsisRendered))
 				return;
 
+			if (_ellipsisBreadcrumbBarItem is not null && _isEllipsisRendered != _itemsRepeaterLayout.EllipsisIsRendered)
+				_ellipsisBreadcrumbBarItem.Visibility = _itemsRepeaterLayout.EllipsisIsRendered ? Visibility.Visible : Visibility.Collapsed;
+
 			_isEllipsisRendered = _itemsRepeaterLayout.EllipsisIsRendered;
-			if (_ellipsisBreadcrumbBarItem is not null)
-				_ellipsisBreadcrumbBarItem.Visibility = _isEllipsisRendered ? Visibility.Visible : Visibility.Collapsed;
 
 			for (int accessibilityIndex = 0, collectionIndex = _itemsRepeaterLayout.IndexAfterEllipsis;
 				accessibilityIndex < _itemsRepeaterLayout.VisibleItemsCount;

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

@@ -1,12 +1,15 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Windows.System;
+
 namespace Files.App.Controls
 {
 	public partial class Omnibar
 	{
 		private void Omnibar_SizeChanged(object sender, SizeChangedEventArgs e)
 		{
+			// Popup width has to be set manually because it doesn't stretch with the parent
 			_textBoxSuggestionsContainerBorder.Width = ActualWidth;
 		}
 
@@ -22,6 +25,10 @@ private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
 
 		private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 		{
+			// TextBox still has focus if the context menu for selected text is open
+			if (_textBox.ContextFlyout.IsOpen)
+				return;
+
 			_isFocused = false;
 
 			if (CurrentSelectedMode?.ContentOnInactive is not null)
@@ -33,11 +40,38 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 			TryToggleIsSuggestionsPopupOpen(false);
 		}
 
+		private void AutoSuggestBox_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
+		{
+			if (e.Key is VirtualKey.Enter)
+			{
+				e.Handled = true;
+
+				// TODO
+			}
+			else if ((e.Key == VirtualKey.Up || e.Key == VirtualKey.Down) && _textBoxSuggestionsPopup.IsOpen)
+			{
+				e.Handled = true;
+
+				// TODO
+			}
+			else if (e.Key == VirtualKey.Escape && _textBoxSuggestionsPopup.IsOpen)
+			{
+				e.Handled = true;
+
+				// TODO
+			}
+			else
+			{
+				// TODO
+			}
+		}
+
 		private void AutoSuggestBox_TextChanged(object sender, TextChangedEventArgs e)
 		{
-			if (_shouldPopupOpen)
+			// After a suggestion item was chosen, text will be changed but we don't want to show suggestions again
+			if (_suggestionWasClicked)
 			{
-				_shouldPopupOpen = false;
+				_suggestionWasClicked = false;
 				return;
 			}
 
@@ -68,7 +102,7 @@ private void AutoSuggestBoxSuggestionsListView_ItemClick(object sender, ItemClic
 
 			TryToggleIsSuggestionsPopupOpen(false);
 
-			_shouldPopupOpen = true;
+			_suggestionWasClicked = true;
 		}
 	}
 }

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

@@ -1,8 +1,10 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Media.Animation;
+using Windows.Foundation;
 
 namespace Files.App.Controls
 {
@@ -27,7 +29,11 @@ public partial class Omnibar : Control
 		private ListView _textBoxSuggestionsListView = null!;
 
 		private bool _isFocused;
-		private bool _shouldPopupOpen;
+		private bool _suggestionWasClicked;
+
+		// Events
+
+		public event TypedEventHandler<Omnibar, OmnibarQuerySubmittedEventArgs>? QuerySubmitted;
 
 		// Constructor
 
@@ -61,6 +67,7 @@ protected override void OnApplyTemplate()
 			SizeChanged += Omnibar_SizeChanged;
 			_textBox.GotFocus += AutoSuggestBox_GotFocus;
 			_textBox.LostFocus += AutoSuggestBox_LostFocus;
+			_textBox.KeyDown += AutoSuggestBox_KeyDown;
 			_textBox.TextChanged += AutoSuggestBox_TextChanged;
 			_textBoxSuggestionsPopup.GettingFocus += AutoSuggestBoxSuggestionsPopup_GettingFocus;
 			_textBoxSuggestionsListView.ItemClick += AutoSuggestBoxSuggestionsListView_ItemClick;
@@ -168,15 +175,12 @@ public void ChangeMode(OmnibarMode modeToExpand, bool useTransition = true)
 			}
 		}
 
-		public bool TryToggleIsSuggestionsPopupOpen(bool open)
+		public bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 		{
-			if (open)
-			{
-				if (!_isFocused || CurrentSelectedMode?.SuggestionItemsSource is null)
-					return false;
-			}
+			if (wantToOpen && (!_isFocused || CurrentSelectedMode?.SuggestionItemsSource is null))
+				return false;
 
-			_textBoxSuggestionsPopup.IsOpen = open;
+			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
 
 			return false;
 		}

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

@@ -0,0 +1,11 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media.Animation;
+using Windows.Foundation;
+
+namespace Files.App.Controls
+{
+	public record class OmnibarQuerySubmittedEventArgs(OmnibarMode Mode, string Text);
+}

tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml

@@ -15,7 +15,7 @@
 		<controls:SamplePanel Header="Default usage">
 			<controls:SamplePanel.MainContent>
 				<Grid
-					Height="36"
+					Height="38"
 					MinWidth="120"
 					Padding="2"
 					HorizontalAlignment="Stretch"