[WIP] Support Blockly v12

Signed-off-by: Hollow Man <[email protected]>

Author: HollowMan6

package-lock.json

@@ -42,11 +42,10 @@
     "dragselect": "^2.7.4"
   },
   "devDependencies": {
-    "@blockly/dev-scripts": "^4.0.7",
-    "@blockly/dev-tools": "^8.0.12",
-    "@blockly/keyboard-navigation": "^0.6.12",
-    "@blockly/workspace-backpack": "^6.0.12",
-    "blockly": "^11.2.0"
+    "@blockly/dev-scripts": "^4.0.9",
+    "@blockly/dev-tools": "^9.0.1",
+    "@blockly/workspace-backpack": "^7.0.1",
+    "blockly": "^12.1.0"
   },
   "peerDependencies": {
     "blockly": ">=11"

package.json

@@ -210,7 +210,7 @@ const registerDuplicate = function() {
         });
         dragSelection.clear();
         multiDraggable.clearAll_();
-        Blockly.common.setSelected(null);
+        Blockly.common.setSelected(workspace);
       } else {
         apply(scope.block);
       }
@@ -833,7 +833,7 @@ const registerSelectAll = function() {
         } else {
           Blockly.getSelected().unselect();
         }
-        Blockly.common.setSelected(null);
+        Blockly.common.setSelected(scope.workspace);
         multiDraggable.clearAll_();
         dragSelectionWeakMap.get(scope.workspace).clear();
       }
@@ -1115,7 +1115,7 @@ const registerCommentDuplicate = function() {
         });
         dragSelection.clear();
         multiDraggable.clearAll_();
-        Blockly.common.setSelected(null);
+        Blockly.common.setSelected(workspace);
       } else {
         apply(scope.comment);
       }

src/multiselect_contextmenu.js

@@ -387,7 +387,7 @@ export class MultiselectControls {
         }
         this.multiDraggable.clearAll_();
         this.dragSelection.clear();
-        Blockly.common.setSelected(null);
+        Blockly.common.setSelected(this.workspace_);
       } else if (Blockly.getSelected() &&
           !(Blockly.getSelected() instanceof MultiselectDraggable)) {
         // Blockly.getSelected() is not a multiselectDraggable
@@ -415,7 +415,7 @@ export class MultiselectControls {
           MultiselectDraggable)) {
         if (Blockly.getSelected() instanceof Blockly.BlockSvg &&
             !Blockly.getSelected().isShadow()) {
-          Blockly.common.setSelected(null);
+          Blockly.common.setSelected(this.workspace_);
         }
         // TODO: Look into this after gesture has been updated at Blockly
         // Currently, the setSelected is called twice even with selection of

src/multiselect_controls.js

@@ -32,6 +32,23 @@ export class MultiselectDraggable {
     this.dragSelection = dragSelectionWeakMap.get(workspace);
   }
 
+  canBeFocused() {
+    return true;
+  }
+
+  getFocusableTree() {
+    return this.workspace;
+  }
+
+  getFocusableElement() {
+    for (const id of this.dragSelection) {
+      const block = this.workspace.getBlockById(id);
+      if (block) {
+        return block.getSvgRoot();
+      }
+    }
+  }
+
   /**
    * Clears everything in the subDraggables
    * map of the MultiselectDraggable object.

src/multiselect_draggable.js

@@ -485,7 +485,7 @@ const registerSelectAll = function() {
         } else {
           Blockly.getSelected().unselect();
         }
-        Blockly.common.setSelected(null);
+        Blockly.common.setSelected(workspace);
         multiDraggable.clearAll_();
         dragSelectionWeakMap.get(workspace).clear();
       }

src/multiselect_shortcut.js

@@ -12,9 +12,9 @@ import * as Blockly from 'blockly';
 import {toolboxCategories, createPlayground} from '@blockly/dev-tools';
 import {Multiselect} from '../src/index';
 import {Backpack} from '@blockly/workspace-backpack';
-import {NavigationController} from '@blockly/keyboard-navigation';
+// import {NavigationController} from '@blockly/keyboard-navigation';
 
-const navigationController = new NavigationController();
+// const navigationController = new NavigationController();
 /**
  * Create a workspace.
  * @param {HTMLElement} blocklyDiv The blockly container div.
@@ -28,7 +28,7 @@ function createWorkspace(blocklyDiv, options) {
   const backpack = new Backpack(workspace);
   backpack.init();
 
-  navigationController.addWorkspace(workspace);
+  // navigationController.addWorkspace(workspace);
 
   // Initialize multiselect plugin.
   const multiselectPlugin = new Multiselect(workspace);
@@ -38,8 +38,8 @@ function createWorkspace(blocklyDiv, options) {
 }
 
 Blockly.ContextMenuItems.registerCommentOptions();
-// Initialize keyboard nav plugin.
-navigationController.init();
+// // Initialize keyboard nav plugin.
+// navigationController.init();
 
 document.addEventListener('DOMContentLoaded', function() {
   const defaultOptions = {