@tinyweb_dev/oe-exam-sdk 0.2.12 → 0.2.13

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

@@ -10,6 +10,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '../../../../components
 import { Switch } from '../../../../components/ui/switch';
 import { useDebouncedCallback } from '../../../../shared/lib/hooks';
 import { Eye, Pencil, Plus, Star, Trash2 } from 'lucide-react';
+import { RichTextEditor } from '../../../../components/shared/RichTextEditor';
 import { MatchingWithLinesGroupClient } from './MatchingWithLinesGroupClient';
 import { MatchingWithLinesImageField } from './MatchingWithLinesImageField';
 import { createEmptyMatchingPair, nextRightId } from './map-matching-with-lines-group-data';
@@ -32,13 +33,15 @@ function normalizeRightItems(raw) {
     }
     return raw.map((item, index) => ({
         id: item.id || `r${index + 1}`,
-        text: item.text || '',
+        ...(item.text?.trim() ? { text: item.text.trim() } : {}),
+        ...(item.imageUrl?.trim() ? { imageUrl: item.imageUrl.trim() } : {}),
     }));
 }
 function normalizeItems(rawItems, rightItems) {
     if (!Array.isArray(rawItems) || rawItems.length === 0) {
         return rightItems.map((right, index) => ({
             imageUrl: '',
+            text: '',
             correctAnswer: right.id,
             isExample: false,
             points: 1,
@@ -47,6 +50,7 @@ function normalizeItems(rawItems, rightItems) {
     }
     return rawItems.map((item, index) => ({
         imageUrl: item.imageUrl || '',
+        text: item.text || '',
         correctAnswer: item.correctAnswer || rightItems[index]?.id || '',
         isExample: item.isExample === true,
         points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
@@ -61,6 +65,9 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
     const [instruction, setInstruction] = useState(initialData?.instruction || MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION);
     const [rightItems, setRightItems] = useState(() => normalizeRightItems(initialData?.rightItems));
     const [items, setItems] = useState(() => normalizeItems(initialData?.items, normalizeRightItems(initialData?.rightItems)));
+    const [passage, setPassage] = useState(initialData?.passage || '');
+    const [audioUrl] = useState(initialData?.audioUrl || '');
+    const [imageUrl, setImageUrl] = useState(initialData?.imageUrl || '');
     const [explanation, setExplanation] = useState(initialData?.explanation || '');
     const [isClientMode, setIsClientMode] = useState(false);
     const [errors, setErrors] = useState([]);
@@ -69,9 +76,12 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
     useEffect(() => {
         onChangeRef.current = onChange;
     }, [onChange]);
-    const buildPayload = (nextTitle = title, nextInstruction = instruction, nextRightItems = rightItems, nextItems = items, nextExplanation = explanation) => ({
+    const buildPayload = (nextTitle = title, nextInstruction = instruction, nextPassage = passage, nextRightItems = rightItems, nextItems = items, nextImageUrl = imageUrl, nextExplanation = explanation) => ({
         title: nextTitle,
         instruction: nextInstruction,
+        ...(nextPassage.trim() ? { passage: nextPassage } : {}),
+        ...(audioUrl ? { audioUrl } : {}),
+        ...(nextImageUrl.trim() ? { imageUrl: nextImageUrl } : {}),
         rightItems: nextRightItems,
         items: nextItems,
         explanation: nextExplanation,
@@ -88,7 +98,7 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
             debouncedOnChange(payload);
             onUnsavedChangesChange?.(true);
         }
-    }, [title, instruction, rightItems, items, explanation, debouncedOnChange, onUnsavedChangesChange]);
+    }, [title, instruction, passage, audioUrl, imageUrl, rightItems, items, explanation, debouncedOnChange, onUnsavedChangesChange]);
     const validate = () => {
         const nextErrors = [];
         if (!instruction.trim()) {
@@ -98,14 +108,15 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
             nextErrors.push('Cần ít nhất 2 cặp để nối.');
         }
         if (items.length !== rightItems.length) {
-            nextErrors.push('Số ảnh (cột trái) phải bằng số từ (cột phải).');
+            nextErrors.push('Số ô cột trái phải bằng số ô cột phải.');
         }
         const ids = new Set();
         rightItems.forEach((item, index) => {
             if (!item.id.trim())
                 nextErrors.push(`Từ ${index + 1}: id không được để trống.`);
-            if (!item.text.trim())
-                nextErrors.push(`Từ ${index + 1}: nội dung không được để trống.`);
+            if (!item.text?.trim() && !item.imageUrl?.trim()) {
+                nextErrors.push(`Cột phải ${index + 1}: cần từ hoặc ảnh.`);
+            }
             if (item.id.trim() && ids.has(item.id.trim())) {
                 nextErrors.push(`Từ ${index + 1}: id "${item.id}" bị trùng.`);
             }
@@ -113,12 +124,13 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
         });
         const usedAnswers = new Set();
         items.forEach((item, index) => {
-            if (!item.imageUrl.trim())
-                nextErrors.push(`Ảnh ${index + 1}: cần upload hình.`);
+            if (!item.imageUrl?.trim() && !item.text?.trim()) {
+                nextErrors.push(`Cột trái ${index + 1}: cần ảnh hoặc chữ.`);
+            }
             if (!item.correctAnswer.trim())
-                nextErrors.push(`Ảnh ${index + 1}: chưa chọn đáp án.`);
+                nextErrors.push(`Cột trái ${index + 1}: chưa chọn đáp án.`);
             if (item.correctAnswer && usedAnswers.has(item.correctAnswer)) {
-                nextErrors.push(`Ảnh ${index + 1}: đáp án bị trùng (mỗi từ chỉ dùng 1 lần).`);
+                nextErrors.push(`Cột trái ${index + 1}: đáp án bị trùng (mỗi từ chỉ dùng 1 lần).`);
             }
             usedAnswers.add(item.correctAnswer);
         });
@@ -132,7 +144,7 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
                 getFormData: () => buildPayload(),
             };
         }
-    }, [validationRef, title, instruction, rightItems, items, explanation]);
+    }, [validationRef, title, instruction, passage, audioUrl, imageUrl, rightItems, items, explanation]);
     const updateItem = (index, patch) => {
         setItems((prev) => {
             const next = [...prev];
@@ -174,7 +186,7 @@ export function MatchingWithLinesGroupCreator({ initialData, onChange, externalE
     };
     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 b\u1EB1ng \u0111\u01B0\u1EDDng k\u1EBB (Nh\u00F3m)" }), _jsx("p", { className: "text-sm text-gray-500", children: "N\u1ED1i \u1EA3nh c\u1ED9t tr\u00E1i v\u1EDBi t\u1EEB c\u1ED9t ph\u1EA3i. M\u1ED7i t\u1EEB d\u00F9ng \u0111\u00FAng 1 l\u1EA7n." })] }), _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 && (_jsxs("div", { className: "rounded-lg border border-red-200 bg-red-50 p-4", children: [_jsx("h3", { className: "text-sm font-medium text-red-800", children: "C\u1EA7n s\u1EEDa c\u00E1c l\u1ED7i sau:" }), _jsx("ul", { className: "mt-2 list-disc space-y-1 pl-5 text-sm text-red-700", 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(MatchingWithLinesGroupClient, { questionData: currentPayload, userAnswers: currentPayload.items.map((item) => item.correctAnswer) }) })] })) : (_jsxs("div", { className: "space-y-6", children: [_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "H\u01B0\u1EDBng d\u1EABn chung" }) }), _jsxs(CardContent, { className: "space-y-4", children: [_jsxs("div", { children: [_jsx(Label, { htmlFor: "mwl-title", children: "Ti\u00EAu \u0111\u1EC1 (optional)" }), _jsx(Input, { id: "mwl-title", value: title, onChange: (e) => setTitle(e.target.value), placeholder: "VOCABULARY", className: "mt-1" })] }), _jsxs("div", { children: [_jsx(Label, { htmlFor: "mwl-instruction", children: "H\u01B0\u1EDBng d\u1EABn b\u00E0i l\u00E0m" }), _jsx(Input, { id: "mwl-instruction", value: instruction, onChange: (e) => setInstruction(e.target.value), placeholder: MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION, className: "mt-1" })] })] })] }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "flex flex-row items-center justify-between", children: [_jsxs(CardTitle, { className: "text-base font-semibold", children: ["C\u1EB7p n\u1ED1i (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: addPair, className: "gap-2", children: [_jsx(Plus, { className: "h-4 w-4" }), "Th\u00EAm c\u1EB7p"] })] }), _jsx(CardContent, { className: "space-y-4", children: items.map((item, index) => (_jsxs("div", { className: "space-y-4 rounded-lg border border-gray-200 bg-gray-50/50 p-4", children: [_jsxs("div", { className: "flex items-center justify-between gap-4", children: [_jsxs("span", { className: "text-sm font-medium text-gray-700", children: ["C\u1EB7p ", index + 1] }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Switch, { id: `mwl-example-${index}`, checked: item.isExample || false, onCheckedChange: (checked) => updateItem(index, { isExample: checked, points: checked ? 0 : 1 }) }), _jsxs(Label, { htmlFor: `mwl-example-${index}`, className: "flex cursor-pointer 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 b\u1EB1ng \u0111\u01B0\u1EDDng k\u1EBB (Nh\u00F3m)" }), _jsx("p", { className: "text-sm text-gray-500", children: "N\u1ED1i \u1EA3nh c\u1ED9t tr\u00E1i v\u1EDBi t\u1EEB c\u1ED9t ph\u1EA3i. M\u1ED7i t\u1EEB d\u00F9ng \u0111\u00FAng 1 l\u1EA7n." })] }), _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 && (_jsxs("div", { className: "rounded-lg border border-red-200 bg-red-50 p-4", children: [_jsx("h3", { className: "text-sm font-medium text-red-800", children: "C\u1EA7n s\u1EEDa c\u00E1c l\u1ED7i sau:" }), _jsx("ul", { className: "mt-2 list-disc space-y-1 pl-5 text-sm text-red-700", 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(MatchingWithLinesGroupClient, { questionData: currentPayload, userAnswers: currentPayload.items.map((item) => item.correctAnswer) }) })] })) : (_jsxs("div", { className: "space-y-6", children: [_jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base font-semibold", children: "H\u01B0\u1EDBng d\u1EABn chung" }) }), _jsxs(CardContent, { className: "space-y-4", children: [_jsxs("div", { children: [_jsx(Label, { htmlFor: "mwl-title", children: "Ti\u00EAu \u0111\u1EC1 (optional)" }), _jsx(Input, { id: "mwl-title", value: title, onChange: (e) => setTitle(e.target.value), placeholder: "VOCABULARY", className: "mt-1" })] }), _jsxs("div", { children: [_jsx(Label, { htmlFor: "mwl-instruction", children: "H\u01B0\u1EDBng d\u1EABn b\u00E0i l\u00E0m" }), _jsx(Input, { id: "mwl-instruction", value: instruction, onChange: (e) => setInstruction(e.target.value), placeholder: MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION, className: "mt-1" })] }), _jsxs("div", { children: [_jsx(Label, { children: "N\u1ED9i dung b\u00E0i \u0111\u1ECDc (Passage)" }), _jsx("div", { className: "mt-1", children: _jsx(RichTextEditor, { value: passage, onChange: setPassage, minHeightClassName: "min-h-[160px]" }) })] }), _jsx(MatchingWithLinesImageField, { id: "mwl-group-image", label: "\u1EA2nh chung (optional)", value: imageUrl, onChange: setImageUrl })] })] }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "flex flex-row items-center justify-between", children: [_jsxs(CardTitle, { className: "text-base font-semibold", children: ["C\u1EB7p n\u1ED1i (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: addPair, className: "gap-2", children: [_jsx(Plus, { className: "h-4 w-4" }), "Th\u00EAm c\u1EB7p"] })] }), _jsx(CardContent, { className: "space-y-4", children: items.map((item, index) => (_jsxs("div", { className: "space-y-4 rounded-lg border border-gray-200 bg-gray-50/50 p-4", children: [_jsxs("div", { className: "flex items-center justify-between gap-4", children: [_jsxs("span", { className: "text-sm font-medium text-gray-700", children: ["C\u1EB7p ", index + 1] }), _jsxs("div", { className: "flex items-center gap-4", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Switch, { id: `mwl-example-${index}`, checked: item.isExample || false, onCheckedChange: (checked) => updateItem(index, { isExample: checked, points: checked ? 0 : 1 }) }), _jsxs(Label, { htmlFor: `mwl-example-${index}`, className: "flex cursor-pointer 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 > 2 && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => removePair(index), className: "text-red-500 hover:bg-red-50 hover:text-red-600", children: _jsx(Trash2, { className: "h-4 w-4" }) }))] })] }), _jsxs("div", { className: "grid gap-4 md:grid-cols-2", children: [_jsx(MatchingWithLinesImageField, { id: `mwl-image-${index}`, label: "\u1EA2nh c\u1ED9t tr\u00E1i", value: item.imageUrl, onChange: (url) => updateItem(index, { imageUrl: url }) }), _jsxs("div", { className: "space-y-3", children: [_jsxs("div", { children: [_jsx(Label, { htmlFor: `mwl-right-text-${index}`, children: "T\u1EEB c\u1ED9t ph\u1EA3i" }), _jsx(Input, { id: `mwl-right-text-${index}`, value: rightItems[index]?.text || '', onChange: (e) => updateRightItem(index, { text: e.target.value }), placeholder: "paintbrush", className: "mt-1 bg-white" })] }), _jsxs("div", { children: [_jsx(Label, { htmlFor: `mwl-answer-${index}`, children: "\u0110\u00E1p \u00E1n \u0111\u00FAng (id t\u1EEB)" }), _jsxs("select", { id: `mwl-answer-${index}`, value: item.correctAnswer, onChange: (e) => updateItem(index, { correctAnswer: e.target.value }), className: "mt-1 w-full rounded-md border border-gray-300 bg-white px-3 py-2 text-sm", children: [_jsx("option", { value: "", children: "Ch\u1ECDn t\u1EEB \u0111\u00FAng" }), rightItems.map((right) => (_jsxs("option", { value: right.id, children: [right.text || right.id, " (", right.id, ")"] }, right.id)))] })] })] })] })] }, `${rightItems[index]?.id || index}`))) })] }), _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Gi\u1EA3i th\u00EDch" }) }), _jsx(CardContent, { children: _jsx(Textarea, { id: "explanation", value: explanation, onChange: (event) => setExplanation(event.target.value), placeholder: "VD: C\u00E2u tr\u1EA3 l\u1EDDi \u0111\u00FAng l\u00E0... v\u00EC...", rows: 3 }) })] })] }))] }));
+                                                                }) }) })), items.length > 2 && (_jsx(Button, { type: "button", variant: "ghost", size: "sm", onClick: () => removePair(index), className: "text-red-500 hover:bg-red-50 hover:text-red-600", children: _jsx(Trash2, { className: "h-4 w-4" }) }))] })] }), _jsxs("div", { className: "grid gap-4 md:grid-cols-2", children: [_jsxs("div", { className: "space-y-3", children: [_jsx(MatchingWithLinesImageField, { id: `mwl-image-${index}`, label: "\u1EA2nh c\u1ED9t tr\u00E1i", value: item.imageUrl || '', onChange: (url) => updateItem(index, { imageUrl: url }) }), _jsxs("div", { children: [_jsx(Label, { htmlFor: `mwl-left-text-${index}`, children: "Ch\u1EEF c\u1ED9t tr\u00E1i (text-to-text)" }), _jsx(Input, { id: `mwl-left-text-${index}`, value: item.text || '', onChange: (e) => updateItem(index, { text: e.target.value }), placeholder: "ball", className: "mt-1 bg-white" })] })] }), _jsxs("div", { className: "space-y-3", children: [_jsx(MatchingWithLinesImageField, { id: `mwl-right-image-${index}`, label: "\u1EA2nh c\u1ED9t ph\u1EA3i (image-to-image)", value: rightItems[index]?.imageUrl || '', onChange: (url) => updateRightItem(index, { imageUrl: url || undefined }) }), _jsxs("div", { children: [_jsx(Label, { htmlFor: `mwl-right-text-${index}`, children: "T\u1EEB c\u1ED9t ph\u1EA3i" }), _jsx(Input, { id: `mwl-right-text-${index}`, value: rightItems[index]?.text || '', onChange: (e) => updateRightItem(index, { text: e.target.value }), placeholder: "paintbrush", className: "mt-1 bg-white" })] }), _jsxs("div", { children: [_jsx(Label, { htmlFor: `mwl-answer-${index}`, children: "\u0110\u00E1p \u00E1n \u0111\u00FAng (id t\u1EEB)" }), _jsxs("select", { id: `mwl-answer-${index}`, value: item.correctAnswer, onChange: (e) => updateItem(index, { correctAnswer: e.target.value }), className: "mt-1 w-full rounded-md border border-gray-300 bg-white px-3 py-2 text-sm", children: [_jsx("option", { value: "", children: "Ch\u1ECDn t\u1EEB \u0111\u00FAng" }), rightItems.map((right) => (_jsxs("option", { value: right.id, children: [right.text || right.id, " (", right.id, ")"] }, right.id)))] })] })] })] })] }, `${rightItems[index]?.id || index}`))) })] }), _jsxs(Card, { children: [_jsx(CardHeader, { children: _jsx(CardTitle, { className: "text-base", children: "Gi\u1EA3i th\u00EDch" }) }), _jsx(CardContent, { children: _jsx(Textarea, { id: "explanation", value: explanation, onChange: (event) => setExplanation(event.target.value), placeholder: "VD: C\u00E2u tr\u1EA3 l\u1EDDi \u0111\u00FAng l\u00E0... v\u00EC...", rows: 3 }) })] })] }))] }));
 }

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

