@tinyweb_dev/oe-exam-sdk 0.2.11 → 0.2.13

package/dist/components/questions/types/fill-in-blank-group/blank-utils.d.ts

@@ -1,3 +1,4 @@
+import type { FillInBlankWordBankEntry } from '../../_shared/types/fill-in-blank-group.type';
 import { FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION } from '../../_shared/types/fill-in-blank-group.type';
 export { FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION };
 export type FillBlankStemPart = {
@@ -15,6 +16,28 @@ export declare function normalizeAnswersMatrix(raw: unknown, requiredLength?: nu
 export declare function joinSlashAnswers(alts: string[] | undefined): string;
 export declare function parseSlashAnswers(text: string): string[];
 export declare function splitStem(question: string): FillBlankStemPart[];
+export type StemTextDecoration = {
+    type: 'text';
+    value: string;
+} | {
+    type: 'tick';
+    value: string;
+} | {
+    type: 'cross';
+    value: string;
+} | {
+    type: 'br';
+};
+/** Split a stem text fragment into ticks, crosses, line breaks, and plain text. */
+export declare function splitStemTextDecorations(text: string): StemTextDecoration[];
 export declare function normalizeStudentText(value: string): string;
 export declare function isBlankMatch(studentValue: string | undefined, alts: string[] | undefined): boolean;
+export declare function parseWordBankEntry(raw: unknown): FillInBlankWordBankEntry;
+export declare function normalizeWordBank(raw: unknown, requiredLength?: number): FillInBlankWordBankEntry[] | undefined;
+export declare function resolveBlankOptions(blankIndex: number, itemWordBank?: FillInBlankWordBankEntry[], groupWordBank?: FillInBlankWordBankEntry[]): string[] | undefined;
+export declare function hasAnyBlankOptions(items: Array<{
+    wordBank?: FillInBlankWordBankEntry[];
+}>, groupWordBank?: FillInBlankWordBankEntry[]): boolean;
+export declare function toFillInBlankImageUrls(value: unknown): string[];
+export declare function fromFillInBlankImageUrls(urls: string[]): string | string[] | undefined;
 export declare function padStudentAnswers(raw: unknown, blankCount: number): string[];

package/dist/components/questions/types/fill-in-blank-group/blank-utils.js

@@ -75,6 +75,42 @@ export function splitStem(question) {
     }
     return parts;
 }
+const STEM_TICK_MARKS = new Set(['✓', '✔', '✅']);
+const STEM_CROSS_MARKS = new Set(['✗', '✘', '❌', '×']);
+const STEM_DECORATION_RE = /[✓✔✅✗✘❌×]|\n/g;
+/** Split a stem text fragment into ticks, crosses, line breaks, and plain text. */
+export function splitStemTextDecorations(text) {
+    if (!text)
+        return [];
+    const normalized = text.replace(/\r\n/g, '\n');
+    const parts = [];
+    let lastIndex = 0;
+    let match;
+    const regex = new RegExp(STEM_DECORATION_RE.source, 'g');
+    while ((match = regex.exec(normalized)) !== null) {
+        if (match.index > lastIndex) {
+            parts.push({ type: 'text', value: normalized.slice(lastIndex, match.index) });
+        }
+        const token = match[0];
+        if (token === '\n') {
+            parts.push({ type: 'br' });
+        }
+        else if (STEM_TICK_MARKS.has(token)) {
+            parts.push({ type: 'tick', value: token });
+        }
+        else if (STEM_CROSS_MARKS.has(token)) {
+            parts.push({ type: 'cross', value: token });
+        }
+        else {
+            parts.push({ type: 'text', value: token });
+        }
+        lastIndex = match.index + token.length;
+    }
+    if (lastIndex < normalized.length) {
+        parts.push({ type: 'text', value: normalized.slice(lastIndex) });
+    }
+    return parts;
+}
 export function normalizeStudentText(value) {
     return value.toString().trim().toLowerCase().replace(/\s+/g, ' ');
 }
@@ -84,6 +120,59 @@ export function isBlankMatch(studentValue, alts) {
         return false;
     return alts.some((alt) => normalizeStudentText(alt) === user);
 }
+export function parseWordBankEntry(raw) {
+    if (raw == null)
+        return null;
+    const options = Array.isArray(raw)
+        ? raw.map((item) => String(item ?? '').trim()).filter(Boolean)
+        : typeof raw === 'object' && Array.isArray(raw.options)
+            ? raw.options
+                .map((item) => String(item ?? '').trim())
+                .filter(Boolean)
+            : [];
+    return options.length >= 2 ? { options } : null;
+}
+export function normalizeWordBank(raw, requiredLength) {
+    if (!Array.isArray(raw))
+        return undefined;
+    let result = raw.map((entry) => parseWordBankEntry(entry));
+    if (typeof requiredLength === 'number' && requiredLength > 0) {
+        result = result.slice(0, requiredLength);
+        while (result.length < requiredLength)
+            result.push(null);
+    }
+    return result.some((entry) => entry && entry.options.length >= 2) ? result : undefined;
+}
+export function resolveBlankOptions(blankIndex, itemWordBank, groupWordBank) {
+    const entry = itemWordBank?.[blankIndex] ?? groupWordBank?.[blankIndex];
+    if (entry && entry.options.length >= 2)
+        return entry.options;
+    return undefined;
+}
+export function hasAnyBlankOptions(items, groupWordBank) {
+    if (normalizeWordBank(groupWordBank))
+        return true;
+    return items.some((item) => Boolean(normalizeWordBank(item.wordBank)));
+}
+export function toFillInBlankImageUrls(value) {
+    if (Array.isArray(value)) {
+        return value
+            .filter((url) => typeof url === 'string')
+            .map((url) => url.trim())
+            .filter((url) => url.length > 0);
+    }
+    if (typeof value === 'string' && value.trim()) {
+        return [value.trim()];
+    }
+    return [];
+}
+export function fromFillInBlankImageUrls(urls) {
+    if (urls.length === 0)
+        return undefined;
+    if (urls.length === 1)
+        return urls[0];
+    return urls;
+}
 export function padStudentAnswers(raw, blankCount) {
     const values = Array.isArray(raw?.answers)
         ? raw.answers.map((item) => String(item ?? ''))

package/dist/components/questions/types/fill-in-blank-group/map-fill-in-blank-group-data.js

@@ -1,5 +1,5 @@
 import { FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION } from '../../_shared/types/fill-in-blank-group.type';
-import { blankSlotCount, extractPlaceholderIndices, normalizeAnswersMatrix, } from './blank-utils';
+import { blankSlotCount, extractPlaceholderIndices, hasAnyBlankOptions, fromFillInBlankImageUrls, normalizeAnswersMatrix, normalizeWordBank, toFillInBlankImageUrls, } from './blank-utils';
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -39,16 +39,18 @@ export function mapFillInBlankGroupItem(item, index, fallbackAnswer) {
             return [];
         return alts.length > 0 ? alts : [''];
     });
+    const wordBank = normalizeWordBank(content.wordBank ?? record.wordBank, blankSlotCount(question));
     return {
         question,
         answers,
         caseSensitive: correctAnswer.caseSensitive === true
             || record.caseSensitive === true
             || fallback.caseSensitive === true,
-        imageUrl: asString(content.imageUrl) || asString(record.imageUrl),
+        imageUrl: fromFillInBlankImageUrls(toFillInBlankImageUrls(content.imageUrl ?? record.imageUrl)),
         audioUrl: asString(content.audioUrl) || asString(record.audioUrl),
         showHints: content.showHints === true,
         hints: asStringArray(content.hints),
+        ...(wordBank ? { wordBank } : {}),
         isExample,
         points: isExample ? 0 : (typeof record.points === 'number' ? record.points : 1),
         questionNumber: typeof record.questionNumber === 'number' ? record.questionNumber : index + 1,
@@ -66,33 +68,49 @@ export function mapQuestionToFillInBlankGroupData(question) {
     const meta = asRecord(content.meta);
     if (Array.isArray(content.items)) {
         const items = content.items.map((item, index) => mapFillInBlankGroupItem(item, index, fallbackAnswers[index]));
+        const groupWordBank = normalizeWordBank(meta.wordBank ?? content.wordBank);
+        const viewMode = meta.viewMode === 'WITH_OPTIONS' || hasAnyBlankOptions(items, groupWordBank)
+            ? 'WITH_OPTIONS'
+            : undefined;
         return {
             instruction: asString(meta.instruction) || FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION,
+            passage: asString(meta.passage),
             audioUrl: asString(meta.audioUrl),
-            imageUrl: asString(meta.imageUrl),
+            imageUrl: fromFillInBlankImageUrls(toFillInBlankImageUrls(meta.imageUrl)),
             showHints: meta.showHints === true,
             hints: asStringArray(meta.hints),
+            ...(viewMode ? { viewMode } : {}),
+            ...(groupWordBank ? { wordBank: groupWordBank } : {}),
             items,
             explanation,
             points: items.reduce((total, item) => (item.isExample ? total : total + (item.points || 0)), 0),
         };
     }
     if (Array.isArray(answer.items)) {
+        const items = answer.items.map((item, index) => mapFillInBlankGroupItem(item, index, fallbackAnswers[index]));
+        const groupWordBank = normalizeWordBank(answer.wordBank);
+        const viewMode = answer.viewMode === 'WITH_OPTIONS' || hasAnyBlankOptions(items, groupWordBank)
+            ? 'WITH_OPTIONS'
+            : undefined;
         return {
             instruction: asString(answer.instruction, FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION),
+            passage: asString(answer.passage),
             audioUrl: asString(answer.audioUrl),
-            imageUrl: asString(answer.imageUrl),
+            imageUrl: fromFillInBlankImageUrls(toFillInBlankImageUrls(answer.imageUrl)),
             showHints: answer.showHints === true,
             hints: asStringArray(answer.hints),
-            items: answer.items.map((item, index) => mapFillInBlankGroupItem(item, index, fallbackAnswers[index])),
+            ...(viewMode ? { viewMode } : {}),
+            ...(groupWordBank ? { wordBank: groupWordBank } : {}),
+            items,
             explanation,
             points: typeof answer.points === 'number' ? answer.points : undefined,
         };
     }
     return {
         instruction: FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION,
+        passage: '',
         audioUrl: '',
-        imageUrl: '',
+        imageUrl: undefined,
         showHints: false,
         hints: [],
         items: [createEmptyFillInBlankGroupItem(1)],

package/dist/components/questions/types/fill-in-blank-group/transform.js

@@ -1,5 +1,5 @@
 import { FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION, FILL_IN_BLANK_ITEM_TYPE, } from '../../_shared/types/fill-in-blank-group.type';
-import { blankSlotCount, extractPlaceholderIndices, normalizeAnswersMatrix, } from './blank-utils';
+import { blankSlotCount, extractPlaceholderIndices, hasAnyBlankOptions, fromFillInBlankImageUrls, normalizeAnswersMatrix, normalizeWordBank, toFillInBlankImageUrls, } from './blank-utils';
 function sumGradablePoints(items) {
     return items.reduce((total, item) => {
         if (item.isExample)
@@ -20,6 +20,9 @@ function toItemAnswer(item) {
         caseSensitive: item.caseSensitive === true,
     };
 }
+function isContentEmpty(html) {
+    return !html || html === '<p></p>' || html === '<p><br></p>' || html.trim() === '';
+}
 /**
  * wrapOnSave nests creator fields under `answer`. getFormData() (Quiz Playground
  * Update save) returns the same fields at the root. Prefer nested items, then root.
@@ -50,15 +53,18 @@ export const transformFillInBlankGroup = (question) => {
         const hints = Array.isArray(item.hints)
             ? item.hints.map((hint) => String(hint ?? '').trim()).filter(Boolean)
             : [];
+        const wordBank = normalizeWordBank(item.wordBank, blankSlotCount(item.question || ''));
+        const imageUrl = fromFillInBlankImageUrls(toFillInBlankImageUrls(item.imageUrl));
         return {
             questionType: FILL_IN_BLANK_ITEM_TYPE,
             ...(item.isExample ? { isExample: true } : {}),
             content: {
                 question: item.question || '',
-                ...(item.imageUrl ? { imageUrl: item.imageUrl } : {}),
+                ...(imageUrl !== undefined ? { imageUrl } : {}),
                 ...(item.audioUrl ? { audioUrl: item.audioUrl } : {}),
                 ...(item.showHints ? { showHints: true } : {}),
                 ...(hints.length > 0 ? { hints } : {}),
+                ...(wordBank ? { wordBank } : {}),
             },
             correctAnswer,
             points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
@@ -68,14 +74,23 @@ export const transformFillInBlankGroup = (question) => {
     const groupHints = Array.isArray(answerData?.hints)
         ? answerData.hints.map((hint) => String(hint ?? '').trim()).filter(Boolean)
         : [];
+    const passage = answerData?.passage?.trim();
+    const groupWordBank = normalizeWordBank(answerData?.wordBank);
+    const viewMode = answerData?.viewMode === 'WITH_OPTIONS' || hasAnyBlankOptions(items, groupWordBank)
+        ? 'WITH_OPTIONS'
+        : undefined;
+    const groupImageUrl = fromFillInBlankImageUrls(toFillInBlankImageUrls(answerData?.imageUrl));
     return {
         apiContent: {
             meta: {
                 instruction: answerData?.instruction || FILL_IN_BLANK_GROUP_DEFAULT_INSTRUCTION,
+                ...(!isContentEmpty(passage) ? { passage } : {}),
                 ...(answerData?.audioUrl ? { audioUrl: answerData.audioUrl } : {}),
-                ...(answerData?.imageUrl ? { imageUrl: answerData.imageUrl } : {}),
+                ...(groupImageUrl !== undefined ? { imageUrl: groupImageUrl } : {}),
                 ...(answerData?.showHints ? { showHints: true } : {}),
                 ...(groupHints.length > 0 ? { hints: groupHints } : {}),
+                ...(viewMode ? { viewMode } : {}),
+                ...(groupWordBank ? { wordBank: groupWordBank } : {}),
             },
             items: apiItems,
         },

package/dist/components/questions/types/match-word-to-picture-group/MatchWordToPictureGroupClient.js

@@ -6,7 +6,7 @@ import { usePresignedFileUrl } from '../../../../shared/lib/hooks';
 function normalizeWord(value) {
     return value.trim().toLowerCase();
 }
-function ClientImageItem({ url, alt }) {
+function ClientImageItem({ url, alt, large = false, }) {
     const { previewUrl, isLoading } = usePresignedFileUrl(url);
     const src = previewUrl ||
         (typeof url === 'string' &&
@@ -19,7 +19,7 @@ function ClientImageItem({ url, alt }) {
     if (!src && !isLoading) {
         return (_jsx("div", { className: "flex h-28 w-28 items-center justify-center rounded-lg border border-gray-200 bg-gray-50 text-xs text-gray-400", children: "Kh\u00F4ng t\u1EA3i \u0111\u01B0\u1EE3c \u1EA3nh" }));
     }
-    return (_jsx("div", { className: "relative h-28 w-28 flex-shrink-0 overflow-hidden rounded-lg border border-gray-200 bg-gray-50", children: isLoading ? (_jsx("div", { className: "flex h-full w-full items-center justify-center", children: _jsx("div", { className: "h-6 w-6 animate-spin rounded-full border-2 border-gray-200 border-t-violet-500" }) })) : (_jsx("img", { src: src, alt: alt || 'Picture', className: "h-full w-full object-contain" })) }));
+    return (_jsx("div", { className: cn('relative flex-shrink-0 overflow-hidden rounded-lg border border-gray-200 bg-gray-50', large ? 'max-h-80 w-full max-w-xl' : 'h-28 w-28'), children: isLoading ? (_jsx("div", { className: "flex h-28 w-full items-center justify-center", children: _jsx("div", { className: "h-6 w-6 animate-spin rounded-full border-2 border-gray-200 border-t-violet-500" }) })) : (_jsx("img", { src: src, alt: alt || 'Picture', className: cn('object-contain', large ? 'mx-auto max-h-80 w-auto' : 'h-full w-full') })) }));
 }
 export function MatchWordToPictureGroupClient({ questionData, isReviewMode = false, userAnswers = [], onAnswerChange, }) {
     const items = questionData.items || [];
@@ -40,19 +40,19 @@ export function MatchWordToPictureGroupClient({ questionData, isReviewMode = fal
             usedWords.add(normalizeWord(value));
         }
     });
-    return (_jsxs("div", { className: "space-y-4", children: [questionData.instruction && (_jsx("div", { className: "rounded-xl border border-indigo-100 bg-indigo-50 px-4 py-3 text-sm font-medium text-indigo-800", children: questionData.instruction })), wordBank.length > 0 && (_jsxs("div", { className: "rounded-xl border border-violet-200 bg-gradient-to-r from-violet-50 to-indigo-50 p-4", children: [_jsx("p", { className: "mb-3 text-sm font-semibold text-violet-700", children: "Word bank:" }), _jsx("div", { className: "flex flex-wrap gap-2", children: wordBank.map((word, index) => {
+    return (_jsxs("div", { className: "space-y-4", children: [(questionData.title || questionData.instruction) && (_jsxs("div", { className: "rounded-xl border border-indigo-100 bg-indigo-50 px-4 py-3", children: [questionData.title && (_jsx("p", { className: "text-xs font-semibold uppercase tracking-wide text-indigo-500", children: questionData.title })), questionData.instruction && (_jsx("p", { className: "text-sm font-medium text-indigo-800", children: questionData.instruction }))] })), wordBank.length > 0 && (_jsxs("div", { className: "rounded-xl border border-violet-200 bg-gradient-to-r from-violet-50 to-indigo-50 p-4", children: [_jsx("p", { className: "mb-3 text-sm font-semibold text-violet-700", children: "Word bank:" }), _jsx("div", { className: "flex flex-wrap gap-2", children: wordBank.map((word, index) => {
                             const isUsed = usedWords.has(normalizeWord(word));
                             return (_jsx("span", { className: cn('rounded-full border px-3 py-1 text-sm font-semibold', isUsed
                                     ? 'border-emerald-200 bg-emerald-50 text-emerald-700'
                                     : 'border-violet-200 bg-white text-slate-700'), children: word }, `${word}-${index}`));
-                        }) })] })), items.map((item, itemIndex) => {
+                        }) })] })), questionData.imageUrl ? (_jsx("div", { className: "flex justify-center rounded-lg border border-slate-100 bg-slate-50 p-3", children: _jsx(ClientImageItem, { url: questionData.imageUrl, alt: "Look and match", large: true }) })) : null, items.map((item, itemIndex) => {
                 const selectedWord = item.isExample
                     ? item.correctAnswer
                     : (userAnswers[itemIndex] ?? '');
                 const canSelect = !isReviewMode && !item.isExample && Boolean(onAnswerChange);
                 const isCorrect = normalizeWord(selectedWord) === normalizeWord(item.correctAnswer) &&
                     Boolean(item.correctAnswer);
-                return (_jsxs("div", { className: "overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-gray-100 bg-gradient-to-r from-gray-50 to-white px-4 py-2.5", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-7 w-7 items-center justify-center rounded-lg bg-gradient-to-br from-violet-500 to-indigo-600 text-white", children: _jsx(CircleHelp, { className: "h-3.5 w-3.5" }) }), _jsxs("span", { className: "text-sm font-medium text-gray-700", children: ["C\u00E2u ", item.questionNumber || itemIndex + 1] }), item.isExample && (_jsxs("span", { className: "inline-flex items-center gap-1 rounded-full bg-amber-100 px-2 py-0.5 text-xs font-semibold text-amber-700", children: [_jsx(Star, { className: "h-3 w-3" }), "Example"] }))] }), _jsxs("span", { className: "text-xs text-gray-500", children: [item.points || 0, " \u0111i\u1EC3m"] })] }), _jsxs("div", { className: "flex flex-col gap-4 p-4 sm:flex-row sm:items-center", children: [_jsx(ClientImageItem, { url: item.imageUrl, alt: `Hình ảnh câu ${item.questionNumber || itemIndex + 1}` }), _jsxs("div", { className: "min-w-0 flex-1 space-y-2", children: [_jsx("p", { className: "text-sm font-semibold text-gray-800", children: "Ch\u1ECDn t\u1EEB ph\u00F9 h\u1EE3p" }), _jsxs("div", { className: "flex items-center gap-3", children: [_jsxs("select", { value: selectedWord, disabled: !canSelect, onChange: (event) => handleSelect(itemIndex, event.target.value), className: cn('h-10 max-w-xs rounded-md border-2 bg-white px-3 text-sm font-medium', isReviewMode && isCorrect
+                return (_jsxs("div", { className: "overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-gray-100 bg-gradient-to-r from-gray-50 to-white px-4 py-2.5", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: "flex h-7 w-7 items-center justify-center rounded-lg bg-gradient-to-br from-violet-500 to-indigo-600 text-white", children: _jsx(CircleHelp, { className: "h-3.5 w-3.5" }) }), _jsxs("span", { className: "text-sm font-medium text-gray-700", children: ["C\u00E2u ", item.questionNumber || itemIndex + 1] }), item.isExample && (_jsxs("span", { className: "inline-flex items-center gap-1 rounded-full bg-amber-100 px-2 py-0.5 text-xs font-semibold text-amber-700", children: [_jsx(Star, { className: "h-3 w-3" }), "Example"] }))] }), _jsxs("span", { className: "text-xs text-gray-500", children: [item.points || 0, " \u0111i\u1EC3m"] })] }), _jsxs("div", { className: "flex flex-col gap-4 p-4 sm:flex-row sm:items-center", children: [item.imageUrl && !questionData.imageUrl ? (_jsx(ClientImageItem, { url: item.imageUrl, alt: `Hình ảnh câu ${item.questionNumber || itemIndex + 1}` })) : null, _jsxs("div", { className: "min-w-0 flex-1 space-y-2", children: [_jsxs("p", { className: "text-sm font-semibold text-gray-800", children: [item.questionNumber || itemIndex + 1, ". Ch\u1ECDn t\u1EEB ph\u00F9 h\u1EE3p"] }), _jsxs("div", { className: "flex items-center gap-3", children: [item.isExample ? (_jsx("span", { className: "text-sm italic text-gray-800 underline decoration-gray-400", children: item.correctAnswer })) : (_jsxs("select", { value: selectedWord, disabled: !canSelect, onChange: (event) => handleSelect(itemIndex, event.target.value), className: cn('h-10 max-w-xs rounded-md border-2 bg-white px-3 text-sm font-medium', isReviewMode && isCorrect
                                                         ? 'border-green-400 bg-green-50 text-green-700'
                                                         : isReviewMode && selectedWord && !isCorrect
                                                             ? 'border-red-400 bg-red-50 text-red-700'
@@ -60,6 +60,6 @@ export function MatchWordToPictureGroupClient({ questionData, isReviewMode = fal
                                                             const isUsedByOther = usedWords.has(normalizeWord(word)) &&
                                                                 normalizeWord(word) !== normalizeWord(selectedWord);
                                                             return (_jsx("option", { value: word, disabled: isUsedByOther, children: word }, `${word}-${wordIndex}`));
-                                                        })] }), isReviewMode && !item.isExample && (_jsx("span", { className: "flex items-center gap-1", children: isCorrect ? (_jsx(Check, { className: "h-5 w-5 text-green-500" })) : (_jsx(X, { className: "h-5 w-5 text-red-500" })) }))] }), isReviewMode && !item.isExample && !isCorrect && (_jsxs("p", { className: "text-sm text-green-700", children: ["\u0110\u00E1p \u00E1n \u0111\u00FAng: ", _jsx("strong", { children: item.correctAnswer || '—' })] }))] })] })] }, `${item.questionNumber}-${itemIndex}`));
+                                                        })] })), isReviewMode && !item.isExample && (_jsx("span", { className: "flex items-center gap-1", children: isCorrect ? (_jsx(Check, { className: "h-5 w-5 text-green-500" })) : (_jsx(X, { className: "h-5 w-5 text-red-500" })) }))] }), isReviewMode && !item.isExample && !isCorrect && (_jsxs("p", { className: "text-sm text-green-700", children: ["\u0110\u00E1p \u00E1n \u0111\u00FAng: ", _jsx("strong", { children: item.correctAnswer || '—' })] }))] })] })] }, `${item.questionNumber}-${itemIndex}`));
             }), isReviewMode && questionData.explanation && (_jsxs("div", { className: "flex items-start gap-2 rounded-xl border border-amber-100 bg-amber-50 px-4 py-3 text-sm text-amber-800", children: [_jsx(Lightbulb, { className: "mt-0.5 h-4 w-4 flex-shrink-0" }), questionData.explanation] }))] }));
 }

package/dist/components/questions/types/match-word-to-picture-group/MatchWordToPictureGroupCreator.js

@@ -28,7 +28,9 @@ function sumPoints(items) {
 }
 export function MatchWordToPictureGroupCreator({ initialData, onChange, externalErrors, onUnsavedChangesChange, validationRef, }) {
     const seeded = mapQuestionToMatchWordToPictureGroupData(initialData ? { answer: initialData } : null);
+    const [title, setTitle] = useState(initialData?.title || '');
     const [instruction, setInstruction] = useState(initialData?.instruction || seeded.instruction || MATCH_WORD_TO_PICTURE_GROUP_DEFAULT_INSTRUCTION);
+    const [imageUrl, setImageUrl] = useState(initialData?.imageUrl || '');
     const [wordBank, setWordBank] = useState(initialData?.wordBank?.length ? initialData.wordBank : seeded.wordBank);
     const [items, setItems] = useState(() => (initialData?.items?.length ? initialData.items : seeded.items));
     const [explanation, setExplanation] = useState(initialData?.explanation || '');
@@ -39,8 +41,10 @@ export function MatchWordToPictureGroupCreator({ initialData, onChange, external
     useEffect(() => {
         onChangeRef.current = onChange;
     }, [onChange]);
-    const buildPayload = (nextInstruction = instruction, nextWordBank = wordBank, nextItems = items, nextExplanation = explanation) => ({
+    const buildPayload = (nextTitle = title, nextInstruction = instruction, nextImageUrl = imageUrl, nextWordBank = wordBank, nextItems = items, nextExplanation = explanation) => ({
+        ...(nextTitle.trim() ? { title: nextTitle } : {}),
         instruction: nextInstruction,
+        ...(nextImageUrl.trim() ? { imageUrl: nextImageUrl } : {}),
         wordBank: nextWordBank,
         items: nextItems,
         explanation: nextExplanation,
@@ -57,7 +61,7 @@ export function MatchWordToPictureGroupCreator({ initialData, onChange, external
             debouncedOnChange(payload);
             onUnsavedChangesChange?.(true);
         }
-    }, [instruction, wordBank, items, explanation, debouncedOnChange, onUnsavedChangesChange]);
+    }, [title, instruction, imageUrl, wordBank, items, explanation, debouncedOnChange, onUnsavedChangesChange]);
     const validate = () => {
         const nextErrors = [];
         if (!instruction.trim())
@@ -68,8 +72,9 @@ export function MatchWordToPictureGroupCreator({ initialData, onChange, external
         if (items.length < 1)
             nextErrors.push('Cần ít nhất một câu hỏi.');
         items.forEach((item, index) => {
-            if (!item.imageUrl.trim())
-                nextErrors.push(`Câu ${index + 1}: cần ảnh.`);
+            if (!imageUrl.trim() && !item.imageUrl?.trim()) {
+                nextErrors.push(`Câu ${index + 1}: cần ảnh (hoặc ảnh chung).`);
+            }
             if (!item.correctAnswer.trim())
                 nextErrors.push(`Câu ${index + 1}: cần chọn từ đúng.`);
         });
@@ -83,13 +88,16 @@ export function MatchWordToPictureGroupCreator({ initialData, onChange, external
                 getFormData: () => buildPayload(),
             };
         }
-    }, [validationRef, instruction, wordBank, items, explanation]);
+    }, [validationRef, title, instruction, imageUrl, wordBank, items, explanation]);
     const updateItem = (index, patch) => {
         setItems((prev) => prev.map((item, i) => (i === index ? { ...item, ...patch } : item)));
     };
     const currentPayload = buildPayload();
     const displayErrors = externalErrors && externalErrors.length > 0 ? externalErrors : errors;
-    return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { children: [_jsx("h3", { className: "text-lg font-medium text-gray-900", children: "T\u1EA1o c\u00E2u h\u1ECFi N\u1ED1i t\u1EEB v\u1EDBi tranh (nh\u00F3m)" }), _jsx("p", { className: "text-sm text-gray-500", children: "Word bank d\u00F9ng chung; m\u1ED7i d\u00F2ng m\u1ED9t tranh." })] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setIsClientMode((prev) => !prev), className: "gap-2", children: [isClientMode ? _jsx(Pencil, { className: "h-4 w-4" }) : _jsx(Eye, { className: "h-4 w-4" }), isClientMode ? 'Chế độ chỉnh sửa' : 'Xem trước học sinh'] })] }), displayErrors.length > 0 && (_jsx("div", { className: "rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700", children: _jsx("ul", { className: "list-disc space-y-1 pl-5", children: displayErrors.map((err, i) => _jsx("li", { children: err }, i)) }) })), isClientMode ? (_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "Xem tr\u01B0\u1EDBc hi\u1EC3n th\u1ECB h\u1ECDc sinh" }) }), _jsx(CardContent, { children: _jsx(MatchWordToPictureGroupClient, { questionData: currentPayload }) })] })) : (_jsxs("div", { className: "space-y-6", children: [_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "Word bank" }) }), _jsxs(CardContent, { className: "space-y-3", children: [_jsxs("div", { children: [_jsx(Label, { htmlFor: "mwtp-group-instruction", children: "H\u01B0\u1EDBng d\u1EABn" }), _jsx(Input, { id: "mwtp-group-instruction", className: "mt-1", value: instruction, onChange: (e) => setInstruction(e.target.value) })] }), wordBank.map((word, index) => (_jsxs("div", { className: "flex gap-2", children: [_jsx(Input, { value: word, onChange: (e) => setWordBank((prev) => prev.map((item, i) => (i === index ? e.target.value : item))), placeholder: `Từ ${index + 1}` }), _jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => setWordBank((prev) => prev.filter((_, i) => i !== index)), children: _jsx(Trash2, { className: "h-4 w-4" }) })] }, index))), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setWordBank((prev) => [...prev, '']), children: [_jsx(Plus, { className: "mr-1 h-4 w-4" }), "Th\u00EAm t\u1EEB"] })] })] }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "flex flex-row items-center justify-between", children: [_jsxs(CardTitle, { className: "text-base font-semibold", children: ["Tranh (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setItems((prev) => [...prev, createEmptyMatchWordToPictureGroupItem(prev.length + 1)]), children: [_jsx(Plus, { className: "mr-1 h-4 w-4" }), "Th\u00EAm tranh"] })] }), _jsx(CardContent, { className: "space-y-4", children: items.map((item, index) => (_jsxs("div", { className: "space-y-3 rounded-lg border border-gray-200 p-4", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm font-medium", children: ["C\u00E2u ", item.questionNumber || index + 1] }), _jsxs("div", { className: "flex items-center gap-3", children: [_jsx(Switch, { checked: item.isExample || false, onCheckedChange: (checked) => updateItem(index, { isExample: checked, points: checked ? 0 : 1 }) }), _jsxs(Label, { className: "flex items-center gap-1 text-xs", children: [_jsx(Star, { className: "h-3 w-3 text-amber-500" }), "Example"] }), !item.isExample && (_jsx("div", { className: "w-24", children: _jsx(PointsInput, { value: item.points, allowZero: true, onChange: (event) => updateItem(index, {
+    return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("div", { children: [_jsx("h3", { className: "text-lg font-medium text-gray-900", children: "T\u1EA1o c\u00E2u h\u1ECFi N\u1ED1i t\u1EEB v\u1EDBi tranh (nh\u00F3m)" }), _jsx("p", { className: "text-sm text-gray-500", children: "Word bank d\u00F9ng chung. C\u00F3 th\u1EC3 1 \u1EA3nh chung + \u00F4 s\u1ED1, ho\u1EB7c m\u1ED7i d\u00F2ng m\u1ED9t tranh." })] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setIsClientMode((prev) => !prev), className: "gap-2", children: [isClientMode ? _jsx(Pencil, { className: "h-4 w-4" }) : _jsx(Eye, { className: "h-4 w-4" }), isClientMode ? 'Chế độ chỉnh sửa' : 'Xem trước học sinh'] })] }), displayErrors.length > 0 && (_jsx("div", { className: "rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700", children: _jsx("ul", { className: "list-disc space-y-1 pl-5", children: displayErrors.map((err, i) => _jsx("li", { children: err }, i)) }) })), isClientMode ? (_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "Xem tr\u01B0\u1EDBc hi\u1EC3n th\u1ECB h\u1ECDc sinh" }) }), _jsx(CardContent, { children: _jsx(MatchWordToPictureGroupClient, { questionData: currentPayload }) })] })) : (_jsxs("div", { className: "space-y-6", children: [_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "Word bank" }) }), _jsxs(CardContent, { className: "space-y-3", children: [_jsxs("div", { children: [_jsx(Label, { htmlFor: "mwtp-group-title", children: "Ti\u00EAu \u0111\u1EC1 (optional)" }), _jsx(Input, { id: "mwtp-group-title", className: "mt-1", value: title, onChange: (e) => setTitle(e.target.value), placeholder: "VOCABULARY" })] }), _jsxs("div", { children: [_jsx(Label, { htmlFor: "mwtp-group-instruction", children: "H\u01B0\u1EDBng d\u1EABn" }), _jsx(Input, { id: "mwtp-group-instruction", className: "mt-1", value: instruction, onChange: (e) => setInstruction(e.target.value) })] }), _jsx(MatchWordToPictureGroupImageField, { id: "mwtp-group-shared-image", label: "\u1EA2nh chung (optional \u2014 1 b\u1EE9c tranh nhi\u1EC1u \u00F4 s\u1ED1)", value: imageUrl, onChange: setImageUrl }), wordBank.map((word, index) => (_jsxs("div", { className: "flex gap-2", children: [_jsx(Input, { value: word, onChange: (e) => setWordBank((prev) => prev.map((item, i) => (i === index ? e.target.value : item))), placeholder: `Từ ${index + 1}` }), _jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => setWordBank((prev) => prev.filter((_, i) => i !== index)), children: _jsx(Trash2, { className: "h-4 w-4" }) })] }, index))), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setWordBank((prev) => [...prev, '']), children: [_jsx(Plus, { className: "mr-1 h-4 w-4" }), "Th\u00EAm t\u1EEB"] })] })] }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "flex flex-row items-center justify-between", children: [_jsxs(CardTitle, { className: "text-base font-semibold", children: ["Tranh (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: () => setItems((prev) => [...prev, createEmptyMatchWordToPictureGroupItem(prev.length + 1)]), children: [_jsx(Plus, { className: "mr-1 h-4 w-4" }), "Th\u00EAm tranh"] })] }), _jsx(CardContent, { className: "space-y-4", children: items.map((item, index) => (_jsxs("div", { className: "space-y-3 rounded-lg border border-gray-200 p-4", children: [_jsxs("div", { className: "flex items-center justify-between", children: [_jsxs("span", { className: "text-sm font-medium", children: ["C\u00E2u ", item.questionNumber || index + 1] }), _jsxs("div", { className: "flex items-center gap-3", children: [_jsx(Switch, { checked: item.isExample || false, onCheckedChange: (checked) => updateItem(index, { isExample: checked, points: checked ? 0 : 1 }) }), _jsxs(Label, { className: "flex items-center gap-1 text-xs", children: [_jsx(Star, { className: "h-3 w-3 text-amber-500" }), "Example"] }), !item.isExample && (_jsx("div", { className: "w-24", children: _jsx(PointsInput, { value: item.points, allowZero: true, onChange: (event) => updateItem(index, {
                                                                     points: parsePointsValue(event.target.value, true),
-                                                                }) }) })), items.length > 1 && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => setItems((prev) => prev.filter((_, i) => i !== index).map((entry, i) => ({ ...entry, questionNumber: i + 1 }))), children: _jsx(Trash2, { className: "h-4 w-4 text-red-500" }) }))] })] }), _jsx(MatchWordToPictureGroupImageField, { id: `mwtp-group-image-${index}`, label: "\u1EA2nh", value: item.imageUrl, onChange: (url) => updateItem(index, { imageUrl: url }) }), _jsxs("select", { className: "rounded-md border px-3 py-2 text-sm", value: item.correctAnswer, onChange: (e) => updateItem(index, { correctAnswer: e.target.value }), children: [_jsx("option", { value: "", children: "Ch\u1ECDn t\u1EEB \u0111\u00FAng" }), wordBank.filter((word) => word.trim()).map((word) => (_jsx("option", { value: word, children: word }, word)))] })] }, index))) })] }), _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Gi\u1EA3i th\u00EDch" }) }), _jsx(CardContent, { children: _jsx(Textarea, { value: explanation, onChange: (event) => setExplanation(event.target.value), rows: 3 }) })] })] }))] }));
+                                                                }) }) })), items.length > 1 && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => setItems((prev) => prev.filter((_, i) => i !== index).map((entry, i) => ({ ...entry, questionNumber: i + 1 }))), children: _jsx(Trash2, { className: "h-4 w-4 text-red-500" }) }))] })] }), _jsx(MatchWordToPictureGroupImageField, { id: `mwtp-group-image-${index}`, label: "\u1EA2nh", value: item.imageUrl, onChange: (url) => updateItem(index, { imageUrl: url }) }), _jsxs("select", { className: "rounded-md border px-3 py-2 text-sm", value: item.correctAnswer, onChange: (e) => updateItem(index, { correctAnswer: e.target.value }), children: [_jsx("option", { value: "", children: "Ch\u1ECDn t\u1EEB \u0111\u00FAng" }), Array.from(new Set([
+                                                    ...wordBank.map((word) => word.trim()).filter(Boolean),
+                                                    item.correctAnswer.trim(),
+                                                ].filter(Boolean))).map((word) => (_jsx("option", { value: word, children: word }, word)))] })] }, index))) })] }), _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Gi\u1EA3i th\u00EDch" }) }), _jsx(CardContent, { children: _jsx(Textarea, { value: explanation, onChange: (event) => setExplanation(event.target.value), rows: 3 }) })] })] }))] }));
 }

package/dist/components/questions/types/match-word-to-picture-group/map-match-word-to-picture-group-data.js

@@ -57,10 +57,14 @@ export function mapQuestionToMatchWordToPictureGroupData(question) {
             : asStringList(answer.wordBank).length
                 ? asStringList(answer.wordBank)
                 : Array.from(new Set(items.map((item) => item.correctAnswer).filter(Boolean)));
+        const title = asString(meta.title) || asString(answer.title);
+        const imageUrl = asString(meta.imageUrl).trim() || asString(answer.imageUrl).trim();
         return {
+            ...(title ? { title } : {}),
             instruction: asString(meta.instruction) ||
                 asString(answer.instruction) ||
                 MATCH_WORD_TO_PICTURE_GROUP_DEFAULT_INSTRUCTION,
+            ...(imageUrl ? { imageUrl } : {}),
             wordBank,
             items,
             explanation,

package/dist/components/questions/types/match-word-to-picture-group/transform.js

@@ -15,7 +15,9 @@ export const transformMatchWordToPictureGroup = (question) => {
     const apiItems = items.map((item, index) => ({
         questionType: MATCH_WORD_TO_PICTURE_ITEM_TYPE,
         ...(item.isExample ? { isExample: true } : {}),
-        content: { imageUrl: item.imageUrl || '' },
+        content: {
+            ...(item.imageUrl?.trim() ? { imageUrl: item.imageUrl.trim() } : {}),
+        },
         correctAnswer: { answer: item.correctAnswer || '' },
         points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
         questionNumber: item.questionNumber || index + 1,
@@ -24,6 +26,12 @@ export const transformMatchWordToPictureGroup = (question) => {
         apiContent: {
             meta: {
                 instruction: answerData?.instruction || MATCH_WORD_TO_PICTURE_GROUP_DEFAULT_INSTRUCTION,
+                ...(typeof answerData?.title === 'string' && answerData.title.trim()
+                    ? { title: answerData.title.trim() }
+                    : {}),
+                ...(typeof answerData?.imageUrl === 'string' && answerData.imageUrl.trim()
+                    ? { imageUrl: answerData.imageUrl.trim() }
+                    : {}),
                 wordBank,
             },
             items: apiItems,

package/dist/components/questions/types/matching-with-lines-group/MatchingWithLinesBoard.d.ts

@@ -1,11 +1,13 @@
 export interface MatchingWithLinesBoardLeftItem {
-    imageUrl: string;
+    imageUrl?: string;
+    text?: string;
     isExample?: boolean;
     questionNumber?: number;
 }
 export interface MatchingWithLinesBoardRightItem {
     id: string;
-    text: string;
+    text?: string;
+    imageUrl?: string;
 }
 interface MatchingWithLinesBoardProps {
     leftItems: MatchingWithLinesBoardLeftItem[];

package/dist/components/questions/types/matching-with-lines-group/MatchingWithLinesBoard.js

@@ -1,5 +1,5 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import { Star } from 'lucide-react';
 import { cn } from '../../../../shared/lib/utils';
@@ -94,7 +94,7 @@ export function MatchingWithLinesBoard({ leftItems, rightItems, values, correctV
             return;
         assignPair(selectedLeft, rightId);
     };
-    return (_jsxs("div", { ref: containerRef, className: "relative", children: [_jsx("svg", { className: "pointer-events-none absolute inset-0 h-full w-full", "aria-hidden": true, children: lines.map((line, index) => (_jsx("line", { x1: line.x1, y1: line.y1, x2: line.x2, y2: line.y2, stroke: line.color, strokeWidth: 3, strokeLinecap: "round" }, `${line.x1}-${line.y1}-${index}`))) }), _jsxs("div", { className: "flex justify-between gap-6 sm:gap-10", children: [_jsx("div", { className: "flex w-max flex-col gap-2", children: leftItems.map((item, index) => (_jsxs("button", { type: "button", onClick: () => handleLeftClick(index), disabled: locked || item.isExample, "aria-label": `Connect left item ${index + 1}`, "aria-pressed": selectedLeft === index, className: cn('box-border flex h-14 w-max items-center gap-2 rounded-lg border bg-white px-1.5 text-left shadow-sm', item.isExample ? 'border-amber-200' : 'border-gray-200', selectedLeft === index && 'ring-2 ring-teal-500', !locked && !item.isExample && 'cursor-pointer hover:border-teal-400'), children: [_jsxs("div", { className: "relative size-11 shrink-0 overflow-hidden rounded-md bg-gray-50", children: [_jsx(ResolvedImage, { src: item.imageUrl, alt: `Match item ${item.questionNumber || index + 1}`, className: "h-full w-full object-contain" }), item.isExample && (_jsxs("span", { className: "absolute left-0.5 top-0.5 inline-flex items-center gap-0.5 rounded-full bg-amber-100 px-1 py-0.5 text-[10px] font-semibold text-amber-700", children: [_jsx(Star, { className: "h-3 w-3" }), "Ex"] }))] }), _jsx("span", { ref: (node) => {
+    return (_jsxs("div", { ref: containerRef, className: "relative", children: [_jsx("svg", { className: "pointer-events-none absolute inset-0 h-full w-full", "aria-hidden": true, children: lines.map((line, index) => (_jsx("line", { x1: line.x1, y1: line.y1, x2: line.x2, y2: line.y2, stroke: line.color, strokeWidth: 3, strokeLinecap: "round" }, `${line.x1}-${line.y1}-${index}`))) }), _jsxs("div", { className: "flex justify-between gap-6 sm:gap-10", children: [_jsx("div", { className: "flex w-max flex-col gap-2", children: leftItems.map((item, index) => (_jsxs("button", { type: "button", onClick: () => handleLeftClick(index), disabled: locked || item.isExample, "aria-label": `Connect left item ${item.text || index + 1}`, "aria-pressed": selectedLeft === index, className: cn('box-border flex h-auto min-h-14 w-max items-center gap-2 rounded-lg border bg-white px-1.5 py-1 text-left shadow-sm', item.isExample ? 'border-amber-200' : 'border-gray-200', selectedLeft === index && 'ring-2 ring-teal-500', !locked && !item.isExample && 'cursor-pointer hover:border-teal-400'), children: [item.imageUrl ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "relative size-11 shrink-0 overflow-hidden rounded-md bg-gray-50", children: [_jsx(ResolvedImage, { src: item.imageUrl, alt: item.text || `Match item ${item.questionNumber || index + 1}`, className: "h-full w-full object-contain" }), item.isExample && (_jsxs("span", { className: "absolute left-0.5 top-0.5 inline-flex items-center gap-0.5 rounded-full bg-amber-100 px-1 py-0.5 text-[10px] font-semibold text-amber-700", children: [_jsx(Star, { className: "h-3 w-3" }), "Ex"] }))] }), item.text?.trim() ? (_jsx("span", { className: "whitespace-nowrap text-sm font-medium text-gray-800", children: item.text })) : null] })) : (_jsxs("span", { className: "relative whitespace-nowrap pl-1 text-sm font-medium text-gray-800", children: [item.isExample && (_jsxs("span", { className: "mr-1 inline-flex items-center gap-0.5 rounded-full bg-amber-100 px-1 py-0.5 text-[10px] font-semibold text-amber-700", children: [_jsx(Star, { className: "h-3 w-3" }), "Ex"] })), item.text || '—'] })), _jsx("span", { ref: (node) => {
                                         leftDotRefs.current[index] = node;
                                     }, className: cn('h-4 w-4 shrink-0 rounded-full border-2 bg-white', selectedLeft === index
                                         ? 'border-teal-600 bg-teal-500'
@@ -102,8 +102,8 @@ export function MatchingWithLinesBoard({ leftItems, rightItems, values, correctV
                                             ? 'border-teal-600'
                                             : 'border-gray-400'), "aria-hidden": true })] }, `left-${index}`))) }), _jsx("div", { className: "flex w-max flex-col gap-2", children: rightItems.map((item, index) => {
                             const used = values.includes(item.id);
-                            return (_jsxs("button", { type: "button", onClick: () => handleRightClick(item.id), disabled: locked, "aria-label": `Connect right item ${item.text || index + 1}`, className: cn('box-border flex h-14 w-full items-center gap-2 rounded-lg border border-gray-200 bg-white px-2 text-left shadow-sm', selectedLeft !== null && !locked && 'cursor-pointer hover:border-teal-400', used && 'border-teal-200'), children: [_jsx("span", { ref: (node) => {
+                            return (_jsxs("button", { type: "button", onClick: () => handleRightClick(item.id), disabled: locked, "aria-label": `Connect right item ${item.text || index + 1}`, className: cn('box-border flex h-auto min-h-14 w-max items-center gap-2 rounded-lg border border-gray-200 bg-white px-2 py-1 text-left shadow-sm', selectedLeft !== null && !locked && 'cursor-pointer hover:border-teal-400', used && 'border-teal-200'), children: [_jsx("span", { ref: (node) => {
                                             rightDotRefs.current[index] = node;
-                                        }, className: cn('h-4 w-4 shrink-0 rounded-full border-2 bg-white', used || selectedLeft !== null ? 'border-teal-600' : 'border-gray-400', selectedLeft !== null && 'bg-teal-100'), "aria-hidden": true }), _jsx("span", { className: "whitespace-nowrap text-sm font-medium text-gray-800", children: item.text || '—' })] }, item.id || `right-${index}`));
+                                        }, className: cn('h-4 w-4 shrink-0 rounded-full border-2 bg-white', used || selectedLeft !== null ? 'border-teal-600' : 'border-gray-400', selectedLeft !== null && 'bg-teal-100'), "aria-hidden": true }), item.imageUrl ? (_jsx("div", { className: "relative size-11 shrink-0 overflow-hidden rounded-md bg-gray-50", children: _jsx(ResolvedImage, { src: item.imageUrl, alt: item.text || `Match option ${index + 1}`, className: "h-full w-full object-contain" }) })) : (_jsx("span", { className: "whitespace-nowrap text-sm font-medium text-gray-800", children: item.text || '—' }))] }, item.id || `right-${index}`));
                         }) })] })] }));
 }

package/dist/components/questions/types/matching-with-lines-group/MatchingWithLinesGroupClient.js

@@ -1,7 +1,17 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Lightbulb } from 'lucide-react';
+import { BookOpen, Lightbulb } from 'lucide-react';
+import { usePresignedFileUrl } from '../../../../shared/lib/hooks';
+import { ResolvedImage } from '../../../../components/common/ResolvedImage';
 import { MatchingWithLinesBoard } from './MatchingWithLinesBoard';
+function ClientAudio({ url }) {
+    const { previewUrl, isLoading } = usePresignedFileUrl(url);
+    const src = previewUrl ||
+        (typeof url === 'string' && (url.startsWith('http') || url.startsWith('blob:')) ? url : '');
+    if (!src && !isLoading)
+        return null;
+    return (_jsx("div", { className: "rounded-xl border border-indigo-100 bg-indigo-50/70 px-4 py-3", children: isLoading ? (_jsx("div", { className: "h-8 w-full animate-pulse rounded bg-indigo-100" })) : (_jsx("audio", { controls: true, src: src, className: "w-full", children: _jsx("track", { kind: "captions" }) })) }));
+}
 export function MatchingWithLinesGroupClient({ questionData, isReviewMode = false, userAnswers = [], onAnswerChange, onAnswersChange, }) {
     const items = questionData.items || [];
     const rightItems = questionData.rightItems || [];
@@ -22,8 +32,9 @@ export function MatchingWithLinesGroupClient({ questionData, isReviewMode = fals
             }
         });
     };
-    return (_jsxs("div", { className: "space-y-4", children: [(questionData.title || questionData.instruction) && (_jsxs("div", { className: "rounded-xl border border-indigo-100 bg-indigo-50 px-4 py-3", children: [questionData.title && (_jsx("p", { className: "text-xs font-semibold uppercase tracking-wide text-indigo-500", children: questionData.title })), questionData.instruction && (_jsx("p", { className: "text-sm font-medium text-indigo-800", children: questionData.instruction }))] })), _jsx(MatchingWithLinesBoard, { leftItems: items.map((item) => ({
+    return (_jsxs("div", { className: "space-y-4", children: [(questionData.title || questionData.instruction) && (_jsxs("div", { className: "rounded-xl border border-indigo-100 bg-indigo-50 px-4 py-3", children: [questionData.title && (_jsx("p", { className: "text-xs font-semibold uppercase tracking-wide text-indigo-500", children: questionData.title })), questionData.instruction && (_jsx("p", { className: "text-sm font-medium text-indigo-800", children: questionData.instruction }))] })), questionData.passage ? (_jsxs("div", { className: "rounded-xl border border-gray-200 bg-white p-5 shadow-xs", children: [_jsxs("div", { className: "mb-2.5 flex items-center gap-2 text-xs font-bold uppercase tracking-wider text-indigo-700", children: [_jsx(BookOpen, { className: "h-4 w-4" }), _jsx("span", { children: "B\u00E0i \u0111\u1ECDc (Reading Passage)" })] }), _jsx("div", { className: "prose prose-sm max-w-none leading-relaxed text-gray-800", dangerouslySetInnerHTML: { __html: questionData.passage } })] })) : null, questionData.audioUrl ? _jsx(ClientAudio, { url: questionData.audioUrl }) : null, questionData.imageUrl ? (_jsx("div", { className: "flex justify-center rounded-lg border border-slate-100 bg-slate-50 p-3", children: _jsx(ResolvedImage, { src: questionData.imageUrl, alt: "Match passage image", className: "max-h-44 w-auto rounded-md object-contain" }) })) : null, _jsx(MatchingWithLinesBoard, { leftItems: items.map((item) => ({
                     imageUrl: item.imageUrl,
+                    text: item.text,
                     isExample: item.isExample,
                     questionNumber: item.questionNumber,
                 })), rightItems: rightItems, values: values, correctValues: isReviewMode ? correctValues : undefined, onChange: handleChange, isReviewMode: isReviewMode, disabled: isReviewMode || !canEdit }), isReviewMode && questionData.explanation && (_jsxs("div", { className: "flex items-start gap-2 rounded-xl border border-amber-100 bg-amber-50 px-4 py-3 text-sm text-amber-800", children: [_jsx(Lightbulb, { className: "mt-0.5 h-4 w-4 flex-shrink-0" }), questionData.explanation] }))] }));