From deb91edce61bafda78bbb2c84d0982e3544fa5b4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Thu, 25 Jun 2026 13:29:34 -0700
Subject: [PATCH] fix: Fix chaotic glitchiness when using scroll options with
 keyboard moves

---
 plugins/scroll-options/src/ScrollBlockDragger.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/scroll-options/src/ScrollBlockDragger.ts b/plugins/scroll-options/src/ScrollBlockDragger.ts
index 241a5a161f..b3f2f29be6 100644
--- a/plugins/scroll-options/src/ScrollBlockDragger.ts
+++ b/plugins/scroll-options/src/ScrollBlockDragger.ts
@@ -155,6 +155,11 @@ export class ScrollBlockDragger extends Blockly.dragging.Dragger {
    * @override
    */
   onDrag(e: PointerEvent, dragDelta: Blockly.utils.Coordinate) {
+    if (Blockly.KeyboardMover.mover.isMoving()) {
+      super.onDrag(e, dragDelta);
+      return;
+    }
+
     const totalDelta = Blockly.utils.Coordinate.sum(
       this.scrollDelta_,
       dragDelta,
@@ -171,6 +176,11 @@ export class ScrollBlockDragger extends Blockly.dragging.Dragger {
    * @override
    */
   onDragEnd(e: PointerEvent) {
+    if (Blockly.KeyboardMover.mover.isMoving()) {
+      super.onDragEnd(e);
+      return;
+    }
+
     super.onDragEnd(e);
     this.stopAutoScrolling();
   }