Merge branch 'main' into introduce-initial-screen-reader-support

Author: BenHenning

eslint.config.js

@@ -259,4 +259,17 @@ module.exports = [
       '@typescript-eslint/no-require-imports': 'error',
     },
   },
+  {
+    files: ['test/webdriverio/test/*.ts'],
+    languageOptions: {
+      parserOptions: {
+        project: true,
+        tsconfigRootDir: __dirname,
+      },
+    },
+    rules: {
+      '@typescript-eslint/no-floating-promises': 'error',
+      '@typescript-eslint/no-misused-promises': 'error',
+    },
+  },
 ];

package-lock.json

@@ -14,7 +14,9 @@
     "predeploy": "blockly-scripts predeploy",
     "prepublishOnly": "npm login --registry https://wombat-dressing-room.appspot.com",
     "start": "blockly-scripts start",
-    "test": "npm run wdio:clean && npm run wdio:build && npm run wdio:run",
+    "test": "npm run test:mocha && npm run test:wdio",
+    "test:mocha": "blockly-scripts test",
+    "test:wdio": "npm run wdio:clean && npm run wdio:run",
     "wdio:build": "npm run wdio:build:app && npm run wdio:build:tests",
     "wdio:build:app": "cd test/webdriverio && webpack",
     "wdio:build:tests": "tsc -p ./test/webdriverio/test/tsconfig.json",
@@ -65,6 +67,7 @@
     "eslint-plugin-jsdoc": "^46.8.2",
     "globals": "^15.4.0",
     "html-webpack-plugin": "^5.6.0",
+    "jsdom-global": "^3.0.2",
     "mocha": "^11.1.0",
     "p5": "^1.10.0",
     "prettier": "^3.3.1",

package.json

@@ -60,9 +60,7 @@ export class Clipboard {
 
   /**
    * Uninstall this action as both a keyboard shortcut and a context menu item.
-   * N. B. This does *not* currently reinstall the original keyboard shortcuts.
-   * You should manually reinstall the previously registered shortcuts (either
-   * from core or from another plugin you may be using).
+   * Reinstall the original cut/copy/paste shortcuts.
    */
   uninstall() {
     ContextMenuRegistry.registry.unregister('blockCutFromContextMenu');
@@ -72,6 +70,18 @@ export class Clipboard {
     ShortcutRegistry.registry.unregister(Constants.SHORTCUT_NAMES.CUT);
     ShortcutRegistry.registry.unregister(Constants.SHORTCUT_NAMES.COPY);
     ShortcutRegistry.registry.unregister(Constants.SHORTCUT_NAMES.PASTE);
+
+    if (this.oldCutShortcut) {
+      ShortcutRegistry.registry.register(this.oldCutShortcut);
+    }
+
+    if (this.oldCopyShortcut) {
+      ShortcutRegistry.registry.register(this.oldCopyShortcut);
+    }
+
+    if (this.oldPasteShortcut) {
+      ShortcutRegistry.registry.register(this.oldPasteShortcut);
+    }
   }
 
   /**

src/actions/clipboard.ts

@@ -5,7 +5,7 @@
  */
 
 import {ContextMenuRegistry, Msg, keyboardNavigationController} from 'blockly';
-import {Navigation} from 'src/navigation';
+import {Navigation} from '../navigation';
 import {getMenuItem} from '../shortcut_formatting';
 import * as Constants from '../constants';
 

src/actions/edit.ts

@@ -105,6 +105,7 @@ export class EnterAction {
         }
       },
       keyCodes: [KeyCodes.ENTER, KeyCodes.SPACE],
+      allowCollision: true,
     });
   }
 
@@ -116,6 +117,7 @@ export class EnterAction {
    */
   private shouldHandleEnterForWS(workspace: WorkspaceSvg): boolean {
     if (!this.navigation.canCurrentlyNavigate(workspace)) return false;
+    if (workspace.isDragging()) return false;
 
     const curNode = workspace.getCursor().getCurNode();
     if (!curNode) return false;