From 307ddbb58e55b0acb2a691091a72c75009156300 Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Mon, 19 Oct 2026 15:59:41 +0800
Subject: [PATCH] fix: keep focus on filter textbox when clicking clear button

---
 src/Views/BlameCommandPalette.axaml               | 1 +
 src/Views/BranchSelector.axaml                    | 1 +
 src/Views/CheckoutCommandPalette.axaml            | 1 +
 src/Views/CommitChanges.axaml                     | 1 +
 src/Views/CommitSearchView.axaml                  | 1 +
 src/Views/Compare.axaml                           | 1 +
 src/Views/CompareCommandPalette.axaml             | 1 +
 src/Views/ExecuteCustomActionCommandPalette.axaml | 1 +
 src/Views/FileHistoryCommandPalette.axaml         | 1 +
 src/Views/LauncherPagesCommandPalette.axaml       | 1 +
 src/Views/MergeCommandPalette.axaml               | 1 +
 src/Views/OpenFileCommandPalette.axaml            | 1 +
 src/Views/Repository.axaml                        | 1 +
 src/Views/RepositoryCommandPalette.axaml          | 1 +
 src/Views/RepositoryConfigure.axaml               | 5 ++++-
 src/Views/RevisionCompare.axaml                   | 1 +
 src/Views/RevisionFiles.axaml                     | 1 +
 src/Views/StashesPage.axaml                       | 1 +
 src/Views/SubmoduleRevisionCompare.axaml          | 1 +
 src/Views/WorkingCopy.axaml                       | 1 +
 20 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Views/BlameCommandPalette.axaml b/src/Views/BlameCommandPalette.axaml
index efb2000f8b..fcbdf2a9d6 100644
--- a/src/Views/BlameCommandPalette.axaml
+++ b/src/Views/BlameCommandPalette.axaml
@@ -38,6 +38,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/BranchSelector.axaml b/src/Views/BranchSelector.axaml
index 7f12a82bfb..79c05e3951 100644
--- a/src/Views/BranchSelector.axaml
+++ b/src/Views/BranchSelector.axaml
@@ -104,6 +104,7 @@
 
                     <TextBox.InnerRightContent>
                       <Button Classes="icon_button"
+                              Focusable="False"
                               Width="16"
                               Margin="0,0,6,0"
                               Click="OnClearSearchFilter"
diff --git a/src/Views/CheckoutCommandPalette.axaml b/src/Views/CheckoutCommandPalette.axaml
index ad881f821b..f568df3bf8 100644
--- a/src/Views/CheckoutCommandPalette.axaml
+++ b/src/Views/CheckoutCommandPalette.axaml
@@ -39,6 +39,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 6fcdad2815..d14b14eca4 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -31,6 +31,7 @@
 
           <TextBox.InnerRightContent>
             <Button Classes="icon_button"
+                    Focusable="False"
                     IsVisible="{Binding SearchChangeFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                     Command="{Binding ClearSearchChangeFilter}">
               <Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/CommitSearchView.axaml b/src/Views/CommitSearchView.axaml
index d870e77e0e..85141f20c7 100644
--- a/src/Views/CommitSearchView.axaml
+++ b/src/Views/CommitSearchView.axaml
@@ -37,6 +37,7 @@
 
         <TextBox.InnerRightContent>
           <Button Classes="icon_button"
+                  Focusable="False"
                   Width="16"
                   Margin="0,0,6,0"
                   Command="{Binding ClearFilter}"
diff --git a/src/Views/Compare.axaml b/src/Views/Compare.axaml
index 72f4a0a799..2fe073c387 100644
--- a/src/Views/Compare.axaml
+++ b/src/Views/Compare.axaml
@@ -162,6 +162,7 @@
 
               <TextBox.InnerRightContent>
                 <Button Classes="icon_button"
+                        Focusable="False"
                         IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                         Command="{Binding ClearSearchFilter}">
                   <Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/CompareCommandPalette.axaml b/src/Views/CompareCommandPalette.axaml
