Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-96c788614a

Author: RoboErikG

.github/workflows/pages.yml

@@ -2,14 +2,16 @@
 name: Deploy static content to Pages
 
 on:
-  # Runs on pushes targeting the default branch
+  # Runs on pushes targeting the default and experimentation branches.
   push:
-    branches: ['main']
+    branches:
+      - main
+      - add-screen-reader-support-experimental
 
-  # Allows you to run this workflow manually from the Actions tab
+  # Allows the workflow to be manually run from the Actions tab.
   workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages.
 permissions:
   contents: read
   pages: write
@@ -26,45 +28,77 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout blockly
+      - name: Checkout tip-of-tree core Blockly
         uses: actions/checkout@v4
         with:
           path: blockly
           repository: google/blockly
           ref: develop
 
-      - name: Checkout blockly-keyboard-experimentation
+      - name: Checkout add-screen-reader-support-experimental core Blockly
+        uses: actions/checkout@v4
+        with:
+          path: blockly-add-screen-reader-support-experimental
+          repository: google/blockly
+          ref: add-screen-reader-support-experimental
+
+      - name: Checkout tip-of-tree blockly-keyboard-experimentation
         uses: actions/checkout@v4
         with:
           path: blockly-keyboard-experimentation
 
+      - name: Checkout add-screen-reader-support-experimental blockly-keyboard-experimentation
+        uses: actions/checkout@v4
+        with:
+          path: blockly-keyboard-experimentation-add-screen-reader-support-experimental
+          ref: add-screen-reader-support-experimental
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
 
-      - name: Build blockly
+      - name: Build tip-of-tree core Blockly
         run: |
           cd blockly
           npm ci
           npm run package
           cd dist
           npm link
-          cd ../..
 
-      - name: Build blockly-keyboard-experimentation
+      - name: Build tip-of-tree blockly-keyboard-experimentation
         run: |
           cd blockly-keyboard-experimentation
           npm ci
           npm link blockly
           npm run ghpages
-          cd ..
+          mkdir ../ghpages
+          cp -r build/* ../ghpages/
+
+      - name: Build add-screen-reader-support-experimental core Blockly
+        run: |
+          cd blockly/dist
+          npm unlink -g
+          cd ../../blockly-add-screen-reader-support-experimental
+          npm ci
+          npm run package
+          cd dist
+          npm link
+
+      - name: Build add-screen-reader-support-experimental blockly-keyboard-experimentation
+        run: |
+          cd blockly-keyboard-experimentation-add-screen-reader-support-experimental
+          npm ci
+          npm link blockly
+          npm run ghpages
+          mkdir ../ghpages/screenreader
+          cp -r build/* ../ghpages/screenreader/
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          # Upload build folder
-          path: './blockly-keyboard-experimentation/build'
+          # Upload configured GH pages site files.
+          path: './ghpages'
 
   deploy:
     environment:

README.md

@@ -81,6 +81,18 @@ const workspace = Blockly.inject('blocklyDiv', {
 const keyboardNav = new KeyboardNavigation(workspace);
 ```
 
+## Add shortcuts to page
+
+In order to see the keyboard help popup when the user presses /, you need to add an empty div element to the hosting page that has the Blockly div element with the id "shortcuts". The plugin will take care of layout and formatting.
+
+```html
+...
+<div id="shortcuts"></div>
+...
+<div id="blockly"></div>
+...
+```
+
 ### Usage with cross-tab-copy-paste plugin
 
 This plugin adds context menu items for copying & pasting. It also adds feedback to copying & pasting as toasts that are shown to the user upon successful copy or cut. It is compatible with the `@blockly/plugin-cross-tab-copy-paste` by following these steps:

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;