Merge branch 'main' into nesky_block_nav_tests

Author: RoboErikG

src/actions/mover.ts

@@ -117,7 +117,6 @@ export class Mover {
     block: BlockSvg,
     insertStartPoint: RenderedConnection | null,
   ) {
-    this.patchWorkspace(workspace);
     this.patchDragStrategy(block, insertStartPoint);
     // Begin dragging block.
     const DraggerClass = registry.getClassFromOptions(
@@ -128,6 +127,7 @@ export class Mover {
     if (!DraggerClass) throw new Error('no Dragger registered');
     const dragger = new DraggerClass(block, workspace);
     // Record that a move is in progress and start dragging.
+    workspace.setKeyboardMoveInProgress(true);
     const info = new MoveInfo(block, dragger);
     this.moves.set(workspace, info);
     // Begin drag.
@@ -158,9 +158,9 @@ export class Mover {
       new utils.Coordinate(0, 0),
     );
 
-    this.unpatchWorkspace(workspace);
     this.unpatchDragStrategy(info.block);
     this.moves.delete(workspace);
+    workspace.setKeyboardMoveInProgress(false);
     // Delay scroll until after block has finished moving.
     setTimeout(() => this.scrollCurrentBlockIntoView(workspace), 0);
     // If the block gets reattached, ensure it retains focus.
@@ -206,9 +206,9 @@ export class Mover {
       if (newNode) workspace.getCursor()?.setCurNode(newNode);
     }
 
-    this.unpatchWorkspace(workspace);
     this.unpatchDragStrategy(info.block);
     this.moves.delete(workspace);
+    workspace.setKeyboardMoveInProgress(false);
     // Delay scroll until after block has finished moving.
     setTimeout(() => this.scrollCurrentBlockIntoView(workspace), 0);
     // If the block gets reattached, ensure it retains focus.
@@ -261,45 +261,6 @@ export class Mover {
     return true;
   }
 
-  /**
-   * Monkeypatch over workspace functions to consider keyboard drags as
-   * well as mouse/pointer drags.
-   *
-   * @param workspace The workspace to patch.
-   */
-  private patchWorkspace(workspace: WorkspaceSvg) {
-    // Keyboard drags are real drags.
-    this.oldIsDragging = workspace.isDragging;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (workspace as any).isDragging = () => this.isMoving(workspace);
-
-    // Ignore mouse/pointer events during keyboard drags.
-    this.oldGetGesture = workspace.getGesture;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (workspace as any).getGesture = (e: PointerEvent) => {
-      // Normally these would be called from Gesture.doStart.
-      e.preventDefault();
-      e.stopPropagation();
-      return null;
-    };
-  }
-
-  /**
-   * Remove monkeypatches on the workspace.
-   *
-   * @param workspace The workspace to unpatch.
-   */
-  private unpatchWorkspace(workspace: WorkspaceSvg) {
-    if (this.oldIsDragging) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (workspace as any).isDragging = this.oldIsDragging;
-    }
-    if (this.oldGetGesture) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (workspace as any).getGesture = this.oldGetGesture;
-    }
-  }
-
   /**
    * Monkeypatch: replace the block's drag strategy and cache the old value.
    *

src/actions/undo_redo.ts

@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {ShortcutRegistry, ShortcutItems, WorkspaceSvg} from 'blockly/core';
+import {
+  ContextMenuRegistry,
+  ShortcutRegistry,
+  ShortcutItems,
+  WorkspaceSvg,
+} from 'blockly/core';
 
 /**
  * Class for registering a shortcut for undo/redo actions.
@@ -22,9 +27,12 @@ export class UndoRedoAction {
       this.originalUndo = undo;
       const patchedUndo = {
         ...this.originalUndo,
-        preconditionFn: (workspace: WorkspaceSvg) => {
+        preconditionFn: (
+          workspace: WorkspaceSvg,
+          scope: ContextMenuRegistry.Scope,
+        ) => {
           return !!(
-            !workspace.isDragging() && undo.preconditionFn?.(workspace)
+            !workspace.isDragging() && undo.preconditionFn?.(workspace, scope)
           );
         },
         allowCollision: true,
@@ -39,9 +47,12 @@ export class UndoRedoAction {
       this.originalRedo = redo;
       const patchedRedo = {
         ...this.originalRedo,
-        preconditionFn: (workspace: WorkspaceSvg) => {
+        preconditionFn: (
+          workspace: WorkspaceSvg,
+          scope: ContextMenuRegistry.Scope,
+        ) => {
           return !!(
-            !workspace.isDragging() && redo.preconditionFn?.(workspace)
+            !workspace.isDragging() && redo.preconditionFn?.(workspace, scope)
           );
         },
         allowCollision: true,