From 8eba4527af3e146a898aa51bd8dae8e3d96b38e8 Mon Sep 17 00:00:00 2001
From: Yuri Karamian <yuri@arkhost.com>
Date: Thu, 25 Jun 2026 14:55:59 +0200
Subject: [PATCH] Notebook reorder: commit drop on any release event and skip
 pointer capture on mouse, so it works in WebView2 (Windows)

---
 src/lib/components/Sidebar.svelte | 35 +++++++++++++------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/lib/components/Sidebar.svelte b/src/lib/components/Sidebar.svelte
index e30766c..764399b 100644
--- a/src/lib/components/Sidebar.svelte
+++ b/src/lib/components/Sidebar.svelte
@@ -53,7 +53,7 @@
 	let dropTargetPath = $state<string | null>(null);
 	let dropPosition = $state<'above' | 'into' | 'below' | null>(null);
 	let draggedNotebookPath = $state<string | null>(null);
-	let nbPointer: { id: number; src: string } | null = null;
+	let nbPointer: { src: string } | null = null;
 
 	// Apply manual ordering recursively when in 'manual' sort mode.
 	// In 'alphabetical' mode the Rust scanner already sorts, so we pass through unchanged.
@@ -385,8 +385,9 @@
 
 	function nbStopDragListeners() {
 		window.removeEventListener('pointermove', nbPointerMove);
-		window.removeEventListener('pointerup', nbPointerUp);
-		window.removeEventListener('pointercancel', nbPointerCancel);
+		window.removeEventListener('pointerup', nbDragEnd);
+		window.removeEventListener('pointercancel', nbDragEnd);
+		window.removeEventListener('mouseup', nbDragEnd);
 	}
 
 	function nbHandleDown(e: PointerEvent, nb: NotebookEntry) {
@@ -394,17 +395,20 @@
 		e.stopPropagation();
 		e.preventDefault();
 		nbStopDragListeners();
-		nbPointer = { id: e.pointerId, src: nb.path };
+		nbPointer = { src: nb.path };
 		draggedNotebookPath = nb.path;
-		try { (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId); } catch {}
-		// WebView2 doesn't reliably send pointermove to a captured element; track on window instead.
+		// Capture helps touch hold the gesture; on Windows mouse it makes WebView2 swallow the release, so skip it there.
+		if (e.pointerType === 'touch') {
+			try { (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId); } catch {}
+		}
 		window.addEventListener('pointermove', nbPointerMove, { passive: false });
-		window.addEventListener('pointerup', nbPointerUp);
-		window.addEventListener('pointercancel', nbPointerCancel);
+		window.addEventListener('pointerup', nbDragEnd);
+		window.addEventListener('pointercancel', nbDragEnd);
+		window.addEventListener('mouseup', nbDragEnd);
 	}
 
 	function nbPointerMove(e: PointerEvent) {
-		if (!nbPointer || e.pointerId !== nbPointer.id) return;
+		if (!nbPointer) return;
 		e.preventDefault();
 		const el = document.elementFromPoint(e.clientX, e.clientY) as HTMLElement | null;
 		if (el?.closest('[data-nb-root]')) { dropTargetPath = '__root__'; dropPosition = null; return; }
@@ -421,8 +425,8 @@
 		dropPosition = pos;
 	}
 
-	function nbPointerUp(e: PointerEvent) {
-		if (!nbPointer || e.pointerId !== nbPointer.id) return;
+	function nbDragEnd() {
+		if (!nbPointer) return;
 		nbStopDragListeners();
 		const src = nbPointer.src;
 		const target = dropTargetPath;
@@ -442,15 +446,6 @@
 		}
 	}
 
-	function nbPointerCancel(e: PointerEvent) {
-		if (!nbPointer || e.pointerId !== nbPointer.id) return;
-		nbStopDragListeners();
-		nbPointer = null;
-		draggedNotebookPath = null;
-		dropTargetPath = null;
-		dropPosition = null;
-	}
-
 	function findSiblingsOfPath(tree: NotebookEntry[], parentPath: string, vaultRoot: string): NotebookEntry[] {
 		if (parentPath === vaultRoot) return tree;
 		for (const nb of tree) {