blockly-fluid 1.2.3 → 1.2.5

package/index.js

@@ -22,6 +22,8 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
       } = configuration;
 
       Blockly.Blocks[name] = {
+        ...Blockly.Blocks[name],
+
         init: function () {
           if ((typeof hat === "function") ? hat() : hat) this.setStyle("hat_blocks");
 
@@ -54,9 +56,20 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                 };
 
                 if (input.options) {
-                  if (typeof input.options === "function") (input.options = input.options());
-
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_dropdown"><field name="DROPDOWN">${(typeof input.default === "function") ? input.default() : (input.default || "")}</field></shadow>`, "text/xml").firstChild);
+                  const dropdownId = Date.now();
+
+                  Blocks[`shadow_dropdown_${dropdownId}`] = {
+                    layout: "DROPDOWN",
+                    fields: {
+                      DROPDOWN: {
+                        type: "dropdown",
+                        default: input.default,
+                        options: input.options
+                      }
+                    }
+                  };
+
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_dropdown_${dropdownId}"><field name="DROPDOWN"></field></shadow>`, "text/xml").firstChild);
                 };
 
                 if (input.shadow) {
@@ -189,7 +202,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
           if (!output) return code;
 
           return (Array.isArray(code)) ? [
-            (code[1]?.toLowerCase() !== "nugget") ? code[0] : `(() => {\n${code[0].split("\n").map((line) => "  " + line).join("\n")}\n})()`,
+            (code[1]?.toLowerCase() !== "nugget") ? code[0] : `await (async () => {\n${code[0].split("\n").map((line) => "  " + line).join("\n")}\n})()`,
             languageGenerator[`ORDER_${(code[1]?.toLowerCase().replaceAll("nugget", "") || "NONE").toUpperCase()}`]
           ] : [
             code,
@@ -265,15 +278,5 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
     ]
   };
 
-  Blocks["shadow_dropdown"] = {
-    layout: "DROPDOWN",
-    fields: {
-      DROPDOWN: {
-        type: "dropdown",
-        options: () => shadowDropdownOptions
-      }
-    }
-  };
-
   return Blocks;
 };

package/package.json

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