@@ -17,9 +17,10 @@ export function nextRightId(existing) {
 }
 export function createEmptyMatchingPair(questionNumber, rightId) {
     return {
-        rightItem: { id: rightId, text: '' },
+        rightItem: { id: rightId },
         item: {
             imageUrl: '',
+            text: '',
             correctAnswer: rightId,
             isExample: false,
             points: 1,
@@ -36,6 +37,7 @@ export function mapMatchingWithLinesGroupItem(item, index, fallbackAnswer) {
         (typeof fallbackAnswer === 'string' ? fallbackAnswer : '');
     return {
         imageUrl: asString(content.imageUrl) || asString(record.imageUrl),
+        text: asString(content.text) || asString(record.text),
         correctAnswer: answer,
         isExample,
         points: isExample ? 0 : (typeof record.points === 'number' ? record.points : 1),
@@ -47,9 +49,12 @@ function mapRightItems(raw) {
         return [];
     return raw.map((item, index) => {
         const record = asRecord(item);
+        const imageUrl = asString(record.imageUrl).trim();
+        const text = asString(record.text).trim();
         return {
             id: asString(record.id, `r${index + 1}`),
-            text: asString(record.text),
+            ...(text ? { text } : {}),
+            ...(imageUrl ? { imageUrl } : {}),
         };
     });
 }
@@ -67,11 +72,17 @@ export function mapQuestionToMatchingWithLinesGroupData(question) {
     const meta = asRecord(content.meta ?? answer.meta);
     if (Array.isArray(content.items)) {
         const items = content.items.map((item, index) => mapMatchingWithLinesGroupItem(item, index, fallbackAnswers[index]));
+        const audioUrl = asString(meta.audioUrl).trim() || asString(answer.audioUrl).trim();
+        const passage = asString(meta.passage).trim() || asString(answer.passage).trim();
+        const imageUrl = asString(meta.imageUrl).trim() || asString(answer.imageUrl).trim();
         return {
             title: asString(meta.title) || asString(answer.title),
             instruction: asString(meta.instruction) ||
                 asString(answer.instruction) ||
                 MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION,
+            ...(passage ? { passage } : {}),
+            ...(audioUrl ? { audioUrl } : {}),
+            ...(imageUrl ? { imageUrl } : {}),
             rightItems: mapRightItems(content.rightItems),
             items,
             explanation,
@@ -80,9 +91,15 @@ export function mapQuestionToMatchingWithLinesGroupData(question) {
     }
     if (Array.isArray(answer.items)) {
         const items = answer.items.map((item, index) => mapMatchingWithLinesGroupItem(item, index, fallbackAnswers[index]));
+        const audioUrl = asString(answer.audioUrl).trim();
+        const passage = asString(answer.passage).trim();
+        const imageUrl = asString(answer.imageUrl).trim();
         return {
             title: asString(answer.title),
             instruction: asString(answer.instruction) || MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION,
+            ...(passage ? { passage } : {}),
+            ...(audioUrl ? { audioUrl } : {}),
+            ...(imageUrl ? { imageUrl } : {}),
             rightItems: mapRightItems(answer.rightItems),
             items,
             explanation,

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

@@ -14,26 +14,42 @@ export const transformMatchingWithLinesGroup = (question) => {
     if (items.length === 0) {
         return { apiContent: { rightItems: [], items: [] }, apiCorrectAnswer: { answer: [] } };
     }
-    const apiItems = items.map((item, index) => ({
-        ...(item.isExample ? { isExample: true } : {}),
-        content: {
-            imageUrl: item.imageUrl || '',
-        },
-        correctAnswer: { answer: item.correctAnswer || '' },
-        points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
-        questionNumber: item.questionNumber || index + 1,
-    }));
+    const apiItems = items.map((item, index) => {
+        const imageUrl = item.imageUrl?.trim() || '';
+        const text = item.text?.trim() || '';
+        return {
+            ...(item.isExample ? { isExample: true } : {}),
+            content: {
+                ...(imageUrl ? { imageUrl } : {}),
+                ...(text ? { text } : {}),
+            },
+            correctAnswer: { answer: item.correctAnswer || '' },
+            points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
+            questionNumber: item.questionNumber || index + 1,
+        };
+    });
     const title = typeof answerData?.title === 'string' ? answerData.title.trim() : '';
+    const passage = typeof answerData?.passage === 'string' ? answerData.passage.trim() : '';
+    const audioUrl = typeof answerData?.audioUrl === 'string' ? answerData.audioUrl.trim() : '';
+    const imageUrl = typeof answerData?.imageUrl === 'string' ? answerData.imageUrl.trim() : '';
     return {
         apiContent: {
             meta: {
                 instruction: answerData?.instruction || MATCHING_WITH_LINES_GROUP_DEFAULT_INSTRUCTION,
                 ...(title ? { title } : {}),
+                ...(passage ? { passage } : {}),
+                ...(audioUrl ? { audioUrl } : {}),
+                ...(imageUrl ? { imageUrl } : {}),
             },
-            rightItems: rightItems.map((item) => ({
-                id: item.id || '',
-                text: item.text || '',
-            })),
+            rightItems: rightItems.map((item) => {
+                const imageUrl = item.imageUrl?.trim() || '';
+                const text = item.text?.trim() || '';
+                return {
+                    id: item.id || '',
+                    ...(text ? { text } : {}),
+                    ...(imageUrl ? { imageUrl } : {}),
+                };
+            }),
             items: apiItems,
         },
         apiCorrectAnswer: {

package/dist/components/questions/types/word-fill-structured-form/WordFillStructuredFormClient.js

@@ -35,6 +35,20 @@ function ClientImageItem({ url, alt }) {
         return null;
     return (_jsx("div", { className: "overflow-hidden rounded-lg border border-gray-200 bg-gray-50 max-w-sm", children: isLoading ? (_jsx("div", { className: "flex h-36 w-48 items-center justify-center", children: _jsx("div", { className: "h-6 w-6 animate-spin rounded-full border-2 border-gray-200 border-t-teal-500" }) })) : (_jsx("img", { src: src, alt: alt || 'Image', className: "max-h-56 w-auto object-contain p-2" })) }));
 }
+function WfsfHtmlImage({ src, alt, className, style, }) {
+    const { previewUrl, isLoading } = usePresignedFileUrl(src);
+    const resolved = previewUrl ||
+        (typeof src === 'string'
+            && (src.startsWith('http') || src.startsWith('blob:') || src.startsWith('data:'))
+            ? src
+            : '');
+    if (isLoading && !resolved) {
+        return _jsx("span", { className: "inline-block h-12 w-12 animate-pulse rounded bg-slate-100" });
+    }
+    if (!resolved)
+        return null;
+    return (_jsx("img", { src: resolved, alt: alt || '', className: className, style: style }));
+}
 function ClientAudioItem({ url }) {
     const { previewUrl } = usePresignedFileUrl(url);
     const src = previewUrl ||
@@ -214,6 +228,10 @@ export function WordFillStructuredFormClient({ questionData, isReviewMode = fals
             }
             const element = node;
             const tagName = element.tagName.toLowerCase();
+            if (tagName === 'img') {
+                const rawStyle = element.getAttribute('style');
+                return (_jsx(WfsfHtmlImage, { src: element.getAttribute('src') || '', alt: element.getAttribute('alt') || '', className: element.getAttribute('class') || undefined, style: rawStyle ? parseStyleAttribute(rawStyle) : undefined }, path));
+            }
             const props = { key: path };
             Array.from(element.attributes).forEach((attr) => {
                 if (attr.name === 'class') {

package/dist/shared/lib/utils/question-reverse-transform.js

@@ -1,3 +1,4 @@
+import { fromFillInBlankImageUrls, toFillInBlankImageUrls, } from '../../../components/questions/types/fill-in-blank-group/blank-utils';
 const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
 const asRecord = (value) => isRecord(value) ? value : {};
 const asArray = (value) => Array.isArray(value) ? value : [];
@@ -309,11 +310,18 @@ const reverseAnswerTheQuestionGroup = (apiQuestion) => {
             questionNumber: asNumber(item.questionNumber, index + 1),
         };
     });
+    const meta = asRecord(content.meta);
+    const imageUrl = asArray(meta.imageUrl)
+        .filter((value) => typeof value === 'string')
+        .map((value) => value.trim())
+        .filter((value) => value !== '');
+    const singleImage = asString(meta.imageUrl).trim();
     return {
         content: '',
         answer: {
-            instruction: asString(asRecord(content.meta).instruction, 'Read the text again and answer the questions.'),
-            passage: asString(asRecord(content.meta).passage),
+            instruction: asString(meta.instruction, 'Read the text again and answer the questions.'),
+            passage: asString(meta.passage),
+            ...(imageUrl.length ? { imageUrl } : (singleImage ? { imageUrl: [singleImage] } : {})),
             items,
             explanation: asString(apiQuestion.explanation),
             points: items.reduce((total, item) => (item.isExample ? total : total + item.points), 0),
@@ -402,27 +410,34 @@ const reverseFillInBlankGroup = (apiQuestion) => {
                 : [String(blank ?? '').trim()].filter(Boolean);
             return alts.length > 0 ? alts : [''];
         });
+        const wordBank = asArray(itemContent.wordBank);
         return {
             question,
             answers: answers.length > 0 ? answers : [['']],
             caseSensitive: itemAnswer.caseSensitive === true || fallback.caseSensitive === true,
-            imageUrl: asString(itemContent.imageUrl),
+            imageUrl: fromFillInBlankImageUrls(toFillInBlankImageUrls(itemContent.imageUrl)),
             audioUrl: asString(itemContent.audioUrl),
             showHints: itemContent.showHints === true,
             hints: asArray(itemContent.hints).map((hint) => String(hint ?? '').trim()).filter(Boolean),
+            ...(wordBank.length > 0 ? { wordBank } : {}),
             isExample,
             points: isExample ? 0 : asNumber(item.points, 1),
             questionNumber: asNumber(item.questionNumber, index + 1),
         };
     });
+    const groupWordBank = asArray(meta.wordBank);
+    const viewMode = asString(meta.viewMode) === 'WITH_OPTIONS' ? 'WITH_OPTIONS' : undefined;
     return {
         content: '',
         answer: {
             instruction: asString(meta.instruction, 'Complete the sentences.'),
+            passage: asString(meta.passage),
             audioUrl: asString(meta.audioUrl),
-            imageUrl: asString(meta.imageUrl),
+            imageUrl: fromFillInBlankImageUrls(toFillInBlankImageUrls(meta.imageUrl)),
             showHints: meta.showHints === true,
             hints: asArray(meta.hints).map((hint) => String(hint ?? '').trim()).filter(Boolean),
+            ...(viewMode ? { viewMode } : {}),
+            ...(groupWordBank.length > 0 ? { wordBank: groupWordBank } : {}),
             items,
             explanation: asString(apiQuestion.explanation),
             points: items.reduce((total, item) => (item.isExample ? total : total + item.points), 0),
@@ -436,9 +451,12 @@ const reverseMatchingWithLinesGroup = (apiQuestion) => {
     const meta = asRecord(content.meta);
     const rightItems = asArray(content.rightItems).map((raw, index) => {
         const item = asRecord(raw);
+        const imageUrl = asString(item.imageUrl).trim();
+        const text = asString(item.text).trim();
         return {
             id: asString(item.id, `r${index + 1}`),
-            text: asString(item.text),
+            ...(text ? { text } : {}),
+            ...(imageUrl ? { imageUrl } : {}),
         };
     });
     const items = asArray(content.items).map((rawItem, index) => {
@@ -449,6 +467,7 @@ const reverseMatchingWithLinesGroup = (apiQuestion) => {
         const isExample = item.isExample === true;
         return {
             imageUrl: asString(itemContent.imageUrl),
+            text: asString(itemContent.text),
             correctAnswer: asString(itemAnswer.answer, typeof fallback === 'string' ? fallback : ''),
             isExample,
             points: isExample ? 0 : asNumber(item.points, 1),
@@ -460,6 +479,9 @@ const reverseMatchingWithLinesGroup = (apiQuestion) => {
         answer: {
             title: asString(meta.title),
             instruction: asString(meta.instruction, 'Look and match.'),
+            ...(asString(meta.passage).trim() ? { passage: asString(meta.passage).trim() } : {}),
+            ...(asString(meta.audioUrl).trim() ? { audioUrl: asString(meta.audioUrl).trim() } : {}),
+            ...(asString(meta.imageUrl).trim() ? { imageUrl: asString(meta.imageUrl).trim() } : {}),
             rightItems,
             items,
             explanation: asString(apiQuestion.explanation),
@@ -669,7 +691,9 @@ const reverseMatchWordToPictureGroup = (apiQuestion) => {
     return {
         content: '',
         answer: {
+            ...(asString(meta.title).trim() ? { title: asString(meta.title).trim() } : {}),
             instruction: asString(meta.instruction, 'Look and complete.'),
+            ...(asString(meta.imageUrl).trim() ? { imageUrl: asString(meta.imageUrl).trim() } : {}),
             wordBank: asArray(meta.wordBank).map((word) => asString(word)).filter(Boolean),
             items: mappedItems,
             explanation: asString(apiQuestion.explanation),

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

@@ -3,12 +3,16 @@ export interface FillInBlankGroupItemAnswer {
     answers: string[][];
     caseSensitive?: boolean;
 }
+export type FillInBlankWordBankEntry = {
+    options: string[];
+} | null;
 export interface FillInBlankGroupItemContent {
     question: string;
-    imageUrl?: string;
+    imageUrl?: string | string[];
     audioUrl?: string;
     showHints?: boolean;
     hints?: string[];
+    wordBank?: FillInBlankWordBankEntry[];
 }
 export interface FillInBlankGroupItem {
     questionType?: typeof FILL_IN_BLANK_ITEM_TYPE;
@@ -21,10 +25,13 @@ export interface FillInBlankGroupItem {
 export interface FillInBlankGroupContent {
     meta?: {
         instruction?: string;
+        passage?: string;
         audioUrl?: string;
-        imageUrl?: string;
+        imageUrl?: string | string[];
         showHints?: boolean;
         hints?: string[];
+        viewMode?: 'WITH_OPTIONS';
+        wordBank?: FillInBlankWordBankEntry[];
     };
     items: FillInBlankGroupItem[];
 }

package/dist/shared/types/questions/match-word-to-picture-group.d.ts

@@ -3,7 +3,7 @@ export interface MatchWordToPictureGroupItem {
     questionType?: typeof MATCH_WORD_TO_PICTURE_ITEM_TYPE;
     isExample?: boolean;
     content: {
-        imageUrl: string;
+        imageUrl?: string;
     };
     correctAnswer?: {
         answer: string;
@@ -13,7 +13,9 @@ export interface MatchWordToPictureGroupItem {
 }
 export interface MatchWordToPictureGroupContent {
     meta?: {
+        title?: string;
         instruction?: string;
+        imageUrl?: string;
         wordBank?: string[];
     };
     items: MatchWordToPictureGroupItem[];

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

@@ -1,9 +1,11 @@
 export interface MatchingWithLinesRightItem {
     id: string;
-    text: string;
+    text?: string;
+    imageUrl?: string;
 }
 export interface MatchingWithLinesGroupItemContent {
-    imageUrl: string;
+    imageUrl?: string;
+    text?: string;
 }
 export interface MatchingWithLinesGroupItem {
     isExample?: boolean;
@@ -18,6 +20,9 @@ export interface MatchingWithLinesGroupContent {
     meta?: {
         instruction?: string;
         title?: string;
+        audioUrl?: string;
+        passage?: string;
+        imageUrl?: string;
     };
     rightItems: MatchingWithLinesRightItem[];
     items: MatchingWithLinesGroupItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyweb_dev/oe-exam-sdk",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Reusable OceanEdu question components.",
   "type": "module",
   "main": "./dist/index.js",