From f8c728b832f924af6785f557466511a1bd7b583f Mon Sep 17 00:00:00 2001
From: Iris Shi <0.0@owo.li>
Date: Thu, 9 Jan 2025 13:30:11 +0800
Subject: [PATCH 1/3] things

---
 src/Files.App/UserControls/PathBreadcrumb.xaml      |  2 +-
 src/Files.App/UserControls/PathBreadcrumb.xaml.cs   |  4 ++--
 .../UserControls/AddressToolbarViewModel.cs         | 13 ++++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml b/src/Files.App/UserControls/PathBreadcrumb.xaml
index a145c34c41d4..db02dd71a56d 100644
--- a/src/Files.App/UserControls/PathBreadcrumb.xaml
+++ b/src/Files.App/UserControls/PathBreadcrumb.xaml
@@ -136,7 +136,7 @@
 		IsItemClickEnabled="True"
 		ItemTemplateSelector="{StaticResource PathBreadcrumbItemSelector}"
 		ItemsSource="{x:Bind ViewModel.PathComponents, Mode=OneWay}"
-		KeyDown="PathBoxItem_KeyDown"
+		PreviewKeyDown="PathBoxItem_PreviewKeyDown"
 		ScrollViewer.HorizontalScrollBarVisibility="Hidden"
 		ScrollViewer.HorizontalScrollMode="Enabled"
 		ScrollViewer.VerticalScrollBarVisibility="Disabled"
diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs
index 0ff28ca67331..e00a0b52262c 100644
--- a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs
+++ b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs
@@ -55,9 +55,9 @@ private void PathBoxItem_PointerPressed(object sender, PointerRoutedEventArgs e)
 			ViewModel.PathBoxItem_PointerPressed(sender, e);
 		}
 
-		private void PathBoxItem_KeyDown(object sender, KeyRoutedEventArgs e)
+		private void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
-			ViewModel.PathBoxItem_KeyDown(sender, e);
+			ViewModel.PathBoxItem_PreviewKeyDown(sender, e);
 		}
 	}
 }
diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
index 099d4c7fa141..c879e37568d4 100644
--- a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -525,7 +525,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			});
 		}
 
-		public void PathBoxItem_KeyDown(object sender, KeyRoutedEventArgs e)
+		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
 			if (e.Key == Windows.System.VirtualKey.Down)
 			{
@@ -533,6 +533,17 @@ public void PathBoxItem_KeyDown(object sender, KeyRoutedEventArgs e)
 				var button = item?.FindDescendant<Button>();
 				button?.Flyout.ShowAt(button);
 				e.Handled = true;
+			} else if (e.Key == Windows.System.VirtualKey.Space || e.Key == Windows.System.VirtualKey.Enter)
+			{
+				var item = e.OriginalSource as ListViewItem;
+				var path = (item?.Content as PathBoxItem)?.Path;
+				if (path == null || path == PathControlDisplayText)
+					return;
+				ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+				{
+					ItemPath = path
+				});
+				e.Handled = true;
 			}
 		}
 

From 8acc5e16f277a5efc9c399ddfd2009c702cfc477 Mon Sep 17 00:00:00 2001
From: Iris Shi <0.0@owo.li>
Date: Thu, 9 Jan 2025 14:05:47 +0800
Subject: [PATCH 2/3] fix

---
 .../ViewModels/UserControls/AddressToolbarViewModel.cs   | 4 ++--
 src/Files.App/Views/MainPage.xaml.cs                     | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
