From 9261279639c2fb60fcdb622d69aa63c9b2919750 Mon Sep 17 00:00:00 2001
From: Manjunath Paparaju <manjunath@halfpixel.ai>
Date: Fri, 13 Nov 2026 15:42:31 +0530
Subject: [PATCH] Drop a held edge-scroll step when the motion turns or the
 pointer moves to the other rail

Co-authored-by: Sameh Khamis <sameh@halfpixel.ai>
---
 src/ui/railEdgeScroll.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ui/railEdgeScroll.js b/src/ui/railEdgeScroll.js
index 7b965cda0..548f79668 100644
--- a/src/ui/railEdgeScroll.js
+++ b/src/ui/railEdgeScroll.js
@@ -222,6 +222,12 @@ export function installRailEdgeScroll(doc = globalThis.document) {
     const notch = stepped && cooled && speed >= NOTCH_DELTA;
     const flick = stepped && cooled && slowed && speed > Math.max(8, lastSpeed * 1.8);
     if (!inGesture || turned || notch || flick) {
+      // A held step belongs to the motion it came from; a reversal or a new
+      // flick replaces it rather than queueing behind it.
+      if (turned && heldStep) {
+        win.clearTimeout(heldStep);
+        heldStep = 0;
+      }
       travel = 0;
       stepped = false;
       peakSpeed = 0;
@@ -246,10 +252,12 @@ export function installRailEdgeScroll(doc = globalThis.document) {
     }
     // Too soon after the last step: hold this one until the gap has passed.
     if (heldStep) return;
+    const heldRail = hot;
     heldStep = win.setTimeout(() => {
       heldStep = 0;
-      // The pointer may have left the strip meanwhile; then nothing steps.
-      if (!hot) return;
+      // The pointer may have left the strip, or moved to the other rail,
+      // meanwhile; then nothing steps.
+      if (!hot || hot !== heldRail) return;
       steppedAt = win.performance?.now?.() ?? Date.now();
       step(direction);
     }, wait);