@tinyweb_dev/oe-exam-sdk 1.0.9 → 1.0.10

package/dist/components/questions/types/cross-out-word-group/CrossOutWordGroupClient.js

@@ -1,10 +1,9 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { CircleHelp, Lightbulb, Star } from 'lucide-react';
+import { Lightbulb } from 'lucide-react';
 import { cn } from '../../../../shared/lib/utils';
-function tokenize(sentence) {
-    return sentence.trim().split(/\s+/).filter(Boolean);
-}
+import { tokenizeCrossOutQuestion } from './tokenize';
+import { KidInstruction, KidQuestionCard } from '../../_shared/components/compact';
 function normalizeWord(word) {
     return word.replace(/[^\p{L}\p{N}'-]/gu, '').toLowerCase();
 }
@@ -21,6 +20,14 @@ function formatAnswer(answer) {
         return 'câu đúng (không gạch)';
     return `gạch "${answer.crossOut}"${posInfo}`;
 }
+function isCorrectToken(correct, tokenIndex, plain) {
+    if (!correct)
+        return false;
+    if (typeof correct.wordIndex === 'number' && correct.wordIndex >= 0) {
+        return correct.wordIndex === tokenIndex;
+    }
+    return Boolean(correct.crossOut) && normalizeWord(correct.crossOut) === plain && plain !== '';
+}
 export function CrossOutWordGroupClient({ questionData, isReviewMode = false, userAnswers = [], onAnswerChange, }) {
     const items = questionData.items || [];
     const emit = (itemIndex, nextItem) => {
@@ -32,47 +39,58 @@ export function CrossOutWordGroupClient({ questionData, isReviewMode = false, us
         next[itemIndex] = nextItem;
         onAnswerChange(next);
     };
-    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 })), items.map((item, itemIndex) => {
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(KidInstruction, { children: questionData.instruction }), items.map((item, itemIndex) => {
                 const isReplace = item.type === 'CROSS_OUT_AND_REPLACE';
                 const userValue = item.isExample ? item.correctAnswer : userAnswers[itemIndex];
                 const canSelect = !isReviewMode && !item.isExample && Boolean(onAnswerChange);
-                const tokens = tokenize(item.question || '');
+                const tokens = tokenizeCrossOutQuestion(item.question || '');
                 const selectedIndex = userValue?.wordIndex;
                 const selectedWord = userValue?.crossOut || '';
                 const replaceWith = userValue?.replaceWith || '';
                 const correct = 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-3 py-2", 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-blue-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"] })), _jsx("span", { className: cn('rounded-full px-2 py-0.5 text-xs font-semibold', isReplace
-                                                ? 'bg-violet-100 text-violet-700'
-                                                : 'bg-sky-100 text-sky-700'), children: isReplace ? 'Gạch + thay' : 'Chỉ gạch' })] }), _jsxs("span", { className: "text-xs text-gray-500", children: [item.points || 0, " \u0111i\u1EC3m"] })] }), _jsxs("div", { className: "space-y-3 p-3", children: [isReplace ? (_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("label", { className: "text-xs font-semibold text-slate-600", children: "T\u1EEB \u0111\u00FAng:" }), _jsx("input", { type: "text", value: replaceWith, disabled: !canSelect, onChange: (event) => emit(itemIndex, {
-                                                type: item.type,
-                                                wordIndex: selectedIndex ?? null,
-                                                crossOut: selectedWord,
-                                                replaceWith: event.target.value,
-                                            }), placeholder: "Nh\u1EADp t\u1EEB thay th\u1EBF...", className: "h-8 min-w-[10rem] rounded-lg border border-slate-200 px-2.5 text-sm outline-none focus:border-blue-500 focus:ring-2 focus:ring-blue-100 disabled:bg-slate-50" })] })) : null, _jsx("div", { className: "flex flex-wrap items-center gap-1.5 text-sm font-medium leading-relaxed text-slate-800", children: tokens.map((token, tokenIndex) => {
-                                        const plain = normalizeWord(token);
-                                        const isSelected = typeof selectedIndex === 'number'
+                return (_jsxs(KidQuestionCard, { title: `Câu ${item.questionNumber || itemIndex + 1}`, points: item.points || 0, isExample: item.isExample, headerExtra: isReviewMode ? (_jsx("span", { className: cn('rounded-full px-2 py-0.5 text-xs font-semibold', isReplace
+                            ? 'bg-violet-100 text-violet-700'
+                            : 'bg-sky-100 text-sky-700'), children: isReplace ? 'Gạch + thay' : 'Chỉ gạch' })) : null, children: [isReplace ? (_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("label", { className: "text-xs font-semibold text-slate-600", children: "T\u1EEB \u0111\u00FAng:" }), _jsx("input", { type: "text", value: replaceWith, disabled: !canSelect, onChange: (event) => emit(itemIndex, {
+                                        type: item.type,
+                                        wordIndex: selectedIndex ?? null,
+                                        crossOut: selectedWord,
+                                        replaceWith: event.target.value,
+                                    }), placeholder: "Nh\u1EADp t\u1EEB thay th\u1EBF...", className: "h-8 min-w-[10rem] rounded-lg border border-slate-200 px-2.5 text-sm outline-none focus:border-blue-500 focus:ring-2 focus:ring-blue-100 disabled:bg-slate-50" })] })) : null, _jsx("div", { className: "flex flex-wrap items-center gap-1.5 text-sm font-medium leading-relaxed text-slate-800", children: tokens.map((token, tokenIndex) => {
+                                const plain = normalizeWord(token);
+                                const isSelected = typeof selectedIndex === 'number'
+                                    ? selectedIndex === tokenIndex
+                                    : Boolean(selectedWord) && normalizeWord(selectedWord) === plain && plain !== '';
+                                const isCorrectTarget = isReviewMode && !item.isExample && correct?.wordIndex === tokenIndex;
+                                const isSelectedCorrect = isReviewMode &&
+                                    !item.isExample &&
+                                    isSelected &&
+                                    isCorrectToken(correct, tokenIndex, plain);
+                                const isSelectedWrong = isReviewMode &&
+                                    !item.isExample &&
+                                    isSelected &&
+                                    Boolean(correct) &&
+                                    !isSelectedCorrect;
+                                return (_jsx("button", { type: "button", disabled: !canSelect || plain === '', onClick: () => {
+                                        const already = typeof selectedIndex === 'number'
                                             ? selectedIndex === tokenIndex
-                                            : Boolean(selectedWord) && normalizeWord(selectedWord) === plain && plain !== '';
-                                        const isCorrectTarget = isReviewMode && !item.isExample && correct?.wordIndex === tokenIndex;
-                                        return (_jsx("button", { type: "button", disabled: !canSelect || plain === '', onClick: () => {
-                                                const already = typeof selectedIndex === 'number'
-                                                    ? selectedIndex === tokenIndex
-                                                    : selectedWord === token;
-                                                emit(itemIndex, {
-                                                    type: item.type,
-                                                    wordIndex: already ? null : tokenIndex,
-                                                    crossOut: already
-                                                        ? ''
-                                                        : token.replace(/[^\p{L}\p{N}'-]/gu, '') || token,
-                                                    ...(isReplace ? { replaceWith } : {}),
-                                                });
-                                            }, className: cn('rounded-lg px-2 py-1 transition-colors', isSelected
+                                            : selectedWord === token;
+                                        emit(itemIndex, {
+                                            type: item.type,
+                                            wordIndex: already ? null : tokenIndex,
+                                            crossOut: already ? '' : token,
+                                            ...(isReplace ? { replaceWith } : {}),
+                                        });
+                                    }, className: cn('rounded-lg px-2 py-1 transition-colors', isSelectedWrong
+                                        ? 'border border-rose-200 bg-rose-100 font-bold text-rose-700 line-through decoration-rose-600'
+                                        : isSelectedCorrect
+                                            ? 'border border-emerald-300 bg-emerald-100 font-bold text-emerald-800 line-through decoration-emerald-600'
+                                            : isSelected
                                                 ? 'border border-blue-200 bg-blue-100 font-bold text-blue-700 line-through decoration-blue-600'
                                                 : isCorrectTarget
                                                     ? 'border-2 border-dashed border-emerald-500 bg-emerald-50 font-bold text-emerald-800'
                                                     : canSelect
                                                         ? 'cursor-pointer hover:bg-blue-50 hover:text-blue-700'
                                                         : 'cursor-default'), children: token }, `${item.questionNumber}-token-${tokenIndex}`));
-                                    }) }), isReviewMode ? (_jsxs("div", { className: "rounded-lg border border-emerald-100 bg-emerald-50 px-3 py-2 text-sm text-emerald-800", children: [_jsx("span", { className: "font-medium", children: "\u0110\u00E1p \u00E1n: " }), formatAnswer(item.correctAnswer)] })) : null] })] }, `${item.questionNumber}-${itemIndex}`));
+                            }) }), isReviewMode ? (_jsxs("div", { className: "rounded-lg border border-emerald-100 bg-emerald-50 px-3 py-2 text-sm text-emerald-800", children: [_jsx("span", { className: "font-medium", children: "\u0110\u00E1p \u00E1n: " }), formatAnswer(item.correctAnswer)] })) : null] }, `${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/cross-out-word-group/CrossOutWordGroupCreator.js

@@ -13,6 +13,8 @@ import { useDebouncedCallback } from '../../../../shared/lib/hooks';
 import { HelpCircle, Plus, Star, Trash2 } from 'lucide-react';
 import { CompactCreatorHeader, CompactExplanationToggle, CompactFieldCard, CompactPreviewBanner, } from '../../_shared/components/compact';
 import { CrossOutWordGroupClient } from './CrossOutWordGroupClient';
+import { createCrossOutAnswer, createEmptyCrossOutItem, DEFAULT_CROSS_OUT_INSTRUCTION, } from './map-cross-out-word-group-data';
+import { tokenizeCrossOutQuestion } from './tokenize';
 function parsePointsValue(raw, allowZero = false) {
     if (raw === '')
         return allowZero ? 0 : 1;
@@ -22,43 +24,9 @@ function parsePointsValue(raw, allowZero = false) {
     const min = allowZero ? 0 : 1;
     return Math.max(min, parsed);
 }
-const DEFAULT_INSTRUCTION = 'Cross out the extra or incorrect word. If the word is incorrect, write the correct word. If the line is correct, leave it blank.';
-function tokenize(sentence) {
-    return sentence.trim().split(/\s+/).filter(Boolean);
-}
-function createAnswer(type, crossOut = '', replaceWith = '', wordIndex) {
-    const parsedIndex = typeof wordIndex === 'number' && Number.isInteger(wordIndex) && wordIndex >= 0
-        ? wordIndex
-        : wordIndex === null
-            ? null
-            : undefined;
-    if (type === 'CROSS_OUT_AND_REPLACE') {
-        return {
-            type,
-            ...(parsedIndex !== undefined ? { wordIndex: parsedIndex } : {}),
-            crossOut,
-            replaceWith,
-        };
-    }
-    return {
-        type: 'CROSS_OUT',
-        ...(parsedIndex !== undefined ? { wordIndex: parsedIndex } : {}),
-        crossOut,
-    };
-}
-function createEmptyItem(questionNumber) {
-    return {
-        type: 'CROSS_OUT',
-        question: '',
-        correctAnswer: createAnswer('CROSS_OUT'),
-        isExample: false,
-        points: 1,
-        questionNumber,
-    };
-}
 function normalizeItems(rawItems) {
     if (!Array.isArray(rawItems) || rawItems.length === 0) {
-        return [createEmptyItem(1)];
+        return [createEmptyCrossOutItem(1)];
     }
     return rawItems.map((item, index) => {
         const type = item.type === 'CROSS_OUT_AND_REPLACE' ||
@@ -66,7 +34,7 @@ function normalizeItems(rawItems) {
             ? 'CROSS_OUT_AND_REPLACE'
             : 'CROSS_OUT';
         const rawIndex = item.correctAnswer?.wordIndex;
-        const correctAnswer = createAnswer(type, item.correctAnswer?.crossOut || '', item.correctAnswer?.replaceWith || '', rawIndex);
+        const correctAnswer = createCrossOutAnswer(type, item.correctAnswer?.crossOut || '', item.correctAnswer?.replaceWith || '', rawIndex);
         return {
             type,
             question: item.question || '',
@@ -81,7 +49,7 @@ function sumPoints(items) {
     return items.reduce((total, item) => item.isExample ? total : total + (typeof item.points === 'number' ? item.points : 1), 0);
 }
 export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors, onUnsavedChangesChange, validationRef, }) {
-    const [instruction, setInstruction] = useState(initialData?.instruction || DEFAULT_INSTRUCTION);
+    const [instruction, setInstruction] = useState(initialData?.instruction || DEFAULT_CROSS_OUT_INSTRUCTION);
     const [items, setItems] = useState(() => normalizeItems(initialData?.items));
     const [explanation, setExplanation] = useState(initialData?.explanation || '');
     const [isClientMode, setIsClientMode] = useState(false);
@@ -121,7 +89,20 @@ export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors
             if (!item.question.trim()) {
                 nextErrors.push(`Câu ${index + 1}: Nội dung câu không được để trống.`);
             }
+            const wordIndex = item.correctAnswer.wordIndex;
+            if (wordIndex === undefined) {
+                nextErrors.push(`Câu ${index + 1}: Cần chọn từ cần gạch hoặc để trống nếu câu đúng (wordIndex).`);
+            }
+            if (typeof wordIndex === 'number') {
+                const tokens = tokenizeCrossOutQuestion(item.question);
+                if (tokens[wordIndex] !== item.correctAnswer.crossOut) {
+                    nextErrors.push(`Câu ${index + 1}: Từ gạch phải khớp token tại wordIndex.`);
+                }
+            }
             if (item.type === 'CROSS_OUT_AND_REPLACE') {
+                if (typeof wordIndex !== 'number') {
+                    nextErrors.push(`Câu ${index + 1}: Cần chọn từ cần gạch (wordIndex).`);
+                }
                 if (!item.correctAnswer.crossOut.trim()) {
                     nextErrors.push(`Câu ${index + 1}: Cần chọn hoặc nhập từ cần gạch (crossOut).`);
                 }
@@ -160,7 +141,7 @@ export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors
             next[index] = {
                 ...current,
                 type,
-                correctAnswer: createAnswer(type, current.correctAnswer.crossOut, current.correctAnswer.replaceWith || '', current.correctAnswer.wordIndex),
+                correctAnswer: createCrossOutAnswer(type, current.correctAnswer.crossOut, current.correctAnswer.replaceWith || '', current.correctAnswer.wordIndex),
             };
             return next;
         });
@@ -174,7 +155,7 @@ export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors
             const type = current.type;
             next[index] = {
                 ...current,
-                correctAnswer: createAnswer(type, patch.crossOut !== undefined ? patch.crossOut : current.correctAnswer.crossOut, patch.replaceWith !== undefined
+                correctAnswer: createCrossOutAnswer(type, patch.crossOut !== undefined ? patch.crossOut : current.correctAnswer.crossOut, patch.replaceWith !== undefined
                     ? patch.replaceWith
                     : current.correctAnswer.replaceWith || '', patch.wordIndex !== undefined ? patch.wordIndex : current.correctAnswer.wordIndex),
             };
@@ -194,15 +175,14 @@ export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors
             });
         }
         else {
-            const cleanWord = token.replace(/[^\p{L}\p{N}'-]/gu, '') || token;
             updateItemAnswer(itemIndex, {
                 wordIndex: tokenIndex,
-                crossOut: cleanWord,
+                crossOut: token,
             });
         }
     };
     const addItem = () => {
-        setItems((prev) => [...prev, createEmptyItem(prev.length + 1)]);
+        setItems((prev) => [...prev, createEmptyCrossOutItem(prev.length + 1)]);
     };
     const removeItem = (index) => {
         setItems((prev) => {
@@ -217,8 +197,8 @@ export function CrossOutWordGroupCreator({ initialData, onChange, externalErrors
     if (isClientMode) {
         return (_jsxs("div", { className: "space-y-4", children: [_jsx(CompactPreviewBanner, { onBack: () => setIsClientMode(false) }), _jsx(CrossOutWordGroupClient, { questionData: currentPayload })] }));
     }
-    return (_jsxs("div", { className: "space-y-3", children: [displayErrors.length > 0 && (_jsx("div", { className: "rounded-md border border-red-200 bg-red-50 p-2 text-xs text-red-700", children: _jsx("ul", { className: "list-disc space-y-1 pl-4", children: displayErrors.map((err, i) => (_jsx("li", { children: err }, i))) }) })), _jsx(CompactFieldCard, { header: _jsx(CompactCreatorHeader, { icon: _jsx(HelpCircle, { className: "h-3.5 w-3.5" }), title: "G\u1EA1ch t\u1EEB / S\u1EEDa t\u1EEB (Nh\u00F3m)", preview: { onClick: () => setIsClientMode(true) } }), children: _jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { htmlFor: "instruction", className: "text-sm font-semibold text-gray-800", children: "H\u01B0\u1EDBng d\u1EABn b\u00E0i l\u00E0m" }), _jsx(Input, { id: "instruction", value: instruction, onChange: (e) => setInstruction(e.target.value), placeholder: DEFAULT_INSTRUCTION, className: "h-10 border-gray-200 bg-white" })] }) }), _jsxs(Card, { className: "overflow-hidden border-0 bg-white shadow-sm", children: [_jsx(CardHeader, { className: "px-3 py-2", children: _jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs(CardTitle, { className: "text-sm font-semibold text-gray-800", children: ["Danh s\u00E1ch c\u00E2u (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: addItem, className: "h-8 gap-1.5 px-2.5 text-xs", children: [_jsx(Plus, { className: "h-3.5 w-3.5" }), "Th\u00EAm c\u00E2u"] })] }) }), _jsxs(CardContent, { className: "space-y-2.5 px-3 pb-3", children: [items.map((item, index) => {
-                                const tokens = tokenize(item.question);
+    return (_jsxs("div", { className: "space-y-3", children: [displayErrors.length > 0 && (_jsx("div", { className: "rounded-md border border-red-200 bg-red-50 p-2 text-xs text-red-700", children: _jsx("ul", { className: "list-disc space-y-1 pl-4", children: displayErrors.map((err, i) => (_jsx("li", { children: err }, i))) }) })), _jsx(CompactFieldCard, { header: _jsx(CompactCreatorHeader, { icon: _jsx(HelpCircle, { className: "h-3.5 w-3.5" }), title: "G\u1EA1ch t\u1EEB / S\u1EEDa t\u1EEB (Nh\u00F3m)", preview: { onClick: () => setIsClientMode(true) } }), children: _jsxs("div", { className: "space-y-1.5", children: [_jsx(Label, { htmlFor: "instruction", className: "text-sm font-semibold text-gray-800", children: "H\u01B0\u1EDBng d\u1EABn b\u00E0i l\u00E0m" }), _jsx(Input, { id: "instruction", value: instruction, onChange: (e) => setInstruction(e.target.value), placeholder: DEFAULT_CROSS_OUT_INSTRUCTION, className: "h-10 border-gray-200 bg-white" })] }) }), _jsxs(Card, { className: "overflow-hidden border-0 bg-white shadow-sm", children: [_jsx(CardHeader, { className: "px-3 py-2", children: _jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs(CardTitle, { className: "text-sm font-semibold text-gray-800", children: ["Danh s\u00E1ch c\u00E2u (", items.length, ")"] }), _jsxs(Button, { type: "button", variant: "outline", size: "sm", onClick: addItem, className: "h-8 gap-1.5 px-2.5 text-xs", children: [_jsx(Plus, { className: "h-3.5 w-3.5" }), "Th\u00EAm c\u00E2u"] })] }) }), _jsxs(CardContent, { className: "space-y-2.5 px-3 pb-3", children: [items.map((item, index) => {
+                                const tokens = tokenizeCrossOutQuestion(item.question);
                                 const selectedWordIndex = item.correctAnswer.wordIndex;
                                 return (_jsxs("div", { className: "space-y-2.5 rounded-md border border-gray-200 bg-white px-3 py-2.5", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-2", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("span", { className: "flex h-7 w-7 items-center justify-center rounded-full bg-blue-100 text-xs font-semibold text-blue-700", children: item.questionNumber || index + 1 }), _jsxs("span", { className: "text-sm font-medium text-gray-700", children: ["C\u00E2u ", index + 1] })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx("div", { className: "w-52", children: _jsxs(Select, { value: item.type, onValueChange: (value) => updateItemType(index, value), children: [_jsx(SelectTrigger, { children: _jsx(SelectValue, { placeholder: "Lo\u1EA1i c\u00E2u" }) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: "CROSS_OUT", children: "Ch\u1EC9 g\u1EA1ch (CROSS_OUT)" }), _jsx(SelectItem, { value: "CROSS_OUT_AND_REPLACE", children: "G\u1EA1ch + thay (CROSS_OUT_AND_REPLACE)" })] })] }) }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Switch, { id: `example-${index}`, checked: item.isExample || false, onCheckedChange: (checked) => updateItem(index, {
                                                                         isExample: checked,

package/dist/components/questions/types/cross-out-word-group/index.d.ts

@@ -3,3 +3,4 @@ export * from './CrossOutWordGroupClient';
 export * from './transform';
 export * from './register';
 export * from './map-cross-out-word-group-data';
+export * from './tokenize';

package/dist/components/questions/types/cross-out-word-group/index.js

@@ -3,3 +3,4 @@ export * from './CrossOutWordGroupClient';
 export * from './transform';
 export * from './register';
 export * from './map-cross-out-word-group-data';
+export * from './tokenize';

package/dist/components/questions/types/cross-out-word-group/map-cross-out-word-group-data.js

@@ -14,20 +14,18 @@ function normalizeMode(type) {
 export function createCrossOutAnswer(type, crossOut = '', replaceWith = '', wordIndex) {
     const parsedIndex = typeof wordIndex === 'number' && Number.isInteger(wordIndex) && wordIndex >= 0
         ? wordIndex
-        : wordIndex === null
-            ? null
-            : undefined;
+        : null;
     if (type === 'CROSS_OUT_AND_REPLACE') {
         return {
             type,
-            ...(parsedIndex !== undefined ? { wordIndex: parsedIndex } : {}),
+            wordIndex: parsedIndex,
             crossOut,
             replaceWith,
         };
     }
     return {
         type: 'CROSS_OUT',
-        ...(parsedIndex !== undefined ? { wordIndex: parsedIndex } : {}),
+        wordIndex: parsedIndex,
         crossOut,
     };
 }
@@ -47,10 +45,12 @@ export function mapCrossOutWordGroupItem(item, index, fallbackAnswer) {
     const correctAnswerRaw = asRecord(record.correctAnswer);
     const answerObj = isRecord(correctAnswerRaw.answer)
         ? correctAnswerRaw.answer
-        : isRecord(fallbackAnswer)
-            ? fallbackAnswer
-            : {};
-    const type = normalizeMode(content.type || answerObj.type);
+        : 'crossOut' in correctAnswerRaw || 'wordIndex' in correctAnswerRaw
+            ? correctAnswerRaw
+            : isRecord(fallbackAnswer)
+                ? fallbackAnswer
+                : {};
+    const type = normalizeMode(content.type || record.type || answerObj.type);
     const isExample = record.isExample === true;
     const rawIndex = typeof answerObj.wordIndex === 'number'
         ? answerObj.wordIndex

package/dist/components/questions/types/cross-out-word-group/tokenize.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeCrossOutQuestionText(question: string): string;
+export declare function tokenizeCrossOutQuestion(question: string): string[];

package/dist/components/questions/types/cross-out-word-group/tokenize.js

@@ -0,0 +1,11 @@
+export function normalizeCrossOutQuestionText(question) {
+    return question
+        .replace(/\\n/g, ' ')
+        .replace(/\r\n|\r|\n/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+export function tokenizeCrossOutQuestion(question) {
+    const normalized = normalizeCrossOutQuestionText(question);
+    return normalized ? normalized.split(' ').filter(Boolean) : [];
+}

package/dist/components/questions/types/cross-out-word-group/transform.js

@@ -16,12 +16,10 @@ function normalizeAnswer(answer, fallbackType) {
     const rawIndex = answer?.wordIndex;
     const wordIndex = typeof rawIndex === 'number' && Number.isInteger(rawIndex) && rawIndex >= 0
         ? rawIndex
-        : rawIndex === null
-            ? null
-            : undefined;
+        : null;
     const result = {
         type,
-        ...(wordIndex !== undefined ? { wordIndex } : {}),
+        wordIndex,
         crossOut: typeof answer?.crossOut === 'string' ? answer.crossOut.trim() : '',
     };
     if (type === 'CROSS_OUT_AND_REPLACE') {

package/dist/components/questions/types/crossword-puzzle/CrosswordPuzzleClient.d.ts

@@ -5,7 +5,8 @@ interface CrosswordPuzzleClientProps {
     correctAnswer?: CrosswordPuzzleCorrectAnswer;
     isReviewMode?: boolean;
     userAnswers?: Record<string, string>;
+    questionNumber?: number;
     onAnswerChange?: (key: string, value: string) => void;
 }
-export declare function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode, userAnswers, onAnswerChange, }: CrosswordPuzzleClientProps): React.JSX.Element;
+export declare function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode, userAnswers, questionNumber, onAnswerChange, }: CrosswordPuzzleClientProps): React.JSX.Element;
 export {};

package/dist/components/questions/types/crossword-puzzle/CrosswordPuzzleClient.js

@@ -1,9 +1,11 @@
 'use client';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
-export function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode = false, userAnswers = {}, onAnswerChange, }) {
+export function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode = false, userAnswers = {}, questionNumber, onAnswerChange, }) {
     const rows = content?.gridSize?.rows || 12;
     const cols = content?.gridSize?.cols || 12;
+    const instructionText = (content?.instruction || content?.title || '').trim();
+    const displayNumber = questionNumber ?? 1;
     const acrossClues = useMemo(() => content?.clues?.across || [], [content?.clues?.across]);
     const downClues = useMemo(() => content?.clues?.down || [], [content?.clues?.down]);
     // Build grid cell mapping
@@ -30,14 +32,14 @@ export function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode = f
         }
         return { cellMap: cMap, clueNumberMap: numMap };
     }, [acrossClues, downClues]);
-    return (_jsxs("div", { className: "flex flex-col gap-3 p-3 bg-white rounded-xl border border-gray-200 shadow-sm", children: [content?.title && (_jsx("h3", { className: "text-lg font-bold text-gray-800 text-center", children: content.title })), _jsxs("div", { className: "grid grid-cols-1 lg:grid-cols-12 gap-6 items-start", children: [_jsxs("div", { className: "lg:col-span-5 flex flex-col gap-4", children: [_jsxs("div", { className: "rounded-lg border border-blue-200 bg-blue-50/50 p-4", children: [_jsxs("h4", { className: "font-bold text-blue-900 mb-2.5 flex items-center gap-2", children: [_jsx("span", { className: "px-2 py-0.5 rounded bg-blue-600 text-white text-xs font-semibold", children: "Across" }), _jsx("span", { children: "H\u00E0ng ngang" })] }), _jsx("div", { className: "flex flex-col gap-2 max-h-60 overflow-y-auto pr-1", children: acrossClues.map((c) => {
+    return (_jsxs("div", { className: "flex flex-col items-stretch gap-3 text-left", children: [_jsxs("p", { className: "w-full text-left text-sm font-semibold text-gray-800", children: [_jsxs("span", { className: "font-bold", children: [displayNumber, "."] }), instructionText ? ` ${instructionText}` : ''] }), _jsxs("div", { className: "grid grid-cols-1 lg:grid-cols-12 gap-6 items-start", children: [_jsxs("div", { className: "lg:col-span-5 flex flex-col gap-4", children: [_jsxs("div", { className: "rounded-lg border border-blue-200 bg-blue-50/50 p-4", children: [_jsxs("h4", { className: "font-bold text-blue-900 mb-2.5 flex items-center gap-2", children: [_jsx("span", { className: "px-2 py-0.5 rounded bg-blue-600 text-white text-xs font-semibold", children: "Across" }), _jsx("span", { children: "H\u00E0ng ngang" })] }), _jsx("div", { className: "flex flex-col gap-2 max-h-60 overflow-y-auto pr-1", children: acrossClues.map((c) => {
                                             const answer = correctAnswer?.answers?.[`across-${c.number}`];
                                             const userAns = userAnswers[`across-${c.number}`];
-                                            return (_jsxs("div", { className: "flex items-start gap-2 text-sm bg-white p-2 rounded border border-blue-100", children: [_jsxs("span", { className: "font-bold text-blue-700 min-w-[20px]", children: [c.number, "."] }), _jsxs("div", { className: "flex-1", children: [_jsx("span", { className: "text-gray-800", children: c.clue }), !isReviewMode && onAnswerChange ? (_jsx("input", { type: "text", value: userAns || '', maxLength: c.length, onChange: (event) => onAnswerChange(`across-${c.number}`, event.target.value.toUpperCase()), placeholder: `${c.length} chữ`, className: "mt-1.5 w-full rounded border border-blue-200 px-2 py-1 text-sm font-semibold uppercase tracking-wider outline-none focus:border-blue-500" })) : null, isReviewMode && answer && (_jsxs("div", { className: "text-xs mt-1", children: [_jsx("span", { className: "text-gray-500", children: "\u0110\u00E1p \u00E1n: " }), _jsx("span", { className: "font-bold text-green-700", children: answer }), userAns && userAns !== answer && (_jsx("span", { className: "ml-2 line-through text-red-500 font-semibold", children: userAns }))] }))] }), _jsxs("span", { className: "text-xs text-gray-400", children: ["(", c.length, " ch\u1EEF)"] })] }, `across-${c.number}`));
+                                            return (_jsxs("div", { className: "flex items-start gap-2 text-sm bg-white p-2 rounded border border-blue-100", children: [_jsxs("span", { className: "font-bold text-blue-700 min-w-[20px]", children: [c.number, "."] }), _jsxs("div", { className: "flex-1", children: [_jsxs("span", { className: "text-gray-800", children: [c.clue, c.isExample && (_jsx("span", { className: "ml-1 rounded bg-amber-100 px-1.5 py-0.5 text-[10px] font-bold text-amber-700", children: "Example" }))] }), !isReviewMode && onAnswerChange && !c.isExample ? (_jsx("input", { type: "text", value: userAns || '', maxLength: c.length, onChange: (event) => onAnswerChange(`across-${c.number}`, event.target.value.toUpperCase()), placeholder: `${c.length} chữ`, className: "mt-1.5 w-full rounded border border-blue-200 px-2 py-1 text-sm font-semibold uppercase tracking-wider outline-none focus:border-blue-500" })) : null, isReviewMode && answer && (_jsxs("div", { className: "text-xs mt-1", children: [_jsx("span", { className: "text-gray-500", children: "\u0110\u00E1p \u00E1n: " }), _jsx("span", { className: "font-bold text-green-700", children: answer }), userAns && userAns !== answer && (_jsx("span", { className: "ml-2 line-through text-red-500 font-semibold", children: userAns }))] }))] }), _jsxs("span", { className: "text-xs text-gray-400", children: ["(", c.length, " ch\u1EEF)"] })] }, `across-${c.number}`));
                                         }) })] }), _jsxs("div", { className: "rounded-lg border border-purple-200 bg-purple-50/50 p-4", children: [_jsxs("h4", { className: "font-bold text-purple-900 mb-2.5 flex items-center gap-2", children: [_jsx("span", { className: "px-2 py-0.5 rounded bg-purple-600 text-white text-xs font-semibold", children: "Down" }), _jsx("span", { children: "H\u00E0ng d\u1ECDc" })] }), _jsx("div", { className: "flex flex-col gap-2 max-h-60 overflow-y-auto pr-1", children: downClues.map((c) => {
                                             const answer = correctAnswer?.answers?.[`down-${c.number}`];
                                             const userAns = userAnswers[`down-${c.number}`];
-                                            return (_jsxs("div", { className: "flex items-start gap-2 text-sm bg-white p-2 rounded border border-purple-100", children: [_jsxs("span", { className: "font-bold text-purple-700 min-w-[20px]", children: [c.number, "."] }), _jsxs("div", { className: "flex-1", children: [_jsx("span", { className: "text-gray-800", children: c.clue }), !isReviewMode && onAnswerChange ? (_jsx("input", { type: "text", value: userAns || '', maxLength: c.length, onChange: (event) => onAnswerChange(`down-${c.number}`, event.target.value.toUpperCase()), placeholder: `${c.length} chữ`, className: "mt-1.5 w-full rounded border border-purple-200 px-2 py-1 text-sm font-semibold uppercase tracking-wider outline-none focus:border-purple-500" })) : null, isReviewMode && answer && (_jsxs("div", { className: "text-xs mt-1", children: [_jsx("span", { className: "text-gray-500", children: "\u0110\u00E1p \u00E1n: " }), _jsx("span", { className: "font-bold text-green-700", children: answer }), userAns && userAns !== answer && (_jsx("span", { className: "ml-2 line-through text-red-500 font-semibold", children: userAns }))] }))] }), _jsxs("span", { className: "text-xs text-gray-400", children: ["(", c.length, " ch\u1EEF)"] })] }, `down-${c.number}`));
+                                            return (_jsxs("div", { className: "flex items-start gap-2 text-sm bg-white p-2 rounded border border-purple-100", children: [_jsxs("span", { className: "font-bold text-purple-700 min-w-[20px]", children: [c.number, "."] }), _jsxs("div", { className: "flex-1", children: [_jsxs("span", { className: "text-gray-800", children: [c.clue, c.isExample && (_jsx("span", { className: "ml-1 rounded bg-amber-100 px-1.5 py-0.5 text-[10px] font-bold text-amber-700", children: "Example" }))] }), !isReviewMode && onAnswerChange && !c.isExample ? (_jsx("input", { type: "text", value: userAns || '', maxLength: c.length, onChange: (event) => onAnswerChange(`down-${c.number}`, event.target.value.toUpperCase()), placeholder: `${c.length} chữ`, className: "mt-1.5 w-full rounded border border-purple-200 px-2 py-1 text-sm font-semibold uppercase tracking-wider outline-none focus:border-purple-500" })) : null, isReviewMode && answer && (_jsxs("div", { className: "text-xs mt-1", children: [_jsx("span", { className: "text-gray-500", children: "\u0110\u00E1p \u00E1n: " }), _jsx("span", { className: "font-bold text-green-700", children: answer }), userAns && userAns !== answer && (_jsx("span", { className: "ml-2 line-through text-red-500 font-semibold", children: userAns }))] }))] }), _jsxs("span", { className: "text-xs text-gray-400", children: ["(", c.length, " ch\u1EEF)"] })] }, `down-${c.number}`));
                                         }) })] })] }), _jsx("div", { className: "lg:col-span-7 flex justify-center overflow-x-auto p-4 bg-gray-50 rounded-xl border border-gray-200", children: _jsx("div", { className: "inline-grid gap-1", style: {
                                 gridTemplateColumns: `repeat(${cols}, minmax(0, 1fr))`,
                             }, children: Array.from({ length: rows }).map((_, rIdx) => {
@@ -90,5 +92,5 @@ export function CrosswordPuzzleClient({ content, correctAnswer, isReviewMode = f
                                     }
                                     return (_jsxs("div", { className: `relative flex items-center justify-center rounded border-2 font-bold shadow-sm h-8 w-8 sm:h-9 sm:w-9 md:h-10 md:w-10 text-sm sm:text-base md:text-lg ${cellBg} ${textColor}`, children: [clueNum && (_jsx("span", { className: "absolute top-0.5 left-1 text-[9px] font-bold text-gray-500 leading-none", children: clueNum })), _jsx("span", { children: previewLetter })] }, key));
                                 });
-                            }) }) })] })] }));
+                            }) }) })] }), (content?.type === 'HIDDEN_WORD' || content?.markedColumn) && (_jsxs("div", { className: "rounded-lg border border-amber-200 bg-amber-50 p-3", children: [_jsx("label", { className: "block text-sm font-semibold text-amber-900 mb-1", children: "What's the hidden word?" }), !isReviewMode && onAnswerChange ? (_jsx("input", { type: "text", value: userAnswers['hidden-word'] || '', onChange: (event) => onAnswerChange('hidden-word', event.target.value.toUpperCase()), placeholder: "Hidden word", className: "w-full rounded border border-amber-300 px-3 py-1.5 text-sm font-semibold uppercase tracking-wider outline-none focus:border-amber-500" })) : (_jsxs("div", { className: "text-sm", children: [userAnswers['hidden-word'] && (_jsx("span", { className: "font-semibold text-gray-800", children: userAnswers['hidden-word'] })), isReviewMode && correctAnswer?.answers?.['hidden-word'] && (_jsxs("div", { className: "text-xs mt-1", children: [_jsx("span", { className: "text-gray-500", children: "\u0110\u00E1p \u00E1n: " }), _jsx("span", { className: "font-bold text-green-700", children: correctAnswer.answers['hidden-word'] })] }))] }))] }))] }));
 }