chore(deps): Update blockly dev dependency to [email protected]

package.json

@@ -36,7 +36,7 @@
     "@eslint/js": "^8.49.0",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
-    "blockly": "^12.0.0-beta.1",
+    "blockly": "^12.0.0-beta.5",
     "conventional-changelog-conventionalcommits": "^5.0.0",
     "eslint": "^8.49.0",
     "eslint-config-google": "^0.14.0",

plugins/field-bitmap/src/field-bitmap.ts

@@ -609,6 +609,18 @@ export class FieldBitmap extends Blockly.Field<number[][]> {
       );
     }
   }
+
+  /**
+   * Returns this field's class.
+   *
+   * Used by keyboard navigation to look up the rules for navigating from this
+   * field.
+   *
+   * @returns This field's class.
+   */
+  getClass() {
+    return FieldBitmap;
+  }
 }
 
 interface Buttons {

plugins/field-colour/package.json

@@ -48,7 +48,7 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0"
+    "blockly": "^12.0.0"
   },
   "publishConfig": {
     "access": "public",

plugins/field-colour/src/field_colour.ts

@@ -209,7 +209,7 @@ export class FieldColour extends Blockly.Field<string> {
    *
    * @returns True if this field should take up the full block. False otherwise.
    */
-  protected isFullBlockField(): boolean {
+  override isFullBlockField(): boolean {
     const block = this.getSourceBlock();
     if (!block) throw new Blockly.UnattachedFieldError();
 
@@ -729,6 +729,18 @@ export class FieldColour extends Blockly.Field<string> {
     // the static fromJson method.
     return new this(options.colour, undefined, options);
   }
+
+  /**
+   * Returns this field's class.
+   *
+   * Used by keyboard navigation to look up the rules for navigating from this
+   * field.
+   *
+   * @returns This field's class.
+   */
+  getClass() {
+    return FieldColour;
+  }
 }
 
 /** The default value for this field. */

plugins/field-grid-dropdown/src/grid.ts

@@ -4,7 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {utils, browserEvents, MenuOption} from 'blockly/core';
+import {
+  browserEvents,
+  FieldDropdown,
+  ImageProperties,
+  MenuOption,
+  utils,
+} from 'blockly/core';
 import {GridItem} from './grid_item';
 
 /**
@@ -88,6 +94,9 @@
   private populateItems(options: MenuOption[]) {
     let row = document.createElement('div');
     for (const [index, item] of options.entries()) {
+      // TODO(#2507): Don't just ignore separators.
+      if (item === FieldDropdown.SEPARATOR) continue;
+
       if (index % this.columns === 0) {
         row = document.createElement('div');
         row.className = 'blocklyFieldGridRow';
@@ -97,11 +106,11 @@
 
       const [label, value] = item;
       const content = (() => {
-        if (typeof label === 'object') {
+        if (isImageProperties(label)) {
           // Convert ImageProperties to an HTMLImageElement.
-          const image = new Image(label['width'], label['height']);
-          image.src = label['src'];
-          image.alt = label['alt'] || '';
+          const image = new Image(label.width, label.height);
+          image.src = label.src;
+          image.alt = label.alt || '';
           return image;
         }
         return label;
@@ -290,3 +299,25 @@
     return this.itemAtIndex(index);
   }
 }
+
+/**
+ * Returns whether or not an object conforms to the ImageProperties
+ * interface.
+ *
+ * @param obj The object to test.
+ * @returns True iff the object conforms to ImageProperties.
+ */
+function isImageProperties(obj: any): obj is ImageProperties {
+  return (
+    obj &&
+    typeof obj === 'object' &&
+    'src' in obj &&
+    typeof obj.src === 'string' &&
+    'alt' in obj &&
+    typeof obj.alt === 'string' &&
+    'width' in obj &&
+    typeof obj.width === 'number' &&
+    'height' in obj &&
+    typeof obj.height === 'number'
+  );
+}

plugins/field-multilineinput/src/field_multilineinput.ts

@@ -163,9 +163,11 @@ export class FieldMultilineInput extends Blockly.FieldTextInput {
       );
     }
     let textLines = this.getText();
+    // TODO(google/blockly#8738): Use minimum-width setting mechanism
+    // to be introduced in PR #9011.
     if (!textLines) {
       // Prevent the field from disappearing if empty.
-      return Blockly.Field.NBSP;
+      return '\u00A0'; // Non-breaking space.
     }
     const lines = textLines.split('\n');
     textLines = '';
@@ -182,7 +184,8 @@ export class FieldMultilineInput extends Blockly.FieldTextInput {
       }
       // Replace whitespace with non-breaking spaces so the text doesn't
       // collapse.
-      text = text.replace(/\s/g, Blockly.Field.NBSP);
+      // TODO(google/blockly#8738): Use Blockly.Field.NBSP.
+      text = text.replace(/\s/g, '\u00A0'); // Non-breaking space.
 
       textLines += text;
       if (i !== displayLinesNumber - 1) {

plugins/package.json

@@ -7,7 +7,7 @@
     "boot": "lerna bootstrap",
     "build": "lerna run build",
     "clean": "lerna run clean",
-    "clean:node": "lerna run clean --yes",
+    "clean:node": "lerna clean --yes",
     "postinstall": "npm run boot",
     "predeploy": "lerna run predeploy",
     "test": "lerna run test"