Make selection of assigned changes and commits/branches mutually exclusive

Author: mtsgrd

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

@@ -76,6 +76,7 @@
 			hasConflicts: boolean;
 			isAncestorMostConflicted: boolean;
 		}) => void;
+		onselect?: () => void;
 	}
 
 	let {
@@ -89,7 +90,8 @@
 		stackingReorderDropzoneManager,
 		handleUncommit,
 		startEditingCommitMessage,
-		handleEditPatch
+		handleEditPatch,
+		onselect
 	}: Props = $props();
 
 	const [stackService, uiState, forge, baseBranchService, dropzoneRegistry] = inject(
@@ -153,6 +155,7 @@
 		} else {
 			stackState.selection.set({ branchName, commitId, upstream });
 		}
+		onselect?.();
 	}
 </script>
 

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

@@ -26,9 +26,10 @@
 		stackId: string;
 		branches: BranchDetails[];
 		focusedStackId?: string;
+		onselect?: () => void;
 	};
 
-	const { projectId, branches, stackId, focusedStackId }: Props = $props();
+	const { projectId, branches, stackId, focusedStackId, onselect }: Props = $props();
 	const [stackService, uiState, modeService] = inject(StackService, UiState, ModeService);
 
 	const projectState = $derived(uiState.project(projectId));
@@ -154,6 +155,7 @@
 							} else {
 								uiState.stack(stackId).selection.set({ branchName });
 							}
+							onselect?.();
 						}}
 					>
 						{#snippet menu({ rightClickTrigger })}
@@ -186,6 +188,7 @@
 								{handleUncommit}
 								{startEditingCommitMessage}
 								{handleEditPatch}
+								{onselect}
 							/>
 						{/snippet}
 					</BranchCard>

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

@@ -43,6 +43,7 @@
 		active?: boolean;
 		conflictEntries?: ConflictEntriesObj;
 		draggableFiles: boolean;
+		onselect?: () => void;
 	};
 
 	const {
@@ -54,7 +55,8 @@
 		active,
 		stackId,
 		conflictEntries,
-		draggableFiles
+		draggableFiles,
+		onselect
 	}: Props = $props();
 
 	const [
@@ -204,6 +206,7 @@
 		selected={idSelection.has(change.path, selectionId)}
 		onclick={(e) => {
 			selectFilesInList(e, change, sortedChanges, idSelection, true, idx, selectionId);
+			onselect?.();
 		}}
 		{conflictEntries}
 	/>

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

@@ -169,6 +169,10 @@
 									onDropzoneActivated={(activated) => {
 										dropzoneActivated = activated;
 									}}
+									onselect={() => {
+										// Clear one selection when you modify the other.
+										stackState?.selection.set(undefined);
+									}}
 								>
 									{#snippet emptyPlaceholder()}
 										{#if !isCommitting}
@@ -204,7 +208,16 @@
 							</div>
 						</div>
 
-						<BranchList {projectId} {branches} stackId={stack.id} {focusedStackId} />
+						<BranchList
+							{projectId}
+							{branches}
+							stackId={stack.id}
+							{focusedStackId}
+							onselect={() => {
+								// Clear one selection when you modify the other.
+								idSelection.clear({ type: 'worktree', stackId: stack.id });
+							}}
+						/>
 						<Resizer
 							viewport={laneEl!}
 							direction="right"

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

@@ -32,6 +32,7 @@
 
 		emptyPlaceholder?: Snippet;
 		notScrollable?: boolean;
+		onselect?: () => void;
 	};
 
 	let {
@@ -44,7 +45,8 @@
 
 		onDropzoneActivated,
 		emptyPlaceholder,
-		notScrollable = false
+		notScrollable = false,
+		onselect
 	}: Props = $props();
 
 	const [uiState, stackService, diffService, uncommittedService] = inject(
@@ -98,6 +100,7 @@
 			{listMode}
 			{active}
 			{stackId}
+			{onselect}
 		/>
 	</div>
 {/snippet}