cleanup

Author: abdel-17

packages/svelte-file-tree/src/lib/components/Tree/state.svelte.ts

@@ -479,8 +479,20 @@ export function createTreeState<TData extends FileTreeNodeData>({
 		});
 	}
 
-	function drop(target: TreeItemState<TData>, position: DropPosition): Promise<boolean> {
-		return moveItems(selectedIds(), isSelected, target, position);
+	async function drop(target: TreeItemState<TData>, position: DropPosition): Promise<boolean> {
+		const currentDraggedId = draggedId();
+		if (currentDraggedId === undefined) {
+			return false;
+		}
+
+		selectedIds().add(currentDraggedId);
+		const didMove = await moveItems(selectedIds(), isSelected, target, position);
+
+		if (didMove) {
+			getItemElement(currentDraggedId)?.focus();
+		}
+
+		return didMove;
 	}
 
 	function copyNode(node: FileTreeNode<TData>): FileTreeNode<TData> {

packages/svelte-file-tree/src/lib/components/TreeItem/TreeItem.svelte

@@ -275,7 +275,7 @@
 				break;
 			}
 			case "Delete": {
-				void treeState.remove(item());
+				treeState.remove(item());
 				break;
 			}
 			case "a": {
@@ -298,7 +298,7 @@
 			}
 			case "v": {
 				if (isControlOrMeta(event)) {
-					void treeState.paste(item());
+					treeState.paste(item());
 				}
 				break;
 			}
@@ -370,22 +370,11 @@
 	const handleDrop: EventHandler<DragEvent, HTMLElement> = (event) => {
 		clearDropPosition();
 
-		const draggedId = treeState.draggedId();
-		if (draggedId === undefined || !canDrop()) {
-			return;
-		}
-
 		const position = getLatestDropPosition(
 			event.currentTarget.getBoundingClientRect(),
 			event.clientY,
 		);
-
-		treeState.selectedIds().add(draggedId);
-		void treeState.drop(item(), position).then((didDrop) => {
-			if (didDrop) {
-				treeState.getItemElement(draggedId)?.focus();
-			}
-		});
+		treeState.drop(item(), position);
 
 		event.preventDefault();
 	};

packages/svelte-file-tree/src/lib/components/TreeItemInput/TreeItemInput.svelte

@@ -21,7 +21,7 @@
 		switch (event.key) {
 			case "Enter": {
 				const { node } = item();
-				void treeState.rename(item(), name).then((didRename) => {
+				treeState.rename(item(), name).then((didRename) => {
 					if (didRename) {
 						treeState.getItemElement(node.id)?.focus();
 					}