chore: Update to v12 beta 6.

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.4",
+    "blockly": "^12.0.0-beta.6",
     "conventional-changelog-conventionalcommits": "^5.0.0",
     "eslint": "^8.49.0",
     "eslint-config-google": "^0.14.0",

plugins/block-shareable-procedures/src/blocks.ts

@@ -299,7 +299,7 @@ const procedureDefUpdateShapeMixin = {
    */
   doProcedureUpdate: function () {
     this.setFieldValue(this.getProcedureModel().getName(), 'NAME');
-    this.setEnabled(this.getProcedureModel().getEnabled());
+    this.setDisabledReason(!this.getProcedureModel().getEnabled());
     this.updateParameters_();
     this.updateMutator_();
   },

plugins/block-shareable-procedures/test/procedure_blocks.mocha.js

@@ -107,7 +107,7 @@ suite('Procedures', function () {
     test('disabling a procedure def block updates the procedure model', function () {
       const defBlock = createProcDefBlock(this.workspace);
 
-      defBlock.setEnabled(false);
+      defBlock.setDisabledReason(true);
       globalThis.clock.runAll();
 
       assert.isFalse(
@@ -1204,7 +1204,7 @@ suite('Procedures', function () {
         const defBlock = createProcDefBlock(this.workspace);
         const callBlock = createProcCallBlock(this.workspace);
 
-        defBlock.setEnabled(false);
+        defBlock.setDisabledReason(true);
         globalThis.clock.runAll();
 
         assert.isFalse(
@@ -1220,10 +1220,10 @@ suite('Procedures', function () {
       function () {
         const defBlock = createProcDefBlock(this.workspace);
         const callBlock = createProcCallBlock(this.workspace);
-        defBlock.setEnabled(false);
+        defBlock.setDisabledReason(true);
         globalThis.clock.runAll();
 
-        defBlock.setEnabled(true);
+        defBlock.setDisabledReason(false);
         globalThis.clock.runAll();
 
         assert.isTrue(
@@ -1241,12 +1241,12 @@ suite('Procedures', function () {
         const defBlock = createProcDefBlock(this.workspace);
         const callBlock = createProcCallBlock(this.workspace);
         globalThis.clock.runAll();
-        callBlock.setEnabled(false);
+        callBlock.setDisabledReason(true);
         globalThis.clock.runAll();
-        defBlock.setEnabled(false);
+        defBlock.setDisabledReason(true);
         globalThis.clock.runAll();
 
-        defBlock.setEnabled(true);
+        defBlock.setDisabledReason(false);
         globalThis.clock.runAll();
 
         assert.isFalse(

plugins/field-colour/src/field_colour.ts

@@ -728,15 +728,6 @@ export class FieldColour extends Blockly.Field<string> {
     // the static fromJson method.
     return new this(options.colour, undefined, options);
   }
-
-  /**
-   * Returns the class of this field.
-   *
-   * @returns FieldColour.
-   */
-  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, FieldDropdown} from 'blockly/core';
+import {
+  browserEvents,
+  FieldDropdown,
+  ImageProperties,
+  MenuOption,
+  utils,
+} from 'blockly/core';
 import {GridItem} from './grid_item';
 
 /**
@@ -100,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;
@@ -293,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-grid-dropdown/test/field_test.mocha.js

@@ -70,9 +70,9 @@ suite('FieldGridDropdown', function () {
       expectedText: 'a',
       args: [
         [
-          [{src: 'scrA', alt: 'a'}, 'A'],
-          [{src: 'scrB', alt: 'b'}, 'B'],
-          [{src: 'scrC', alt: 'c'}, 'C'],
+          [{src: 'scrA', alt: 'a', width: 0, height: 0}, 'A'],
+          [{src: 'scrB', alt: 'b', width: 0, height: 0}, 'B'],
+          [{src: 'scrC', alt: 'c', width: 0, height: 0}, 'C'],
         ],
       ],
     },
@@ -99,9 +99,9 @@ suite('FieldGridDropdown', function () {
       args: [
         () => {
           return [
-            [{src: 'scrA', alt: 'a'}, 'A'],
-            [{src: 'scrB', alt: 'b'}, 'B'],
-            [{src: 'scrC', alt: 'c'}, 'C'],
+            [{src: 'scrA', alt: 'a', width: 0, height: 0}, 'A'],
+            [{src: 'scrB', alt: 'b', width: 0, height: 0}, 'B'],
+            [{src: 'scrC', alt: 'c', width: 0, height: 0}, 'C'],
           ];
         },
       ],