refactor: Move drag indicator addition/removal into KeyboardDragStrategy.

Author: gonfunko

src/actions/mover.ts

@@ -17,7 +17,6 @@ import * as Constants from '../constants';
 import {Direction, getXYFromDirection} from '../drag_direction';
 import {KeyboardDragStrategy} from '../keyboard_drag_strategy';
 import {Navigation} from '../navigation';
-import {MoveIcon} from '../move_icon';
 import {clearMoveHints} from '../hints';
 
 /**
@@ -124,7 +123,6 @@ export class Mover {
     // Begin drag.
     dragger.onDragStart(info.fakePointerEvent('pointerdown'));
     info.updateTotalDelta();
-    block.addIcon(new MoveIcon(block));
     return true;
   }
 
@@ -147,8 +145,6 @@ export class Mover {
       new utils.Coordinate(0, 0),
     );
 
-    info.block.removeIcon(MoveIcon.type);
-
     this.unpatchWorkspace(workspace);
     this.unpatchDragStrategy(info.block);
     this.moves.delete(workspace);
@@ -176,8 +172,6 @@ export class Mover {
     (info.dragger as any).shouldReturnToStart = () => true;
     const blockSvg = info.block;
 
-    blockSvg.removeIcon(MoveIcon.type);
-
     // Explicitly call `hidePreview` because it is not called in revertDrag.
     // @ts-expect-error Access to private property dragStrategy.
     blockSvg.dragStrategy.connectionPreviewer.hidePreview();

src/keyboard_drag_strategy.ts

@@ -14,6 +14,7 @@ import {
 } from 'blockly';
 import {Direction, getDirectionFromXY} from './drag_direction';
 import {showUnconstrainedMoveHint} from './hints';
+import {MoveIcon} from './move_icon';
 
 // Copied in from core because it is not exported.
 interface ConnectionCandidate {
@@ -44,6 +45,8 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
     // @ts-expect-error connectionCandidate is private.
     this.connectionCandidate = this.createInitialCandidate();
     this.forceShowPreview();
+    // @ts-expect-error block is private.
+    this.block.addIcon(new MoveIcon(this.block));
   }
 
   override drag(newLoc: utils.Coordinate, e?: PointerEvent): void {
@@ -80,6 +83,12 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
     }
   }
 
+  override endDrag(e?: PointerEvent) {
+    super.endDrag(e);
+    // @ts-expect-error block is private.
+    this.block.removeIcon(MoveIcon.type);
+  }
+
   /**
    * Returns the next compatible connection in keyboard navigation order,
    * based on the input direction.