Close the diff viewer for discarded changes

Author: charlesvien

apps/array/src/renderer/features/panels/store/panelLayoutStore.ts

@@ -12,6 +12,7 @@ import {
   createDiffTabId,
   createFileTabId,
   generatePanelId,
+  getDiffTabIdsForFile,
   getLeafPanel,
   getSplitConfig,
   selectNextTabAfterClose,
@@ -55,6 +56,7 @@ export interface PanelLayoutStore {
   closeOtherTabs: (taskId: string, panelId: string, tabId: string) => void;
   closeTabsToRight: (taskId: string, panelId: string, tabId: string) => void;
   closeTabsForFile: (taskId: string, filePath: string) => void;
+  closeDiffTabsForFile: (taskId: string, filePath: string) => void;
   setActiveTab: (taskId: string, panelId: string, tabId: string) => void;
   setDraggingTab: (
     taskId: string,
@@ -428,12 +430,7 @@ export const usePanelLayoutStore = createWithEqualityFn<PanelLayoutStore>()(
 
         const tabIds = [
           createFileTabId(filePath),
-          createDiffTabId(filePath),
-          createDiffTabId(filePath, "modified"),
-          createDiffTabId(filePath, "deleted"),
-          createDiffTabId(filePath, "added"),
-          createDiffTabId(filePath, "untracked"),
-          createDiffTabId(filePath, "renamed"),
+          ...getDiffTabIdsForFile(filePath),
         ];
 
         for (const tabId of tabIds) {
@@ -444,6 +441,20 @@ export const usePanelLayoutStore = createWithEqualityFn<PanelLayoutStore>()(
         }
       },
 
+      closeDiffTabsForFile: (taskId, filePath) => {
+        const layout = get().taskLayouts[taskId];
+        if (!layout) return;
+
+        const tabIds = getDiffTabIdsForFile(filePath);
+
+        for (const tabId of tabIds) {
+          const tabLocation = findTabInTree(layout.panelTree, tabId);
+          if (tabLocation) {
+            get().closeTab(taskId, tabLocation.panelId, tabId);
+          }
+        }
+      },
+
       setActiveTab: (taskId, panelId, tabId) => {
         set((state) =>
           updateTaskLayout(state, taskId, (layout) => {

apps/array/src/renderer/features/panels/store/panelStoreHelpers.ts

@@ -29,6 +29,17 @@ export function createDiffTabId(filePath: string, status?: string): string {
   return `diff-${filePath}`;
 }
 
+export function getDiffTabIdsForFile(filePath: string): string[] {
+  return [
+    createDiffTabId(filePath),
+    createDiffTabId(filePath, "modified"),
+    createDiffTabId(filePath, "deleted"),
+    createDiffTabId(filePath, "added"),
+    createDiffTabId(filePath, "untracked"),
+    createDiffTabId(filePath, "renamed"),
+  ];
+}
+
 export function parseTabId(tabId: string): ParsedTabId & { status?: string } {
   if (tabId.startsWith("file-")) {
     return { type: "file", value: tabId.slice(5) };

apps/array/src/renderer/features/task-detail/components/ChangesPanel.tsx

@@ -88,6 +88,9 @@ function ChangedFileItem({
   isActive,
 }: ChangedFileItemProps) {
   const openDiff = usePanelLayoutStore((state) => state.openDiff);
+  const closeDiffTabsForFile = usePanelLayoutStore(
+    (state) => state.closeDiffTabsForFile,
+  );
   const queryClient = useQueryClient();
   const fileName = file.path.split("/").pop() || file.path;
   const indicator = getStatusIndicator(file.status);
@@ -107,7 +110,7 @@ function ChangedFileItem({
   };
 
   const handleDiscard = async (e: React.MouseEvent) => {
-    e.stopPropagation();
+    e.preventDefault();
 
     const { message, action } = getDiscardInfo(file, fileName);
 
@@ -128,7 +131,9 @@ function ChangedFileItem({
         file.path,
         file.status,
       );
-      // Invalidate the changed files query to refresh the list
+
+      closeDiffTabsForFile(taskId, file.path);
+
       queryClient.invalidateQueries({
         queryKey: ["changed-files-head", repoPath],
       });