From d3704a0f0950e3bfd3b0e3679fbe5ddaa49dcd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= <bkaankose@outlook.com>
Date: Wed, 31 Dec 2025 11:08:30 +0100
Subject: [PATCH] More coverage for Esc to unselect all items.

---
 Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs      | 5 +++++
 Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml    | 9 ++++++++-
 Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs | 5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
index 67d7365b..f2cb5458 100644
--- a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
@@ -559,6 +559,11 @@ public sealed partial class MailListPage : MailListPageAbstract,
         {
             await ViewModel.MailCollection.ToggleSelectAllAsync();
         }
+        else if (args.Key == VirtualKey.Escape)
+        {
+            // Unselect the selected items.
+            await ViewModel.MailCollection.UnselectAllAsync();
+        }
         else
         {
             // Check keyboard shortcuts from service.
diff --git a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
index 6b84a962..3784fd89 100644
--- a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
+++ b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
@@ -19,6 +19,9 @@
     IsDarkEditor="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}"
     mc:Ignorable="d">
 
+    <Page.KeyboardAccelerators>
+        <KeyboardAccelerator Key="Escape" Invoked="EscapeInvoked" />
+    </Page.KeyboardAccelerators>
     <Page.Resources>
         <DataTemplate x:Key="InternetAddressTemplate" x:DataType="viewModelData:AccountContactViewModel">
             <HyperlinkButton
@@ -472,7 +475,11 @@
             <Grid Margin="1" CornerRadius="{ThemeResource OverlayCornerRadius}">
                 <Grid Background="White" Visibility="{x:Bind IsDarkEditor, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}" />
 
-                <WebView2 x:Name="Chromium" NavigationStarting="WebViewNavigationStarting" />
+                <WebView2 x:Name="Chromium" NavigationStarting="WebViewNavigationStarting">
+                    <WebView2.KeyboardAccelerators>
+                        <KeyboardAccelerator Key="Escape" Invoked="EscapeInvoked" />
+                    </WebView2.KeyboardAccelerators>
+                </WebView2>
 
                 <ProgressRing
                     Width="50"
diff --git a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
index 66551899..62b6b7b9 100644
--- a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
@@ -342,4 +342,9 @@ public sealed partial class MailRenderingPage : MailRenderingPageAbstract,
         WeakReferenceMessenger.Default.Unregister<CancelRenderingContentRequested>(this);
         WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
     }
+
+    private void EscapeInvoked(Microsoft.UI.Xaml.Input.KeyboardAccelerator sender, Microsoft.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
+    {
+        WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested());
+    }
 }