refactor: Update to v12.0.0-beta.3 and use cursor from core. (#405)

* chore: Update dependency to Blockly v12 beta 3.

* refactor: Use the built-in cursor in core.

* chore: Fix imports.

Author: gonfunko

package-lock.json

@@ -55,7 +55,7 @@
     "@types/p5": "^1.7.6",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
-    "blockly": "12.0.0-beta.2",
+    "blockly": "12.0.0-beta.3",
     "chai": "^5.2.0",
     "eslint": "^8.49.0",
     "eslint-config-google": "^0.14.0",
@@ -71,11 +71,11 @@
     "webdriverio": "^9.12.1"
   },
   "peerDependencies": {
-    "blockly": "^12.0.0-beta.2"
+    "blockly": "^12.0.0-beta.3"
   },
   "overrides": {
     "@blockly/field-colour": {
-      "blockly": "^12.0.0-beta.2"
+      "blockly": "^12.0.0-beta.3"
     }
   },
   "publishConfig": {

package.json

@@ -12,10 +12,10 @@ import {
   utils as blocklyUtils,
   clipboard,
   ICopyData,
+  LineCursor,
 } from 'blockly';
 import * as Constants from '../constants';
 import type {BlockSvg, WorkspaceSvg} from 'blockly';
-import {LineCursor} from '../line_cursor';
 import {Navigation} from '../navigation';
 import {ScopeWithConnection} from './action_menu';
 

src/actions/clipboard.ts

@@ -9,10 +9,10 @@ import {
   Gesture,
   ShortcutRegistry,
   utils as BlocklyUtils,
+  LineCursor,
 } from 'blockly';
 import * as Constants from '../constants';
 import type {BlockSvg, WorkspaceSvg} from 'blockly';
-import {LineCursor} from '../line_cursor';
 import {Navigation} from '../navigation';
 
 const KeyCodes = BlocklyUtils.KeyCodes;

src/actions/delete.ts

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {ContextMenuRegistry} from 'blockly';
-import {LineCursor} from '../line_cursor';
+import {ContextMenuRegistry, LineCursor} from 'blockly';
 import {Navigation} from 'src/navigation';
 
 /**

src/actions/edit.ts

@@ -271,7 +271,6 @@ export class EnterAction {
     if (block.isSimpleReporter()) {
       for (const input of block.inputList) {
         for (const field of input.fieldRow) {
-          // @ts-expect-error isFullBlockField is a protected method.
           if (field.isClickable() && field.isFullBlockField()) {
             field.showEditor();
             return true;

src/actions/enter.ts

@@ -109,6 +109,8 @@ export class WorkspaceMovement {
     if (!curNode || curNode.getType() !== ASTNode.types.WORKSPACE) return false;
 
     const wsCoord = curNode.getWsCoordinate();
+    if (!wsCoord) return false;
+
     const newX = xDirection * WS_MOVE_DISTANCE + wsCoord.x;
     const newY = yDirection * WS_MOVE_DISTANCE + wsCoord.y;
 

src/actions/ws_movement.ts

@@ -17,14 +17,14 @@ import {scrollBoundsIntoView} from './workspace_utilities';
  * This controls how a user navigates blocks in the flyout.
  * This cursor only allows a user to go to the previous or next stack.
  */
-export class FlyoutCursor extends Blockly.Cursor {
+export class FlyoutCursor extends Blockly.LineCursor {
   /**
    * The constructor for the FlyoutCursor.
    *
    * @param flyout The flyout this cursor is for.
    */
   constructor(private readonly flyout: Blockly.IFlyout) {
-    super();
+    super(flyout.getWorkspace());
   }
 
   /**

src/flyout_cursor.ts

@@ -6,12 +6,11 @@
 
 import * as Blockly from 'blockly/core';
 import {NavigationController} from './navigation_controller';
-import {CursorOptions, LineCursor} from './line_cursor';
 import {getFlyoutElement, getToolboxElement} from './workspace_utilities';
 
 /** Options object for KeyboardNavigation instances. */
 export interface NavigationOptions {
-  cursor: Partial<CursorOptions>;
+  cursor: Partial<Blockly.CursorOptions>;
 }
 
 /** Default options for LineCursor instances. */
@@ -49,7 +48,7 @@ export class KeyboardNavigation {
   private navigationController: NavigationController;
 
   /** Cursor for the main workspace. */
-  private cursor: LineCursor;
+  private cursor: Blockly.LineCursor;
 
   /**
    * These fields are used to preserve the workspace's initial state to restore
@@ -92,8 +91,7 @@ export class KeyboardNavigation {
     this.originalTheme = workspace.getTheme();
     this.setGlowTheme();
 
-    this.cursor = new LineCursor(workspace, options.cursor);
-    this.cursor.install();
+    this.cursor = new Blockly.LineCursor(workspace, options.cursor);
 
     // Ensure that only the root SVG G (group) has a tab index.
     this.injectionDivTabIndex = workspace
@@ -276,8 +274,6 @@ export class KeyboardNavigation {
       this.workspace.getInjectionDiv().removeAttribute('tabindex');
     }
 
-    this.cursor.uninstall();
-
     this.workspace.setTheme(this.originalTheme);
 
     this.navigationController.dispose();

src/index.ts

@@ -4,9 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {ASTNode, BlockSvg, RenderedConnection, dragging, utils} from 'blockly';
+import {
+  ASTNode,
+  BlockSvg,
+  RenderedConnection,
+  LineCursor,
+  dragging,
+  utils,
+} from 'blockly';
 import {Direction, getDirectionFromXY} from './drag_direction';
-import {LineCursor} from './line_cursor';
 
 // Copied in from core because it is not exported.
 interface ConnectionCandidate {