Merge pull request #9063 from gitbutlerapp/fix-drawer-not-closing-after-assignment

Fix drawer not closign after asignment

Author: Caleb-T-Owens

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

@@ -11,6 +11,7 @@
 	import { focusable } from '$lib/focus/focusable.svelte';
 	import { DiffService } from '$lib/hunks/diffService.svelte';
 	import { AssignmentDropHandler } from '$lib/hunks/dropHandler';
+	import { IdSelection } from '$lib/selection/idSelection.svelte';
 	import { UncommittedService } from '$lib/selection/uncommittedService.svelte';
 	import { StackService } from '$lib/stacks/stackService.svelte';
 	import { UiState } from '$lib/state/uiState.svelte';
@@ -49,11 +50,12 @@
 		onselect
 	}: Props = $props();
 
-	const [uiState, stackService, diffService, uncommittedService] = inject(
+	const [uiState, stackService, diffService, uncommittedService, idSelection] = inject(
 		UiState,
 		StackService,
 		DiffService,
-		UncommittedService
+		UncommittedService,
+		IdSelection
 	);
 
 	const uncommitDzHandler = $derived(
@@ -77,7 +79,13 @@
 	let scrollTopIsVisible = $state(true);
 
 	const assignmentDZHandler = $derived(
-		new AssignmentDropHandler(projectId, diffService, uncommittedService, stackId || null)
+		new AssignmentDropHandler(
+			projectId,
+			diffService,
+			uncommittedService,
+			stackId || null,
+			idSelection
+		)
 	);
 
 	function getDropzoneLabel(handler: DropzoneHandler | undefined): string {

apps/desktop/src/lib/hunks/dropHandler.ts

@@ -1,14 +1,16 @@
 import { ChangeDropData, HunkDropDataV3 } from '$lib/dragging/draggables';
 import { type DiffService } from '$lib/hunks/diffService.svelte';
 import type { DropzoneHandler } from '$lib/dragging/handler';
+import type { IdSelection } from '$lib/selection/idSelection.svelte';
 import type { UncommittedService } from '$lib/selection/uncommittedService.svelte';
 
 export class AssignmentDropHandler implements DropzoneHandler {
 	constructor(
 		private readonly projectId: string,
 		private readonly diffService: DiffService,
 		private readonly uncommittedService: UncommittedService,
-		private readonly stackId: string | null
+		private readonly stackId: string | null,
+		private readonly idSelection: IdSelection
 	) {}
 
 	accepts(data: unknown) {
@@ -28,6 +30,7 @@ export class AssignmentDropHandler implements DropzoneHandler {
 
 	async ondrop(data: ChangeDropData | HunkDropDataV3) {
 		if (data instanceof ChangeDropData) {
+			// A whole file.
 			const changes = await data.treeChanges();
 			const assignments = changes
 				.flatMap((c) => this.uncommittedService.getAssignmentsByPath(data.stackId, c.path))
@@ -36,16 +39,28 @@ export class AssignmentDropHandler implements DropzoneHandler {
 				projectId: this.projectId,
 				assignments
 			});
+
+			// If files are coming from the uncommitted changes
+			this.idSelection.remove(data.change.path, data.selectionId);
 		} else {
 			const assignment = this.uncommittedService.getAssignmentByHeader(
 				data.stackId,
 				data.change.path,
 				data.hunk
 			).current!;
+			const allAssignments = this.uncommittedService.getAssignmentsByPath(
+				data.stackId,
+				data.change.path
+			);
 			await this.diffService.assignHunk({
 				projectId: this.projectId,
 				assignments: [{ ...assignment, stackId: this.stackId }]
 			});
+
+			// If we just moved the last assignment, remove the file from the selection.
+			if (allAssignments.length === 1) {
+				this.idSelection.remove(data.change.path, data.selectionId);
+			}
 		}
 	}
 }