Option to expand/contract expandables in context menu (#40)

Author: SharkPool-SP

blocks_vertical/control.js

@@ -251,6 +251,7 @@ Blockly.Blocks['control_expandableIf'] = {
     this.branches_ = 0;
     this.nextIsElse = true;
     this.endsInElse = false;
+    this.expandable_ = true;
   },
 
   fillInBlock: Blockly.scratchBlocksUtils.generateMutatorShadow,

blocks_vertical/live_tests.js

@@ -29,9 +29,9 @@ Blockly.Blocks['operator_expandableBool'] = {
     });
 
     this.inputs_ = 0;
+    this.expandable_ = true;
   },
 
-  // EDIT THIS IN https://github.com/PenguinMod/penguinmod.github.io/blob/develop/src/addons/addons/editor-tweaks/userscript.js#L105
   fillInBlock: Blockly.scratchBlocksUtils.generateMutatorShadow,
   menuGenerator: function () {
     const dropdown = new Blockly.FieldDropdown(function () {
@@ -158,6 +158,7 @@ Blockly.Blocks['operator_expandableCompare'] = {
     });
 
     this.inputs_ = 0;
+    this.expandable_ = true;
   },
 
   fillInBlock: Blockly.scratchBlocksUtils.generateMutatorShadow,
@@ -225,7 +226,7 @@ Blockly.Blocks['operator_expandableCompare'] = {
         const menu = input.appendField(this.menuGenerator());
         menu.fieldRow[0].setValue(menuValues[i - 1] ? menuValues[i - 1] : "m", true);
       }
-      // vm will automatically replace2 empty inputs with saved shadows
+      // vm will automatically replace empty inputs with saved shadows
     }
   },
 

blocks_vertical/operators.js

@@ -146,6 +146,7 @@ Blockly.Blocks['operator_expandableMath'] = {
     });
 
     this.inputs_ = 0;
+    this.expandable_ = true;
   },
 
   fillInBlock: Blockly.scratchBlocksUtils.generateMutatorShadow,
@@ -663,6 +664,7 @@ Blockly.Blocks['operator_expandablejoininputs'] = {
 
     this.messageList = ["apple", "banana", "pear", "orange", "mango", "strawberry", "pineapple", "grape", "kiwi"];
     this.inputs_ = 0;
+    this.expandable_ = true;
   },
 
   fillInBlock: Blockly.scratchBlocksUtils.generateMutatorShadow,

core/block.js

@@ -115,6 +115,12 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
    */
   this.editable_ = true;
 
+  /**
+   * @type {boolean}
+   * @private
+   */
+  this.expandable_ = false;
+
   /**
    * @type {boolean}
    * @private
@@ -704,6 +710,14 @@ Blockly.Block.prototype.isEditable = function() {
   return this.editable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
+/**
+ * Get whether this block is expandable or not
+ * @return {boolean} True if expandable.
+ */
+Blockly.Block.prototype.isExpandable = function() {
+  return this.expandable_;
+};
+
 /**
  * Set whether this block is editable or not.
  * @param {boolean} editable True if editable.

core/block_svg.js

@@ -731,7 +731,13 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
     if (this.isEditable() && this.workspace.options.comments) {
       menuOptions.push(Blockly.ContextMenu.blockCommentOption(block));
     }
-    //menuOptions.push(Blockly.ContextMenu.blockCollapseOption(block));
+    // UNUSED menuOptions.push(Blockly.ContextMenu.blockCollapseOption(block));
+    if (this.isExpandable()) {
+      menuOptions.push(
+        Blockly.ContextMenu.expandBlockOption(block),
+        Blockly.ContextMenu.contractBlockOption(block),
+      );
+    }
     menuOptions.push(Blockly.ContextMenu.blockDeleteOption(block));
   } else if (this.parentBlock_ && this.isShadow_ && this.type !== 'polygon') {
     this.parentBlock_.showContextMenu_(e);

core/contextmenu.js

@@ -339,6 +339,38 @@ Blockly.ContextMenu.blockCommentOption = function(block) {
   return commentOption;
 };
 
+/**
+ * Make a context menu option for expanding an expandable block.
+ * @param {!Blockly.BlockSvg} block The block where the right-click originated.
+ * @return {!Object} A menu option, containing text, enabled, and a callback.
+ * @package
+ */
+Blockly.ContextMenu.expandBlockOption = function(block) {
+  return {
+    enabled: true,
+    text: "Expand",
+    callback: function() {
+      block.onExpandableButtonClicked_(true);
+    }
+  };
+};
+
+/**
+ * Make a context menu option for contracting an expandable block.
+ * @param {!Blockly.BlockSvg} block The block where the right-click originated.
+ * @return {!Object} A menu option, containing text, enabled, and a callback.
+ * @package
+ */
+Blockly.ContextMenu.contractBlockOption = function(block) {
+  return {
+    enabled: true,
+    text: "Contract",
+    callback: function() {
+      block.onExpandableButtonClicked_(false);
+    }
+  };
+};
+
 /**
  * Make a context menu option for undoing the most recent action on the
  * workspace.