feat: wire isNewBlock into keyboard drag strategy

Author: rachel-fenichel

src/actions/enter.ts

@@ -149,7 +149,7 @@ export class EnterAction {
     this.navigation.focusWorkspace(workspace);
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     workspace.getCursor()?.setCurNode(ASTNode.createBlockNode(newBlock)!);
-    this.mover.startMove(workspace, newBlock);
+    this.mover.startMove(workspace, newBlock, true);
   }
 
   /**

src/actions/move.ts

@@ -35,7 +35,9 @@ export class MoveActions {
       },
       callback: (workspace) => {
         const startBlock = this.getCurrentBlock(workspace);
-        return !!startBlock && this.mover.startMove(workspace, startBlock);
+        return (
+          !!startBlock && this.mover.startMove(workspace, startBlock, false)
+        );
       },
       keyCodes: [KeyCodes.M],
     },
@@ -148,7 +150,9 @@ export class MoveActions {
         const workspace = scope.block?.workspace as WorkspaceSvg | null;
         if (!workspace) return false;
         const startBlock = this.getCurrentBlock(workspace);
-        return !!startBlock && this.mover.startMove(workspace, startBlock);
+        return (
+          !!startBlock && this.mover.startMove(workspace, startBlock, false)
+        );
       },
       scopeType: ContextMenuRegistry.ScopeType.BLOCK,
       id: 'move',

src/actions/mover.ts

@@ -5,12 +5,7 @@
  */
 
 import type {BlockSvg, IDragger, IDragStrategy, Gesture} from 'blockly';
-import {
-  Connection,
-  registry,
-  utils,
-  WorkspaceSvg,
-} from 'blockly';
+import {Connection, registry, utils, WorkspaceSvg} from 'blockly';
 import * as Constants from '../constants';
 import {Direction, getXYFromDirection} from '../drag_direction';
 import {KeyboardDragStrategy} from '../keyboard_drag_strategy';
@@ -93,14 +88,12 @@ export class Mover {
    *
    * @param workspace The workspace we might be moving on.
    * @param block The block to start dragging.
+   * @param isNewBlock Whether the moving block was created for this action.
    * @returns True iff a move has successfully begun.
    */
-  startMove(workspace: WorkspaceSvg, block: BlockSvg) {
-    const cursor = workspace?.getCursor();
-    if (!cursor) throw new Error('precondition failure');
-
+  startMove(workspace: WorkspaceSvg, block: BlockSvg, isNewBlock: boolean) {
     this.patchWorkspace(workspace);
-    this.patchDragStrategy(block);
+    this.patchDragStrategy(block, isNewBlock);
     // Begin dragging block.
     const DraggerClass = registry.getClassFromOptions(
       registry.Type.BLOCK_DRAGGER,
@@ -257,11 +250,14 @@ export class Mover {
    * Monkeypatch: replace the block's drag strategy and cache the old value.
    *
    * @param block The block to patch.
+   * @param isNewBlock Whether the moving block was created for this action.
    */
-  private patchDragStrategy(block: BlockSvg) {
+  private patchDragStrategy(block: BlockSvg, isNewBlock: boolean) {
     // @ts-expect-error block.dragStrategy is private.
     this.oldDragStrategy = block.dragStrategy;
-    block.setDragStrategy(new KeyboardDragStrategy(block, this.navigation));
+    block.setDragStrategy(
+      new KeyboardDragStrategy(block, this.navigation, isNewBlock),
+    );
   }
 
   /**

src/keyboard_drag_strategy.ts

@@ -42,6 +42,7 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
   constructor(
     private block: BlockSvg,
     private navigation: Navigation,
+    private isNewBlock: boolean,
   ) {
     super(block);
     this.cursor = block.workspace.getCursor();