@pie-element/mc-populated-blank 0.2.13 → 0.3.0-next.10

package/dist/controller/defaults.d.ts

@@ -2,10 +2,13 @@ import { DEFAULT_LAYOUT_LIMITS } from '../shared/layoutLimits';
 export { DEFAULT_LAYOUT_LIMITS };
 /** Token authors must include exactly once in `template` (HTML). */
 export declare const BLANK_TOKEN = "{{blank}}";
+/**
+ * The values `normalize` fills in for fields an item leaves out. They carry no
+ * content and no `id` or `element`: those come from the item config, and a
+ * default here would stand in for a field the author never set.
+ */
 declare const _default: {
     model: {
-        id: string;
-        element: string;
         prompt: string;
         promptEnabled: boolean;
         interactionMode: "populate_blank";
@@ -21,8 +24,8 @@ declare const _default: {
             horizontalChoiceWidthVw: number;
             horizontalChoiceTileMinHeightRem: number;
             horizontalChoiceContentMinHeightRem: number;
-            selectedImageMaxHeightRem: number;
             choiceImageMaxHeightRem: number;
+            choiceImageMaxWidthRem: number;
             listenButtonSizePx: number;
             stimulusMinColumnPx: number;
             textMinColumnPx: number;
@@ -51,45 +54,20 @@ declare const _default: {
         };
         audioButtonSkin: null;
         audioButtonSkinsByLocale: {};
-        uiText: {
-            answerChoices: string;
-            selectedAnswerInSentence: string;
-            showCorrectAnswer: string;
-            hideCorrectAnswer: string;
-            clickToEnableAutoplay: string;
-            audioResourceUnavailable: string;
-            transcriptLabel: string;
-            listenLabelEn: string;
-            listenLabelEs: string;
-            listenSilentAlt: string;
-            listenPlayingAlt: string;
-            listenSilentAltEs: string;
-            listenPlayingAltEs: string;
-        };
         sentenceHtml: string;
         template: string;
         choiceMode: "text";
-        choices: {
-            id: string;
-            labelHtml: string;
-        }[];
+        choices: never[];
+        choiceGroupLabel: string;
         correctChoiceId: string;
         hasAudio: boolean;
         autoplayAudioEnabled: boolean;
         completeAudioEnabled: boolean;
         audioUrl: string;
         audioTranscript: string;
-        showVisibleTranscript: boolean;
         locale: string;
         teacherInstructions: string;
         teacherInstructionsEnabled: boolean;
     };
-    configuration: {
-        prompt: {
-            label: string;
-            settings: boolean;
-        };
-    };
 };
 export default _default;
-//# sourceMappingURL=defaults.d.ts.map

package/dist/controller/index.d.ts

@@ -1,8 +1,10 @@
 import type { McpbChoice, McpbQuestion, McpbSession, McpbEnv, McpbCorrectness } from '../shared/types';
 export declare function countBlankTokens(template: string): number;
 export declare const getCorrectness: (question: McpbQuestion, session: McpbSession) => McpbCorrectness;
-export declare const getPartialScore: (_question: McpbQuestion, session: McpbSession) => 0 | 1;
+/** One blank, one key: an answered session scores 1 only when it picked the key. */
+export declare const getPartialScore: (question: McpbQuestion, session: McpbSession) => 1 | 0;
 export declare const outcome: (question: McpbQuestion, session: McpbSession, env: McpbEnv) => Promise<unknown>;
+/** The authoring starting point: a question that passes `validate()` as it stands. */
 export declare const createDefaultModel: (model?: McpbQuestion) => {
     layoutLimits: {
         blankStandaloneWidthRem: number;
@@ -13,8 +15,8 @@ export declare const createDefaultModel: (model?: McpbQuestion) => {
         horizontalChoiceWidthVw: number;
         horizontalChoiceTileMinHeightRem: number;
         horizontalChoiceContentMinHeightRem: number;
-        selectedImageMaxHeightRem: number;
         choiceImageMaxHeightRem: number;
+        choiceImageMaxWidthRem: number;
         listenButtonSizePx: number;
         stimulusMinColumnPx: number;
         textMinColumnPx: number;
@@ -41,40 +43,44 @@ export declare const createDefaultModel: (model?: McpbQuestion) => {
         inlineTemplateMarginTopRem: number;
         inlineChoicesMarginTopRem: number;
     };
-    id: string;
-    element: string;
-    prompt: string;
-    promptEnabled: boolean;
-    interactionMode: import("../shared/types").McpbInteractionMode;
-    layoutProfile: string;
-    choiceLayout: string;
-    layoutProfilePresets: {};
-    audioButtonSkin: import("../shared/types").McpbAudioButtonSkin | null;
-    audioButtonSkinsByLocale: {};
-    uiText: import("../shared/types").McpbUiText;
-    sentenceHtml: string;
-    template: string;
-    choiceMode: import("../shared/types").McpbChoiceMode;
-    choices: McpbChoice[] | {
-        id: string;
-        labelHtml: string;
-    }[];
-    correctChoiceId: string;
-    hasAudio: boolean;
-    autoplayAudioEnabled: boolean;
-    completeAudioEnabled: boolean;
-    audioUrl: string;
-    audioTranscript: string;
-    showVisibleTranscript: boolean;
+    id?: string;
+    element?: string;
+    prompt?: string;
+    promptEnabled?: boolean;
+    interactionMode?: import("../shared/types").McpbInteractionMode;
+    layoutProfile?: string;
+    choiceLayout?: string;
+    layoutProfilePresets?: Record<string, Partial<import("../shared/layoutLimits").LayoutLimits>>;
+    audioButtonSkin?: import("../shared/types").McpbAudioButtonSkin | null;
+    audioButtonSkinsByLocale?: Record<string, import("../shared/types").McpbAudioButtonSkin>;
+    sentenceHtml?: string;
+    template?: string;
+    choiceMode?: import("../shared/types").McpbChoiceMode;
+    choices?: McpbChoice[];
+    choiceGroupLabel?: string;
+    correctChoiceId?: string;
+    hasAudio?: boolean;
+    autoplayAudioEnabled?: boolean;
+    completeAudioEnabled?: boolean;
+    audioUrl?: string;
+    audioTranscript?: string;
     useFeatureButtonAudio?: boolean;
-    locale: string;
-    shuffle?: boolean;
+    locale?: string;
+    language?: string;
     lockChoiceOrder?: boolean;
-    teacherInstructions: string;
-    teacherInstructionsEnabled: boolean;
+    shuffle?: boolean;
+    teacherInstructions?: string;
+    teacherInstructionsEnabled?: boolean;
+    printAnswerKey?: boolean;
     customType?: string;
 };
+/**
+ * What `model()` and `outcome()` read: the item's own fields, with neutral
+ * values for the rest. Starter content here would reach a learner as the
+ * item's prompt or choices.
+ */
 export declare const normalize: (question?: McpbQuestion) => {
+    lockChoiceOrder: boolean;
     layoutLimits: {
         blankStandaloneWidthRem: number;
         blankWideWidthRem: number;
@@ -84,8 +90,8 @@ export declare const normalize: (question?: McpbQuestion) => {
         horizontalChoiceWidthVw: number;
         horizontalChoiceTileMinHeightRem: number;
         horizontalChoiceContentMinHeightRem: number;
-        selectedImageMaxHeightRem: number;
         choiceImageMaxHeightRem: number;
+        choiceImageMaxWidthRem: number;
         listenButtonSizePx: number;
         stimulusMinColumnPx: number;
         textMinColumnPx: number;
@@ -112,37 +118,34 @@ export declare const normalize: (question?: McpbQuestion) => {
         inlineTemplateMarginTopRem: number;
         inlineChoicesMarginTopRem: number;
     };
-    id: string;
-    element: string;
-    prompt: string;
-    promptEnabled: boolean;
-    interactionMode: import("../shared/types").McpbInteractionMode;
-    layoutProfile: string;
-    choiceLayout: string;
-    layoutProfilePresets: {};
-    audioButtonSkin: import("../shared/types").McpbAudioButtonSkin | null;
-    audioButtonSkinsByLocale: {};
-    uiText: import("../shared/types").McpbUiText;
-    sentenceHtml: string;
-    template: string;
-    choiceMode: import("../shared/types").McpbChoiceMode;
-    choices: McpbChoice[] | {
-        id: string;
-        labelHtml: string;
-    }[];
-    correctChoiceId: string;
-    hasAudio: boolean;
-    autoplayAudioEnabled: boolean;
-    completeAudioEnabled: boolean;
-    audioUrl: string;
-    audioTranscript: string;
-    showVisibleTranscript: boolean;
+    id?: string;
+    element?: string;
+    prompt?: string;
+    promptEnabled?: boolean;
+    interactionMode?: import("../shared/types").McpbInteractionMode;
+    layoutProfile?: string;
+    choiceLayout?: string;
+    layoutProfilePresets?: Record<string, Partial<import("../shared/layoutLimits").LayoutLimits>>;
+    audioButtonSkin?: import("../shared/types").McpbAudioButtonSkin | null;
+    audioButtonSkinsByLocale?: Record<string, import("../shared/types").McpbAudioButtonSkin>;
+    sentenceHtml?: string;
+    template?: string;
+    choiceMode?: import("../shared/types").McpbChoiceMode;
+    choices?: McpbChoice[];
+    choiceGroupLabel?: string;
+    correctChoiceId?: string;
+    hasAudio?: boolean;
+    autoplayAudioEnabled?: boolean;
+    completeAudioEnabled?: boolean;
+    audioUrl?: string;
+    audioTranscript?: string;
     useFeatureButtonAudio?: boolean;
-    locale: string;
+    locale?: string;
+    language?: string;
     shuffle?: boolean;
-    lockChoiceOrder?: boolean;
-    teacherInstructions: string;
-    teacherInstructionsEnabled: boolean;
+    teacherInstructions?: string;
+    teacherInstructionsEnabled?: boolean;
+    printAnswerKey?: boolean;
     customType?: string;
 };
 export declare const normalizeSession: (s: McpbSession) => McpbSession;
@@ -151,6 +154,19 @@ type UpdateSessionFn = (id: string, element: string, data: {
 }) => Promise<void>;
 export declare const model: (question: McpbQuestion, session: McpbSession | null, env: McpbEnv | null, updateSession?: UpdateSessionFn) => Promise<Record<string, unknown>>;
 export declare const createCorrectResponseSession: (question: McpbQuestion, env: McpbEnv) => Promise<unknown>;
-export declare const validate: (question?: McpbQuestion, _config?: Record<string, unknown>) => Record<string, string>;
+type ValidateConfig = {
+    minAnswerChoices?: number;
+    maxAnswerChoices?: number;
+    prompt?: {
+        required?: boolean;
+    };
+    teacherInstructions?: {
+        required?: boolean;
+    };
+};
+/**
+ * Authoring errors in multiple-choice's shape: a message per field, and under
+ * `choices` a message per choice keyed by its id.
+ */
+export declare const validate: (question?: McpbQuestion, config?: ValidateConfig) => Record<string, string | Record<string, string>>;
 export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/controller/index.js

@@ -9,8 +9,8 @@ var DEFAULT_LAYOUT_LIMITS = {
 	horizontalChoiceWidthVw: 30,
 	horizontalChoiceTileMinHeightRem: 11,
 	horizontalChoiceContentMinHeightRem: 7.5,
-	selectedImageMaxHeightRem: 4,
-	choiceImageMaxHeightRem: 5,
+	choiceImageMaxHeightRem: 9.375,
+	choiceImageMaxWidthRem: 9.375,
 	listenButtonSizePx: 128,
 	stimulusMinColumnPx: 210,
 	textMinColumnPx: 260,
@@ -41,37 +41,44 @@ var DEFAULT_LAYOUT_LIMITS = {
 //#region src/controller/defaults.ts
 /** Token authors must include exactly once in `template` (HTML). */
 var BLANK_TOKEN = "{{blank}}";
+/**
+* The values `normalize` fills in for fields an item leaves out. They carry no
+* content and no `id` or `element`: those come from the item config, and a
+* default here would stand in for a field the author never set.
+*/
+var defaults_default$1 = { model: {
+	prompt: "",
+	promptEnabled: true,
+	interactionMode: "populate_blank",
+	layoutProfile: "",
+	choiceLayout: "",
+	layoutProfilePresets: {},
+	layoutLimits: { ...DEFAULT_LAYOUT_LIMITS },
+	audioButtonSkin: null,
+	audioButtonSkinsByLocale: {},
+	sentenceHtml: "",
+	template: "",
+	choiceMode: "text",
+	choices: [],
+	choiceGroupLabel: "",
+	correctChoiceId: "",
+	hasAudio: false,
+	autoplayAudioEnabled: false,
+	completeAudioEnabled: false,
+	audioUrl: "",
+	audioTranscript: "",
+	locale: "",
+	teacherInstructions: "",
+	teacherInstructionsEnabled: true
+} };
+//#endregion
+//#region src/author/defaults.ts
+/** The model a new item starts from: a valid question an author edits in place. */
 var defaults_default = {
 	model: {
-		id: "1",
-		element: "mc-populated-blank",
+		...defaults_default$1.model,
 		prompt: "<p><strong>Demo prompt</strong></p>",
-		promptEnabled: true,
-		interactionMode: "populate_blank",
-		layoutProfile: "",
-		choiceLayout: "",
-		layoutProfilePresets: {},
-		layoutLimits: { ...DEFAULT_LAYOUT_LIMITS },
-		audioButtonSkin: null,
-		audioButtonSkinsByLocale: {},
-		uiText: {
-			answerChoices: "Answer choices",
-			selectedAnswerInSentence: "blank",
-			showCorrectAnswer: "Show correct answer",
-			hideCorrectAnswer: "Hide correct answer",
-			clickToEnableAutoplay: "Click to enable audio autoplay",
-			audioResourceUnavailable: "Audio is enabled but no playable audio URL is configured.",
-			transcriptLabel: "Transcript",
-			listenLabelEn: "Listen",
-			listenLabelEs: "Escuchar",
-			listenSilentAlt: "Repeat instructions",
-			listenPlayingAlt: "Instructions are playing",
-			listenSilentAltEs: "Escuchar. Repetir las instrucciones.",
-			listenPlayingAltEs: "Escuchar. Estas son las instrucciones."
-		},
-		sentenceHtml: "",
 		template: `<p>The answer is ${BLANK_TOKEN}.</p>`,
-		choiceMode: "text",
 		choices: [
 			{
 				id: "c1",
@@ -86,16 +93,7 @@ var defaults_default = {
 				labelHtml: "<p>Option C</p>"
 			}
 		],
-		correctChoiceId: "c2",
-		hasAudio: false,
-		autoplayAudioEnabled: false,
-		completeAudioEnabled: false,
-		audioUrl: "",
-		audioTranscript: "",
-		showVisibleTranscript: false,
-		locale: "",
-		teacherInstructions: "",
-		teacherInstructionsEnabled: false
+		correctChoiceId: "c2"
 	},
 	configuration: { prompt: {
 		label: "Prompt",
@@ -115,10 +113,8 @@ var getCorrectness = (question, session) => {
 	if (session.choiceId === correct) return "correct";
 	return "incorrect";
 };
-var getPartialScore = (_question, session) => {
-	if (!session || isEmptyObject(session) || !session.choiceId) return 0;
-	return 1;
-};
+/** One blank, one key: an answered session scores 1 only when it picked the key. */
+var getPartialScore = (question, session) => getCorrectness(question, session) === "correct" ? 1 : 0;
 var outcome = (question, session, env) => new Promise((resolve) => {
 	if (!session || isEmptyObject(session)) {
 		resolve({
@@ -129,8 +125,8 @@ var outcome = (question, session, env) => new Promise((resolve) => {
 		return;
 	}
 	session = normalizeSession(session);
-	const correctness = getCorrectness(question, session);
-	if (correctness === "unanswered") {
+	const normalizedQuestion = normalize(question);
+	if (getCorrectness(normalizedQuestion, session) === "unanswered") {
 		resolve({
 			score: 0,
 			empty: true,
@@ -138,29 +134,41 @@ var outcome = (question, session, env) => new Promise((resolve) => {
 		});
 		return;
 	}
-	const score = correctness === "correct" ? 1 : 0;
+	const score = getPartialScore(normalizedQuestion, session);
 	resolve({
 		score,
 		empty: false,
 		traceLog: [
 			`Mode: ${env?.mode || "unknown"}.`,
 			`Student selected choice: ${session.choiceId}.`,
-			`Correct choice: ${question?.correctChoiceId || "none"}.`,
+			`Correct choice: ${normalizedQuestion.correctChoiceId || "none"}.`,
 			`Final score: ${score}.`
 		]
 	});
 });
-var createDefaultModel = (model = {}) => ({
-	...defaults_default.model,
+var withDefaults = (base, model = {}) => ({
+	...base,
 	...model,
 	layoutLimits: {
 		...DEFAULT_LAYOUT_LIMITS,
 		...model?.layoutLimits || {}
 	}
 });
-var normalize = (question = {}) => createDefaultModel(question);
+/** The authoring starting point: a question that passes `validate()` as it stands. */
+var createDefaultModel = (model = {}) => withDefaults(defaults_default.model, model);
+/**
+* What `model()` and `outcome()` read: the item's own fields, with neutral
+* values for the rest. Starter content here would reach a learner as the
+* item's prompt or choices.
+*/
+var normalize = (question = {}) => {
+	const { shuffle, ...rest } = question || {};
+	return {
+		...withDefaults(defaults_default$1.model, rest),
+		lockChoiceOrder: typeof rest.lockChoiceOrder === "boolean" ? rest.lockChoiceOrder : shuffle !== true
+	};
+};
 var normalizeSession = (s) => ({ ...s });
-var shouldShuffleChoices = (question) => !!question?.shuffle;
 var shouldLockChoices = (question, env) => {
 	if (question?.lockChoiceOrder) return true;
 	if (env?.["@pie-element"]?.lockChoiceOrder) return true;
@@ -174,6 +182,16 @@ function shuffleArray(items) {
 	}
 	return out;
 }
+/**
+* The fields delivery renders. An imported choice can carry more, such as a
+* correctness flag or feedback, which must not reach a learner's browser.
+*/
+var toDeliveryChoice = ({ id, labelHtml, imageUrl, imageAlt }) => ({
+	id,
+	...labelHtml !== void 0 ? { labelHtml } : {},
+	...imageUrl !== void 0 ? { imageUrl } : {},
+	...imageAlt !== void 0 ? { imageAlt } : {}
+});
 var getStoredShuffle = (session) => Array.isArray(session?.data?.shuffledValues) ? session.data.shuffledValues : Array.isArray(session?.shuffledValues) ? session.shuffledValues : [];
 var applyShuffledValues = (choices, shuffledValues, choiceKey) => {
 	const orderedChoices = shuffledValues.map((value) => choices.find((choice) => choice?.[choiceKey] === value)).filter((c) => !!c);
@@ -184,8 +202,7 @@ var applyShuffledValues = (choices, shuffledValues, choiceKey) => {
 };
 var getOrderedChoices = async (question, session, env, updateSession) => {
 	const choices = Array.isArray(question?.choices) ? [...question.choices] : [];
-	if (!choices.length || !shouldShuffleChoices(question)) return choices;
-	if (shouldLockChoices(question, env || {})) return choices;
+	if (!choices.length || shouldLockChoices(question, env || {})) return choices;
 	const shuffledValues = getStoredShuffle(session);
 	if (shuffledValues.length) return applyShuffledValues(choices, shuffledValues, "id");
 	const shuffledChoices = shuffleArray(choices);
@@ -199,7 +216,7 @@ var model = async (question, session, env, updateSession) => {
 	const safeSession = session || {};
 	const safeEnv = env || {};
 	const normalizedQuestion = normalize(question);
-	const choices = await getOrderedChoices(normalizedQuestion, safeSession, safeEnv, updateSession);
+	const choices = (await getOrderedChoices(normalizedQuestion, safeSession, safeEnv, updateSession)).filter((c) => !!c && typeof c === "object").map(toDeliveryChoice);
 	const out = {
 		prompt: normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null,
 		interactionMode: normalizedQuestion.interactionMode || "populate_blank",
@@ -209,20 +226,20 @@ var model = async (question, session, env, updateSession) => {
 		layoutLimits: normalizedQuestion.layoutLimits || { ...DEFAULT_LAYOUT_LIMITS },
 		audioButtonSkin: normalizedQuestion.audioButtonSkin && typeof normalizedQuestion.audioButtonSkin === "object" ? normalizedQuestion.audioButtonSkin : null,
 		audioButtonSkinsByLocale: normalizedQuestion.audioButtonSkinsByLocale && typeof normalizedQuestion.audioButtonSkinsByLocale === "object" ? normalizedQuestion.audioButtonSkinsByLocale : {},
-		uiText: normalizedQuestion.uiText && typeof normalizedQuestion.uiText === "object" ? normalizedQuestion.uiText : {},
 		sentenceHtml: normalizedQuestion.sentenceHtml || null,
 		template: normalizedQuestion.template,
 		choiceMode: normalizedQuestion.choiceMode,
 		choices,
+		choiceGroupLabel: normalizedQuestion.choiceGroupLabel || "",
 		hasAudio: normalizedQuestion.hasAudio,
 		autoplayAudioEnabled: !!normalizedQuestion.autoplayAudioEnabled,
 		completeAudioEnabled: !!normalizedQuestion.completeAudioEnabled,
 		audioUrl: normalizedQuestion.hasAudio ? normalizedQuestion.audioUrl : null,
 		audioTranscript: normalizedQuestion.hasAudio ? normalizedQuestion.audioTranscript : null,
-		showVisibleTranscript: !!normalizedQuestion.showVisibleTranscript,
 		customType: normalizedQuestion.customType || "",
 		useFeatureButtonAudio: typeof normalizedQuestion.useFeatureButtonAudio === "boolean" ? normalizedQuestion.useFeatureButtonAudio : void 0,
 		locale: normalizedQuestion.locale || "",
+		language: normalizedQuestion.language || normalizedQuestion.locale || void 0,
 		disabled: safeEnv.mode !== "gather",
 		mode: safeEnv.mode
 	};
@@ -240,18 +257,22 @@ var createCorrectResponseSession = (question, env) => {
 	return new Promise((resolve) => {
 		if (env.mode !== "evaluate" && env.role === "instructor") resolve({
 			id: "1",
-			element: "mc-populated-blank",
 			choiceId: question?.correctChoiceId || ""
 		});
 		else resolve(null);
 	});
 };
-var validate = (question = {}, _config = {}) => {
+/** Markup with its tags removed, keeping media an author can answer from. */
+var getContent = (html) => (html || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, "").trim();
+/**
+* Authoring errors in multiple-choice's shape: a message per field, and under
+* `choices` a message per choice keyed by its id.
+*/
+var validate = (question = {}, config = {}) => {
 	const errors = {};
-	if (question.promptEnabled) {
-		const p = question.prompt?.trim() || "";
-		if (!p || p === "<p></p>") errors.prompt = "Prompt is required when prompt is enabled";
-	}
+	const { minAnswerChoices = 2, maxAnswerChoices } = config;
+	if ((question.promptEnabled || config.prompt?.required) && !getContent(question.prompt)) errors.prompt = "This field is required.";
+	if (config.teacherInstructions?.required && !getContent(question.teacherInstructions)) errors.teacherInstructions = "This field is required.";
 	const interactionMode = question.interactionMode || "populate_blank";
 	const n = countBlankTokens(question.template || "");
 	if (interactionMode === "audio_mc_only") {
@@ -261,33 +282,35 @@ var validate = (question = {}, _config = {}) => {
 		else if (n > 1) errors.template = `Template must contain only one ${BLANK_TOKEN} placeholder`;
 	} else errors.interactionMode = "Unknown interaction mode";
 	const choices = Array.isArray(question.choices) ? question.choices : [];
-	if (choices.length < 2) errors.choices = "At least two choices are required";
+	if (choices.length < minAnswerChoices) errors.answerChoices = `There should be at least ${minAnswerChoices} choices defined.`;
+	else if (maxAnswerChoices != null && choices.length > maxAnswerChoices) errors.answerChoices = `No more than ${maxAnswerChoices} choices should be defined.`;
 	const mode = question.choiceMode || "text";
-	for (let i = 0; i < choices.length; i++) {
-		const c = choices[i];
+	const choicesErrors = {};
+	const seenIds = /* @__PURE__ */ new Set();
+	const seenLabels = /* @__PURE__ */ new Set();
+	choices.forEach((c, i) => {
+		const key = c?.id || String(i);
 		if (!c?.id) {
-			errors.choices = `Choice ${i + 1} is missing an id`;
-			break;
+			choicesErrors[key] = "Choice needs an id.";
+			return;
 		}
-		if (mode === "text") {
-			const lbl = (c.labelHtml || "").trim();
-			if (!lbl || lbl === "<p></p>") {
-				errors.choices = `Choice ${i + 1} needs label text`;
-				break;
-			}
-		} else {
-			if (!c.imageUrl?.trim()) {
-				errors.choices = `Choice ${i + 1} needs an image URL`;
-				break;
-			}
-			if (!c.imageAlt?.trim()) {
-				errors.choices = `Choice ${i + 1} needs image alt text`;
-				break;
-			}
+		if (seenIds.has(c.id)) {
+			choicesErrors[key] = "Choice id should be unique.";
+			return;
 		}
-	}
+		seenIds.add(c.id);
+		if (mode === "text") {
+			const label = getContent(c.labelHtml);
+			if (!label) choicesErrors[key] = "Content should not be empty.";
+			else if (seenLabels.has(label)) choicesErrors[key] = "Content should be unique.";
+			seenLabels.add(label);
+		} else if (!c.imageUrl?.trim()) choicesErrors[key] = "An image is required.";
+		else if (!c.imageAlt?.trim()) choicesErrors[key] = "Image alt text is required.";
+	});
+	if (Object.keys(choicesErrors).length) errors.choices = choicesErrors;
 	const correct = question.correctChoiceId;
-	if (!correct || !choices.some((c) => c.id === correct)) errors.correctChoiceId = "Correct choice must match one of the choice ids";
+	if (!correct) errors.correctResponse = "No correct response defined.";
+	else if (!choices.some((c) => c?.id === correct)) errors.correctResponse = "The correct response must be one of the choices.";
 	if (question.hasAudio) {
 		if (!!!question.audioUrl?.trim()) errors.audioUrl = "A playable audio URL is required when audio is enabled";
 	}
@@ -301,8 +324,8 @@ var validate = (question = {}, _config = {}) => {
 		"horizontalChoiceWidthVw",
 		"horizontalChoiceTileMinHeightRem",
 		"horizontalChoiceContentMinHeightRem",
-		"selectedImageMaxHeightRem",
 		"choiceImageMaxHeightRem",
+		"choiceImageMaxWidthRem",
 		"listenButtonSizePx",
 		"stimulusMinColumnPx",
 		"textMinColumnPx",