fix: Call blocks handle both manual disabling and disabled defs (#2334)

* Update blockly dependency from 11.0.0-beta.7 to 11.0.0-beta.9

* Disallow reenabling a call block with a disabled def.

plugins/block-dynamic-connection/package.json

@@ -42,13 +42,13 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
     "@blockly/dev-tools": "^7.1.6",
-    "blockly": "^11.0.0-beta.7",
+    "blockly": "^11.0.0-beta.9",
     "chai": "^4.2.0",
     "mocha": "^10.2.0",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",

plugins/block-plus-minus/package.json

@@ -41,13 +41,13 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
     "@blockly/dev-tools": "^7.1.6",
-    "blockly": "^11.0.0-beta.7",
+    "blockly": "^11.0.0-beta.9",
     "chai": "^4.2.0",
     "mocha": "^10.2.0",
     "sinon": "^9.0.1"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",

plugins/block-shareable-procedures/package.json

@@ -43,15 +43,15 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
     "@blockly/dev-tools": "^7.1.6",
-    "blockly": "^11.0.0-beta.7",
+    "blockly": "^11.0.0-beta.9",
     "chai": "^4.3.7",
     "jsdom": "^16.4.0",
     "jsdom-global": "^3.0.2",
     "sinon": "^15.0.1",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",

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

@@ -745,7 +745,7 @@ const procedureDefOnChangeMixin = {
       e.blockId === this.id &&
       e.element === 'disabled'
     ) {
-      this.getProcedureModel().setEnabled(!e.newValue);
+      this.getProcedureModel().setEnabled(this.isEnabled());
     }
   },
 };
@@ -949,8 +949,6 @@ Blockly.Extensions.register(
 );
 
 const procedureCallerMutator = {
-  previousEnabledState_: true,
-
   paramsFromSerializedState_: [],
 
   /**
@@ -1053,6 +1051,8 @@ Blockly.Extensions.registerMutator(
   procedureCallerMutator,
 );
 
+const PROCEDURE_MODEL_DISABLED_REASON = 'PROCEDURE_MODEL_DISABLED';
+
 const procedureCallerUpdateShapeMixin = {
   /**
    * Renders the block for the first time based on the procedure model.
@@ -1094,12 +1094,10 @@ const procedureCallerUpdateShapeMixin = {
    *     model.
    */
   updateEnabled_: function () {
-    if (!this.getProcedureModel().getEnabled()) {
-      this.previousEnabledState_ = this.isEnabled();
-      this.setEnabled(false);
-    } else {
-      this.setEnabled(this.previousEnabledState_);
-    }
+    this.setDisabledReason(
+      !this.getProcedureModel().getEnabled(),
+      PROCEDURE_MODEL_DISABLED_REASON,
+    );
   },
 
   /**

plugins/block-test/package.json

@@ -40,10 +40,10 @@
   ],
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",

plugins/content-highlight/package.json

@@ -45,11 +45,11 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
     "@blockly/dev-tools": "^7.1.6",
-    "blockly": "^11.0.0-beta.7",
+    "blockly": "^11.0.0-beta.9",
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",

plugins/continuous-toolbox/package.json

@@ -41,10 +41,10 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.1",
     "@blockly/dev-tools": "^7.1.6",
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "peerDependencies": {
-    "blockly": "^11.0.0-beta.7"
+    "blockly": "^11.0.0-beta.9"
   },
   "publishConfig": {
     "access": "public",