live_tests.js -- Expandable Polishing (1/2), JWK cant listen nor code.

Author: SharkPool-SP

blocks_vertical/live_tests.js

@@ -322,6 +322,11 @@ Blockly.Blocks['control_dualblock'] = {
 };
 
 Blockly.Blocks['operators_expandablejoininputs'] = {
+  /*
+    default block texts
+  */
+  messageList: ["apple", "banana", "pear", "orange", "mango", "strawberry", "pineapple", "grape", "kiwi"],
+
   /**
    * @this Blockly.Block
    */
@@ -342,14 +347,31 @@ Blockly.Blocks['operators_expandablejoininputs'] = {
       "extensions": ["colours_operators", "output_string"]
     });
 
-    this.inputs_ = 0;
+    this.inputs_ = 2;
+    if (this.isInFlyout) {
+      for (let i = 0; i < this.inputs_; i++) {
+        const input = this.appendValueInput(`INPUT${i + 1}`);
+        this.fillInBlock(input.connection, i);
+      }
+    }
+  },
+
+  fillInBlock: function (connection, index) {
+    if (connection.sourceBlock_.isInsertionMarker_) return;
+    const block = this.workspace.newBlock('text');
+    const text = this.messageList[index];
+    block.setFieldValue(text ? text : "...", "TEXT");
+    block.setShadow(true);
+    block.initSvg();
+    block.render(true);
+    block.outputConnection.connect(connection);
   },
 
   mutationToDom: function () {
     // on save
     const container = document.createElement("mutation");
     let number = Number(this.inputs_);
-    if (isNaN(number)) number = 0;
+    if (isNaN(number)) number = 1;
     container.setAttribute("inputcount", String(number));
     return container;
   },
@@ -359,37 +381,36 @@ Blockly.Blocks['operators_expandablejoininputs'] = {
     const inputCount = Number(xmlElement.getAttribute("inputcount"));
     this.inputs_ = isNaN(inputCount) ? 0 : inputCount;
     for (let i = 0; i < this.inputs_; i++) {
-      let input = this.appendValueInput(`INPUT${i + 1}`)
+      const input = this.appendValueInput(`INPUT${i + 1}`);
+      this.fillInBlock(input.connection, i);
     }
+    queueMicrotask(() => {
+      const connections = this.getConnections_();
+      for (let i = 1; i < connections.length; i++) {
+        const block = connections[i].targetBlock();
+        if (!block) continue;
+        if (!block.category_ && !block.isShadow()) block.dispose();
+      }
+    });
   },
 
   onExpandableButtonClicked_: function (isAdding) {
     // Create an event group to keep field value and mutator in sync
     // Return null at the end because setValue is called here already.
     Blockly.Events.setGroup(true);
     var oldMutation = Blockly.Xml.domToText(this.mutationToDom());
-    if (!isAdding) {
+    if (isAdding) {
+      this.inputs_++;
+      const number = this.inputs_;
+      const newInput = this.appendValueInput(`INPUT${number}`);
+      this.fillInBlock(newInput.connection, number - 1);
+    } else if (this.inputs_ > 1) {
       const number = this.inputs_;
       this.removeInput(`INPUT${number}`);
       this.inputs_--;
-      if (this.inputs_ < 0) {
-        this.inputs_ = 0;
-      }
-    } else {
-      this.inputs_++;
-      const number = this.inputs_;
-      let input = this.appendValueInput(`INPUT${number}`)
-      let shadow = this.workspace.newBlock('text')
-      shadow.setFieldValue('text', 'TEXT')
-      shadow.setShadow(true)
-      shadow.initSvg()
-      shadow.render()
-      input.connection.connect(shadow.outputConnection)
     }
     this.initSvg();
-    if (this.rendered) {
-      this.render();
-    }
+    if (this.rendered) this.render();
 
     var newMutation = Blockly.Xml.domToText(this.mutationToDom());
     Blockly.Events.fire(new Blockly.Events.BlockChange(this,