If someone else wants to join in on the fun be my guest

src/components/Exercises/FillBlanks/index.tsx

@@ -20,6 +20,7 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
     onNext,
     onBack,
 }) => {
+    const { shuffleMaps } = useExamStore((state) => state);
     const [answers, setAnswers] = useState<{ id: string; solution: string }[]>(userSolutions);
     const hasExamEnded = useExamStore((state) => state.hasExamEnded);
 
@@ -62,6 +63,15 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
           } else if ('letter' in option) {
             return solution.toLowerCase() === option.word.toLowerCase();
           } else if ('options' in option) {
+            if (shuffleMaps.length !== 0) {
+                const shuffleMap = shuffleMaps.find((map) => map.id == x.id)
+                if (!shuffleMap) {
+                    return false;
+                }
+                const original = shuffleMap[x.solution as keyof typeof shuffleMap];
+                return solution.toLowerCase() === (option.options[original as keyof typeof option.options] || '').toLowerCase();
+            }
+
             return solution.toLowerCase() === (option.options[x.solution as keyof typeof option.options] || '').toLowerCase();
           }
           return false;
@@ -119,6 +129,18 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
         setAnswers((prev) => [...prev.filter((x) => x.id !== id), { id: id, solution: value }]);
     }
 
+    const getShuffles = () => {
+		let shuffle = {};
+		if (shuffleMaps.length !== 0) {
+			shuffle = {
+				shuffleMaps: shuffleMaps.filter((map) =>
+					answers.some(answer => answer.id === map.id)
+				)
+			}
+		}
+		return shuffle;
+	}
+
     return (
         <>
             <div className="flex flex-col gap-4 mt-4 h-full w-full mb-20">
@@ -190,14 +212,14 @@ const FillBlanks: React.FC<FillBlanksExercise & CommonProps> = ({
                 <Button
                     color="purple"
                     variant="outline"
-                    onClick={() => onBack({ exercise: id, solutions: answers, score: calculateScore(), type })}
+                    onClick={() => onBack({ exercise: id, solutions: answers, score: calculateScore(), type, ...getShuffles() })}
                     className="max-w-[200px] w-full">
                     Back
                 </Button>
 
                 <Button
                     color="purple"
-                    onClick={() => onNext({ exercise: id, solutions: answers, score: calculateScore(), type })}
+                    onClick={() => onNext({ exercise: id, solutions: answers, score: calculateScore(), type, ...getShuffles() })}
                     className="max-w-[200px] self-end w-full">
                     Next
                 </Button>