feat: ctrl/cmd+v pastes near focused block (#10061)

* feat: ctrl/cmd+v pastes near focused block

* fix: lint

* chore: simplify

* chore: clarify comment

Author: mikeharv

packages/blockly/core/clipboard/block_paster.ts

@@ -37,7 +37,7 @@ export class BlockPaster implements IPaster<BlockCopyData, BlockSvg> {
     // However, the algorithm for deciding where to paste a block depends on
     // the starting position of the copied block, so we'll pass those coordinates along
     const initialCoordinates =
-      coordinate ||
+      coordinate ??
       new Coordinate(
         copyData.blockState['x'] || 0,
         copyData.blockState['y'] || 0,

packages/blockly/core/keyboard_nav/navigators/navigator.ts

@@ -5,6 +5,7 @@
  */
 
 import {BlockSvg} from '../../block_svg.js';
+import {CommentEditor} from '../../comments/comment_editor.js';
 import {Field} from '../../field.js';
 import {getFocusManager} from '../../focus_manager.js';
 import {Icon} from '../../icons/icon.js';
@@ -499,6 +500,9 @@ export class Navigator {
       return node.getSourceBlock();
     } else if (node instanceof Icon) {
       return node.getSourceBlock() as BlockSvg;
+    } else if (node instanceof CommentEditor) {
+      const parent = node.getParent();
+      return parent instanceof BlockSvg ? parent : null;
     }
 
     return null;

packages/blockly/core/shortcut_items.ts

@@ -330,6 +330,7 @@ export function registerPaste() {
     },
     callback(workspace: WorkspaceSvg, e: Event) {
       const copyData = clipboard.getLastCopiedData();
+      const focusedNode = getFocusManager().getFocusedNode();
       if (!copyData) return false;
 
       const copyWorkspace = clipboard.getLastCopiedWorkspace();
@@ -355,6 +356,17 @@ export function registerPaste() {
         return !!clipboard.paste(copyData, targetWorkspace, mouseCoords);
       }
 
+      // If the focused node is a block, or part of a block (connection, field, etc.),
+      // paste relative to that block's position.
+      const block = targetWorkspace
+        .getNavigator()
+        .getSourceBlockFromNode(focusedNode);
+      const pasteOrigin = block?.getRelativeToSurfaceXY();
+      if (pasteOrigin) {
+        return !!clipboard.paste(copyData, targetWorkspace, pasteOrigin);
+      }
+
+      // No spatial focus target (e.g. workspace root) — use copy-location behavior.
       const copyCoords = clipboard.getLastCopiedLocation();
       if (!copyCoords) {
         // If we don't have location data about the original copyable, let the

packages/blockly/tests/mocha/shortcut_items_test.js

@@ -429,6 +429,79 @@ suite('Keyboard Shortcut Items', function () {
       sinon.assert.calledWith(toastSpy, this.workspace, 'copiedHint');
       toastSpy.restore();
     });
+
+    test('Pastes near focused block instead of copy origin', function () {
+      this.workspace.clear();
+      const blockA = setSelectedBlock(this.workspace);
+
+      this.injectionDiv.dispatchEvent(
+        createKeyDownEvent(Blockly.utils.KeyCodes.C, [
+          Blockly.utils.KeyCodes.CTRL_CMD,
+        ]),
+      );
+
+      const blockB = Blockly.serialization.blocks.append(
+        {type: 'stack_block', x: 300, y: 300},
+        this.workspace,
+      );
+      Blockly.getFocusManager().focusNode(blockB);
+
+      this.injectionDiv.dispatchEvent(
+        createKeyDownEvent(Blockly.utils.KeyCodes.V, [
+          Blockly.utils.KeyCodes.CTRL_CMD,
+        ]),
+      );
+
+      const pastedBlock = this.workspace
+        .getAllBlocks(false)
+        .find((b) => ![blockA, blockB].includes(b));
+      assert.isDefined(pastedBlock);
+
+      const pastedXY = pastedBlock.getRelativeToSurfaceXY();
+      // Check that the pasted block is closer to blockB than blockA, which means
+      // it used the focus location instead of the copy origin.
+      assert.isBelow(
+        Blockly.utils.Coordinate.distance(
+          pastedXY,
+          blockB.getRelativeToSurfaceXY(),
+        ),
+        Blockly.utils.Coordinate.distance(
+          pastedXY,
+          blockA.getRelativeToSurfaceXY(),
+        ),
+      );
+    });
+
+    test('Uses copy origin when workspace has focus', function () {
+      const blockA = setSelectedBlock(this.workspace);
+      this.injectionDiv.dispatchEvent(
+        createKeyDownEvent(Blockly.utils.KeyCodes.C, [
+          Blockly.utils.KeyCodes.CTRL_CMD,
+        ]),
+      );
+
+      Blockly.getFocusManager().focusNode(this.workspace);
+      this.injectionDiv.dispatchEvent(
+        createKeyDownEvent(Blockly.utils.KeyCodes.V, [
+          Blockly.utils.KeyCodes.CTRL_CMD,
+        ]),
+      );
+
+      const pastedBlock = this.workspace
+        .getAllBlocks(false)
+        .find((b) => b.id !== blockA.id);
+      assert.isDefined(pastedBlock);
+
+      const copyOrigin = blockA.getRelativeToSurfaceXY();
+      const pastedXY = pastedBlock.getRelativeToSurfaceXY();
+      assert.isBelow(
+        Blockly.utils.Coordinate.distance(pastedXY, copyOrigin),
+        Blockly.utils.Coordinate.distance(
+          pastedXY,
+          new Blockly.utils.Coordinate(300, 300),
+        ),
+      );
+    });
   });
 
   suite('Undo', function () {