Updated

Author: 0x5bfa

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

@@ -16,7 +16,7 @@ private void Omnibar_SizeChanged(object sender, SizeChangedEventArgs e)
 
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
 		{
-			_isFocused = true;
+			IsFocused = true;
 
 			VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
 			VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
@@ -30,7 +30,7 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 			if (_textBox.ContextFlyout.IsOpen)
 				return;
 
-			_isFocused = false;
+			IsFocused = false;
 
 			if (CurrentSelectedMode?.ContentOnInactive is not null)
 			{
@@ -92,7 +92,8 @@ private void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
 
 		private void AutoSuggestBox_TextChanged(object sender, TextChangedEventArgs e)
 		{
-			CurrentSelectedMode!.Text = _textBox.Text;
+			if (string.Compare(_textBox.Text, CurrentSelectedMode!.Text, StringComparison.OrdinalIgnoreCase) is not 0)
+				CurrentSelectedMode!.Text = _textBox.Text;
 
 			// UpdateSuggestionListView();
 

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

@@ -15,5 +15,8 @@ public partial class Omnibar
 
 		[GeneratedDependencyProperty]
 		public partial Thickness AutoSuggestBoxPadding { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial bool IsFocused { get; set; }
 	}
 }

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

@@ -28,7 +28,6 @@ public partial class Omnibar : Control
 		private Border _textBoxSuggestionsContainerBorder = null!;
 		private ListView _textBoxSuggestionsListView = null!;
 
-		private bool _isFocused;
 		private string _userInput = string.Empty;
 		private OmnibarTextChangeReason _textChangeReason = OmnibarTextChangeReason.None;
 
@@ -148,15 +147,15 @@ public void ChangeMode(OmnibarMode modeToExpand, bool shouldFocus = false, bool
 			CurrentSelectedMode = modeToExpand;
 
 			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
-			_textBox.Text = CurrentSelectedMode.Text ?? string.Empty;
+			ChangeTextBoxText(CurrentSelectedMode.Text ?? string.Empty);
 
 			// Move cursor of the TextBox to the tail
 			_textBox.Select(_textBox.Text.Length, 0);
 
 			VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
 			CurrentSelectedMode.OnChangingCurrentMode(true);
 
-			if (_isFocused)
+			if (IsFocused)
 			{
 				VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
 				VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
@@ -174,7 +173,7 @@ public void ChangeMode(OmnibarMode modeToExpand, bool shouldFocus = false, bool
 			if (shouldFocus)
 				_textBox.Focus(FocusState.Keyboard);
 
-			TryToggleIsSuggestionsPopupOpen(_isFocused && CurrentSelectedMode?.SuggestionItemsSource is not null);
+			TryToggleIsSuggestionsPopupOpen(IsFocused && CurrentSelectedMode?.SuggestionItemsSource is not null);
 
 			// Remove the reposition transition from the all modes
 			if (useTransition)
@@ -189,7 +188,7 @@ public void ChangeMode(OmnibarMode modeToExpand, bool shouldFocus = false, bool
 
 		public bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 		{
-			if (wantToOpen && (!_isFocused || CurrentSelectedMode?.SuggestionItemsSource is null))
+			if (wantToOpen && (!IsFocused || CurrentSelectedMode?.SuggestionItemsSource is null))
 				return false;
 
 			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
@@ -205,10 +204,15 @@ public void ChooseSuggestionItem(object obj)
 			if (CurrentSelectedMode.UpdateTextOnSelect)
 			{
 				_textChangeReason = OmnibarTextChangeReason.SuggestionChosen;
-				_textBox.Text = GetObjectText(obj);
+				ChangeTextBoxText(GetObjectText(obj));
 			}
 
 			SuggestionChosen?.Invoke(this, new(CurrentSelectedMode, obj));
+		}
+
+		internal protected void ChangeTextBoxText(string text)
+		{
+			_textBox.Text = text;
 
 			// Move the cursor to the end of the TextBox
 			_textBox?.Select(_textBox.Text.Length, 0);
@@ -245,10 +249,7 @@ private void RevertTextToUserInput()
 			_textBoxSuggestionsListView.SelectedIndex = -1;
 			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
 
-			_textBox.Text = _userInput ?? "";
-
-			// Move the cursor to the end of the TextBox
-			_textBox?.Select(_textBox.Text.Length, 0);
+			ChangeTextBoxText(_userInput ?? "");
 		}
 	}
 }

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

@@ -39,5 +39,13 @@ public partial class OmnibarMode
 
 		[GeneratedDependencyProperty(DefaultValue = true)]
 		public partial bool UpdateTextOnSelect { get; set; }
+
+		partial void OnTextChanged(string? newValue)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false)
+				return;
+
+			owner.ChangeTextBoxText(newValue ?? string.Empty);
+		}
 	}
 }

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -233,7 +233,7 @@
 				QuerySubmitted="VisiblePath_QuerySubmitted"
 				ScrollViewer.HorizontalScrollBarVisibility="Auto"
 				ScrollViewer.VerticalScrollBarVisibility="Hidden"
