From c3ba8e1b0ce92ef447b98b9389f28e6fcd9135cc Mon Sep 17 00:00:00 2001
From: Leo Vasanko <leo@git>
Date: Mon, 25 Aug 2025 17:34:58 -0600
Subject: [PATCH] Cleanup

---
 src/plugins/scrollManager.js | 50 +++++++++++++++---------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/plugins/scrollManager.js b/src/plugins/scrollManager.js
index 3384356..21fb1d9 100644
--- a/src/plugins/scrollManager.js
+++ b/src/plugins/scrollManager.js
@@ -70,6 +70,9 @@ function createMomentumDrag({
     momentumFrame = requestAnimationFrame(step)
   }
   function applyDragByDelta(deltaY, reason) {
+    const now = performance.now()
+    while (samples[0]?.timestamp < now - VELOCITY_MS) samples.shift()
+    samples.push({ timestamp: now, position: deltaY })
     const newScrollTop = startScroll - deltaY * speed
     const maxScroll = Math.max(0, contentHeight.value - viewportHeight.value)
     const clamped = Math.max(0, Math.min(newScrollTop, maxScroll))
@@ -80,14 +83,15 @@ function createMomentumDrag({
     applyDragByDelta(deltaY, reason)
   }
   function endDrag() {
+    if (!dragging) return
     dragging = false
     window.removeEventListener('pointermove', onPointerMove, true)
-    window.removeEventListener('pointerup', onPointerUp, true)
-    window.removeEventListener('pointercancel', onPointerUp, true)
+    window.removeEventListener('pointerup', endDrag, true)
+    window.removeEventListener('pointercancel', endDrag, true)
     if (allowTouch) {
       window.removeEventListener('touchmove', onTouchMove)
-      window.removeEventListener('touchend', onTouchEnd)
-      window.removeEventListener('touchcancel', onTouchEnd)
+      window.removeEventListener('touchend', endDrag)
+      window.removeEventListener('touchcancel', endDrag)
     }
     document.removeEventListener('pointerlockchange', onPointerLockChange, true)
     if (usingPointerLock && document.pointerLockElement === viewport.value) {
@@ -108,32 +112,20 @@ function createMomentumDrag({
     startMomentum()
   }
   function onPointerMove(e) {
-    if (!dragging) return
-    if (document.pointerLockElement === viewport.value) {
-      // Use movementY deltas under pointer lock
-      const now = performance.now()
-      dragAccumY += e.movementY
-      while (samples[0]?.timestamp < now - VELOCITY_MS) samples.shift()
-      samples.push({ timestamp: now, position: dragAccumY })
-      applyDragByDelta(dragAccumY, reasonDragPointer)
-    }
+    if (!dragging || document.pointerLockElement !== viewport.value) return
+    dragAccumY += e.movementY
+    applyDragByDelta(dragAccumY, reasonDragPointer)
     e.preventDefault()
   }
-  function onPointerUp() {
-    if (dragging) endDrag()
-  }
   function onTouchMove(e) {
     if (!dragging) return
-    const t = e.touches[0]
-    const now = performance.now()
-    while (samples[0]?.timestamp < now - VELOCITY_MS) samples.shift()
-    samples.push({ timestamp: now, position: t.clientY })
-    applyDragPosition(t.clientY, reasonDragTouch)
+    if (e.touches.length !== 1) {
+      endDrag()
+      return
+    }
+    applyDragPosition(e.touches[0].clientY, reasonDragTouch)
     e.preventDefault()
   }
-  function onTouchEnd() {
-    if (dragging) endDrag()
-  }
   function handlePointerDown(e) {
     if (e.button !== undefined && e.button !== 0) return
     if (hitTest && !hitTest(e)) return
@@ -146,10 +138,10 @@ function createMomentumDrag({
     dragAccumY = 0
     samples = [{ timestamp: performance.now(), position: e.clientY }]
     window.addEventListener('pointermove', onPointerMove, true)
-    window.addEventListener('pointerup', onPointerUp, true)
-    window.addEventListener('pointercancel', onPointerUp, true)
+    window.addEventListener('pointerup', endDrag, true)
+    window.addEventListener('pointercancel', endDrag, true)
     document.addEventListener('pointerlockchange', onPointerLockChange, true)
-    viewport.value.requestPointerLock()
+    viewport.value.requestPointerLock({ unadjustedMovement: true })
   }
   function handleTouchStart(e) {
     if (!allowTouch) return
@@ -164,8 +156,8 @@ function createMomentumDrag({
     dragAccumY = 0
     samples = [{ timestamp: performance.now(), position: t.clientY }]
     window.addEventListener('touchmove', onTouchMove, { passive: false })
-    window.addEventListener('touchend', onTouchEnd, { passive: false })
-    window.addEventListener('touchcancel', onTouchEnd, { passive: false })
+    window.addEventListener('touchend', endDrag, { passive: false })
+    window.addEventListener('touchcancel', endDrag, { passive: false })
     e.preventDefault()
   }
   function onPointerLockChange() {