@opencitylabs/formio-custom-components 0.7.8 → 0.7.10

package/dist/index.js

@@ -6806,7 +6806,7 @@ var Jn = ({ component: e, current: t, onChange: n, i18next: o }) => {
 	return t.conditionallyHidden() || t.visible === !1 ? null : /* @__PURE__ */ i(r, { children: p ? /* @__PURE__ */ a("div", { children: [/* @__PURE__ */ a("label", {
 		className: "col-form-label floating-label",
 		htmlFor: `${e.id}-${e.key}`,
-		children: [e.label, e.validate.required && /* @__PURE__ */ i("span", { className: "text-danger" })]
+		children: [o.t(e.label), e.validate.required && /* @__PURE__ */ i("span", { className: "text-danger" })]
 	}), /* @__PURE__ */ a("ul", {
 		className: "upload-file-list",
 		children: [c.map((e, t) => /* @__PURE__ */ a("li", {
@@ -6844,7 +6844,7 @@ var Jn = ({ component: e, current: t, onChange: n, i18next: o }) => {
 			htmlFor: `${e.id}-${e.key}`,
 			title: e.tooltip || void 0,
 			children: [
-				e.label,
+				o.t(e.label),
 				e.validate.required && /* @__PURE__ */ i("span", { className: "text-danger" }),
 				e.tooltip && /* @__PURE__ */ i("i", {
 					tabIndex: 0,
@@ -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;
 			}
 		}
 	}