-				Text="{x:Bind ViewModel.PathText, Mode=OneWay}"
+				Text="{x:Bind ViewModel.LegacySharedPathPaletteText, Mode=OneWay}"
 				TextChanged="{x:Bind ViewModel.VisiblePath_TextChanged, Mode=OneWay}"
 				TextMemberPath="Text"
 				Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
@@ -338,15 +338,16 @@
 		<controls:Omnibar
 			x:Name="Omnibar"
 			Grid.Column="1"
-			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}">
+			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
+			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}">
 
 			<controls:OmnibarMode
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 				IsDefault="True"
 				ModeName="{helpers:ResourceString Name=Path}"
 				PlaceholderText="{helpers:ResourceString Name=OmnibarPathModeTextPlaceholder}"
-				Text="{x:Bind ViewModel.PathText, Mode=OneWay}">
+				Text="{x:Bind ViewModel.OmnibarPathModeText, Mode=OneWay}">
 				<controls:OmnibarMode.ContentOnInactive>
 					<controls:BreadcrumbBar x:Name="NewBreadcrumbBar" ItemsSource="{x:Bind ViewModel.PathComponents, Mode=OneWay}">
 						<controls:BreadcrumbBar.RootItem>

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

@@ -182,17 +182,37 @@ public bool IsSearchBoxVisible
 			}
 		}
 
-		private string? _PathText;
-		public string? PathText
+		private string? _LegacySharedPathPaletteText;
+		[Obsolete("Remove once Omnibar goes out of experimental.")]
+		public string? LegacySharedPathPaletteText
 		{
-			get => _PathText;
+			get => _LegacySharedPathPaletteText;
 			set
 			{
-				_PathText = value;
-				OnPropertyChanged(nameof(PathText));
+				if (SetProperty(ref _LegacySharedPathPaletteText, value))
+					OnPropertyChanged(nameof(OmnibarPathModeText));
 			}
 		}
 
+		private bool _IsOmnibarFocused;
+		public  bool IsOmnibarFocused
+		{
+			get => _IsOmnibarFocused;
+			set
+			{
+				if (SetProperty(ref _IsOmnibarFocused, value))
+				{
+					if (value)
+					{
+						EditModeEnabled?.Invoke(this, EventArgs.Empty);
+					}
+				}
+			}
+		}
+
+		private string _OmnibarPathModeText;
+		public string OmnibarPathModeText { get => _OmnibarPathModeText; set => SetProperty(ref _OmnibarPathModeText, value); }
+
 		private CurrentInstanceViewModel _InstanceViewModel;
 		public CurrentInstanceViewModel InstanceViewModel
 		{
@@ -210,6 +230,7 @@ public CurrentInstanceViewModel InstanceViewModel
 			}
 		}
 
+		[Obsolete("Remove once Omnibar goes out of experimental.")]
 		public bool IsEditModeEnabled
 		{
 			get => ManualEntryBoxLoaded;
@@ -589,7 +610,7 @@ public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 
 		public void OpenCommandPalette()
 		{
-			PathText = ">";
+			LegacySharedPathPaletteText = ">";
 			IsCommandPaletteOpen = true;
 			ManualEntryBoxLoaded = true;
 			ClickablePathLoaded = false;

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -442,9 +442,10 @@ protected void NavigationToolbar_EditModeEnabled(object sender, EventArgs e)
 		{
 			ToolbarViewModel.ManualEntryBoxLoaded = true;
 			ToolbarViewModel.ClickablePathLoaded = false;
-			ToolbarViewModel.PathText = string.IsNullOrEmpty(ShellViewModel?.WorkingDirectory)
+			ToolbarViewModel.OmnibarPathModeText = string.IsNullOrEmpty(ShellViewModel?.WorkingDirectory)
 				? Constants.UserEnvironmentPaths.HomePath
 				: ShellViewModel.WorkingDirectory;
+			ToolbarViewModel.LegacySharedPathPaletteText = ToolbarViewModel.OmnibarPathModeText;
 		}
 
 		protected async void DrivesManager_PropertyChanged(object sender, PropertyChangedEventArgs e)