Merge pull request #7896 from gitbutlerapp/e-branch-2

Discarding a file unselects it

Author: estib-vega

apps/desktop/src/components/v3/FileContextMenu.svelte

@@ -24,6 +24,7 @@
 		branchId?: string;
 		trigger?: HTMLElement;
 		isBinary?: boolean;
+		unSelectChanges: (changes: TreeChange[]) => void;
 	};
 
 	type FileItem = {
@@ -40,7 +41,7 @@
 		);
 	}
 
-	const { trigger, isUnapplied, isBinary = false }: Props = $props();
+	const { trigger, isUnapplied, isBinary = false, unSelectChanges }: Props = $props();
 	const [stackService, project] = inject(StackService, Project);
 	const userSettings = getContextStoreBySymbol<Settings, Writable<Settings>>(SETTINGS);
 
@@ -67,6 +68,8 @@
 			worktreeChanges
 		});
 
+		unSelectChanges(item.changes);
+
 		close();
 	}
 

apps/desktop/src/components/v3/FileListItemWrapper.svelte

@@ -83,6 +83,13 @@
 
 		contextMenu?.open(e, { changes: [change] });
 	}
+
+	function unSelectChanges(changes: TreeChange[]) {
+		for (const change of changes) {
+			idSelection.remove(change.path, selectedFile);
+			changeSelection.remove(change.path);
+		}
+	}
 </script>
 
 <div
@@ -104,6 +111,7 @@
 		isUnapplied={false}
 		branchId={$stack?.id}
 		isBinary={false}
+		{unSelectChanges}
 	/>
 	{#if isHeader}
 		<FileViewHeader