@opencitylabs/formio-custom-components 0.7.8 → 0.7.9

package/dist/index.js

@@ -7965,19 +7965,24 @@ var pr = e.components.select, mr = class extends fr(pr) {
 		return n?.components && n.components.push(dr), t;
 	}
 	choicesOptions() {
-		let e = super.choicesOptions(), t = this.component.customOptions;
-		if (typeof t != "string" || !t.trim()) return e;
+		let e = this.component.customOptions;
+		this.component.customOptions = void 0;
+		let t = super.choicesOptions();
+		if (this.component.customOptions = e, typeof e != "string" || !e.trim()) return t;
 		try {
-			return JSON.parse(t), e;
+			return {
+				...t,
+				...JSON.parse(e)
+			};
 		} catch {
 			try {
-				let n = Function("instance", `return (${t})`)(this);
+				let n = Function("instance", `return (${e})`)(this);
 				return {
-					...e,
+					...t,
 					...n
 				};
-			} catch (t) {
-				return console.warn("Select customOptions eval error:", t.message), e;
+			} catch (e) {
+				return console.warn("Select customOptions eval error:", e.message), t;
 			}
 		}
 	}