blockly-fluid 1.1.1 → 1.2.1

package/index.js

@@ -1,4 +1,6 @@
 module.exports = (Blockly, { generator: languageGeneratorFallback, generators: languageGenerators = {}, translate = (text) => text } = {}) => {
+  let shadowDropdownOptions = [];
+
   const Blocks = new Proxy({}, {
     set(_, name, {
       hat,
@@ -46,7 +48,15 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
 
                   valueInput.setCheck(input.check || null);
                 } else {
-                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="string"><field name="TEXT"></field></shadow>`, "text/xml").firstChild);
+                  valueInput.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_string"><field name="TEXT"></field></shadow>`, "text/xml").firstChild);
+                };
+
+                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);
+
+                  shadowDropdownOptions = Object.entries(input.options).map(([name, text]) => [translate((typeof text === "function") ? text() : text), (typeof name === "function") ? name() : name]);
                 };
 
                 if (input.shadow) {
@@ -71,8 +81,10 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
                     ]), token);
                     break;
                   case "dropdown":
+                    if (typeof field.options === "function") (field.options = field.options());
+
                     dummy.appendField(new Blockly.FieldDropdown(...[
-                      Object.entries(field.options).map(([name, text]) => [translate((typeof text === "function") ? text() : text), (typeof name === "function") ? name() : name]),
+                      ((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.validator) ? [field.validator] : []
                     ]), token);
                     break;
@@ -116,7 +128,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
           this.inputList.forEach((input) => {
             if (input.connection?.shadowDom || !Array.isArray(input.connection?.check) || input.connection.check.every((check) => !["String", "Number"].includes(check))) return;
 
-            input.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="${((input.connection.check?.length === 1) && (input.connection.check[0] === "Number")) ? "number" : "string"}"><field name="${((input.connection.check?.length === 1) && (input.connection.check[0] === "Number")) ? "NUMBER" : "TEXT"}"></field></shadow>`, "text/xml").firstChild);
+            input.connection.setShadowDom(new DOMParser().parseFromString(`<shadow type="shadow_${((input.connection.check?.length === 1) && (input.connection.check[0] === "Number")) ? "number" : "string"}"><field name="${((input.connection.check?.length === 1) && (input.connection.check[0] === "Number")) ? "NUMBER" : "TEXT"}"></field></shadow>`, "text/xml").firstChild);
           });
         }
       };
@@ -218,7 +230,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
     }
   });
 
-  Blocks["string"] = {
+  Blocks["shadow_string"] = {
     layout: "TEXT",
     fields: {
       TEXT: {
@@ -233,7 +245,7 @@ module.exports = (Blockly, { generator: languageGeneratorFallback, generators: l
     ]
   };
 
-  Blocks["number"] = {
+  Blocks["shadow_number"] = {
     layout: "NUMBER",
     fields: {
       NUMBER: {
@@ -253,5 +265,15 @@ 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.1.1",
+  "version": "1.2.1",
   "description": "A flexible proxy wrapper for Blockly blocks.",
   "main": "index.js",
   "scripts": {