Merge branch 'main' into move-shortcuts

Author: gonfunko

.github/workflows/pages.yml

@@ -26,20 +26,46 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout blockly
         uses: actions/checkout@v4
+        with:
+          path: blockly
+          repository: google/blockly
+          ref: develop
+
+      - name: Checkout blockly-keyboard-experimentation
+        uses: actions/checkout@v4
+        with:
+          path: blockly-keyboard-experimentation
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: latest
-          cache: 'npm'
-      - run: npm ci
-      - run: npm run ghpages
+          node-version: 20.x
+
+      - name: Build blockly
+        run: |
+          cd blockly
+          npm ci
+          npm run package
+          cd dist
+          npm link
+          cd ../..
+
+      - name: Build blockly-keyboard-experimentation
+        run: |
+          cd blockly-keyboard-experimentation
+          npm ci
+          npm link blockly
+          npm run ghpages
+          cd ..
+
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload build folder
-          path: './dist'
+          path: './blockly-keyboard-experimentation/dist'
+
   deploy:
     environment:
       name: github-pages

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockly/keyboard-experiment",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "A plugin for keyboard navigation.",
   "scripts": {
     "audit:fix": "blockly-scripts auditFix",
@@ -48,16 +48,16 @@
     "src"
   ],
   "devDependencies": {
-    "@blockly/dev-scripts": "^4.0.1",
-    "@blockly/field-colour": "^5.0.7",
+    "@blockly/dev-scripts": "^4.0.8",
+    "@blockly/field-colour": "^6.0.0",
     "@eslint/eslintrc": "^2.1.2",
     "@eslint/js": "^8.49.0",
     "@types/chai": "^5.2.1",
     "@types/mocha": "^10.0.10",
     "@types/p5": "^1.7.6",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
-    "blockly": "^12.0.0",
+    "blockly": "^12.0.1-beta.1",
     "chai": "^5.2.0",
     "eslint": "^8.49.0",
     "eslint-config-google": "^0.14.0",
@@ -73,11 +73,11 @@
     "webdriverio": "^9.12.1"
   },
   "peerDependencies": {
-    "blockly": "^12.0.0"
+    "blockly": "^12.0.1-beta.1"
   },
   "overrides": {
     "@blockly/field-colour": {
-      "blockly": "^12.0.0"
+      "blockly": "^12.0.1-beta.1"
     }
   },
   "publishConfig": {

package.json

@@ -45,12 +45,23 @@ export class ActionMenu {
   private registerShortcut() {
     const menuShortcut: ShortcutRegistry.KeyboardShortcut = {
       name: Constants.SHORTCUT_NAMES.MENU,
-      preconditionFn: (workspace) =>
-        this.navigation.canCurrentlyNavigate(workspace),
+      preconditionFn: (workspace) => {
+        return (
+          this.navigation.canCurrentlyNavigate(workspace) &&
+          !workspace.isDragging()
+        );
+      },
       callback: (workspace) => {
         switch (this.navigation.getState(workspace)) {
           case Constants.STATE.WORKSPACE:
             return this.openActionMenu(workspace);
+          case Constants.STATE.FLYOUT: {
+            const flyoutWorkspace = workspace.getFlyout()?.getWorkspace();
+            if (flyoutWorkspace) {
+              return this.openActionMenu(flyoutWorkspace);
+            }
+            return false;
+          }
           default:
             return false;
         }

src/actions/action_menu.ts

@@ -6,12 +6,14 @@
 
 import {
   BlockSvg,
-  RenderedConnection,
+  Events,
   ShortcutRegistry,
   utils as BlocklyUtils,
+  Connection,
+  ConnectionType,
 } from 'blockly';
 import * as Constants from '../constants';
-import type {WorkspaceSvg, IFocusableNode} from 'blockly';
+import type {WorkspaceSvg} from 'blockly';
 import {Navigation} from '../navigation';
 
 const KeyCodes = BlocklyUtils.KeyCodes;
@@ -76,66 +78,16 @@ export class DisconnectAction {
    */
   disconnectBlocks(workspace: WorkspaceSvg) {
     const cursor = workspace.getCursor();
-    if (!cursor) {
-      return;
-    }
-    let curNode: IFocusableNode | null = cursor.getCurNode();
-    let wasVisitingConnection = true;
-    while (
-      curNode &&
-      !(curNode instanceof RenderedConnection && curNode.isConnected())
-    ) {
-      if (curNode instanceof BlockSvg) {
-        const previous = curNode.previousConnection;
-        const output = curNode.outputConnection;
-        if (previous?.isConnected()) {
-          curNode = previous;
-          break;
-        } else if (output?.isConnected()) {
-          curNode = output;
-          break;
-        }
-      }
-
-      curNode = workspace.getNavigator().getParent(curNode);
-      wasVisitingConnection = false;
-    }
-    if (!curNode) {
-      console.log('Unable to find a connection to disconnect');
-      return;
-    }
-    if (!(curNode instanceof RenderedConnection && curNode.isConnected())) {
-      return;
-    }
-    const targetConnection = curNode.targetConnection;
-    if (!targetConnection) {
-      throw new Error('Must have target if connected');
-    }
-
-    const superiorConnection = curNode.isSuperior()
-      ? curNode
-      : targetConnection;
-
-    const inferiorConnection = curNode.isSuperior()
-      ? targetConnection
-      : curNode;
-
-    if (inferiorConnection.getSourceBlock().isShadow()) {
-      return;
-    }
-
-    if (!inferiorConnection.getSourceBlock().isMovable()) {
-      return;
-    }
-
-    superiorConnection.disconnect();
-    inferiorConnection.bumpAwayFrom(superiorConnection);
+    if (!cursor) return;
+    const curNode = cursor.getCurNode();
+    if (!(curNode instanceof BlockSvg)) return;
 
-    const rootBlock = superiorConnection.getSourceBlock().getRootBlock();
-    rootBlock.bringToFront();
+    const healStack = !curNode.outputConnection?.isConnected();
+    Events.setGroup(true);
+    curNode.unplug(healStack);
+    Events.setGroup(false);
 
-    if (wasVisitingConnection) {
-      workspace.getCursor()?.setCurNode(superiorConnection);
-    }
+    // Needed or we end up with passive focus.
+    cursor.setCurNode(curNode);
   }
 }