Overhaul the ordering system

Tacodiva · Aug 28, 2023 · 7766382 · 7766382
1 parent 03a31e3
commit 7766382
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 70 deletions.
diff --git a/addons/middle-click-popup/BlockRenderer.js b/addons/middle-click-popup/BlockRenderer.js
@@ -272,7 +272,7 @@ function _renderBlock(block, container, parentCategory, isVertical) {
       } else if (blockPart instanceof BlockInputEnum) {
         if (blockPart.isRound) {
           component = createBackedTextedComponent(
-            blockInput?.string ?? blockPart.values[0].string,
+            blockInput.string,
             blockContainer,
             BlockShapes.TextInput,
             categoryClass,
@@ -282,7 +282,7 @@ function _renderBlock(block, container, parentCategory, isVertical) {
           );
         } else {
           component = createBackedTextedComponent(
-            blockInput?.string ?? blockPart.values[0].string,
+            blockInput.string,
             blockContainer,
             BlockShapes.SquareInput,
             categoryClass,

diff --git a/addons/middle-click-popup/BlockTypeInfo.js b/addons/middle-click-popup/BlockTypeInfo.js
@@ -213,6 +213,7 @@ export class BlockInputEnum extends BlockInput {
       }
     }
     this.isRound = isRound;
+    this.defaultValue = this.values[0];
   }
 
   /**
@@ -260,6 +261,10 @@ export class BlockInstance {
     this.typeInfo = typeInfo;
     /** @type {Array} */
     this.inputs = inputs;
+
+    for (let i = 0; i < this.typeInfo.inputs.length; i++) {
+      if (this.inputs[i] == null) this.inputs[i] = this.typeInfo.inputs[i].defaultValue;
+    }
   }
 
   /**
@@ -275,9 +280,8 @@ export class BlockInstance {
 
     const block = this.typeInfo.Blockly.Xml.domToBlock(this.typeInfo.domForm, this.typeInfo.workspace);
     for (let i = 0; i < this.typeInfo.inputs.length; i++) {
-      const input = this.typeInfo.inputs[i];
-      const inputValue = this.inputs[i] ?? input.defaultValue;
-      if (inputValue != null) input.setValue(block, inputValue);
+      const inputValue = this.inputs[i];
+      if (inputValue != null) this.typeInfo.inputs[i].setValue(block, inputValue);
     }
 
     return block;
@@ -508,17 +512,14 @@ export class BlockTypeInfo {
 
         const ofInputs = [];
 
-        const inputTarget = new BlockInputEnum(
+        ofInputs[baseVarInputIdx] = new BlockInputEnum(options, baseVarInput.inputIdx, baseVarInput.fieldIdx, false);
+        ofInputs[baseTargetInputIdx] = new BlockInputEnum(
           [[targetInput.string, targetInput.value]],
           baseTargetInput.inputIdx,
           baseTargetInput.fieldIdx,
           isStage
         );
 
-        ofInputs[baseVarInputIdx] = new BlockInputEnum(options, baseVarInput.inputIdx, baseVarInput.fieldIdx, false);
-        ofInputs[baseTargetInputIdx] = inputTarget;
-        inputTarget.defaultValue = inputTarget.values[0];
-
         const ofParts = [...parts];
         ofParts[baseVarPartIdx] = ofInputs[baseVarInputIdx];
         ofParts[baseTargetPartIdx] = ofInputs[baseTargetInputIdx];