Merge branch 'april-ut' of github.com:microbit-matt-hillsdon/blockly-keyboard-experimentation into april-ut

Author: microbit-matt-hillsdon

src/actions/move.ts

@@ -22,6 +22,13 @@ const createSerializedKey = ShortcutRegistry.registry.createSerializedKey.bind(
  * Actions for moving blocks with keyboard shortcuts.
  */
 export class MoveActions {
+  /**
+   * Stored to enable us to restore monkey patch.
+   */
+  private oldShortcutRegistryOnKeyDown:
+    | typeof ShortcutRegistry.registry.onKeyDown
+    | null = null;
+
   constructor(private mover: Mover) {}
 
   private shortcuts: ShortcutRegistry.KeyboardShortcut[] = [
@@ -154,6 +161,32 @@ export class MoveActions {
     for (const menuItem of this.menuItems) {
       ContextMenuRegistry.registry.register(menuItem);
     }
+
+    // Monkey patch shortcut registry to ignore all non-move-related
+    // actions during a move.
+    this.oldShortcutRegistryOnKeyDown = ShortcutRegistry.registry.onKeyDown;
+    ShortcutRegistry.registry.onKeyDown = (workspace, e) => {
+      if (!this.oldShortcutRegistryOnKeyDown) return false;
+      // @ts-expect-error private method
+      const key = ShortcutRegistry.registry.serializeKeyEvent(e);
+      const moveShortcutNames =
+        ShortcutRegistry.registry.getShortcutNamesByKeyCode(key);
+      if (
+        !this.shortcuts.some((shortcut) =>
+          moveShortcutNames?.includes(shortcut.name),
+        )
+      ) {
+        if (this.mover.isMoving(workspace)) {
+          return false;
+        }
+      }
+
+      return this.oldShortcutRegistryOnKeyDown.call(
+        ShortcutRegistry.registry,
+        workspace,
+        e,
+      );
+    };
   }
 
   /**
@@ -166,5 +199,9 @@ export class MoveActions {
     for (const menuItem of this.menuItems) {
       ContextMenuRegistry.registry.unregister(menuItem.id);
     }
+
+    if (this.oldShortcutRegistryOnKeyDown) {
+      ShortcutRegistry.registry.onKeyDown = this.oldShortcutRegistryOnKeyDown;
+    }
   }
 }

src/actions/mover.ts

@@ -167,6 +167,8 @@ export class Mover {
     this.unpatchDragStrategy(info.block);
     this.moves.delete(workspace);
 
+    // Delay scroll until after block has finished moving.
+    setTimeout(() => this.scrollCurrentBlockIntoView(workspace), 0);
     return true;
   }
 
@@ -215,6 +217,8 @@ export class Mover {
     this.unpatchWorkspace(workspace);
     this.unpatchDragStrategy(info.block);
     this.moves.delete(workspace);
+    // Delay scroll until after block has finished moving.
+    setTimeout(() => this.scrollCurrentBlockIntoView(workspace), 0);
     return true;
   }
 
@@ -237,6 +241,7 @@ export class Mover {
     );
 
     info.updateTotalDelta();
+    this.scrollCurrentBlockIntoView(workspace);
     return true;
   }
 
@@ -258,6 +263,7 @@ export class Mover {
     info.totalDelta.y += y * UNCONSTRAINED_MOVE_DISTANCE * workspace.scale;
 
     info.dragger.onDrag(info.fakePointerEvent('pointermove'), info.totalDelta);
+    this.scrollCurrentBlockIntoView(workspace);
     return true;
   }
 
@@ -388,6 +394,20 @@ export class Mover {
     this.currentMoveIndicator?.remove();
     this.currentMoveIndicator = null;
   }
+
+  /**
+   * Scrolls the current block into view if exists one.
+   *
+   * @param workspace The workspace to get current block from.
+   */
+  private scrollCurrentBlockIntoView(workspace: WorkspaceSvg) {
+    const blockToView = this.getCurrentBlock(workspace);
+    if (blockToView) {
+      workspace.scrollBoundsIntoView(
+        blockToView.getBoundingRectangleWithoutChildren(),
+      );
+    }
+  }
 }
 
 /**