index e8b32115cc..f45e73175c 100644
--- a/src/Views/CompareCommandPalette.axaml
+++ b/src/Views/CompareCommandPalette.axaml
@@ -51,6 +51,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/ExecuteCustomActionCommandPalette.axaml b/src/Views/ExecuteCustomActionCommandPalette.axaml
index e512c2d754..250ce6bb9b 100644
--- a/src/Views/ExecuteCustomActionCommandPalette.axaml
+++ b/src/Views/ExecuteCustomActionCommandPalette.axaml
@@ -38,6 +38,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/FileHistoryCommandPalette.axaml b/src/Views/FileHistoryCommandPalette.axaml
index 0027fcc2fb..786746862f 100644
--- a/src/Views/FileHistoryCommandPalette.axaml
+++ b/src/Views/FileHistoryCommandPalette.axaml
@@ -38,6 +38,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/LauncherPagesCommandPalette.axaml b/src/Views/LauncherPagesCommandPalette.axaml
index 4acb43a2a8..b5c8f8dfe4 100644
--- a/src/Views/LauncherPagesCommandPalette.axaml
+++ b/src/Views/LauncherPagesCommandPalette.axaml
@@ -27,6 +27,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/MergeCommandPalette.axaml b/src/Views/MergeCommandPalette.axaml
index 0ce5ad1c7d..2b3dd08606 100644
--- a/src/Views/MergeCommandPalette.axaml
+++ b/src/Views/MergeCommandPalette.axaml
@@ -39,6 +39,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/OpenFileCommandPalette.axaml b/src/Views/OpenFileCommandPalette.axaml
index 3c9b9f15c5..dc5fcc0e9c 100644
--- a/src/Views/OpenFileCommandPalette.axaml
+++ b/src/Views/OpenFileCommandPalette.axaml
@@ -38,6 +38,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 23540a29e6..7005773478 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -279,6 +279,7 @@
 
                 <TextBox.InnerRightContent>
                   <Button Classes="icon_button"
+                          Focusable="False"
                           Width="16"
                           Margin="0,0,6,0"
                           Command="{Binding ClearFilter}"
diff --git a/src/Views/RepositoryCommandPalette.axaml b/src/Views/RepositoryCommandPalette.axaml
index 81b6ea5e93..661e7d46db 100644
--- a/src/Views/RepositoryCommandPalette.axaml
+++ b/src/Views/RepositoryCommandPalette.axaml
@@ -27,6 +27,7 @@
 
       <TextBox.InnerRightContent>
         <Button Classes="icon_button"
+                Focusable="False"
                 Width="16"
                 Margin="0,0,6,0"
                 Command="{Binding ClearFilter}"
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 8509df574e..0b92d46e38 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -130,7 +130,10 @@
                    Watermark="{DynamicResource Text.Configure.Proxy.Placeholder}"
                    Text="{Binding HttpProxy, Mode=TwoWay}">
             <TextBox.InnerRightContent>
-              <Button Classes="icon_button" IsVisible="{Binding HttpProxy, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Command="{Binding ClearHttpProxy}">
+              <Button Classes="icon_button"
+                      Focusable="False"
+                      IsVisible="{Binding HttpProxy, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                      Command="{Binding ClearHttpProxy}">
                 <Path Width="16" Height="16" Margin="0,0,0,0" Data="{StaticResource Icons.Clear}" Fill="{DynamicResource Brush.FG1}"/>
               </Button>
             </TextBox.InnerRightContent>
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index e76bb87962..ebb14b8c2c 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -92,6 +92,7 @@
 
             <TextBox.InnerRightContent>
               <Button Classes="icon_button"
+                      Focusable="False"
                       IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                       Command="{Binding ClearSearchFilter}">
                 <Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 0c0ca22eec..ad2b02e06d 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -36,6 +36,7 @@
 
           <TextBox.InnerRightContent>
             <Button Classes="icon_button"
+                    Focusable="False"
                     IsVisible="{Binding RevisionFileSearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                     Command="{Binding ClearRevisionFileSearchFilter}">
               <Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index 288d53c6c0..feda1adcbb 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -52,6 +52,7 @@
 
           <TextBox.InnerRightContent>
             <Button Classes="icon_button"
+                    Focusable="False"
                     Width="16"
                     Margin="0,0,6,0"
                     Command="{Binding ClearSearchFilter}"
diff --git a/src/Views/SubmoduleRevisionCompare.axaml b/src/Views/SubmoduleRevisionCompare.axaml
index e94888b750..d5082ecb21 100644
--- a/src/Views/SubmoduleRevisionCompare.axaml
+++ b/src/Views/SubmoduleRevisionCompare.axaml
@@ -124,6 +124,7 @@
 
               <TextBox.InnerRightContent>
                 <Button Classes="icon_button"
+                        Focusable="False"
                         IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                         Command="{Binding ClearSearchFilter}">
                   <Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 615759d818..79710814a7 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -52,6 +52,7 @@
 
             <TextBox.InnerRightContent>
               <Button Classes="icon_button"
+                      Focusable="False"
                       Width="16"
                       Margin="0,0,6,0"
                       Command="{Binding ClearFilter}"