feat: pass insertStartPoint into the drag strategy after all

Author: rachel-fenichel

src/actions/enter.ts

@@ -131,14 +131,9 @@ export class EnterAction {
     const stationaryNode = this.navigation.getStationaryNode(workspace);
     const newBlock = this.createNewBlock(workspace);
     if (!newBlock) return;
-    if (stationaryNode) {
-      if (!this.navigation.tryToConnectBlock(stationaryNode, newBlock)) {
-        console.warn(
-          'Something went wrong while inserting a block from the flyout.',
-        );
-      }
-    }
-
+    const insertStartPoint = stationaryNode
+      ? this.navigation.findInsertStartPoint(stationaryNode, newBlock)
+      : null;
     if (workspace.getTopBlocks().includes(newBlock)) {
       this.positionNewTopLevelBlock(workspace, newBlock);
     }
@@ -149,7 +144,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, true);
+    this.mover.startMove(workspace, newBlock, insertStartPoint);
   }
 
   /**

src/actions/move.ts

@@ -36,7 +36,7 @@ export class MoveActions {
       callback: (workspace) => {
         const startBlock = this.getCurrentBlock(workspace);
         return (
-          !!startBlock && this.mover.startMove(workspace, startBlock, false)
+          !!startBlock && this.mover.startMove(workspace, startBlock, null)
         );
       },
       keyCodes: [KeyCodes.M],
@@ -151,7 +151,7 @@ export class MoveActions {
         if (!workspace) return false;
         const startBlock = this.getCurrentBlock(workspace);
         return (
-          !!startBlock && this.mover.startMove(workspace, startBlock, false)
+          !!startBlock && this.mover.startMove(workspace, startBlock, null)
         );
       },
       scopeType: ContextMenuRegistry.ScopeType.BLOCK,

src/actions/mover.ts

@@ -4,7 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {BlockSvg, IDragger, IDragStrategy, Gesture} from 'blockly';
+import type {
+  BlockSvg,
+  IDragger,
+  IDragStrategy,
+  Gesture,
+  RenderedConnection,
+} from 'blockly';
 import {
   ASTNode,
   Connection,
@@ -107,12 +113,17 @@ 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.
+   * @param insertStartPoint Where to insert the block, or null if the block
+   *     already existed.
    * @returns True iff a move has successfully begun.
    */
-  startMove(workspace: WorkspaceSvg, block: BlockSvg, isNewBlock: boolean) {
+  startMove(
+    workspace: WorkspaceSvg,
+    block: BlockSvg,
+    insertStartPoint: RenderedConnection | null,
+  ) {
     this.patchWorkspace(workspace);
-    this.patchDragStrategy(block, isNewBlock);
+    this.patchDragStrategy(block, insertStartPoint);
     // Begin dragging block.
     const DraggerClass = registry.getClassFromOptions(
       registry.Type.BLOCK_DRAGGER,
@@ -286,14 +297,16 @@ 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.
+   * @param insertStartPoint Where to insert the block, or null if the block
+   *     already existed.
    */
-  private patchDragStrategy(block: BlockSvg, isNewBlock: boolean) {
+  private patchDragStrategy(
+    block: BlockSvg,
+    insertStartPoint: RenderedConnection | null,
+  ) {
     // @ts-expect-error block.dragStrategy is private.
     this.oldDragStrategy = block.dragStrategy;
-    block.setDragStrategy(
-      new KeyboardDragStrategy(block, this.navigation, isNewBlock),
-    );
+    block.setDragStrategy(new KeyboardDragStrategy(block, insertStartPoint));
   }
 
   /**

src/keyboard_drag_strategy.ts

@@ -15,7 +15,6 @@ import {
   utils,
 } from 'blockly';
 import {Direction, getDirectionFromXY} from './drag_direction';
-import {Navigation} from './navigation';
 
 // Copied in from core because it is not exported.
 interface ConnectionCandidate {
@@ -39,12 +38,14 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
 
   private cursor: LineCursor | null;
 
+  isNewBlock: boolean;
+
   constructor(
     private block: BlockSvg,
-    private navigation: Navigation,
-    readonly isNewBlock: boolean,
+    private insertStartPoint: RenderedConnection | null,
   ) {
     super(block);
+    this.isNewBlock = !!this.insertStartPoint;
     this.cursor = block.workspace.getCursor();
   }
 
@@ -279,7 +280,7 @@ export class KeyboardDragStrategy extends dragging.BlockDragStrategy {
    */
   private createInitialCandidate(): ConnectionCandidate | null {
     // @ts-expect-error startParentConn is private.
-    const neighbour = this.startParentConn;
+    const neighbour = this.insertStartPoint ?? this.startParentConn;
     if (neighbour) {
       this.searchNode = ASTNode.createConnectionNode(neighbour);
       switch (neighbour.type) {