index c879e37568d4..18a372f0d768 100644
--- a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -527,13 +527,13 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
-			if (e.Key == Windows.System.VirtualKey.Down)
+			if (e.Key is Windows.System.VirtualKey.Down)
 			{
 				var item = e.OriginalSource as ListViewItem;
 				var button = item?.FindDescendant<Button>();
 				button?.Flyout.ShowAt(button);
 				e.Handled = true;
-			} else if (e.Key == Windows.System.VirtualKey.Space || e.Key == Windows.System.VirtualKey.Enter)
+			} else if (e.Key is Windows.System.VirtualKey.Space or Windows.System.VirtualKey.Enter)
 			{
 				var item = e.OriginalSource as ListViewItem;
 				var path = (item?.Content as PathBoxItem)?.Path;
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
index 1c14c97dce2f..4ba06c1f0e5b 100644
--- a/src/Files.App/Views/MainPage.xaml.cs
+++ b/src/Files.App/Views/MainPage.xaml.cs
@@ -235,13 +235,20 @@ private async Task OnPreviewKeyDownAsync(KeyRoutedEventArgs e)
 				default:
 					var currentModifiers = HotKeyHelpers.GetCurrentKeyModifiers();
 					HotKey hotKey = new((Keys)e.Key, currentModifiers);
+					var source = (DependencyObject)e.OriginalSource;
 
 					// A textbox takes precedence over certain hotkeys.
-					if (e.OriginalSource is DependencyObject source && source.FindAscendantOrSelf<TextBox>() is not null)
+					if (source.FindAscendantOrSelf<TextBox>() is not null)
 						break;
 
 					// Execute command for hotkey
 					var command = Commands[hotKey];
+
+					if (command.Code is CommandCodes.OpenItem && source.FindAscendantOrSelf<PathBreadcrumb>() is not null)
+					{
+						break;
+					}
+
 					if (command.Code is not CommandCodes.None && keyReleased)
 					{
 						keyReleased = false;

From fdf7c953cca696ee3a71431e01644e4cb86b76ee Mon Sep 17 00:00:00 2001
From: Iris Shi <0.0@owo.li>
Date: Thu, 9 Jan 2025 14:20:45 +0800
Subject: [PATCH 3/3] codestyle

---
 .../UserControls/AddressToolbarViewModel.cs   | 37 +++++++++++--------
 src/Files.App/Views/MainPage.xaml.cs          |  9 ++---
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
index 18a372f0d768..4a770a16bc85 100644
--- a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -527,23 +527,30 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
 
 		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
-			if (e.Key is Windows.System.VirtualKey.Down)
+			switch (e.Key)
 			{
-				var item = e.OriginalSource as ListViewItem;
-				var button = item?.FindDescendant<Button>();
-				button?.Flyout.ShowAt(button);
-				e.Handled = true;
-			} else if (e.Key is Windows.System.VirtualKey.Space or Windows.System.VirtualKey.Enter)
-			{
-				var item = e.OriginalSource as ListViewItem;
-				var path = (item?.Content as PathBoxItem)?.Path;
-				if (path == null || path == PathControlDisplayText)
-					return;
-				ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+				case Windows.System.VirtualKey.Down:
 				{
-					ItemPath = path
-				});
-				e.Handled = true;
+					var item = e.OriginalSource as ListViewItem;
+					var button = item?.FindDescendant<Button>();
+					button?.Flyout.ShowAt(button);
+					e.Handled = true;
+					break;
+				}
+				case Windows.System.VirtualKey.Space: 
+				case Windows.System.VirtualKey.Enter:
+				{
+					var item = e.OriginalSource as ListViewItem;
+					var path = (item?.Content as PathBoxItem)?.Path;
+					if (path == PathControlDisplayText)
+						return;
+					ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+					{
+						ItemPath = path
+					});
+					e.Handled = true;
+					break;
+				}
 			}
 		}
 
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
index 4ba06c1f0e5b..031a34973649 100644
--- a/src/Files.App/Views/MainPage.xaml.cs
+++ b/src/Files.App/Views/MainPage.xaml.cs
@@ -235,19 +235,18 @@ private async Task OnPreviewKeyDownAsync(KeyRoutedEventArgs e)
 				default:
 					var currentModifiers = HotKeyHelpers.GetCurrentKeyModifiers();
 					HotKey hotKey = new((Keys)e.Key, currentModifiers);
-					var source = (DependencyObject)e.OriginalSource;
+					var source = e.OriginalSource as DependencyObject;
 
 					// A textbox takes precedence over certain hotkeys.
-					if (source.FindAscendantOrSelf<TextBox>() is not null)
+					if (source?.FindAscendantOrSelf<TextBox>() is not null)
 						break;
 
 					// Execute command for hotkey
 					var command = Commands[hotKey];
 
-					if (command.Code is CommandCodes.OpenItem && source.FindAscendantOrSelf<PathBreadcrumb>() is not null)
-					{
+					if (command.Code is CommandCodes.OpenItem && source?.FindAscendantOrSelf<PathBreadcrumb>() is not null)
 						break;
-					}
+					
 
 					if (command.Code is not CommandCodes.None && keyReleased)
 					{