@yungu-fed/question-editor 0.1.7 → 0.1.8

package/dist/index.mjs

@@ -1446,7 +1446,7 @@ function gr(e, t, n) {
 	}, []);
 }
 //#endregion
-//#region node_modules/.pnpm/ulid@3.0.2/node_modules/ulid/dist/browser/index.js
+//#region ../../node_modules/.pnpm/ulid@3.0.2/node_modules/ulid/dist/browser/index.js
 var _r = "0123456789ABCDEFGHJKMNPQRSTVWXYZ", vr = 32, yr = 16, br = 0xffffffffffff, xr;
 (function(e) {
 	e.Base32IncorrectEncoding = "B32_ENC_INVALID", e.DecodeTimeInvalidCharacter = "DEC_TIME_CHAR", e.DecodeTimeValueMalformed = "DEC_TIME_MALFORMED", e.EncodeTimeNegative = "ENC_TIME_NEG", e.EncodeTimeSizeExceeded = "ENC_TIME_SIZE_EXCEED", e.EncodeTimeValueMalformed = "ENC_TIME_MALFORMED", e.PRNGDetectFailure = "PRNG_DETECT", e.ULIDInvalid = "ULID_INVALID", e.Unexpected = "UNEXPECTED", e.UUIDInvalid = "UUID_INVALID";
@@ -2970,6 +2970,7 @@ var Cs = {
 			editorTitle: "Composite Editor",
 			emptyNodes: "No child questions yet.",
 			emptyTemplate: "This business type has no supported structure.",
+			missingTemplate: "Missing question type structure.",
 			moveChildDown: "Move child {{index}} down",
 			moveChildUp: "Move child {{index}} up",
 			questionKind: "Question",
@@ -3155,6 +3156,7 @@ var Cs = {
 			editorTitle: "\u7ec4\u5408\u9898\u7f16\u8f91",
 			emptyNodes: "\u6682\u65e0\u5b50\u9898\u3002",
 			emptyTemplate: "\u8be5\u4e1a\u52a1\u9898\u578b\u6682\u65e0\u53ef\u652f\u6301\u7684\u7ed3\u6784\u3002",
+			missingTemplate: "\u7f3a\u5c11\u9898\u578b\u7ed3\u6784\u3002",
 			moveChildDown: "\u4e0b\u79fb\u7b2c {{index}} \u9898",
 			moveChildUp: "\u4e0a\u79fb\u7b2c {{index}} \u9898",
 			questionKind: "\u9898\u76ee",
@@ -3189,7 +3191,25 @@ function Es(e) {
 function Ds(e, t = {}) {
 	return Object.entries(t).reduce((e, [t, n]) => e.split(`{{${t}}}`).join(n == null ? "" : String(n)), e);
 }
-var Os = {
+//#endregion
+//#region src/question/content-editor/question-type-template.ts
+function Os(e, t) {
+	var n;
+	return (n = Ms(e, t)) == null ? void 0 : n.structure;
+}
+function ks(e, t) {
+	return k(k({}, e), {}, { hasAnswer: t && e.hasAnswer });
+}
+function As(e, t) {
+	return Os(e, t.questionTypeKey);
+}
+function js(e, t) {
+	return t !== null && e.questionTypeKey === t;
+}
+function Ms(e, t) {
+	return e.find((e) => js(e, t));
+}
+var Ns = {
 	root: "_root_1ojgr_1",
 	"rich-text-root": "_rich-text-root_1ojgr_28",
 	"rich-text-toolbar": "_rich-text-toolbar_1ojgr_37"
@@ -3218,7 +3238,7 @@ var Os = {
 };
 //#endregion
 //#region \0@oxc-project+runtime@0.129.0/helpers/objectWithoutPropertiesLoose.js
-function ks(e, t) {
+function Ps(e, t) {
 	if (e == null) return {};
 	var n = {};
 	for (var r in e) if ({}.hasOwnProperty.call(e, r)) {
@@ -3229,9 +3249,9 @@ function ks(e, t) {
 }
 //#endregion
 //#region \0@oxc-project+runtime@0.129.0/helpers/objectWithoutProperties.js
-function As(e, t) {
+function Fs(e, t) {
 	if (e == null) return {};
-	var n, r, i = ks(e, t);
+	var n, r, i = Ps(e, t);
 	if (Object.getOwnPropertySymbols) {
 		var a = Object.getOwnPropertySymbols(e);
 		for (r = 0; r < a.length; r++) n = a[r], t.includes(n) || {}.propertyIsEnumerable.call(e, n) && (i[n] = e[n]);
@@ -3240,7 +3260,7 @@ function As(e, t) {
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentEditorUi.tsx
-var js = [
+var Is = [
 	"children",
 	"className",
 	"danger",
@@ -3249,7 +3269,7 @@ var js = [
 	"type"
 ];
 function F(e) {
-	let { children: t, className: n, danger: r = !1, icon: i, size: s, type: c } = e, l = As(e, js);
+	let { children: t, className: n, danger: r = !1, icon: i, size: s, type: c } = e, l = Fs(e, Is);
 	return /* @__PURE__ */ o("button", k(k({
 		className: [
 			P.button,
@@ -3264,7 +3284,7 @@ function F(e) {
 		children: i
 	}) : null, t] }));
 }
-function Ms({ "aria-label": e, allowClear: t = !1, className: n, disabled: r, onChange: i, options: s, placeholder: c, value: l }) {
+function Ls({ "aria-label": e, allowClear: t = !1, className: n, disabled: r, onChange: i, options: s, placeholder: c, value: l }) {
 	function u(e) {
 		let t = e.target.value;
 		i(t === "" ? void 0 : t);
@@ -3285,7 +3305,7 @@ function Ms({ "aria-label": e, allowClear: t = !1, className: n, disabled: r, on
 		}, e.value))]
 	});
 }
-function Ns({ cancelText: e, children: t, closeLabel: n, okButtonProps: r, okText: i, onCancel: s, onOk: c, open: l, title: u }) {
+function Rs({ cancelText: e, children: t, closeLabel: n, okButtonProps: r, okText: i, onCancel: s, onOk: c, open: l, title: u }) {
 	return l ? /* @__PURE__ */ a("div", {
 		className: P["modal-backdrop"],
 		role: "presentation",
@@ -3322,7 +3342,7 @@ function Ns({ cancelText: e, children: t, closeLabel: n, okButtonProps: r, okTex
 		})
 	}) : null;
 }
-function Ps({ onChange: e, options: t, value: n }) {
+function zs({ onChange: e, options: t, value: n }) {
 	return /* @__PURE__ */ a("div", {
 		className: P["radio-group"],
 		children: t.map((t) => /* @__PURE__ */ o("label", {
@@ -3336,14 +3356,14 @@ function Ps({ onChange: e, options: t, value: n }) {
 		}, t.value))
 	});
 }
-var Fs = { Group: Ps };
-function Is({ description: e }) {
+var Bs = { Group: zs };
+function Vs({ description: e }) {
 	return /* @__PURE__ */ a("div", {
 		className: P.empty,
 		children: e
 	});
 }
-function Ls({ children: e, className: t, size: n = 8, wrap: r = !1 }) {
+function Hs({ children: e, className: t, size: n = 8, wrap: r = !1 }) {
 	return /* @__PURE__ */ a("span", {
 		className: [
 			P.space,
@@ -3354,7 +3374,7 @@ function Ls({ children: e, className: t, size: n = 8, wrap: r = !1 }) {
 		children: e
 	});
 }
-function Rs({ children: e, className: t, strong: n = !1, type: r }) {
+function Us({ children: e, className: t, strong: n = !1, type: r }) {
 	return /* @__PURE__ */ a("span", {
 		className: [
 			P.text,
@@ -3365,8 +3385,8 @@ function Rs({ children: e, className: t, strong: n = !1, type: r }) {
 		children: e
 	});
 }
-var I = { Text: Rs };
-function zs({ columns: e, dataSource: t, rowKey: n }) {
+var I = { Text: Us };
+function Ws({ columns: e, dataSource: t, rowKey: n }) {
 	return /* @__PURE__ */ a("div", {
 		className: P["table-wrap"],
 		children: /* @__PURE__ */ o("table", {
@@ -3375,19 +3395,19 @@ function zs({ columns: e, dataSource: t, rowKey: n }) {
 				style: { width: e.width },
 				children: e.title
 			}, e.key)) }) }), /* @__PURE__ */ a("tbody", { children: t.map((t, r) => /* @__PURE__ */ a("tr", { children: e.map((e) => {
-				let n = Bs(t, e.dataIndex);
-				return /* @__PURE__ */ a("td", { children: e.render ? e.render(n, t, r) : Vs(n) }, e.key);
+				let n = Gs(t, e.dataIndex);
+				return /* @__PURE__ */ a("td", { children: e.render ? e.render(n, t, r) : Ks(n) }, e.key);
 			}) }, n(t))) })]
 		})
 	});
 }
-function Bs(e, t) {
+function Gs(e, t) {
 	var n;
 	if (!t || typeof e != "object" || !e) return;
 	let r = String(t);
 	return (n = Object.entries(e).find(([e]) => e === r)) == null ? void 0 : n[1];
 }
-function Vs(e) {
+function Ks(e) {
 	return typeof e == "boolean" || typeof e == "number" || typeof e == "string" ? String(e) : "";
 }
 var L = {
@@ -3400,7 +3420,7 @@ var L = {
 };
 //#endregion
 //#region src/question/rich-text/RichTextFieldTestToolbar.tsx
-function Hs({ toolbarExtra: e }) {
+function qs({ toolbarExtra: e }) {
 	return /* @__PURE__ */ o("div", {
 		className: L.toolbar,
 		role: "toolbar",
@@ -3431,19 +3451,19 @@ function Hs({ toolbarExtra: e }) {
 }
 //#endregion
 //#region src/question/rich-text/RichTextField.tsx
-function Us({ apiRef: t, ariaLabel: n, compact: r = !1, onChange: i, plugins: s = [], toolbarExtra: c, uploadImage: l, value: u }) {
+function Js({ apiRef: t, ariaLabel: n, compact: r = !1, onChange: i, plugins: s = [], toolbarExtra: c, uploadImage: l, value: u }) {
 	let d = Ss() && !c;
-	return Ws() ? /* @__PURE__ */ o("div", {
-		className: Gs(r),
-		children: [/* @__PURE__ */ a(Hs, { toolbarExtra: c }), /* @__PURE__ */ a("textarea", {
+	return Ys() ? /* @__PURE__ */ o("div", {
+		className: Xs(r),
+		children: [/* @__PURE__ */ a(qs, { toolbarExtra: c }), /* @__PURE__ */ a("textarea", {
 			"aria-label": n,
 			className: `${L.textarea} rich-content-editor-surface`,
 			onChange: (e) => i(v(e.target.value)),
 			value: u.text
 		})]
 	}) : d ? /* @__PURE__ */ a("div", {
-		className: Gs(r),
-		children: qs({
+		className: Xs(r),
+		children: Qs({
 			apiRef: t,
 			ariaLabel: n,
 			compact: r,
@@ -3451,7 +3471,7 @@ function Us({ apiRef: t, ariaLabel: n, compact: r = !1, onChange: i, plugins: s
 			value: u
 		})
 	}) : /* @__PURE__ */ a("div", {
-		className: Gs(r),
+		className: Xs(r),
 		children: /* @__PURE__ */ o(e.Root, {
 			plugins: s,
 			uploadImage: l,
@@ -3481,27 +3501,27 @@ function Us({ apiRef: t, ariaLabel: n, compact: r = !1, onChange: i, plugins: s
 			}), /* @__PURE__ */ a(e.Editor, {
 				apiRef: t,
 				"aria-label": n,
-				className: Ks(r),
+				className: Zs(r),
 				initialValue: u.json,
 				onChange: (e) => i(y({ json: e }))
 			})]
 		})
 	});
 }
-function Ws() {
+function Ys() {
 	return typeof navigator < "u" && navigator.userAgent.toLowerCase().includes("jsdom");
 }
-function Gs(e) {
+function Xs(e) {
 	return e ? `${L.field} ${L.compact} rich-content-editor is-compact` : `${L.field} rich-content-editor`;
 }
-function Ks(e) {
+function Zs(e) {
 	return e ? `${L.editor} ${L.compact} rich-content-editor-surface is-compact` : `${L.editor} rich-content-editor-surface`;
 }
-function qs({ apiRef: t, ariaLabel: n, compact: r, onChange: i, value: o }) {
+function Qs({ apiRef: t, ariaLabel: n, compact: r, onChange: i, value: o }) {
 	return /* @__PURE__ */ a(e.Editor, {
 		apiRef: t,
 		"aria-label": n,
-		className: Ks(r),
+		className: Zs(r),
 		initialValue: o.json,
 		onChange: (e) => i(y({ json: e }))
 	});
@@ -3512,7 +3532,7 @@ function R({ controls: e, disabled: t, editorRef: n, label: r, onChange: i, plac
 	return /* @__PURE__ */ o("div", {
 		"aria-disabled": t,
 		className: t ? "pointer-events-none opacity-70" : void 0,
-		children: [/* @__PURE__ */ a(Us, {
+		children: [/* @__PURE__ */ a(Js, {
 			apiRef: n,
 			ariaLabel: r,
 			compact: l === "compact",
@@ -3528,21 +3548,21 @@ function R({ controls: e, disabled: t, editorRef: n, label: r, onChange: i, plac
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentBlankGroupEditor.tsx
-function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: s, translator: c }) {
+function $s({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: s, translator: c }) {
 	let { t: l } = c, [u, d] = m(null), [f, p] = m(null), h = t ? ta(n.answers, n.blanks) : [], g = na(h);
 	function _(e) {
 		r(k(k({}, e), {}, { answers: t ? ta(e.answers, e.blanks) : [] }));
 	}
 	function v(e, t, r) {
-		let i = Ys(h, e);
+		let i = ec(h, e);
 		i && _(oa(k(k({}, n), {}, { answers: h }), e, i.answerPools.map((e, n) => n === t ? r : e)));
 	}
 	function y(e) {
-		let t = Ys(h, e);
+		let t = ec(h, e);
 		t && _(oa(k(k({}, n), {}, { answers: h }), e, [...t.answerPools, M()]));
 	}
 	function b(e, t) {
-		let r = Ys(h, e);
+		let r = ec(h, e);
 		r && _(oa(k(k({}, n), {}, { answers: h }), e, r.answerPools.filter((e, n) => n !== t)));
 	}
 	function x(e, t) {
@@ -3618,7 +3638,7 @@ function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 				}),
 				/* @__PURE__ */ o("label", {
 					className: "flex min-w-0 items-center gap-2",
-					children: [/* @__PURE__ */ a(I.Text, { children: l("questionContentEditor.blank.answers") }), /* @__PURE__ */ a(Ms, {
+					children: [/* @__PURE__ */ a(I.Text, { children: l("questionContentEditor.blank.answers") }), /* @__PURE__ */ a(Ls, {
 						"aria-label": l("questionContentEditor.blank.answerSelectAria", { index: r + 1 }),
 						className: "w-48",
 						disabled: e,
@@ -3680,7 +3700,7 @@ function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 	function te() {
 		let e = /* @__PURE__ */ new Set();
 		return n.blanks.reduce((t, n, r) => {
-			let i = h.findIndex((e) => e.blankIds.includes(n)), a = Ys(h, i);
+			let i = h.findIndex((e) => e.blankIds.includes(n)), a = ec(h, i);
 			if (!a) return t;
 			if (a.blankIds.length > 1) {
 				if (e.has(i)) return t;
@@ -3696,7 +3716,7 @@ function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 			className: "flex min-w-0 flex-col gap-3",
 			children: te()
 		})
-	}), /* @__PURE__ */ a(Ns, {
+	}), /* @__PURE__ */ a(Rs, {
 		cancelText: l("questionContentEditor.actions.cancel"),
 		closeLabel: l("questionContentEditor.actions.close"),
 		okButtonProps: { disabled: !f },
@@ -3710,7 +3730,7 @@ function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 			children: [/* @__PURE__ */ a(I.Text, {
 				type: "secondary",
 				children: l("questionContentEditor.blank.createGroupDescription")
-			}), /* @__PURE__ */ a(Fs.Group, {
+			}), /* @__PURE__ */ a(Bs.Group, {
 				onChange: (e) => p(String(e.target.value)),
 				options: S(u == null ? "" : u).map((e) => ({
 					label: l("questionContentEditor.blank.shortLabel", { index: n.blanks.indexOf(e) + 1 }),
@@ -3727,7 +3747,7 @@ function Js({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 		})
 	});
 }
-function Ys(e, t) {
+function ec(e, t) {
 	return e.slice(t, t + 1)[0];
 }
 var z = {
@@ -3753,7 +3773,7 @@ var z = {
 };
 //#endregion
 //#region src/question/content-editor/QuestionContentClassificationEditor.tsx
-function Xs({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
+function tc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
 	let { t: c } = s, l = La(n, t);
 	function u(e) {
 		r(La(e, t));
@@ -3812,7 +3832,7 @@ function Xs({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 									variant: "compact"
 								})
 							}),
-							Zs({
+							nc({
 								ariaLabel: c("questionContentEditor.classification.deleteCategory", { index: n + 1 }),
 								disabled: e || l.categories.length <= 1,
 								onClick: () => u(za(l, t.id))
@@ -3861,7 +3881,7 @@ function Xs({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 									value: n.content,
 									variant: "compact"
 								})
-							}), Zs({
+							}), nc({
 								ariaLabel: c("questionContentEditor.classification.deleteCard", { index: r + 1 }),
 								disabled: e || l.items.length <= 1,
 								onClick: () => u(Ha(l, n.id))
@@ -3871,7 +3891,7 @@ function Xs({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 							children: [/* @__PURE__ */ a("span", {
 								className: z["answer-label"],
 								children: c("questionContentEditor.classification.correctCategory")
-							}), /* @__PURE__ */ a(Ms, {
+							}), /* @__PURE__ */ a(Ls, {
 								allowClear: !0,
 								"aria-label": `${c("questionContentEditor.blank.correctAnswer")} ${r + 1}`,
 								className: z.select,
@@ -3891,7 +3911,7 @@ function Xs({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 		})]
 	});
 }
-function Zs({ ariaLabel: e, disabled: t, onClick: n }) {
+function nc({ ariaLabel: e, disabled: t, onClick: n }) {
 	return /* @__PURE__ */ a(F, {
 		"aria-label": e,
 		className: z["icon-button"],
@@ -3908,7 +3928,7 @@ function Zs({ ariaLabel: e, disabled: t, onClick: n }) {
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentFillTextEditor.tsx
-function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richTextControls: c, title: l, translator: u }) {
+function rc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richTextControls: c, title: l, translator: u }) {
 	let { t: d } = u, f = p(null), [h, g] = m({}), [_, v] = m(null), [y, b] = m(null), x = Bi(r, t, n), S = {
 		answers: x.answers.filter((e) => "answerPools" in e),
 		blanks: x.blanks,
@@ -3952,7 +3972,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 		let r = D(), i = r.slice(e, e + 1)[0];
 		if (!i) return;
 		let a = te(i), o = (t < i.answerOptionIds.length ? i.answerOptionIds.map((e, r) => r === t ? n : e) : [...i.answerOptionIds, n]).filter((e, t, n) => !!e && n.indexOf(e) === t);
-		t >= i.answerOptionIds.length && n && g((e) => k(k({}, e), {}, { [a]: Math.max(0, $s(e, a) - 1) })), O(r.map((t, n) => n === e ? k(k({}, t), {}, { answerOptionIds: o }) : t));
+		t >= i.answerOptionIds.length && n && g((e) => k(k({}, e), {}, { [a]: Math.max(0, ic(e, a) - 1) })), O(r.map((t, n) => n === e ? k(k({}, t), {}, { answerOptionIds: o }) : t));
 	}
 	function re(e) {
 		let t = Yi(x.blankOptionGroups, x.blanks).find((t) => t.blankId === e);
@@ -4019,7 +4039,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 	}
 	function he(e) {
 		let t = te(e);
-		g((e) => k(k({}, e), {}, { [t]: $s(e, t) + 1 }));
+		g((e) => k(k({}, e), {}, { [t]: ic(e, t) + 1 }));
 	}
 	function ge(e, t) {
 		return [
@@ -4111,7 +4131,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 		return new Set(D().filter((e) => e.blankIds.every((e) => !n.has(e))).reduce((e, t) => [...e, ...t.answerOptionIds], []));
 	}
 	function Ce(t, n) {
-		let r = te(t), i = Xi(t), s = i.length ? [...i, ...Array.from({ length: $s(h, r) }, () => "")] : Array.from({ length: $s(h, r) + 1 }, () => ""), c = Se(t), l = xe().map((e, t) => {
+		let r = te(t), i = Xi(t), s = i.length ? [...i, ...Array.from({ length: ic(h, r) }, () => "")] : Array.from({ length: ic(h, r) + 1 }, () => ""), c = Se(t), l = xe().map((e, t) => {
 			let n = Ci("upperAlpha", t), r = i.includes(e.optionId);
 			return {
 				disabled: c.has(e.optionId) && !r,
@@ -4121,7 +4141,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 		});
 		return /* @__PURE__ */ o("div", {
 			className: "flex min-w-0 flex-wrap items-center gap-3",
-			children: [s.map((t, i) => /* @__PURE__ */ a(Ms, {
+			children: [s.map((t, i) => /* @__PURE__ */ a(Ls, {
 				allowClear: !0,
 				"aria-label": d("questionContentEditor.blank.answerPool", {
 					groupIndex: n + 1,
@@ -4178,7 +4198,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 					strong: !0,
 					children: d("questionContentEditor.blank.shortLabel", { index: n + 1 })
 				}),
-				/* @__PURE__ */ a(Ms, {
+				/* @__PURE__ */ a(Ls, {
 					"aria-label": d("questionContentEditor.blank.answerAssignmentAria", { index: n + 1 }),
 					className: "w-48",
 					disabled: e,
@@ -4250,7 +4270,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 						children: [/* @__PURE__ */ a(I.Text, {
 							strong: !0,
 							children: d("questionContentEditor.blank.correctAnswer")
-						}), /* @__PURE__ */ a(Ms, {
+						}), /* @__PURE__ */ a(Ls, {
 							"aria-label": d("questionContentEditor.blank.correctAnswerAria", { index: r + 1 }),
 							className: "min-w-48",
 							disabled: e,
@@ -4310,7 +4330,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 				placeholder: d("questionContentEditor.placeholders.fillTextContent"),
 				value: x.content
 			}),
-			t.config.candidateMode === "none" ? /* @__PURE__ */ a(Js, {
+			t.config.candidateMode === "none" ? /* @__PURE__ */ a($s, {
 				disabled: e,
 				hasAnswer: n,
 				item: S,
@@ -4318,7 +4338,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 				richTextControls: c,
 				translator: u
 			}) : Ne(),
-			/* @__PURE__ */ a(Ns, {
+			/* @__PURE__ */ a(Rs, {
 				cancelText: d("questionContentEditor.actions.cancel"),
 				closeLabel: d("questionContentEditor.actions.close"),
 				okButtonProps: { disabled: !y },
@@ -4332,7 +4352,7 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 					children: [/* @__PURE__ */ a(I.Text, {
 						type: "secondary",
 						children: d("questionContentEditor.blank.createGroupDescription")
-					}), /* @__PURE__ */ a(Fs.Group, {
+					}), /* @__PURE__ */ a(Bs.Group, {
 						onChange: (e) => b(String(e.target.value)),
 						options: _e(),
 						value: y
@@ -4342,13 +4362,13 @@ function Qs({ disabled: e, element: t, hasAnswer: n, item: r, onChange: s, richT
 		]
 	});
 }
-function $s(e, t) {
+function ic(e, t) {
 	var n, r;
 	return (n = (r = Object.entries(e).find(([e]) => e === t)) == null ? void 0 : r[1]) == null ? 0 : n;
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentJudgementGroupEditor.tsx
-function ec({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, translator: o }) {
+function ac({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, translator: o }) {
 	let { t: s } = o, c = Ei(t.config.judgeAnswerMode), l = n ? r.answers.filter((e) => c.includes(e)).slice(0, 1) : [];
 	function u(e) {
 		i(k(k({}, r), {}, { answers: l.includes(e) ? [] : [e] }));
@@ -4374,18 +4394,18 @@ function ec({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, trans
 }
 //#endregion
 //#region src/utils/cn.ts
-function tc(...e) {
-	return e.reduce((e, t) => [...e, ...nc(t)], []).join(" ");
+function oc(...e) {
+	return e.reduce((e, t) => [...e, ...sc(t)], []).join(" ");
 }
-function nc(e) {
-	return e ? rc(e) ? e.reduce((e, t) => [...e, ...nc(t)], []) : [e] : [];
+function sc(e) {
+	return e ? cc(e) ? e.reduce((e, t) => [...e, ...sc(t)], []) : [e] : [];
 }
-function rc(e) {
+function cc(e) {
 	return Array.isArray(e);
 }
 //#endregion
 //#region src/question/line-connect/lineConnectLines.ts
-function ic(e, t, n = ze) {
+function lc(e, t, n = ze) {
 	let r = e.columns.reduce((e, t, n) => (t.items.forEach((t, r) => e.set(t.itemId, {
 		columnIndex: n,
 		itemIndex: r
@@ -4406,25 +4426,25 @@ function ic(e, t, n = ze) {
 		}, [])] : e;
 	}, []);
 }
-function ac(e, t, n) {
+function uc(e, t, n) {
 	return e.left - t.left + n + e.width / 2;
 }
-function oc(e, t, n) {
+function dc(e, t, n) {
 	return e.top - t.top + n + e.height / 2;
 }
-function sc(e, t, n) {
+function fc(e, t, n) {
 	return e.left - t.left + n;
 }
-function cc(e, t, n) {
+function pc(e, t, n) {
 	return e.right - t.left + n;
 }
-function lc(e, t) {
-	e((e) => uc(e, t) ? e : t);
+function mc(e, t) {
+	e((e) => hc(e, t) ? e : t);
 }
-function uc(e, t) {
-	return (e == null ? void 0 : e.height) === t.height && e.width === t.width && e.lines.length === t.lines.length && e.lines.every((e, n) => dc(e, t.lines[n]));
+function hc(e, t) {
+	return (e == null ? void 0 : e.height) === t.height && e.width === t.width && e.lines.length === t.lines.length && e.lines.every((e, n) => gc(e, t.lines[n]));
 }
-function dc(e, t) {
+function gc(e, t) {
 	return t !== void 0 && e.key === t.key && e.x1 === t.x1 && e.x2 === t.x2 && e.y1 === t.y1 && e.y2 === t.y2;
 }
 var B = {
@@ -4446,7 +4466,7 @@ var B = {
 	"connect-dot": "_connect-dot_1cqr2_56",
 	"connect-button-connected": "_connect-button-connected_1cqr2_64",
 	"connect-button-selected": "_connect-button-selected_1cqr2_70"
-}, fc = [
+}, _c = [
 	"number",
 	"upperAlpha",
 	"lowerAlpha",
@@ -4454,29 +4474,29 @@ var B = {
 	"chineseNumber",
 	"none"
 ];
-function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
+function vc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
 	let { t: u } = c, [h, g] = m(null), [_, v] = m(null), y = p(null), b = p(/* @__PURE__ */ new Map()), x = xa(r, t, n), S = { gridTemplateColumns: `repeat(${x.columns.length}, minmax(16rem, 1fr))` }, C = f(() => JSON.stringify({
 		answers: x.answers,
 		columns: x.columns.map((e) => e.items.map((e) => e.itemId))
-	}), [x.answers, x.columns]), w = f(() => n ? ic(x, x.answers) : [], [n, x]), T = l(() => {
+	}), [x.answers, x.columns]), w = f(() => n ? lc(x, x.answers) : [], [n, x]), T = l(() => {
 		let e = y.current;
 		if (!n || !e || w.length === 0) {
 			v(null);
 			return;
 		}
 		let t = e.getBoundingClientRect(), r = w.reduce((n, r) => {
-			let i = b.current.get(yc(r.fromItemId, "outgoing")), a = b.current.get(yc(r.toItemId, "incoming"));
+			let i = b.current.get(wc(r.fromItemId, "outgoing")), a = b.current.get(wc(r.toItemId, "incoming"));
 			if (!i || !a) return n;
 			let o = i.getBoundingClientRect(), s = a.getBoundingClientRect();
 			return [...n, {
 				key: r.key,
-				x1: ac(o, t, e.scrollLeft),
-				x2: ac(s, t, e.scrollLeft),
-				y1: oc(o, t, e.scrollTop),
-				y2: oc(s, t, e.scrollTop)
+				x1: uc(o, t, e.scrollLeft),
+				x2: uc(s, t, e.scrollLeft),
+				y1: dc(o, t, e.scrollTop),
+				y2: dc(s, t, e.scrollTop)
 			}];
 		}, []);
-		lc(v, {
+		mc(v, {
 			height: e.scrollHeight,
 			lines: r,
 			width: e.scrollWidth
@@ -4496,7 +4516,7 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 	]);
 	function ee(e, t) {
 		return (n) => {
-			let r = yc(e, t);
+			let r = wc(e, t);
 			if (n) {
 				b.current.set(r, n);
 				return;
@@ -4544,11 +4564,11 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 						children: u("questionContentEditor.lineConnect.column", { index: n + 1 })
 					}), /* @__PURE__ */ o("div", {
 						className: "flex items-center gap-2",
-						children: [/* @__PURE__ */ a(Ms, {
+						children: [/* @__PURE__ */ a(Ls, {
 							"aria-label": u("questionContentEditor.lineConnect.labelStyle", { index: n + 1 }),
 							disabled: e,
 							onChange: (e) => e ? E(wa(x, t.columnId, e)) : void 0,
-							options: fc.map((e) => ({
+							options: _c.map((e) => ({
 								label: u(`questionContentEditor.lineConnect.labels.${e}`),
 								value: e
 							})),
@@ -4579,9 +4599,9 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		}, t.columnId);
 	}
 	function ie(t, r, i, c) {
-		let l = wi(t.labelStyle, c), d = l ? `${l}. ${i.content.text}` : i.content.text, f = (h == null ? void 0 : h.itemId) === i.itemId, p = mc(x, i.itemId), m = hc(x, i.itemId), g = gc(p, m), _ = _c(n);
+		let l = wi(t.labelStyle, c), d = l ? `${l}. ${i.content.text}` : i.content.text, f = (h == null ? void 0 : h.itemId) === i.itemId, p = yc(x, i.itemId), m = bc(x, i.itemId), g = xc(p, m), _ = Sc(n);
 		return /* @__PURE__ */ o("div", {
-			className: vc(f, g),
+			className: Cc(f, g),
 			"data-testid": `line-connect-item-${i.itemId}`,
 			style: _,
 			children: [
@@ -4617,7 +4637,7 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		return n ? /* @__PURE__ */ a("button", {
 			"aria-label": se("incoming", t, i, r.content.text),
 			"aria-pressed": c,
-			className: tc(V.marker, V["incoming-marker"], c && V["connect-button-connected"]),
+			className: oc(V.marker, V["incoming-marker"], c && V["connect-button-connected"]),
 			disabled: e,
 			onClick: () => O(t, r.itemId, s),
 			ref: ee(r.itemId, "incoming"),
@@ -4637,7 +4657,7 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		return n ? /* @__PURE__ */ a("button", {
 			"aria-label": se("outgoing", t, i, r.content.text),
 			"aria-pressed": s,
-			className: tc(V["connect-handle"], V["connect-handle-outgoing"], s && V["connect-button-selected"], c && V["connect-button-connected"]),
+			className: oc(V["connect-handle"], V["connect-handle-outgoing"], s && V["connect-button-selected"], c && V["connect-button-connected"]),
 			disabled: e,
 			ref: ee(r.itemId, "outgoing"),
 			onClick: () => O(t, r.itemId, o),
@@ -4697,26 +4717,26 @@ function pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		]
 	});
 }
-function mc(e, t) {
+function yc(e, t) {
 	return Object.values(e.answers).some((e) => e.includes(t));
 }
-function hc(e, t) {
+function bc(e, t) {
 	var n;
 	return ((n = e.answers[t]) == null ? [] : n).length > 0;
 }
-function gc(e, t) {
+function xc(e, t) {
 	return e || t;
 }
-function _c(e) {
+function Sc(e) {
 	return { gridTemplateColumns: e ? "2rem minmax(0, 1fr) auto auto" : "2rem minmax(0, 1fr) auto" };
 }
-function vc(e, t) {
-	return tc("grid min-w-0 items-center gap-2 rounded-md border border-slate-200 bg-white p-2", e && "border-blue-600 bg-blue-50", t && !e && "border-blue-200 bg-blue-50/40");
+function Cc(e, t) {
+	return oc("grid min-w-0 items-center gap-2 rounded-md border border-slate-200 bg-white p-2", e && "border-blue-600 bg-blue-50", t && !e && "border-blue-200 bg-blue-50/40");
 }
-function yc(e, t) {
+function wc(e, t) {
 	return `${t}:${e}`;
 }
-var bc = {
+var Tc = {
 	board: "_board_30ao0_1",
 	"connect-board": "_connect-board_30ao0_7",
 	columns: "_columns_30ao0_14",
@@ -4726,7 +4746,7 @@ var bc = {
 	selected: "_selected_30ao0_46",
 	matched: "_matched_30ao0_51",
 	marker: "_marker_30ao0_55"
-}, xc = [
+}, Ec = [
 	"number",
 	"upperAlpha",
 	"lowerAlpha",
@@ -4734,8 +4754,8 @@ var bc = {
 	"chineseNumber",
 	"none"
 ];
-function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
-	let { t: u } = c, [h, g] = m(null), [_, v] = m(null), y = p(null), b = p(/* @__PURE__ */ new Map()), x = ka(r, t, n), S = { gridTemplateColumns: `repeat(${x.columns.length}, minmax(16rem, 1fr))` }, C = f(() => n ? ic(x, x.answers, ft) : [], [n, x]), w = f(() => JSON.stringify({
+function Dc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
+	let { t: u } = c, [h, g] = m(null), [_, v] = m(null), y = p(null), b = p(/* @__PURE__ */ new Map()), x = ka(r, t, n), S = { gridTemplateColumns: `repeat(${x.columns.length}, minmax(16rem, 1fr))` }, C = f(() => n ? lc(x, x.answers, ft) : [], [n, x]), w = f(() => JSON.stringify({
 		answers: x.answers,
 		columns: x.columns.map((e) => e.items.map((e) => e.itemId))
 	}), [x.answers, x.columns]), T = l(() => {
@@ -4745,18 +4765,18 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			return;
 		}
 		let t = e.getBoundingClientRect(), r = C.reduce((n, r) => {
-			let i = b.current.get(Ec(r.fromItemId, "outgoing")), a = b.current.get(Ec(r.toItemId, "incoming"));
+			let i = b.current.get(jc(r.fromItemId, "outgoing")), a = b.current.get(jc(r.toItemId, "incoming"));
 			if (!i || !a) return n;
 			let o = i.getBoundingClientRect(), s = a.getBoundingClientRect();
 			return [...n, {
 				key: r.key,
-				x1: ac(o, t, e.scrollLeft),
-				x2: ac(s, t, e.scrollLeft),
-				y1: oc(o, t, e.scrollTop),
-				y2: oc(s, t, e.scrollTop)
+				x1: uc(o, t, e.scrollLeft),
+				x2: uc(s, t, e.scrollLeft),
+				y1: dc(o, t, e.scrollTop),
+				y2: dc(s, t, e.scrollTop)
 			}];
 		}, []);
-		lc(v, {
+		mc(v, {
 			height: e.scrollHeight,
 			lines: r,
 			width: e.scrollWidth
@@ -4776,7 +4796,7 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 	]);
 	function ee(e, t) {
 		return (n) => {
-			let r = Ec(e, t);
+			let r = jc(e, t);
 			if (n) {
 				b.current.set(r, n);
 				return;
@@ -4805,15 +4825,15 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 	}
 	function O(t, n) {
 		return /* @__PURE__ */ o("section", {
-			className: bc.column,
+			className: Tc.column,
 			children: [
 				/* @__PURE__ */ a("div", {
 					className: "flex min-w-0 flex-wrap items-center justify-end gap-2",
-					children: /* @__PURE__ */ a(Ms, {
+					children: /* @__PURE__ */ a(Ls, {
 						"aria-label": u("questionContentEditor.matching.labelStyle", { index: n + 1 }),
 						disabled: e,
 						onChange: (e) => e ? E(Aa(x, t.columnId, e)) : void 0,
-						options: xc.map((e) => ({
+						options: Ec.map((e) => ({
 							label: u(`questionContentEditor.matching.labels.${e}`),
 							value: e
 						})),
@@ -4821,7 +4841,7 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 					})
 				}),
 				/* @__PURE__ */ a("div", {
-					className: bc.items,
+					className: Tc.items,
 					children: t.items.map((e, r) => ne(t, n, e, r))
 				}),
 				/* @__PURE__ */ a(F, {
@@ -4836,9 +4856,9 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		}, t.columnId);
 	}
 	function ne(t, r, i, c) {
-		let l = Ti(t.labelStyle, c), d = (h == null ? void 0 : h.itemId) === i.itemId, f = Cc(x, i.itemId), p = wc(x, i.itemId), m = f || p, g = l ? `${l}. ${i.content.text}` : i.content.text, _ = Tc(n);
+		let l = Ti(t.labelStyle, c), d = (h == null ? void 0 : h.itemId) === i.itemId, f = Oc(x, i.itemId), p = kc(x, i.itemId), m = f || p, g = l ? `${l}. ${i.content.text}` : i.content.text, _ = Ac(n);
 		return /* @__PURE__ */ o("div", {
-			className: tc(bc.item, d ? bc.selected : "", m ? bc.matched : ""),
+			className: oc(Tc.item, d ? Tc.selected : "", m ? Tc.matched : ""),
 			"data-testid": `matching-editor-item-${i.itemId}`,
 			style: _,
 			children: [
@@ -4874,7 +4894,7 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		return n ? /* @__PURE__ */ a("button", {
 			"aria-label": ae("incoming", t, i, r.content.text),
 			"aria-pressed": c,
-			className: tc(bc.marker, V["incoming-marker"], c && V["connect-button-connected"]),
+			className: oc(Tc.marker, V["incoming-marker"], c && V["connect-button-connected"]),
 			disabled: e,
 			onClick: () => te(t, r.itemId, s),
 			ref: ee(r.itemId, "incoming"),
@@ -4885,7 +4905,7 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 				className: V["connect-dot"]
 			})
 		}) : o ? /* @__PURE__ */ a("span", {
-			className: bc.marker,
+			className: Tc.marker,
 			children: o
 		}) : /* @__PURE__ */ a("span", {});
 	}
@@ -4893,7 +4913,7 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		return n ? /* @__PURE__ */ a("button", {
 			"aria-label": ae("outgoing", t, i, r.content.text),
 			"aria-pressed": s,
-			className: tc(V["connect-handle"], V["connect-handle-outgoing"], s && V["connect-button-selected"], c && V["connect-button-connected"]),
+			className: oc(V["connect-handle"], V["connect-handle-outgoing"], s && V["connect-button-selected"], c && V["connect-button-connected"]),
 			disabled: e,
 			onClick: () => te(t, r.itemId, o),
 			ref: ee(r.itemId, "outgoing"),
@@ -4913,13 +4933,13 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		});
 	}
 	return /* @__PURE__ */ o("div", {
-		className: bc.board,
+		className: Tc.board,
 		children: [n ? /* @__PURE__ */ a("div", {
 			"aria-live": "polite",
 			className: "rounded-md border border-blue-100 bg-blue-50 px-3 py-2 text-sm text-blue-700",
 			children: h ? u("questionContentEditor.matching.connectHintActive", { label: h.label }) : u("questionContentEditor.matching.connectHintIdle")
 		}) : null, /* @__PURE__ */ o("div", {
-			className: bc["connect-board"],
+			className: Tc["connect-board"],
 			"data-testid": "matching-editor-board",
 			ref: y,
 			children: [n && _ ? /* @__PURE__ */ a("svg", {
@@ -4940,29 +4960,29 @@ function Sc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 					y2: e.y2
 				}, e.key))
 			}) : null, /* @__PURE__ */ a("div", {
-				className: bc.columns,
+				className: Tc.columns,
 				style: S,
 				children: x.columns.map((e, t) => O(e, t))
 			})]
 		})]
 	});
 }
-function Cc(e, t) {
+function Oc(e, t) {
 	return Object.values(e.answers).some((e) => e.includes(t));
 }
-function wc(e, t) {
+function kc(e, t) {
 	var n;
 	return ((n = e.answers[t]) == null ? [] : n).length > 0;
 }
-function Tc(e) {
+function Ac(e) {
 	return { gridTemplateColumns: e ? "2rem minmax(0, 1fr) auto auto" : "2rem minmax(0, 1fr) auto" };
 }
-function Ec(e, t) {
+function jc(e, t) {
 	return `${t}:${e}`;
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentOptionGroupEditor.tsx
-function Dc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
+function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, translator: c }) {
 	let { t: l } = c, u = n ? r.answers.optionIds : [], d = t.config.renderer === "table", f = Di(r, t.config.optionLabelStyle);
 	function p(e) {
 		i(k(k({}, e), {}, { answers: n ? e.answers : { optionIds: [] } }));
@@ -5077,7 +5097,7 @@ function Dc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 				})]
 			}), /* @__PURE__ */ a("div", {
 				className: "max-w-full overflow-x-auto",
-				children: /* @__PURE__ */ a(zs, {
+				children: /* @__PURE__ */ a(Ws, {
 					columns: [
 						{
 							dataIndex: "rowIndex",
@@ -5179,7 +5199,7 @@ function Dc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentOrderingEditor.tsx
-function Oc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
+function Nc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
 	let { t: c } = s, l = Ga(n, t), u = new Map(l.sortOptions.map((e) => [e.id, e]));
 	function d(e) {
 		r(Ga(e, t));
@@ -5268,7 +5288,7 @@ function Oc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentRichTextEditor.tsx
-function kc({ disabled: e, item: t, onChange: n, richTextControls: r, translator: i }) {
+function Pc({ disabled: e, item: t, onChange: n, richTextControls: r, translator: i }) {
 	let { t: o } = i;
 	return /* @__PURE__ */ a(R, {
 		controls: r,
@@ -5279,7 +5299,7 @@ function kc({ disabled: e, item: t, onChange: n, richTextControls: r, translator
 		value: t.content
 	});
 }
-var Ac = {
+var Fc = {
 	stack: "_stack_1v8u9_1",
 	"toolbar-row": "_toolbar-row_1v8u9_8",
 	"marker-list": "_marker-list_1v8u9_13",
@@ -5290,7 +5310,7 @@ var Ac = {
 };
 //#endregion
 //#region src/question/content-editor/QuestionContentTextMarkerEditor.tsx
-function jc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
+function Ic({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, translator: s }) {
 	let c = p(null), { t: l } = s, u = Vt(n.content.json);
 	function d(e) {
 		r(Ri(e, e.content, t));
@@ -5308,14 +5328,14 @@ function jc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 		d(k(k({}, n), {}, { answers: r }));
 	}
 	return /* @__PURE__ */ o("div", {
-		className: Ac.stack,
+		className: Fc.stack,
 		children: [
 			/* @__PURE__ */ a(I.Text, {
 				strong: !0,
 				children: l("questionContentEditor.fields.textMarkerContent")
 			}),
 			/* @__PURE__ */ a("div", {
-				className: Ac["toolbar-row"],
+				className: Fc["toolbar-row"],
 				children: /* @__PURE__ */ a(F, {
 					disabled: e,
 					onClick: f,
@@ -5333,20 +5353,20 @@ function jc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 				value: n.content
 			}),
 			/* @__PURE__ */ o("div", {
-				className: Ac["marker-list"],
+				className: Fc["marker-list"],
 				children: [/* @__PURE__ */ a(I.Text, {
 					strong: !0,
 					children: l("questionContentEditor.textMarker.markersTitle")
 				}), u.length === 0 ? /* @__PURE__ */ a("div", {
-					className: Ac.empty,
+					className: Fc.empty,
 					children: l("questionContentEditor.textMarker.emptyMarkers")
 				}) : u.map((r) => /* @__PURE__ */ o("label", {
-					className: Ac["marker-card"],
+					className: Fc["marker-card"],
 					children: [/* @__PURE__ */ a("span", {
-						className: Ac["marker-text"],
+						className: Fc["marker-text"],
 						children: r.text
 					}), /* @__PURE__ */ o("span", {
-						className: Ac["answer-toggle"],
+						className: Fc["answer-toggle"],
 						children: [/* @__PURE__ */ a("input", {
 							"aria-label": l("questionContentEditor.textMarker.answerAria", { marker: r.text }),
 							checked: n.answers.includes(r.markerId),
@@ -5360,7 +5380,7 @@ function jc({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 		]
 	});
 }
-var H = {
+var Lc = {
 	root: "_root_tq733_1",
 	head: "_head_tq733_7",
 	section: "_section_tq733_16",
@@ -5371,7 +5391,7 @@ var H = {
 };
 //#endregion
 //#region src/question/content-editor/QuestionContentWordBuilderEditor.tsx
-function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, title: c, translator: l }) {
+function Rc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: s, title: c, translator: l }) {
 	let { t: u } = l, d = p(null), f = zi(r, n, t);
 	function m(e) {
 		i(zi(e, n, t));
@@ -5397,10 +5417,10 @@ function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		m(k(k({}, f), {}, { answers: k(k({}, f.answers), {}, { [e]: t.target.value }) }));
 	}
 	return /* @__PURE__ */ o("div", {
-		className: H.root,
+		className: Lc.root,
 		children: [
 			/* @__PURE__ */ o("div", {
-				className: H.head,
+				className: Lc.head,
 				children: [/* @__PURE__ */ a(I.Text, {
 					strong: !0,
 					children: c
@@ -5423,9 +5443,9 @@ function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 				value: f.content
 			}),
 			/* @__PURE__ */ o("section", {
-				className: H.section,
+				className: Lc.section,
 				children: [/* @__PURE__ */ o("div", {
-					className: H["section-head"],
+					className: Lc["section-head"],
 					children: [/* @__PURE__ */ a(I.Text, {
 						strong: !0,
 						children: u("questionContentEditor.fields.candidateOptions")
@@ -5437,12 +5457,12 @@ function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 						children: u("questionContentEditor.actions.addCandidateOption")
 					})]
 				}), /* @__PURE__ */ a("div", {
-					className: H.rows,
+					className: Lc.rows,
 					children: f.candidateOptions.map((t, n) => /* @__PURE__ */ o("label", {
-						className: H.row,
+						className: Lc.row,
 						children: [/* @__PURE__ */ a("input", {
 							"aria-label": u("questionContentEditor.fields.candidateOption", { index: n + 1 }),
-							className: H.input,
+							className: Lc.input,
 							disabled: e,
 							onChange: (e) => g(n, e.target.value),
 							value: t
@@ -5458,19 +5478,19 @@ function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 				})]
 			}),
 			n ? /* @__PURE__ */ o("section", {
-				className: H.section,
+				className: Lc.section,
 				children: [/* @__PURE__ */ a(I.Text, {
 					strong: !0,
 					children: u("questionContentEditor.blank.correctAnswer")
 				}), /* @__PURE__ */ a("div", {
-					className: H.rows,
+					className: Lc.rows,
 					children: f.blanks.map((t, n) => {
 						var r;
 						return /* @__PURE__ */ a("label", {
-							className: H.row,
+							className: Lc.row,
 							children: /* @__PURE__ */ a("input", {
 								"aria-label": u("questionContentEditor.blank.correctAnswerAria", { index: n + 1 }),
-								className: H.input,
+								className: Lc.input,
 								disabled: e,
 								onChange: (e) => y(t, e),
 								placeholder: u("questionContentEditor.placeholders.blankAnswer"),
@@ -5485,9 +5505,9 @@ function Mc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentElementEditor.tsx
-function Nc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: o, title: s, translator: c }) {
+function zc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: o, title: s, translator: c }) {
 	let { t: l } = c;
-	return t.type === "inlineFill" ? /* @__PURE__ */ a(Qs, {
+	return t.type === "inlineFill" ? /* @__PURE__ */ a(rc, {
 		disabled: e,
 		element: t,
 		hasAnswer: n,
@@ -5496,7 +5516,7 @@ function Nc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		richTextControls: o,
 		title: s,
 		translator: c
-	}) : t.type === "wordBuilder" ? /* @__PURE__ */ a(Mc, {
+	}) : t.type === "wordBuilder" ? /* @__PURE__ */ a(Rc, {
 		disabled: e,
 		element: t,
 		hasAnswer: n,
@@ -5505,20 +5525,20 @@ function Nc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		richTextControls: o,
 		title: s,
 		translator: c
-	}) : t.type === "classification" ? Fc(s, null, /* @__PURE__ */ a(Xs, {
+	}) : t.type === "classification" ? Vc(s, null, /* @__PURE__ */ a(tc, {
 		disabled: e,
 		hasAnswer: n,
 		item: r,
 		onChange: i,
 		richTextControls: o,
 		translator: c
-	})) : t.type === "richText" ? Fc(s, null, /* @__PURE__ */ a(kc, {
+	})) : t.type === "richText" ? Vc(s, null, /* @__PURE__ */ a(Pc, {
 		disabled: e,
 		item: r,
 		onChange: i,
 		richTextControls: o,
 		translator: c
-	})) : Pc({
+	})) : Bc({
 		disabled: e,
 		element: t,
 		hasAnswer: n,
@@ -5530,15 +5550,15 @@ function Nc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		t: l
 	});
 }
-function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: o, title: s, translator: c, t: l }) {
+function Bc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richTextControls: o, title: s, translator: c, t: l }) {
 	switch (t.type) {
-		case "fill": return Fc(s, /* @__PURE__ */ a(F, {
+		case "fill": return Vc(s, /* @__PURE__ */ a(F, {
 			"aria-label": l("questionContentEditor.actions.addBlank"),
 			disabled: e,
 			icon: "+",
-			onClick: () => i(Ic(r, n)),
+			onClick: () => i(Hc(r, n)),
 			children: l("questionContentEditor.actions.addBlank")
-		}), /* @__PURE__ */ a(Js, {
+		}), /* @__PURE__ */ a($s, {
 			disabled: e,
 			hasAnswer: n,
 			item: r,
@@ -5546,7 +5566,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			richTextControls: o,
 			translator: c
 		}));
-		case "choice": return Fc(s, null, /* @__PURE__ */ a(Dc, {
+		case "choice": return Vc(s, null, /* @__PURE__ */ a(Mc, {
 			disabled: e,
 			element: t,
 			hasAnswer: n,
@@ -5555,7 +5575,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			richTextControls: o,
 			translator: c
 		}));
-		case "judgement": return Fc(s, null, /* @__PURE__ */ a(ec, {
+		case "judgement": return Vc(s, null, /* @__PURE__ */ a(ac, {
 			disabled: e,
 			element: t,
 			hasAnswer: n,
@@ -5563,7 +5583,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			onChange: i,
 			translator: c
 		}));
-		case "lineConnect": return Fc(s, null, /* @__PURE__ */ a(pc, {
+		case "lineConnect": return Vc(s, null, /* @__PURE__ */ a(vc, {
 			disabled: e,
 			element: t,
 			hasAnswer: n,
@@ -5572,7 +5592,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			richTextControls: o,
 			translator: c
 		}));
-		case "matching": return Fc(s, null, /* @__PURE__ */ a(Sc, {
+		case "matching": return Vc(s, null, /* @__PURE__ */ a(Dc, {
 			disabled: e,
 			element: t,
 			hasAnswer: n,
@@ -5581,7 +5601,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			richTextControls: o,
 			translator: c
 		}));
-		case "ordering": return Fc(s, null, /* @__PURE__ */ a(Oc, {
+		case "ordering": return Vc(s, null, /* @__PURE__ */ a(Nc, {
 			disabled: e,
 			hasAnswer: n,
 			item: r,
@@ -5589,7 +5609,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 			richTextControls: o,
 			translator: c
 		}));
-		case "textMarker": return Fc(s, null, /* @__PURE__ */ a(jc, {
+		case "textMarker": return Vc(s, null, /* @__PURE__ */ a(Ic, {
 			disabled: e,
 			hasAnswer: n,
 			item: r,
@@ -5599,7 +5619,7 @@ function Pc({ disabled: e, element: t, hasAnswer: n, item: r, onChange: i, richT
 		}));
 	}
 }
-function Fc(e, t, n) {
+function Vc(e, t, n) {
 	return /* @__PURE__ */ o("div", {
 		className: "flex min-w-0 flex-col gap-3",
 		children: [/* @__PURE__ */ o("div", {
@@ -5611,22 +5631,19 @@ function Fc(e, t, n) {
 		}), n]
 	});
 }
-function Ic(e, t) {
+function Hc(e, t) {
 	let n = $i(e);
 	return t ? n : k(k({}, n), {}, { answers: [] });
 }
 //#endregion
 //#region src/question/content-editor/subquestion-group-editor-helpers.ts
-function Lc(e, t) {
-	return hi(zc(e.structure, t), e.questionTypeKey);
+function Uc(e, t) {
+	return hi(ks(e.structure, t), e.questionTypeKey);
 }
-function Rc(e) {
+function Wc(e) {
 	return e;
 }
-function zc(e, t) {
-	return k(k({}, e), {}, { hasAnswer: t && e.hasAnswer });
-}
-function Bc(e, t, n) {
+function Gc(e, t, n) {
 	let r = t + n;
 	return t < 0 || r < 0 || r >= e.length ? e : e.map((n, i) => {
 		if (i === t) {
@@ -5642,20 +5659,20 @@ function Bc(e, t, n) {
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentSubquestionAddChildDropdown.tsx
-function Vc({ disabled: e, hasAnswer: t, onAddChild: n, subquestionTemplates: r, translator: i }) {
+function Kc({ disabled: e, hasAnswer: t, onAddChild: n, questionTypeTemplates: r, translator: i }) {
 	var s, c, l;
-	let { t: u } = i, d = f(() => Rc(r), [r]), p = f(() => new Map(d.map((e) => [String(e.questionTypeKey), e])), [d]), h = f(() => d.map((e) => ({
+	let { t: u } = i, d = f(() => Wc(r), [r]), p = f(() => new Map(d.map((e) => [String(e.questionTypeKey), e])), [d]), h = f(() => d.map((e) => ({
 		label: e.label,
 		value: String(e.questionTypeKey)
 	})), [d]), [g, _] = m((s = (c = h[0]) == null ? void 0 : c.value) == null ? "" : s), v = p.has(g) ? g : ((l = h[0]) == null ? void 0 : l.value) || "";
 	function y() {
 		let e = p.get(v);
-		e && n(Lc(e, t));
+		e && n(Uc(e, t));
 	}
 	let b = e || d.length === 0;
 	return /* @__PURE__ */ o("span", {
 		className: "flex min-w-0 flex-wrap items-center gap-2",
-		children: [h.length > 1 ? /* @__PURE__ */ a(Ms, {
+		children: [h.length > 1 ? /* @__PURE__ */ a(Ls, {
 			"aria-label": u("questionContentEditor.subquestion.selectTemplate"),
 			disabled: e,
 			onChange: (e) => _(e == null ? "" : e),
@@ -5671,12 +5688,12 @@ function Vc({ disabled: e, hasAnswer: t, onAddChild: n, subquestionTemplates: r,
 }
 //#endregion
 //#region src/question/shared/subquestion-numbering.ts
-function Hc(e) {
+function qc(e) {
 	return e.map((e) => String(e + 1)).join(".");
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentSubquestionChildElements.tsx
-function Uc({ child: e, disabled: t, onChange: n, richTextControls: r, structure: i, translator: s }) {
+function Jc({ child: e, disabled: t, onChange: n, richTextControls: r, structure: i, translator: s }) {
 	let { t: c } = s;
 	function l(t) {
 		n(k(k({}, e), Mi(e, t)));
@@ -5684,11 +5701,11 @@ function Uc({ child: e, disabled: t, onChange: n, richTextControls: r, structure
 	function u(t) {
 		n(k(k({}, e), Ni(e, t)));
 	}
-	return i.elements.length === 0 && i.extras.length === 0 ? /* @__PURE__ */ a(Is, { description: c("questionContentEditor.subquestion.emptyTemplate") }) : /* @__PURE__ */ o("div", {
+	return i.elements.length === 0 && i.extras.length === 0 ? /* @__PURE__ */ a(Vs, { description: c("questionContentEditor.subquestion.emptyTemplate") }) : /* @__PURE__ */ o("div", {
 		className: "flex min-w-0 flex-col",
 		children: [i.elements.map((n) => /* @__PURE__ */ a("section", {
 			className: "flex min-w-0 flex-col gap-3 border-t border-slate-100 py-3 first:border-t-0 first:pt-0 last:pb-0",
-			children: /* @__PURE__ */ a(Nc, {
+			children: /* @__PURE__ */ a(zc, {
 				disabled: t,
 				element: n,
 				hasAnswer: i.hasAnswer,
@@ -5702,11 +5719,11 @@ function Uc({ child: e, disabled: t, onChange: n, richTextControls: r, structure
 			let o = Si(e, n);
 			return /* @__PURE__ */ a("section", {
 				className: "flex min-w-0 flex-col gap-3 border-t border-slate-100 py-3 first:border-t-0 first:pt-0 last:pb-0",
-				children: /* @__PURE__ */ a(Nc, {
+				children: /* @__PURE__ */ a(zc, {
 					disabled: t,
-					element: Wc(n),
+					element: Yc(n),
 					hasAnswer: i.hasAnswer,
-					item: Gc(o),
+					item: Xc(o),
 					onChange: (e) => u({
 						content: e.content,
 						extraKey: n.extraKey,
@@ -5720,7 +5737,7 @@ function Uc({ child: e, disabled: t, onChange: n, richTextControls: r, structure
 		})]
 	});
 }
-function Wc(e) {
+function Yc(e) {
 	return {
 		config: {},
 		elementKey: e.extraKey,
@@ -5728,7 +5745,7 @@ function Wc(e) {
 		type: "richText"
 	};
 }
-function Gc(e) {
+function Xc(e) {
 	return {
 		content: e.content,
 		elementKey: e.extraKey,
@@ -5736,17 +5753,14 @@ function Gc(e) {
 	};
 }
 //#endregion
-//#region src/question/content-editor/subquestion-template.ts
-function Kc(e, t) {
-	return t !== null && e.questionTypeKey === t;
-}
-function qc(e, t) {
-	return e.find((e) => Kc(e, t));
-}
-//#endregion
 //#region src/question/content-editor/QuestionContentSubquestionChildEditor.tsx
-function Jc({ child: e, childIndex: t, disabled: n, hasAnswer: r, numberPath: i, onChange: s, onDelete: c, onMove: l, richTextControls: u, siblingCount: d, subquestionTemplates: f, translator: p }) {
-	let { t: m } = p, h = i == null ? [t] : i, g = Hc(h), _ = Yc(e, f), v = Xc(_, r), y = mi(v), b = k(k(k({}, e), ji(v, e)), {}, { children: e.children });
+function Zc({ child: e, childIndex: t, disabled: n, hasAnswer: r, numberPath: i, onChange: s, onDelete: c, onMove: l, richTextControls: u, siblingCount: d, questionTypeTemplates: f, translator: p }) {
+	let { t: m } = p, h = i == null ? [t] : i, g = qc(h), _ = Qc(e, f), v = _ ? ks(_.structure, r) : void 0;
+	if (!v) return /* @__PURE__ */ o("section", {
+		className: "flex min-w-0 flex-col gap-3 border-b border-l-2 border-slate-200 border-l-blue-600 bg-white py-4 pr-0 pl-3 last:border-b-0 sm:pl-4",
+		children: [T(null), /* @__PURE__ */ a(Vs, { description: m("questionContentEditor.subquestion.missingTemplate") })]
+	});
+	let y = mi(v), b = k(k(k({}, e), ji(v, e)), {}, { children: e.children });
 	function x(e) {
 		s(k(k({}, b), {}, { children: [...b.children, e] }));
 	}
@@ -5757,68 +5771,16 @@ function Jc({ child: e, childIndex: t, disabled: n, hasAnswer: r, numberPath: i,
 		s(k(k({}, b), {}, { children: b.children.filter((t, n) => n !== e) }));
 	}
 	function w(e, t) {
-		s(k(k({}, b), {}, { children: Bc(b.children, e, t) }));
+		s(k(k({}, b), {}, { children: Gc(b.children, e, t) }));
 	}
 	return /* @__PURE__ */ o("section", {
 		className: "flex min-w-0 flex-col gap-3 border-b border-l-2 border-slate-200 border-l-blue-600 bg-white py-4 pr-0 pl-3 last:border-b-0 sm:pl-4",
 		children: [
-			/* @__PURE__ */ o("div", {
-				className: "flex min-w-0 flex-wrap items-start justify-between gap-3",
-				children: [/* @__PURE__ */ o("span", {
-					className: "min-w-0",
-					children: [/* @__PURE__ */ a(I.Text, {
-						strong: !0,
-						children: m("questionContentEditor.subquestion.childTitle", { index: g })
-					}), /* @__PURE__ */ o(I.Text, {
-						className: "block",
-						type: "secondary",
-						children: [
-							m("questionContentEditor.subquestion.questionKind"),
-							" \u00b7",
-							" ",
-							Zc(_, e)
-						]
-					})]
-				}), /* @__PURE__ */ o(Ls, {
-					size: 4,
-					wrap: !0,
-					children: [
-						/* @__PURE__ */ a(Vc, {
-							disabled: n,
-							hasAnswer: r,
-							onAddChild: x,
-							subquestionTemplates: f,
-							translator: p
-						}),
-						/* @__PURE__ */ a(F, {
-							"aria-label": m("questionContentEditor.subquestion.moveChildUp", { index: g }),
-							disabled: n || t === 0,
-							icon: "\u2191",
-							onClick: () => l(-1),
-							size: "small"
-						}),
-						/* @__PURE__ */ a(F, {
-							"aria-label": m("questionContentEditor.subquestion.moveChildDown", { index: g }),
-							disabled: n || t === d - 1,
-							icon: "\u2193",
-							onClick: () => l(1),
-							size: "small"
-						}),
-						/* @__PURE__ */ a(F, {
-							"aria-label": m("questionContentEditor.subquestion.deleteChild", { index: g }),
-							danger: !0,
-							disabled: n,
-							icon: "\u00d7",
-							onClick: c,
-							size: "small"
-						})
-					]
-				})]
-			}),
-			Qc(y, n, b, s, u, v, p),
+			T(x),
+			el(y, n, b, s, u, v, p),
 			b.children.length === 0 ? null : /* @__PURE__ */ a("div", {
 				className: "ml-3 flex min-w-0 flex-col pl-3 sm:ml-4 sm:pl-4",
-				children: b.children.map((e, t) => /* @__PURE__ */ a(Jc, {
+				children: b.children.map((e, t) => /* @__PURE__ */ a(Zc, {
 					child: e,
 					childIndex: t,
 					disabled: n,
@@ -5829,29 +5791,76 @@ function Jc({ child: e, childIndex: t, disabled: n, hasAnswer: r, numberPath: i,
 					onMove: (e) => w(t, e),
 					richTextControls: u,
 					siblingCount: b.children.length,
-					subquestionTemplates: f,
+					questionTypeTemplates: f,
 					translator: p
-				}, $c(e, t)))
+				}, tl(e, t)))
 			})
 		]
 	});
+	function T(i) {
+		return /* @__PURE__ */ o("div", {
+			className: "flex min-w-0 flex-wrap items-start justify-between gap-3",
+			children: [/* @__PURE__ */ o("span", {
+				className: "min-w-0",
+				children: [/* @__PURE__ */ a(I.Text, {
+					strong: !0,
+					children: m("questionContentEditor.subquestion.childTitle", { index: g })
+				}), /* @__PURE__ */ o(I.Text, {
+					className: "block",
+					type: "secondary",
+					children: [
+						m("questionContentEditor.subquestion.questionKind"),
+						" \u00b7",
+						" ",
+						$c(_, e)
+					]
+				})]
+			}), /* @__PURE__ */ o(Hs, {
+				size: 4,
+				wrap: !0,
+				children: [
+					i ? /* @__PURE__ */ a(Kc, {
+						disabled: n,
+						hasAnswer: r,
+						onAddChild: i,
+						questionTypeTemplates: f,
+						translator: p
+					}) : null,
+					/* @__PURE__ */ a(F, {
+						"aria-label": m("questionContentEditor.subquestion.moveChildUp", { index: g }),
+						disabled: n || t === 0,
+						icon: "\u2191",
+						onClick: () => l(-1),
+						size: "small"
+					}),
+					/* @__PURE__ */ a(F, {
+						"aria-label": m("questionContentEditor.subquestion.moveChildDown", { index: g }),
+						disabled: n || t === d - 1,
+						icon: "\u2193",
+						onClick: () => l(1),
+						size: "small"
+					}),
+					/* @__PURE__ */ a(F, {
+						"aria-label": m("questionContentEditor.subquestion.deleteChild", { index: g }),
+						danger: !0,
+						disabled: n,
+						icon: "\u00d7",
+						onClick: c,
+						size: "small"
+					})
+				]
+			})]
+		});
+	}
 }
-function Yc(e, t) {
-	return qc(t, e.questionTypeKey);
-}
-function Xc(e, t) {
-	return zc(e ? e.structure : {
-		elements: [],
-		extras: [],
-		hasAnswer: t,
-		systemQuestionType: ""
-	}, t);
+function Qc(e, t) {
+	return Ms(t, e.questionTypeKey);
 }
-function Zc(e, t) {
+function $c(e, t) {
 	return e ? e.label : t.questionTypeKey;
 }
-function Qc(e, t, n, r, i, o, s) {
-	return e ? null : /* @__PURE__ */ a(Uc, {
+function el(e, t, n, r, i, o, s) {
+	return e ? null : /* @__PURE__ */ a(Jc, {
 		child: n,
 		disabled: t,
 		onChange: r,
@@ -5860,12 +5869,12 @@ function Qc(e, t, n, r, i, o, s) {
 		translator: s
 	});
 }
-function $c(e, t) {
+function tl(e, t) {
 	return `child-${e.questionTypeKey}-${t}`;
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentSubquestionGroupEditor.tsx
-function el({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, subquestionTemplates: s, translator: c }) {
+function nl({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls: i, questionTypeTemplates: s, translator: c }) {
 	let { t: l } = c, u = n.children.length;
 	function d(e) {
 		r(k(k({}, n), {}, {
@@ -5883,11 +5892,11 @@ function el({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 		d(n.children.filter((t, n) => n !== e));
 	}
 	function h(e, t) {
-		d(Bc(n.children, e, t));
+		d(Gc(n.children, e, t));
 	}
 	function g(r, o) {
 		var l;
-		return /* @__PURE__ */ a(Jc, {
+		return /* @__PURE__ */ a(Zc, {
 			child: r,
 			childIndex: o,
 			disabled: e,
@@ -5897,7 +5906,7 @@ function el({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 			onMove: (e) => h(o, e),
 			richTextControls: i,
 			siblingCount: n.children.length,
-			subquestionTemplates: s,
+			questionTypeTemplates: s,
 			translator: c
 		}, `child-${(l = r.questionTypeKey) == null ? "unknown" : l}-${o}`);
 	}
@@ -5915,56 +5924,55 @@ function el({ disabled: e, hasAnswer: t, item: n, onChange: r, richTextControls:
 					type: "secondary",
 					children: l("questionContentEditor.subquestion.structureCheck", { nodeCount: u })
 				})]
-			}), /* @__PURE__ */ a(Ls, {
+			}), /* @__PURE__ */ a(Hs, {
 				className: "min-w-0 justify-end",
 				wrap: !0,
-				children: /* @__PURE__ */ a(Vc, {
+				children: /* @__PURE__ */ a(Kc, {
 					disabled: e,
 					hasAnswer: t,
 					onAddChild: f,
-					subquestionTemplates: s,
+					questionTypeTemplates: s,
 					translator: c
 				})
 			})]
 		}), /* @__PURE__ */ a("div", {
 			className: "flex min-w-0 flex-col",
-			children: u === 0 ? /* @__PURE__ */ a(Is, { description: l("questionContentEditor.subquestion.emptyNodes") }) : n.children.map(g)
+			children: u === 0 ? /* @__PURE__ */ a(Vs, { description: l("questionContentEditor.subquestion.emptyNodes") }) : n.children.map(g)
 		})]
 	});
 }
 //#endregion
 //#region src/question/content-editor/QuestionContentEditor.tsx
-function tl({ disabled: t = !1, locale: n = "zh-CN", onChange: r, structure: i, subquestionTemplates: s = [], uploadImage: c, value: l }) {
-	let u = ws(n), { t: d } = u, p = f(() => ({
+function rl({ disabled: t = !1, locale: n = "zh-CN", onChange: r, questionTypeTemplates: i, uploadImage: s, value: c }) {
+	let l = ws(n), { t: u } = l, d = As(i, c), p = f(() => ({
 		plugins: [ni, ys],
-		uploadImage: c
-	}), [c]);
+		uploadImage: s
+	}), [s]);
 	function m(e) {
-		r(Mi(l, e));
+		r(Mi(c, e));
 	}
 	function h(e) {
-		r(Ni(l, e));
+		r(Ni(c, e));
 	}
-	function g(e) {
-		let n = xi(l, e, i.hasAnswer);
-		return /* @__PURE__ */ a(Nc, {
+	function g(e, n) {
+		return /* @__PURE__ */ a(zc, {
 			disabled: t,
 			element: e,
-			hasAnswer: i.hasAnswer,
-			item: n,
+			hasAnswer: n,
+			item: xi(c, e, n),
 			onChange: m,
 			richTextControls: p,
-			title: e.name || d(`questionContentEditor.elementType.${e.type}`),
-			translator: u
+			title: e.name || u(`questionContentEditor.elementType.${e.type}`),
+			translator: l
 		});
 	}
-	function _(e) {
-		let n = Si(l, e);
-		return /* @__PURE__ */ a(Nc, {
+	function _(e, n) {
+		let r = Si(c, e);
+		return /* @__PURE__ */ a(zc, {
 			disabled: t,
-			element: nl(e),
-			hasAnswer: i.hasAnswer,
-			item: rl(n),
+			element: il(e),
+			hasAnswer: n,
+			item: al(r),
 			onChange: (t) => h({
 				content: t.content,
 				extraKey: e.extraKey,
@@ -5972,45 +5980,45 @@ function tl({ disabled: t = !1, locale: n = "zh-CN", onChange: r, structure: i,
 			}),
 			richTextControls: p,
 			title: e.name,
-			translator: u
+			translator: l
 		});
 	}
-	let v = mi(i) ? /* @__PURE__ */ a(el, {
+	let v = d ? mi(d) ? /* @__PURE__ */ a(nl, {
 		disabled: t,
-		hasAnswer: i.hasAnswer,
-		item: k(k({}, l), {}, { elements: [] }),
+		hasAnswer: d.hasAnswer,
+		item: k(k({}, c), {}, { elements: [] }),
 		onChange: r,
 		richTextControls: p,
-		subquestionTemplates: s,
-		translator: u
+		questionTypeTemplates: i,
+		translator: l
 	}) : /* @__PURE__ */ o("div", {
 		className: "flex min-w-0 flex-col gap-4",
-		children: [i.elements.map((e) => /* @__PURE__ */ a("section", {
+		children: [d.elements.map((e) => /* @__PURE__ */ a("section", {
 			className: "flex min-w-0 flex-col gap-3 rounded-md border border-slate-200 bg-white p-4",
-			children: g(e)
-		}, e.elementKey)), i.extras.map((e) => /* @__PURE__ */ a("section", {
+			children: g(e, d.hasAnswer)
+		}, e.elementKey)), d.extras.map((e) => /* @__PURE__ */ a("section", {
 			className: "flex min-w-0 flex-col gap-3 rounded-md border border-slate-200 bg-white p-4",
-			children: _(e)
+			children: _(e, d.hasAnswer)
 		}, e.extraKey))]
-	});
+	}) : /* @__PURE__ */ a(Vs, { description: u("questionContentEditor.subquestion.missingTemplate") });
 	return /* @__PURE__ */ o(e.Root, {
 		className: [
 			"question-content-editor",
-			Os.root,
-			Os["rich-text-root"]
+			Ns.root,
+			Ns["rich-text-root"]
 		].join(" "),
 		plugins: p.plugins,
-		uploadImage: c,
+		uploadImage: s,
 		children: [t ? null : /* @__PURE__ */ a(e.Toolbar, {
 			"aria-label": "Rich text toolbar",
-			className: Os["rich-text-toolbar"]
+			className: Ns["rich-text-toolbar"]
 		}), /* @__PURE__ */ a(xs.Provider, {
 			value: !0,
 			children: v
 		})]
 	});
 }
-function nl(e) {
+function il(e) {
 	return {
 		config: {},
 		elementKey: e.extraKey,
@@ -6018,7 +6026,7 @@ function nl(e) {
 		type: "richText"
 	};
 }
-function rl(e) {
+function al(e) {
 	return {
 		content: e.content,
 		elementKey: e.extraKey,
@@ -6027,38 +6035,37 @@ function rl(e) {
 }
 //#endregion
 //#region src/question/content-editor/structure.ts
-function il(e, t) {
+function ol(e, t) {
 	return {
-		elements: e.elements.map((e) => hl(e, t)),
+		elements: e.elements.map((e) => _l(e, t)),
 		extras: e.extras.map((e) => ({
 			extraKey: e.extraKey,
-			name: _l(e, Jr(e.type), Yr(e.type), t),
+			name: yl(e, Jr(e.type), Yr(e.type), t),
 			type: e.type
 		})),
 		hasAnswer: e.globalConfig.hasAnswer,
 		systemQuestionType: ""
 	};
 }
-function al(e, t, n) {
-	return !e || !t ? null : k(k({}, ji(t, cl(e))), {}, { children: e.children.map((e) => {
-		let t = qc(n, e.questionTypeKey);
-		return t ? al(e, t.structure, n) : null;
-	}).filter((e) => !!e) });
+function sl(e, t) {
+	if (!e) return null;
+	let n = Os(t, e.questionTypeKey);
+	return n ? k(k({}, ji(n, ul(e))), {}, { children: e.children.map((e) => sl(e, t)).filter((e) => !!e) }) : null;
 }
-function ol(e) {
+function cl(e) {
 	return {
 		description: e.description,
-		elements: e.elements.map(dl),
-		extras: e.extras.map(ml),
+		elements: e.elements.map(pl),
+		extras: e.extras.map(gl),
 		globalConfig: k({}, e.globalConfig),
 		isSubjective: e.isSubjective,
 		version: e.version
 	};
 }
-function sl(e, t) {
-	return e.globalConfig.hasAnswer !== t.globalConfig.hasAnswer || e.elements.length !== t.elements.length || e.extras.length !== t.extras.length || ll(e.elements, t.elements) || ul(e.extras, t.extras) ? "shape" : "metadata";
+function ll(e, t) {
+	return e.globalConfig.hasAnswer !== t.globalConfig.hasAnswer || e.elements.length !== t.elements.length || e.extras.length !== t.extras.length || dl(e.elements, t.elements) || fl(e.extras, t.extras) ? "shape" : "metadata";
 }
-function cl(e) {
+function ul(e) {
 	return {
 		questionTypeKey: e.questionTypeKey,
 		children: [],
@@ -6068,22 +6075,22 @@ function cl(e) {
 		version: e.version
 	};
 }
-function ll(e, t) {
+function dl(e, t) {
 	return e.some((e, n) => {
 		let r = t.slice(n, n + 1)[0];
 		return !r || e.clientId !== r.clientId || e.elementKey !== r.elementKey || e.type !== r.type || JSON.stringify(e.config) !== JSON.stringify(r.config);
 	});
 }
-function ul(e, t) {
+function fl(e, t) {
 	return e.some((e, n) => {
 		let r = t.slice(n, n + 1)[0];
 		return !r || e.clientId !== r.clientId || e.extraKey !== r.extraKey || e.type !== r.type;
 	});
 }
-function dl(e) {
-	return e.type === "fill" || e.type === "classification" || e.type === "ordering" || e.type === "richText" || e.type === "textMarker" ? pl(e) : fl(e);
+function pl(e) {
+	return e.type === "fill" || e.type === "classification" || e.type === "ordering" || e.type === "richText" || e.type === "textMarker" ? hl(e) : ml(e);
 }
-function fl(e) {
+function ml(e) {
 	switch (e.type) {
 		case "inlineFill": return {
 			config: k({}, e.config),
@@ -6129,7 +6136,7 @@ function fl(e) {
 		};
 	}
 }
-function pl(e) {
+function hl(e) {
 	return {
 		config: {},
 		elementKey: e.elementKey,
@@ -6138,7 +6145,7 @@ function pl(e) {
 		type: e.type
 	};
 }
-function ml(e) {
+function gl(e) {
 	return {
 		enName: e.enName,
 		extraKey: e.extraKey,
@@ -6146,15 +6153,15 @@ function ml(e) {
 		type: e.type
 	};
 }
-function hl(e, t) {
+function _l(e, t) {
 	return e.type === "fill" || e.type === "classification" || e.type === "ordering" || e.type === "richText" || e.type === "textMarker" ? {
 		config: {},
 		elementKey: e.elementKey,
-		name: _l(e, A(e.type), j(e.type), t),
+		name: yl(e, A(e.type), j(e.type), t),
 		type: e.type
-	} : gl(e, t);
+	} : vl(e, t);
 }
-function gl(e, t) {
+function vl(e, t) {
 	switch (e.type) {
 		case "inlineFill": return {
 			config: {
@@ -6162,19 +6169,19 @@ function gl(e, t) {
 				candidateMode: e.config.candidateMode
 			},
 			elementKey: e.elementKey,
-			name: _l(e, A("inlineFill"), j("inlineFill"), t),
+			name: yl(e, A("inlineFill"), j("inlineFill"), t),
 			type: "inlineFill"
 		};
 		case "wordBuilder": return {
 			config: { builderMode: e.config.builderMode },
 			elementKey: e.elementKey,
-			name: _l(e, A("wordBuilder"), j("wordBuilder"), t),
+			name: yl(e, A("wordBuilder"), j("wordBuilder"), t),
 			type: "wordBuilder"
 		};
 		case "judgement": return {
 			config: { judgeAnswerMode: e.config.judgeAnswerMode },
 			elementKey: e.elementKey,
-			name: _l(e, A("judgement"), j("judgement"), t),
+			name: yl(e, A("judgement"), j("judgement"), t),
 			type: "judgement"
 		};
 		case "choice": return {
@@ -6184,24 +6191,24 @@ function gl(e, t) {
 				selectionType: e.config.selectionType
 			},
 			elementKey: e.elementKey,
-			name: _l(e, A("choice"), j("choice"), t),
+			name: yl(e, A("choice"), j("choice"), t),
 			type: "choice"
 		};
 		case "lineConnect": return {
 			config: { columns: e.config.columns.map((e) => k({}, e)) },
 			elementKey: e.elementKey,
-			name: _l(e, A("lineConnect"), j("lineConnect"), t),
+			name: yl(e, A("lineConnect"), j("lineConnect"), t),
 			type: "lineConnect"
 		};
 		case "matching": return {
 			config: { columns: e.config.columns.map((e) => k({}, e)) },
 			elementKey: e.elementKey,
-			name: _l(e, A("matching"), j("matching"), t),
+			name: yl(e, A("matching"), j("matching"), t),
 			type: "matching"
 		};
 	}
 }
-function _l(e, t, n, r) {
+function yl(e, t, n, r) {
 	var i;
 	if (r === "en-US") {
 		var a;
@@ -6211,231 +6218,221 @@ function _l(e, t, n, r) {
 }
 //#endregion
 //#region src/question/player/helpers.ts
-function vl(e, t, n = []) {
-	let r = mi(t);
+function bl(e, t) {
+	let n = Os(t, e.questionTypeKey), r = n ? mi(n) : !1;
 	return {
 		questionTypeKey: e.questionTypeKey,
-		children: e.children.map((e) => Rl(e, n)),
+		children: e.children.map((e) => bl(e, t)),
 		id: e.id,
-		items: r ? [] : t.elements.reduce((n, r) => {
-			let i = zl(r, xi(e, r, t.hasAnswer));
-			return i ? [...n, i] : n;
+		items: !n || r ? [] : n.elements.reduce((t, r) => {
+			let i = Bl(r, xi(e, r, n.hasAnswer));
+			return i ? [...t, i] : t;
 		}, []),
 		version: e.version
 	};
 }
-function yl(e, t) {
+function xl(e, t) {
 	var n;
-	return (n = eu(e, t, "choice")) == null ? {
+	return (n = tu(e, t, "choice")) == null ? {
 		elementKey: t,
 		selectedOptionIds: [],
 		type: "choice"
 	} : n;
 }
-function bl(e, t, n) {
+function Sl(e, t, n) {
 	var r;
-	return (r = eu(e, t, "fill")) == null ? {
-		answers: Ql(n),
+	return (r = tu(e, t, "fill")) == null ? {
+		answers: $l(n),
 		elementKey: t,
 		type: "fill"
 	} : r;
 }
-function xl(e, t, n) {
+function Cl(e, t, n) {
 	var r;
-	return (r = eu(e, t.elementKey, "inlineFill")) == null ? {
-		answers: $l(t, n),
+	return (r = tu(e, t.elementKey, "inlineFill")) == null ? {
+		answers: eu(t, n),
 		elementKey: t.elementKey,
 		type: "inlineFill"
 	} : r;
 }
-function Sl(e, t, n) {
+function wl(e, t, n) {
 	var r;
-	return (r = eu(e, t, "wordBuilder")) == null ? {
-		answers: Ql(n),
+	return (r = tu(e, t, "wordBuilder")) == null ? {
+		answers: $l(n),
 		elementKey: t,
 		type: "wordBuilder"
 	} : r;
 }
-function Cl(e, t) {
+function Tl(e, t) {
 	var n;
-	return (n = eu(e, t, "judgement")) == null ? {
+	return (n = tu(e, t, "judgement")) == null ? {
 		elementKey: t,
 		selectedValues: [],
 		type: "judgement"
 	} : n;
 }
-function wl(e, t) {
+function El(e, t) {
 	var n;
-	return (n = eu(e, t, "classification")) == null ? {
+	return (n = tu(e, t, "classification")) == null ? {
 		elementKey: t,
 		placements: {},
 		type: "classification"
 	} : n;
 }
-function Tl(e, t) {
+function Dl(e, t) {
 	var n;
-	return (n = eu(e, t, "lineConnect")) == null ? {
+	return (n = tu(e, t, "lineConnect")) == null ? {
 		connections: {},
 		elementKey: t,
 		type: "lineConnect"
 	} : n;
 }
-function El(e, t) {
+function Ol(e, t) {
 	var n;
-	return (n = eu(e, t, "matching")) == null ? {
+	return (n = tu(e, t, "matching")) == null ? {
 		connections: {},
 		elementKey: t,
 		type: "matching"
 	} : n;
 }
-function Dl(e, t) {
+function kl(e, t) {
 	var n;
-	return (n = eu(e, t.elementKey, "ordering")) == null ? {
+	return (n = tu(e, t.elementKey, "ordering")) == null ? {
 		elementKey: t.elementKey,
 		orderedOptionIds: t.sortOptions.map((e) => e.id),
 		type: "ordering"
 	} : n;
 }
-function Ol(e, t) {
+function Al(e, t) {
 	var n;
-	return (n = eu(e, t, "textMarker")) == null ? {
+	return (n = tu(e, t, "textMarker")) == null ? {
 		elementKey: t,
 		selectedMarkers: [],
 		type: "textMarker"
 	} : n;
 }
-function kl(e, t) {
+function jl(e, t) {
 	let n = e.items.some((e) => e.elementKey === t.elementKey && e.type === t.type);
 	return k(k({}, e), {}, { items: n ? e.items.map((e) => e.elementKey === t.elementKey && e.type === t.type ? t : e) : [...e.items, t] });
 }
-function Al(e, t, n) {
+function Ml(e, t, n) {
 	return k(k({}, e), {}, { children: e.children.map((e, r) => r === t ? n : e) });
 }
-function jl(e, t, n) {
+function Nl(e, t, n) {
 	return ue(e, t, n);
 }
-function Ml(e, t, n = "single") {
+function Pl(e, t, n = "single") {
 	return {
 		kind: "option",
 		optionIds: ue((e == null ? void 0 : e.kind) === "option" ? e.optionIds : [], t, n)
 	};
 }
-function Nl(e, t, n) {
+function Fl(e, t, n) {
 	return Xe(e, t, n);
 }
-function Pl(e, t, n) {
+function Il(e, t, n) {
 	return bt(e, t, n);
 }
-function Fl(e, t, n) {
+function Ll(e, t, n) {
 	return ke(e, t, n);
 }
-function Il(e, t, n, r) {
+function Rl(e, t, n, r) {
 	return Xa(e, t.sortOptions, n, r);
 }
-function Ll(e, t) {
-	return e.includes(t) ? e.filter((e) => e !== t) : [...e, t];
-}
-function Rl(e, t) {
-	var n;
-	let r = qc(t, e.questionTypeKey);
-	return vl(e, (n = r == null ? void 0 : r.structure) == null ? {
-		elements: [],
-		extras: [],
-		hasAnswer: !0,
-		systemQuestionType: ""
-	} : n, t);
-}
 function zl(e, t) {
-	return e.type === "richText" ? null : e.type === "ordering" ? Xl(e.elementKey, t) : e.type === "classification" ? Vl(e.elementKey, t) : e.type === "fill" ? Wl(e.elementKey, t) : Bl(e, t);
+	return e.includes(t) ? e.filter((e) => e !== t) : [...e, t];
 }
 function Bl(e, t) {
+	return e.type === "richText" ? null : e.type === "ordering" ? Zl(e.elementKey, t) : e.type === "classification" ? Hl(e.elementKey, t) : e.type === "fill" ? Gl(e.elementKey, t) : Vl(e, t);
+}
+function Vl(e, t) {
 	switch (e.type) {
-		case "choice": return Ul(e.elementKey);
-		case "inlineFill": return Gl(e, t);
-		case "wordBuilder": return Hl(e.elementKey, t);
-		case "judgement": return Kl(e.elementKey);
-		case "lineConnect": return ql(e.elementKey);
-		case "matching": return Jl(e.elementKey);
-		case "textMarker": return Zl(e.elementKey);
+		case "choice": return Wl(e.elementKey);
+		case "inlineFill": return Kl(e, t);
+		case "wordBuilder": return Ul(e.elementKey, t);
+		case "judgement": return ql(e.elementKey);
+		case "lineConnect": return Jl(e.elementKey);
+		case "matching": return Yl(e.elementKey);
+		case "textMarker": return Ql(e.elementKey);
 	}
 }
-function Vl(e, t) {
+function Hl(e, t) {
 	return t.type === "classification" ? {
 		elementKey: e,
-		placements: Yl({}, t),
+		placements: Xl({}, t),
 		type: "classification"
 	} : null;
 }
-function Hl(e, t) {
+function Ul(e, t) {
 	return t.type === "wordBuilder" ? {
-		answers: Ql(t.blanks),
+		answers: $l(t.blanks),
 		elementKey: e,
 		type: "wordBuilder"
 	} : null;
 }
-function Ul(e) {
+function Wl(e) {
 	return {
 		elementKey: e,
 		selectedOptionIds: [],
 		type: "choice"
 	};
 }
-function Wl(e, t) {
+function Gl(e, t) {
 	return t.type === "fill" ? {
-		answers: Ql(t.blanks),
+		answers: $l(t.blanks),
 		elementKey: e,
 		type: "fill"
 	} : null;
 }
-function Gl(e, t) {
+function Kl(e, t) {
 	return t.type === "inlineFill" ? {
-		answers: $l(e, t.blanks),
+		answers: eu(e, t.blanks),
 		elementKey: e.elementKey,
 		type: "inlineFill"
 	} : null;
 }
-function Kl(e) {
+function ql(e) {
 	return {
 		elementKey: e,
 		selectedValues: [],
 		type: "judgement"
 	};
 }
-function ql(e) {
+function Jl(e) {
 	return {
 		connections: {},
 		elementKey: e,
 		type: "lineConnect"
 	};
 }
-function Jl(e) {
+function Yl(e) {
 	return {
 		connections: {},
 		elementKey: e,
 		type: "matching"
 	};
 }
-function Yl(e, t) {
+function Xl(e, t) {
 	return Oe(e, t.categories, t.items);
 }
-function Xl(e, t) {
+function Zl(e, t) {
 	return t.type === "ordering" ? {
 		elementKey: e,
 		orderedOptionIds: t.sortOptions.map((e) => e.id),
 		type: "ordering"
 	} : null;
 }
-function Zl(e) {
+function Ql(e) {
 	return {
 		elementKey: e,
 		selectedMarkers: [],
 		type: "textMarker"
 	};
 }
-function Ql(e) {
+function $l(e) {
 	return e.reduce((e, t) => k(k({}, e), {}, { [t]: "" }), {});
 }
-function $l(e, t) {
+function eu(e, t) {
 	return t.reduce((t, n) => k(k({}, t), {}, { [n]: e.config.candidateMode === "none" ? {
 		kind: "text",
 		value: ""
@@ -6444,12 +6441,12 @@ function $l(e, t) {
 		optionIds: []
 	} }), {});
 }
-function eu(e, t, n) {
+function tu(e, t, n) {
 	return e.items.find((e) => e.elementKey === t && e.type === n);
 }
 //#endregion
 //#region src/question/i18n/messages.ts
-var tu = {
+var nu = {
 	"en-US": {
 		addBlank: "Add blank",
 		addCard: "Add card",
@@ -6511,7 +6508,7 @@ var tu = {
 		wholeQuestion: "Whole question",
 		moveDown: "Move down",
 		moveUp: "Move up",
-		missingSubquestionTemplate: "Missing subquestion structure.",
+		missingQuestionTypeTemplate: "Missing question type structure.",
 		previewEmpty: "No question content."
 	},
 	"zh-CN": {
@@ -6575,19 +6572,19 @@ var tu = {
 		wholeQuestion: "\u6574\u9898",
 		moveDown: "\u4e0b\u79fb",
 		moveUp: "\u4e0a\u79fb",
-		missingSubquestionTemplate: "\u7f3a\u5c11\u5b50\u9898\u7ed3\u6784\u3002",
+		missingQuestionTypeTemplate: "\u7f3a\u5c11\u9898\u578b\u7ed3\u6784\u3002",
 		previewEmpty: "\u6682\u65e0\u9898\u76ee\u5185\u5bb9\u3002"
 	}
 };
-function nu(e = "zh-CN") {
+function ru(e = "zh-CN") {
 	switch (e) {
-		case "en-US": return tu["en-US"];
-		case "zh-CN": return tu["zh-CN"];
+		case "en-US": return nu["en-US"];
+		case "zh-CN": return nu["zh-CN"];
 	}
 }
 //#endregion
 //#region src/question/renderers/helpers.ts
-function ru(...e) {
+function H(...e) {
 	return e.filter(Boolean).join(" ");
 }
 function iu(e, t, n) {
@@ -6657,14 +6654,14 @@ var U = {
 };
 //#endregion
 //#region src/question/player/QuestionPlayerComposite.tsx
-function fu({ messages: e, numberPath: t = [], onChildResponseChange: n, renderChild: r, response: i, subquestionTemplates: s, value: c }) {
-	return c.children.length === 0 ? /* @__PURE__ */ a("div", {
+function fu({ messages: e, numberPath: t = [], onChildResponseChange: n, renderChild: r, response: i, value: s }) {
+	return s.children.length === 0 ? /* @__PURE__ */ a("div", {
 		className: U.empty,
 		children: e.previewEmpty
 	}) : /* @__PURE__ */ a("div", {
 		className: U.children,
-		children: c.children.map((c, l) => {
-			let u = [...t, l], d = qc(s, c.questionTypeKey), f = i.children.slice(l, l + 1)[0];
+		children: s.children.map((s, c) => {
+			let l = [...t, c], u = i.children.slice(c, c + 1)[0];
 			return /* @__PURE__ */ o("section", {
 				className: U.child,
 				children: [/* @__PURE__ */ o("div", {
@@ -6672,13 +6669,13 @@ function fu({ messages: e, numberPath: t = [], onChildResponseChange: n, renderC
 					children: [
 						e.subquestion,
 						" ",
-						Hc(u)
+						qc(l)
 					]
-				}), d && f ? r(c, f, d.structure, (e) => n(l, e), u) : /* @__PURE__ */ a("div", {
+				}), u ? r(s, u, (e) => n(c, e), l) : /* @__PURE__ */ a("div", {
 					className: U.empty,
-					children: e.missingSubquestionTemplate
+					children: e.missingQuestionTypeTemplate
 				})]
-			}, c.id || l);
+			}, s.id || c);
 		})
 	});
 }
@@ -6748,7 +6745,7 @@ function K({ groups: e, title: t }) {
 //#endregion
 //#region src/question/player/QuestionBlankGroupPlayer.tsx
 function mu({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: s }) {
-	let c = bl(i, t.elementKey, t.blanks), l = ta(t.answers, t.blanks).map((e, r) => ({
+	let c = Sl(i, t.elementKey, t.blanks), l = ta(t.answers, t.blanks).map((e, r) => ({
 		contents: e.answerPools.map((e, t) => /* @__PURE__ */ a(G, { content: e }, `group-${r}-answer-${t}`)),
 		marker: iu(e.blankIds, t.blanks, n.blankLabel)
 	}));
@@ -6809,9 +6806,9 @@ var q = {
 //#endregion
 //#region src/question/player/QuestionClassificationPlayer.tsx
 function vu({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: s }) {
-	let [c, l] = m(""), u = wl(i, t.elementKey), d = bu(u.placements, t), f = t.items.find((e) => e.id === c);
+	let [c, l] = m(""), u = El(i, t.elementKey), d = bu(u.placements, t), f = t.items.find((e) => e.id === c);
 	function p(e, n) {
-		r(k(k({}, u), {}, { placements: bu(Fl(d, e, n), t) })), l("");
+		r(k(k({}, u), {}, { placements: bu(Ll(d, e, n), t) })), l("");
 	}
 	function h(t, n) {
 		t.preventDefault();
@@ -6822,7 +6819,7 @@ function vu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 		let r = c === n.id, i = yu(n.id, d, t, s);
 		return /* @__PURE__ */ a("button", {
 			"aria-pressed": r,
-			className: ru(q.item, r && q.selected, i === "correct" && q.correct, i === "incorrect" && q.incorrect, i === "unanswered" && q.unanswered),
+			className: H(q.item, r && q.selected, i === "correct" && q.correct, i === "incorrect" && q.incorrect, i === "unanswered" && q.unanswered),
 			"data-status": i,
 			"data-testid": `classification-player-item-${n.id}`,
 			disabled: e,
@@ -7041,7 +7038,7 @@ function Fu(e, t, n) {
 //#endregion
 //#region src/question/player/QuestionFillTextPlayer.tsx
 function Iu({ disabled: e, element: t, item: n, messages: r, onChange: i, response: s, showAnswer: c }) {
-	let l = Bi(n, t, !0), u = uu(l), d = xl(s, t, l.blanks), f = u.map((e, t) => ({
+	let l = Bi(n, t, !0), u = uu(l), d = Cl(s, t, l.blanks), f = u.map((e, t) => ({
 		contents: e.contents.map((e, n) => /* @__PURE__ */ a(G, { content: e }, `group-${t}-answer-${n}`)),
 		marker: iu(e.blankIds, l.blanks, r.blankLabel)
 	}));
@@ -7140,7 +7137,7 @@ function Bu({ activeAnswer: e, blankId: t, disabled: n, onAnswerChange: r, optio
 		className: o ? J.selected : void 0,
 		"data-selected": o ? "true" : void 0,
 		disabled: n,
-		onClick: () => r(t, Ml(e, i.optionId, "single")),
+		onClick: () => r(t, Pl(e, i.optionId, "single")),
 		type: "button",
 		children: /* @__PURE__ */ a(G, { content: i.content })
 	}, i.optionId);
@@ -7162,7 +7159,7 @@ var Y = {
 //#endregion
 //#region src/question/player/QuestionJudgementGroupPlayer.tsx
 function Vu({ disabled: e, element: t, item: n, messages: r, onChange: i, response: s, showAnswer: c }) {
-	let l = Cl(s, t.elementKey), u = Ei(t.config.judgeAnswerMode), d = [{
+	let l = Tl(s, t.elementKey), u = Ei(t.config.judgeAnswerMode), d = [{
 		contents: n.answers.filter((e) => e.trim() !== ""),
 		marker: ""
 	}];
@@ -7172,11 +7169,11 @@ function Vu({ disabled: e, element: t, item: n, messages: r, onChange: i, respon
 	return /* @__PURE__ */ o("div", {
 		className: W.element,
 		children: [/* @__PURE__ */ a("ol", {
-			className: ru(W["judgement-list"], Y["judgement-list"]),
+			className: H(W["judgement-list"], Y["judgement-list"]),
 			children: u.map((t) => {
 				let n = l.selectedValues.includes(t);
 				return /* @__PURE__ */ a("li", {
-					className: ru(W["judgement-item"], Y["judgement-option"], n && Y.selected),
+					className: H(W["judgement-item"], Y["judgement-option"], n && Y.selected),
 					"data-selected": n ? "true" : void 0,
 					children: /* @__PURE__ */ a("button", {
 						"aria-pressed": n,
@@ -7221,7 +7218,7 @@ function Uu(e) {
 //#endregion
 //#region src/question/player/QuestionLineConnectPlayer.tsx
 function Wu({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: s }) {
-	let [c, u] = m(null), [h, g] = m(null), _ = p(null), v = p(/* @__PURE__ */ new Map()), y = Tl(i, t.elementKey), b = { gridTemplateColumns: `repeat(${t.columns.length}, minmax(12rem, 1fr))` }, x = f(() => ic(t, y.connections), [t, y.connections]), S = f(() => JSON.stringify({
+	let [c, u] = m(null), [h, g] = m(null), _ = p(null), v = p(/* @__PURE__ */ new Map()), y = Dl(i, t.elementKey), b = { gridTemplateColumns: `repeat(${t.columns.length}, minmax(12rem, 1fr))` }, x = f(() => lc(t, y.connections), [t, y.connections]), S = f(() => JSON.stringify({
 		columns: t.columns.map((e) => e.items.map((e) => e.itemId)),
 		connections: y.connections
 	}), [t.columns, y.connections]), C = l(() => {
@@ -7236,13 +7233,13 @@ function Wu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 			let o = i.getBoundingClientRect(), s = a.getBoundingClientRect();
 			return [...n, {
 				key: r.key,
-				x1: cc(o, t, e.scrollLeft),
-				x2: sc(s, t, e.scrollLeft),
-				y1: oc(o, t, e.scrollTop),
-				y2: oc(s, t, e.scrollTop)
+				x1: pc(o, t, e.scrollLeft),
+				x2: fc(s, t, e.scrollLeft),
+				y1: dc(o, t, e.scrollTop),
+				y2: dc(s, t, e.scrollTop)
 			}];
 		}, []);
-		lc(g, {
+		mc(g, {
 			height: e.scrollHeight,
 			lines: n,
 			width: e.scrollWidth
@@ -7272,7 +7269,7 @@ function Wu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 			itemId: n
 		}) : null;
 		if (i) {
-			r(k(k({}, y), {}, { connections: Nl(y.connections, i.fromItemId, i.toItemId) })), u(null);
+			r(k(k({}, y), {}, { connections: Fl(y.connections, i.fromItemId, i.toItemId) })), u(null);
 			return;
 		}
 		u({
@@ -7317,7 +7314,7 @@ function Wu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 					}), t.items.map((n, i) => {
 						let s = wi(t.labelStyle, i), l = (c == null ? void 0 : c.itemId) === n.itemId;
 						return /* @__PURE__ */ a("div", {
-							className: ru(B.item, l && B.selected),
+							className: H(B.item, l && B.selected),
 							"data-selected": l ? "true" : void 0,
 							"data-testid": `line-connect-player-item-${n.itemId}`,
 							ref: w(n.itemId),
@@ -7372,7 +7369,7 @@ var Ku = {
 //#endregion
 //#region src/question/player/QuestionMatchingPlayer.tsx
 function qu({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: s }) {
-	let [c, l] = m(null), u = El(i, t.elementKey), d = Ju(t, u.connections);
+	let [c, l] = m(null), u = Ol(i, t.elementKey), d = Ju(t, u.connections);
 	function f(t, n) {
 		if (e) return;
 		let i = c ? pt(c, {
@@ -7380,7 +7377,7 @@ function qu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 			itemId: n
 		}) : null;
 		if (i) {
-			r(k(k({}, u), {}, { connections: Pl(u.connections, i.fromItemId, i.toItemId) })), l(null);
+			r(k(k({}, u), {}, { connections: Il(u.connections, i.fromItemId, i.toItemId) })), l(null);
 			return;
 		}
 		l((c == null ? void 0 : c.itemId) === n ? null : {
@@ -7392,7 +7389,7 @@ function qu({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 		let r = (c == null ? void 0 : c.itemId) === t.item.itemId;
 		return /* @__PURE__ */ o("button", {
 			"aria-pressed": r,
-			className: ru(Ku.item, r && Ku.selected, n && Ku.matched),
+			className: H(Ku.item, r && Ku.selected, n && Ku.matched),
 			"data-testid": `matching-player-item-${t.item.itemId}`,
 			disabled: e,
 			onClick: () => f(t.columnIndex, t.item.itemId),
@@ -7470,9 +7467,9 @@ var Xu = {
 //#endregion
 //#region src/question/player/QuestionOptionGroupPlayer.tsx
 function Zu({ disabled: e, element: t, item: n, messages: r, onChange: i, response: s, showAnswer: c }) {
-	let l = yl(s, t.elementKey), u = Di(n, t.config.optionLabelStyle);
+	let l = xl(s, t.elementKey), u = Di(n, t.config.optionLabelStyle);
 	function d(e) {
-		i(k(k({}, l), {}, { selectedOptionIds: jl(l.selectedOptionIds, e, t.config.selectionType) }));
+		i(k(k({}, l), {}, { selectedOptionIds: Nl(l.selectedOptionIds, e, t.config.selectionType) }));
 	}
 	if (t.config.renderer === "table") {
 		let i = Yu(t, n);
@@ -7497,7 +7494,7 @@ function Zu({ disabled: e, element: t, item: n, messages: r, onChange: i, respon
 									onClick: () => d(t.optionId),
 									type: "button",
 									children: /* @__PURE__ */ a("span", {
-										className: ru(W.marker, Y["table-option-marker"]),
+										className: H(W.marker, Y["table-option-marker"]),
 										"data-selected": n ? "true" : void 0,
 										children: t.marker
 									})
@@ -7527,7 +7524,7 @@ function Zu({ disabled: e, element: t, item: n, messages: r, onChange: i, respon
 			children: u.map((t) => {
 				let n = l.selectedOptionIds.includes(t.optionId);
 				return /* @__PURE__ */ a("li", {
-					className: ru(W["option-item"], Y["choice-option"], n && Y.selected),
+					className: H(W["option-item"], Y["choice-option"], n && Y.selected),
 					"data-selected": n ? "true" : void 0,
 					children: /* @__PURE__ */ o("button", {
 						className: Y["choice-button"],
@@ -7536,7 +7533,7 @@ function Zu({ disabled: e, element: t, item: n, messages: r, onChange: i, respon
 						onClick: () => d(t.optionId),
 						type: "button",
 						children: [/* @__PURE__ */ a("span", {
-							className: ru(W.marker, Y["option-marker"]),
+							className: H(W.marker, Y["option-marker"]),
 							"data-selected": n ? "true" : void 0,
 							children: t.marker
 						}), /* @__PURE__ */ a(G, { content: t.standardContent })]
@@ -7564,16 +7561,16 @@ function Qu(e) {
 //#endregion
 //#region src/question/player/QuestionOrderingPlayer.tsx
 function $u({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: s }) {
-	let c = Dl(i, t), l = new Map(t.sortOptions.map((e) => [e.id, e])), u = c.orderedOptionIds.map((e) => l.get(e)).filter((e) => !!e);
+	let c = kl(i, t), l = new Map(t.sortOptions.map((e) => [e.id, e])), u = c.orderedOptionIds.map((e) => l.get(e)).filter((e) => !!e);
 	function d(e, n) {
-		r(k(k({}, c), {}, { orderedOptionIds: Il(c.orderedOptionIds, t, e, n) }));
+		r(k(k({}, c), {}, { orderedOptionIds: Rl(c.orderedOptionIds, t, e, n) }));
 	}
 	return /* @__PURE__ */ o("div", {
 		className: W.element,
 		children: [/* @__PURE__ */ a("ol", {
 			className: W["option-list"],
 			children: u.map((t, r) => /* @__PURE__ */ o("li", {
-				className: ru(W["option-item"], Y["choice-option"]),
+				className: H(W["option-item"], Y["choice-option"]),
 				children: [
 					/* @__PURE__ */ a("span", {
 						className: W.marker,
@@ -7644,7 +7641,7 @@ function td({ answerMarkers: e = [], content: t, disabled: n = !1, onMarkerClick
 		let n = i.includes(t), a = o && e.includes(t);
 		return {
 			answer: a,
-			className: tc(ed.marker, r ? ed["marker-button"] : "", n ? ed["marker-selected"] : "", a ? ed["marker-answer"] : ""),
+			className: oc(ed.marker, r ? ed["marker-button"] : "", n ? ed["marker-selected"] : "", a ? ed["marker-answer"] : ""),
 			selected: n
 		};
 	}
@@ -7695,7 +7692,7 @@ function id({ item: e, messages: t, showAnswer: n }) {
 //#endregion
 //#region src/question/player/QuestionTextMarkerPlayer.tsx
 function ad({ disabled: e, item: t, messages: n, onChange: r, response: i, showAnswer: o }) {
-	let s = Ol(i, t.elementKey);
+	let s = Al(i, t.elementKey);
 	return o ? /* @__PURE__ */ a(id, {
 		item: t,
 		messages: n,
@@ -7704,7 +7701,7 @@ function ad({ disabled: e, item: t, messages: n, onChange: r, response: i, showA
 		answerMarkers: t.answers,
 		content: t.content,
 		disabled: e,
-		onMarkerClick: (e) => r(k(k({}, s), {}, { selectedMarkers: Ll(s.selectedMarkers, e) })),
+		onMarkerClick: (e) => r(k(k({}, s), {}, { selectedMarkers: zl(s.selectedMarkers, e) })),
 		selectedMarkers: s.selectedMarkers
 	});
 }
@@ -7729,7 +7726,7 @@ var sd = {
 //#endregion
 //#region src/question/player/QuestionWordBuilderPlayer.tsx
 function cd({ disabled: e, element: t, item: n, messages: r, onChange: i, response: s, showAnswer: c }) {
-	let l = zi(n, !0, t), u = Sl(s, t.elementKey, l.blanks), d = od(l, r.blankLabel);
+	let l = zi(n, !0, t), u = wl(s, t.elementKey, l.blanks), d = od(l, r.blankLabel);
 	function f(e, t) {
 		i(k(k({}, u), {}, { answers: k(k({}, u.answers), {}, { [e]: t }) }));
 	}
@@ -7908,12 +7905,20 @@ function dd({ disabled: e, element: t, item: n, messages: r, onResponseItemChang
 var fd = ["locale"];
 function pd(e) {
 	let { locale: t = "zh-CN" } = e;
-	return /* @__PURE__ */ a(md, k(k({}, As(e, fd)), {}, {
-		messages: nu(t),
+	return /* @__PURE__ */ a(md, k(k({}, Fs(e, fd)), {}, {
+		messages: ru(t),
 		numberPath: []
 	}));
 }
-function md({ className: e, disabled: t = !1, messages: n, numberPath: r, onResponseChange: i, response: o, showAnswer: s = !1, showExtraAttributes: c = !1, structure: l, subquestionTemplates: u = [], value: d }) {
+function md({ className: e, disabled: t = !1, messages: n, numberPath: r, onResponseChange: i, response: o, showAnswer: s = !1, showExtraAttributes: c = !1, questionTypeTemplates: l, value: u }) {
+	let d = As(l, u);
+	if (!d) return /* @__PURE__ */ a("div", {
+		className: H(U.root, e),
+		children: /* @__PURE__ */ a("div", {
+			className: U.empty,
+			children: n.missingQuestionTypeTemplate
+		})
+	});
 	let f = hd({
 		disabled: t,
 		messages: n,
@@ -7922,13 +7927,13 @@ function md({ className: e, disabled: t = !1, messages: n, numberPath: r, onResp
 		response: o,
 		showAnswer: s,
 		showExtraAttributes: c,
-		structure: l,
-		subquestionTemplates: u,
-		value: d
+		structure: d,
+		questionTypeTemplates: l,
+		value: u
 	});
 	return /* @__PURE__ */ a("div", {
-		className: ru(U.root, e),
-		children: vd(l, d) ? /* @__PURE__ */ a("div", {
+		className: H(U.root, e),
+		children: vd(d, u) ? /* @__PURE__ */ a("div", {
 			className: U.empty,
 			children: n.previewEmpty
 		}) : f
@@ -7949,7 +7954,7 @@ function gd({ disabled: e, messages: t, onResponseChange: n, response: r, showAn
 					element: o,
 					item: s,
 					messages: t,
-					onResponseItemChange: (e) => n(kl(r, e)),
+					onResponseItemChange: (e) => n(jl(r, e)),
 					response: r,
 					showAnswer: i && c.hasAnswer
 				})
@@ -7974,26 +7979,24 @@ function gd({ disabled: e, messages: t, onResponseChange: n, response: r, showAn
 		}) : null]
 	});
 }
-function _d({ disabled: e, messages: t, numberPath: n, onResponseChange: r, response: i, showAnswer: o, showExtraAttributes: s, subquestionTemplates: c = [], value: l }) {
+function _d({ disabled: e, messages: t, numberPath: n, onResponseChange: r, response: i, showAnswer: o, showExtraAttributes: s, questionTypeTemplates: c, value: l }) {
 	return l.children.length === 0 ? null : /* @__PURE__ */ a(fu, {
 		disabled: e,
 		messages: t,
 		numberPath: n,
-		onChildResponseChange: (e, t) => r(Al(i, e, t)),
+		onChildResponseChange: (e, t) => r(Ml(i, e, t)),
 		response: i,
-		renderChild: (n, r, i, l, u) => /* @__PURE__ */ a(md, {
+		renderChild: (n, r, i, l) => /* @__PURE__ */ a(md, {
 			disabled: e,
 			messages: t,
-			numberPath: u,
-			onResponseChange: l,
+			numberPath: l,
+			onResponseChange: i,
 			response: r,
 			showAnswer: o,
 			showExtraAttributes: s,
-			structure: i,
-			subquestionTemplates: c,
+			questionTypeTemplates: c,
 			value: n
 		}),
-		subquestionTemplates: c,
 		value: l
 	});
 }
@@ -8396,14 +8399,14 @@ var X = {
 };
 //#endregion
 //#region src/question/preview/QuestionCompositePreview.tsx
-function Id({ messages: e, numberPath: t = [], renderChild: n, subquestionTemplates: r, value: i }) {
-	return i.children.length === 0 ? /* @__PURE__ */ a("div", {
+function Id({ messages: e, numberPath: t = [], renderChild: n, value: r }) {
+	return r.children.length === 0 ? /* @__PURE__ */ a("div", {
 		className: X.empty,
 		children: e.previewEmpty
 	}) : /* @__PURE__ */ a("div", {
 		className: X.children,
-		children: i.children.map((i, s) => {
-			let c = [...t, s], l = qc(r, i.questionTypeKey);
+		children: r.children.map((r, i) => {
+			let a = [...t, i];
 			return /* @__PURE__ */ o("section", {
 				className: X.child,
 				children: [/* @__PURE__ */ o("div", {
@@ -8411,13 +8414,10 @@ function Id({ messages: e, numberPath: t = [], renderChild: n, subquestionTempla
 					children: [
 						e.subquestion,
 						" ",
-						Hc(c)
+						qc(a)
 					]
-				}), l ? n(i, l.structure, c) : /* @__PURE__ */ a("div", {
-					className: X.empty,
-					children: e.missingSubquestionTemplate
-				})]
-			}, i.id || s);
+				}), n(r, a)]
+			}, r.id || i);
 		})
 	});
 }
@@ -8426,27 +8426,35 @@ function Id({ messages: e, numberPath: t = [], renderChild: n, subquestionTempla
 var Ld = ["locale"];
 function Rd(e) {
 	let { locale: t = "zh-CN" } = e;
-	return /* @__PURE__ */ a(zd, k(k({}, As(e, Ld)), {}, {
-		messages: nu(t),
+	return /* @__PURE__ */ a(zd, k(k({}, Fs(e, Ld)), {}, {
+		messages: ru(t),
 		numberPath: []
 	}));
 }
-function zd({ className: e, messages: t, numberPath: n, showAnswer: r = !1, showExtraAttributes: s = !1, structure: c, subquestionTemplates: l = [], value: u }) {
-	let d = /* @__PURE__ */ o(i, { children: [mi(c) ? null : /* @__PURE__ */ o("div", {
+function zd({ className: e, messages: t, numberPath: n, showAnswer: r = !1, showExtraAttributes: s = !1, questionTypeTemplates: c, value: l }) {
+	let u = As(c, l);
+	if (!u) return /* @__PURE__ */ a("div", {
+		className: H(X.root, e),
+		children: /* @__PURE__ */ a("div", {
+			className: X.empty,
+			children: t.missingQuestionTypeTemplate
+		})
+	});
+	let d = /* @__PURE__ */ o(i, { children: [mi(u) ? null : /* @__PURE__ */ o("div", {
 		className: X["element-list"],
-		children: [c.elements.map((e) => {
-			let n = xi(u, e, c.hasAnswer);
+		children: [u.elements.map((e) => {
+			let n = xi(l, e, u.hasAnswer);
 			return /* @__PURE__ */ a("section", {
 				className: X.element,
 				children: /* @__PURE__ */ a(Pd, {
 					element: e,
 					item: n,
 					messages: t,
-					showAnswer: r && c.hasAnswer
+					showAnswer: r && u.hasAnswer
 				})
 			}, e.elementKey);
-		}), s ? c.extras.map((e) => {
-			let n = Si(u, e);
+		}), s ? u.extras.map((e) => {
+			let n = Si(l, e);
 			return /* @__PURE__ */ o("section", {
 				className: X.element,
 				children: [/* @__PURE__ */ a("h3", {
@@ -8460,24 +8468,22 @@ function zd({ className: e, messages: t, numberPath: n, showAnswer: r = !1, show
 				})]
 			}, e.extraKey);
 		}) : null]
-	}), u.children.length === 0 ? null : /* @__PURE__ */ a(Id, {
+	}), l.children.length === 0 ? null : /* @__PURE__ */ a(Id, {
 		messages: t,
 		numberPath: n,
-		renderChild: (e, n, i) => /* @__PURE__ */ a(zd, {
-			numberPath: i,
+		renderChild: (e, n) => /* @__PURE__ */ a(zd, {
+			numberPath: n,
 			messages: t,
 			showAnswer: r,
 			showExtraAttributes: s,
-			structure: n,
-			subquestionTemplates: l,
+			questionTypeTemplates: c,
 			value: e
 		}),
-		subquestionTemplates: l,
-		value: u
+		value: l
 	})] });
 	return /* @__PURE__ */ a("div", {
-		className: ru(X.root, e),
-		children: Bd(c, u) ? /* @__PURE__ */ a("div", {
+		className: H(X.root, e),
+		children: Bd(u, l) ? /* @__PURE__ */ a("div", {
 			className: X.empty,
 			children: t.previewEmpty
 		}) : d
@@ -9412,4 +9418,4 @@ function Ef(e) {
 	return (t = (n = (r = e.elements[0]) == null ? void 0 : r.clientId) == null ? (i = e.extras[0]) == null ? void 0 : i.clientId : n) == null ? null : t;
 }
 //#endregion
-export { tl as QuestionContentEditor, pd as QuestionPlayer, Rd as QuestionPreview, G as QuestionRichContentView, wf as QuestionStructureEditor, $i as addBlankToGroup, ra as assignBlankToAnswerGroup, tc as cn, ia as createBlankAnswerGroupWithBlank, hi as createEmptyQuestionContentDraft, rr as createEmptyQuestionData, vl as createEmptyQuestionPlayerResponse, ar as createEmptyQuestionResponse, Ir as createEmptyQuestionStructureDraft, ji as createQuestionContentDraftFromSerialized, il as createQuestionContentStructureFromDraft, al as createQuestionPreviewDraft, Rr as createQuestionStructureElement, Lr as createQuestionStructureExtra, M as createRichContentValue, gi as createRichContentValueFromDocument, v as createRichTextContent, ea as deleteBlankFromGroup, Hr as deleteQuestionStructureElement, Vr as deleteQuestionStructureExtra, aa as detachBlankFromAnswerGroup, qc as findQuestionContentSubquestionTemplate, Si as getQuestionContentExtraItem, xi as getQuestionContentItem, Ei as getQuestionContentJudgementOptions, Ci as getQuestionContentOptionMarker, yi as getQuestionContentTextMarkerAnswerText, sl as getQuestionStructureDraftChangeKind, j as getQuestionStructureElementDefaultEnName, A as getQuestionStructureElementDefaultName, Yr as getQuestionStructureExtraDefaultEnName, Jr as getQuestionStructureExtraDefaultName, bi as getRichContentDocument, na as getSharedBlankAnswerGroups, mi as isCompositeQuestionContentStructure, sr as isCompositeQuestionType, ki as isQuestionContentDraftEmpty, Kc as isQuestionContentSubquestionTemplateMatch, Ur as moveQuestionStructureElement, Bi as normalizeFillTextCandidateState, ir as normalizeQuestionData, or as normalizeQuestionResponse, y as normalizeRichTextContent, Ar as questionStructureElementTypes, jr as questionStructureExtraKeys, Ai as serializeQuestionContentDraft, ol as serializeQuestionStructureDraft, Ni as updateQuestionContentExtraItem, Mi as updateQuestionContentItem, Gr as updateQuestionStructureElement, Wr as updateQuestionStructureExtra, Kr as updateQuestionStructureGlobalConfig, qr as updateQuestionStructureMetadata, ur as validateQuestionDataElementAlignment };
+export { rl as QuestionContentEditor, pd as QuestionPlayer, Rd as QuestionPreview, G as QuestionRichContentView, wf as QuestionStructureEditor, $i as addBlankToGroup, ra as assignBlankToAnswerGroup, oc as cn, ia as createBlankAnswerGroupWithBlank, hi as createEmptyQuestionContentDraft, rr as createEmptyQuestionData, bl as createEmptyQuestionPlayerResponse, ar as createEmptyQuestionResponse, Ir as createEmptyQuestionStructureDraft, ji as createQuestionContentDraftFromSerialized, ol as createQuestionContentStructureFromDraft, sl as createQuestionPreviewDraft, Rr as createQuestionStructureElement, Lr as createQuestionStructureExtra, M as createRichContentValue, gi as createRichContentValueFromDocument, v as createRichTextContent, ea as deleteBlankFromGroup, Hr as deleteQuestionStructureElement, Vr as deleteQuestionStructureExtra, aa as detachBlankFromAnswerGroup, Os as findQuestionContentQuestionTypeStructure, Ms as findQuestionContentQuestionTypeTemplate, Si as getQuestionContentExtraItem, xi as getQuestionContentItem, Ei as getQuestionContentJudgementOptions, Ci as getQuestionContentOptionMarker, yi as getQuestionContentTextMarkerAnswerText, ll as getQuestionStructureDraftChangeKind, j as getQuestionStructureElementDefaultEnName, A as getQuestionStructureElementDefaultName, Yr as getQuestionStructureExtraDefaultEnName, Jr as getQuestionStructureExtraDefaultName, bi as getRichContentDocument, na as getSharedBlankAnswerGroups, mi as isCompositeQuestionContentStructure, sr as isCompositeQuestionType, ki as isQuestionContentDraftEmpty, Ur as moveQuestionStructureElement, Bi as normalizeFillTextCandidateState, ir as normalizeQuestionData, or as normalizeQuestionResponse, y as normalizeRichTextContent, Ar as questionStructureElementTypes, jr as questionStructureExtraKeys, Ai as serializeQuestionContentDraft, cl as serializeQuestionStructureDraft, Ni as updateQuestionContentExtraItem, Mi as updateQuestionContentItem, Gr as updateQuestionStructureElement, Wr as updateQuestionStructureExtra, Kr as updateQuestionStructureGlobalConfig, qr as updateQuestionStructureMetadata, ur as validateQuestionDataElementAlignment };