From 3cba7edcf849d85b60196fd4c0c4b8fa4adfc782 Mon Sep 17 00:00:00 2001
From: stijnpotters <stijn.potters1@gmail.com>
Date: Tue, 21 Apr 2026 13:29:49 +0200
Subject: [PATCH] Refactor file selection logic to prevent event propagation
 and ensure async handling

---
 .../frontend/app/components/git/git-changes.tsx    | 14 ++++++++------
 src/main/frontend/app/components/git/git-panel.tsx |  9 +++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/frontend/app/components/git/git-changes.tsx b/src/main/frontend/app/components/git/git-changes.tsx
index 201bcd14..67d13752 100644
--- a/src/main/frontend/app/components/git/git-changes.tsx
+++ b/src/main/frontend/app/components/git/git-changes.tsx
@@ -112,12 +112,14 @@ function FileSection({
                 )}
                 onClick={() => onSelectFile(file)}
               >
-                <IndeterminateCheckbox
-                  checked={checkboxChecked}
-                  indeterminate={checkboxIndeterminate}
-                  onChange={() => onToggleFile(file)}
-                  title={checkboxChecked ? 'Deselect all chunks' : 'Select all chunks'}
-                />
+                <div onClick={(e) => e.stopPropagation()}>
+                  <IndeterminateCheckbox
+                    checked={checkboxChecked}
+                    indeterminate={checkboxIndeterminate}
+                    onChange={() => onToggleFile(file)}
+                    title={checkboxChecked ? 'Deselect all chunks' : 'Select all chunks'}
+                  />
+                </div>
                 <span
                   className={clsx(
                     'flex h-4 w-4 flex-shrink-0 items-center justify-center rounded text-[10px] font-bold',
diff --git a/src/main/frontend/app/components/git/git-panel.tsx b/src/main/frontend/app/components/git/git-panel.tsx
index 779ee131..67b6ca40 100644
--- a/src/main/frontend/app/components/git/git-panel.tsx
+++ b/src/main/frontend/app/components/git/git-panel.tsx
@@ -84,13 +84,14 @@ export default function GitPanel({ projectName, hasStoredToken }: GitPanelProps)
   )
 
   const handleToggleFile = useCallback(
-    (filePath: string) => {
+    async (filePath: string) => {
       const hunkState = useGitStore.getState().fileHunkStates[filePath]
       if (!hunkState || hunkState.totalHunks === 0) {
-        handleSelectFile(filePath)
-        return
+        await handleSelectFile(filePath)
       }
-      if (hunkState.selectedHunks.size === hunkState.totalHunks) {
+
+      const updatedState = useGitStore.getState().fileHunkStates[filePath]
+      if (updatedState.selectedHunks.size === updatedState.totalHunks) {
         clearFileHunks(filePath)
       } else {
         selectAllFileHunks(filePath)