Update BaseLayoutPage.cs

Author: yaira2

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -6,7 +6,6 @@
 using Files.App.Helpers.ContextFlyouts;
 using Files.App.UserControls.Menus;
 using Files.App.ViewModels.Layouts;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -16,6 +15,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.ComTypes;
+using System.Text;
 using Vanara.Extensions;
 using Vanara.PInvoke;
 using Windows.ApplicationModel.DataTransfer;
@@ -24,7 +24,7 @@
 using Windows.Foundation.Collections;
 using Windows.Storage;
 using Windows.System;
-using Windows.UI.Core;
+using Windows.Win32;
 using static Files.App.Helpers.PathNormalization;
 using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 using SortDirection = Files.App.Data.Enums.SortDirection;
@@ -1009,18 +1009,21 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			var pressedKey = e.Key;
 			var currentFilter = shellPage.ShellViewModel.FilesAndFoldersFilter ?? string.Empty;
 			var isFilterModeOn = FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems;
-			var isShiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift)
-				.HasFlag(CoreVirtualKeyStates.Down);
+			var buffer = new StringBuilder(4);
+			var state = new byte[256];
+			char? typedCharacter = null;
 
-			// Get typed character
-			var typedCharacter = pressedKey switch
+			if (PInvoke.GetKeyboardState(state))
 			{
-				>= VirtualKey.A and <= VirtualKey.Z => (char)('A' + (pressedKey - VirtualKey.A)),
-				>= VirtualKey.Number0 and <= VirtualKey.Number9 => (char)('0' + (pressedKey - VirtualKey.Number0)),
-				_ when (int)pressedKey == (int)Keys.OemMinus => isShiftPressed ? '_' : '-',
-				_ when (int)pressedKey == (int)Keys.OemPeriod => '.',
-				_ => (char?)null
-			};
+				var virtualKey = (uint)pressedKey;
+				var scanCode = PInvoke.MapVirtualKey(virtualKey, 0);
+				var keyboardLayout = PInvoke.GetKeyboardLayout(0);
+
+				if (Win32PInvoke.ToUnicodeEx(virtualKey, scanCode, state, buffer, buffer.Capacity, 0, keyboardLayout) > 0)
+				{
+					typedCharacter = buffer[^1];
+				}
+			}
 
 			// Handle valid character input
 			if (typedCharacter.HasValue && !Path.GetInvalidFileNameChars().Contains(char.ToLowerInvariant(typedCharacter.Value)))
@@ -1043,10 +1046,6 @@ _ when (int)pressedKey == (int)Keys.OemPeriod => '.',
 			{
 				switch (pressedKey)
 				{
-					case VirtualKey.Space:
-						shellPage.ShellViewModel.FilesAndFoldersFilter += " ";
-						break;
-
 					case VirtualKey.Back when currentFilter.Length > 1:
 						shellPage.ShellViewModel.FilesAndFoldersFilter = currentFilter[..^1];
 						break;