blockly-fluid 1.2.8 → 1.2.10

package/index.js

@@ -61,7 +61,27 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                   if (typeof input.default === "function") (input.default = input.default());
                   if (typeof input.options === "function") (input.options = input.options());
 
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_dropdown><field name="DROPDOWN">${encodeURIComponent(JSON.stringify([input.default, ...((Array.isArray(field.options)) ? field.options.map((option) => [option, option]) : Object.entries(field.options)).map(([name, text]) => [translate((typeof text === "function") ? text() : text), (typeof name === "function") ? name() : name])]))}</field></shadow>`, "text/xml").firstChild);
+                  const dropdownId = encodeURIComponent(JSON.stringify([input.default, ...((Array.isArray(input.options)) ? input.options.map((option) => [option, option]) : Object.entries(input.options)).map(([name, text]) => [translate((typeof text === "function") ? text() : text), (typeof name === "function") ? name() : name])]));
+
+                  Blocks[`shadow_dropdown_${dropdownId}`] = {
+                    layout: "DROPDOWN",
+                    fields: {
+                      DROPDOWN: {
+                        type: "dropdown",
+                        default: input.default,
+                        options: input.options
+                      }
+                    },
+                    color,
+                    output: true,
+
+                    generator: ({ DROPDOWN = `""` }) => [
+                      `"${DROPDOWN}"`,
+                      "atomic"
+                    ]
+                  };
+
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_dropdown_${dropdownId}"></shadow>`, "text/xml").firstChild);
                 };
 
                 if (input.shadow) {
@@ -270,40 +290,5 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
     ]
   };
 
-  Blockly.Blocks['shadow_dropdown'] = {
-  init: function() {
-    console.log(this.getFieldValue("DROPDOWN"));
-
-    this.appendDummyInput()
-        .appendField("number")
-        .appendField(new Blockly.FieldNumber(0), "NUM");
-    this.setOutput(true, "Number");  // This makes it a value block
-    this.setColour(230);
-    this.setTooltip("A minimal block that outputs a number");
-    this.setHelpUrl("");
-
-    console.log(this.getFieldValue("DROPDOWN"));
-  }
-};
-
-
-  /*Blocks[`shadow_dropdown_${dropdownId}`] = {
-    layout: "DROPDOWN",
-    fields: {
-      DROPDOWN: {
-        type: "dropdown",
-        default: input.default,
-        options: input.options
-      }
-    },
-    color,
-    output: true,
-
-    generator: ({ DROPDOWN = `""` }) => [
-      `"${DROPDOWN}"`,
-      "atomic"
-    ]
-  };*/
-
   return Blocks;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockly-fluid",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "A flexible proxy wrapper for Blockly blocks.",
   "main": "index.js",
   "scripts": {