fix: Use Command and Control as modifiers for unconstrained move mode

Author: gonfunko

packages/blockly/core/dragging/block_drag_strategy.ts

@@ -204,7 +204,7 @@ export class BlockDragStrategy implements IDragStrategy {
    */
   protected shouldHealStack(e: PointerEvent | KeyboardEvent | undefined) {
     return e instanceof PointerEvent
-      ? e.altKey || e.ctrlKey || e.metaKey
+      ? e.ctrlKey || e.metaKey
       : !!this.block.previousConnection;
   }
 
@@ -277,7 +277,7 @@ export class BlockDragStrategy implements IDragStrategy {
   /** Moves the block and updates any connection previews. */
   drag(newLoc: Coordinate, e?: PointerEvent | KeyboardEvent): void {
     this.moveMode =
-      e instanceof KeyboardEvent && !e.altKey
+      e instanceof KeyboardEvent && !(e.ctrlKey || e.metaKey)
         ? MoveMode.CONSTRAINED
         : MoveMode.UNCONSTRAINED;
 

packages/blockly/core/hints.ts

@@ -24,7 +24,7 @@ export function showUnconstrainedMoveHint(
 ) {
   const modifier =
     userAgent.MAC || userAgent.IPAD || userAgent.IPHONE
-      ? Msg['OPTION_KEY']
+      ? Msg['COMMAND_KEY']
       : Msg['CONTROL_KEY'];
   const message = Msg['KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT']
     .replace('%1', modifier)

packages/blockly/core/shortcut_items.ts

@@ -449,10 +449,7 @@ export function registerMovementShortcuts() {
       keyCodes: [
         KeyCodes.LEFT,
         ShortcutRegistry.registry.createSerializedKey(KeyCodes.LEFT, [
-          KeyCodes.ALT,
-        ]),
-        ShortcutRegistry.registry.createSerializedKey(KeyCodes.LEFT, [
-          KeyCodes.CTRL,
+          KeyCodes.CTRL_CMD,
         ]),
       ],
       allowCollision: true,
@@ -467,10 +464,7 @@ export function registerMovementShortcuts() {
       keyCodes: [
         KeyCodes.RIGHT,
         ShortcutRegistry.registry.createSerializedKey(KeyCodes.RIGHT, [
-          KeyCodes.ALT,
-        ]),
-        ShortcutRegistry.registry.createSerializedKey(KeyCodes.RIGHT, [
-          KeyCodes.CTRL,
+          KeyCodes.CTRL_CMD,
         ]),
       ],
       allowCollision: true,
@@ -485,10 +479,7 @@ export function registerMovementShortcuts() {
       keyCodes: [
         KeyCodes.UP,
         ShortcutRegistry.registry.createSerializedKey(KeyCodes.UP, [
-          KeyCodes.ALT,
-        ]),
-        ShortcutRegistry.registry.createSerializedKey(KeyCodes.UP, [
-          KeyCodes.CTRL,
+          KeyCodes.CTRL_CMD,
         ]),
       ],
       allowCollision: true,
@@ -503,10 +494,7 @@ export function registerMovementShortcuts() {
       keyCodes: [
         KeyCodes.DOWN,
         ShortcutRegistry.registry.createSerializedKey(KeyCodes.DOWN, [
-          KeyCodes.ALT,
-        ]),
-        ShortcutRegistry.registry.createSerializedKey(KeyCodes.DOWN, [
-          KeyCodes.CTRL,
+          KeyCodes.CTRL_CMD,
         ]),
       ],
       allowCollision: true,

packages/blockly/tests/mocha/keyboard_movement_test.js

@@ -374,7 +374,7 @@ suite('Keyboard-driven movement', function () {
       this.element = this.workspace.newBlock('logic_boolean');
       this.element.initSvg();
       this.element.render();
-      this.modifiers = [Blockly.utils.KeyCodes.ALT];
+      this.modifiers = [Blockly.utils.KeyCodes.CTRL_CMD];
     });
 
     suite('in unconstrained mode', function () {
@@ -401,7 +401,7 @@ suite('Keyboard-driven movement', function () {
         assert.equal(
           toastSpy.args[0][1]['message'],
           Blockly.utils.userAgent.MAC
-            ? 'Hold ⌥ Option and use arrow keys to move freely, then Enter to accept the position'
+            ? 'Hold ⌘ Command and use arrow keys to move freely, then Enter to accept the position'
             : 'Hold Ctrl and use arrow keys to move freely, then Enter to accept the position',
         );
         toastSpy.restore();