@nualang/nualang-ui-components 0.1.1142 → 0.1.1143

package/dist/Charts/Bar/Exercises/Exercises.js

@@ -66,7 +66,7 @@ function Exercises({
   }, []);
   return /*#__PURE__*/_react.default.createElement("div", null, !showTable ? /*#__PURE__*/_react.default.createElement(_reactChartjs.Bar, {
     "aria-label": alt ? alt : "Exercises Completed Chart",
-    "aria-role": "img",
+    role: "img",
     data: exercisesData,
     options: {
       indexAxis: "y",

package/dist/Forms/CreateCourse/Steps/CourseInformation/CourseInformation.js

@@ -101,7 +101,7 @@ function CourseInformation({
     variant: "outlined",
     fullWidth: true,
     required: true
-  }, difficultyOptions)), "        ", /*#__PURE__*/_react.default.createElement(_material.Grid, {
+  }, difficultyOptions)), " ", /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
     xs: 12
   }, /*#__PURE__*/_react.default.createElement(_LanguageSelector.default, {

package/dist/hooks/useExerciseState.js

@@ -271,40 +271,42 @@ function useExerciseState({
   (0, _react.useEffect)(() => {
     if (["translation"].includes(exerciseName)) {
       if (currentTranslations && currentTranslations.length > 0) {
-        // Create an array of the needed words for the translation
         const currentTranslationArray = currentTranslations[0].split(" ");
-        let wordLibraryCopy = [];
-        for (let i = 0; i < wordLibrary.length; i++) {
-          if (i === 0) {
-            if (!wordLibrary.includes(`${wordLibrary[i]}-${wordLibrary[i + 1]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          } else if (i === wordLibrary.length - 1) {
-            if (!wordLibrary.includes(`${wordLibrary[i - 1]}-${wordLibrary[i]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          } else {
-            if (i > 0 && i < wordLibrary.length - 1 && !wordLibrary.includes(`${wordLibrary[i]}-${wordLibrary[i + 1]}`) && !wordLibrary.includes(`${wordLibrary[i - 1]}-${wordLibrary[i]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          }
-        }
-        // Shuffle the word library
-        (0, _index.shuffle)(wordLibraryCopy);
-        // Create a unique list of words to prevent duplicates being used for additional options
-        const wordSet = new Set([...currentTranslationArray, ...wordLibraryCopy]);
-        // Take up to five additional words as additional options
-        const additonalOptions = [...wordSet].slice(currentTranslationArray.length, currentTranslationArray.length + 5).filter(w => {
-          if (currentTranslationArray.includes(w) || currentTranslationArray.includes(w.toLowerCase()) || currentTranslationArray.includes(w.toUpperCase()) || currentTranslationArray.includes((0, _index.capitalize)(w))) {
+        const normalizeWord = word => word.replace(/[.,!¡¿?;:]/g, "").toLowerCase();
+        const normalizedToOriginalMap = new Map();
+        currentTranslationArray.forEach(word => {
+          const normalized = normalizeWord(word);
+          normalizedToOriginalMap.set(normalized, word);
+        });
+        const wordLibraryCopy = wordLibrary.filter((word, i, arr) => {
+          const prevWord = i > 0 ? arr[i - 1] : null;
+          const nextWord = i < arr.length - 1 ? arr[i + 1] : null;
+          const prevPair = prevWord ? `${prevWord}-${word}` : null;
+          const nextPair = nextWord ? `${word}-${nextWord}` : null;
+          if (prevPair && arr.includes(prevPair) || nextPair && arr.includes(nextPair)) {
             return false;
-          } else {
+          }
+          const normalized = normalizeWord(word);
+          if (!normalizedToOriginalMap.has(normalized)) {
+            normalizedToOriginalMap.set(normalized, word);
             return true;
           }
+          return false;
         });
-        // Create the word options array
-        const wordOptions = [...currentTranslationArray, ...additonalOptions].map((w, i) => ({
-          text: w,
-          id: i
+
+        // Shuffle the word library copy
+        (0, _index.shuffle)(wordLibraryCopy);
+
+        // Create a set for unique words
+        const wordSet = new Set(normalizedToOriginalMap.keys());
+
+        // Take up to five additional words as options
+        const additionalOptions = Array.from(wordSet).slice(currentTranslationArray.length, currentTranslationArray.length + 5);
+
+        // Create the word options array using the original formatting for display
+        const wordOptions = [...currentTranslationArray, ...additionalOptions.map(normalized => normalizedToOriginalMap.get(normalized))].map((text, id) => ({
+          text,
+          id
         }));
         (0, _index.shuffle)(wordOptions);
         setWordOptions(wordOptions);
@@ -314,40 +316,42 @@ function useExerciseState({
   (0, _react.useEffect)(() => {
     if (["listening"].includes(exerciseName)) {
       if (wordLibrary && wordLibrary.length > 0) {
-        // Create an array of the needed words for the phrase
         const currentPhraseArray = currentPhrase.phrase.split(" ");
-        let wordLibraryCopy = [];
-        for (let i = 0; i < wordLibrary.length; i++) {
-          if (i === 0) {
-            if (!wordLibrary.includes(`${wordLibrary[i]}-${wordLibrary[i + 1]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          } else if (i === wordLibrary.length - 1) {
-            if (!wordLibrary.includes(`${wordLibrary[i - 1]}-${wordLibrary[i]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          } else {
-            if (i > 0 && i < wordLibrary.length - 1 && !wordLibrary.includes(`${wordLibrary[i]}-${wordLibrary[i + 1]}`) && !wordLibrary.includes(`${wordLibrary[i - 1]}-${wordLibrary[i]}`)) {
-              wordLibraryCopy.push(wordLibrary[i]);
-            }
-          }
-        }
-        // Shuffle the word library
-        (0, _index.shuffle)(wordLibraryCopy);
-        // Create a unique list of words to prevent duplicates being used for additional options
-        const wordSet = new Set([...currentPhraseArray, ...wordLibraryCopy]);
-        // Take up to five additional words as additional options
-        const additonalOptions = [...wordSet].slice(currentPhraseArray.length, currentPhraseArray.length + 5).filter(w => {
-          if (currentPhraseArray.includes(w) || currentPhraseArray.includes(w.toLowerCase()) || currentPhraseArray.includes(w.toUpperCase()) || currentPhraseArray.includes((0, _index.capitalize)(w))) {
+        const normalizeWord = word => word.replace(/[.,!¡¿?;:]/g, "").toLowerCase();
+        const normalizedToOriginalMap = new Map();
+        currentPhraseArray.forEach(word => {
+          const normalized = normalizeWord(word);
+          normalizedToOriginalMap.set(normalized, word);
+        });
+        const wordLibraryCopy = wordLibrary.filter((word, i, arr) => {
+          const prevWord = i > 0 ? arr[i - 1] : null;
+          const nextWord = i < arr.length - 1 ? arr[i + 1] : null;
+          const prevPair = prevWord ? `${prevWord}-${word}` : null;
+          const nextPair = nextWord ? `${word}-${nextWord}` : null;
+          if (prevPair && arr.includes(prevPair) || nextPair && arr.includes(nextPair)) {
             return false;
-          } else {
+          }
+          const normalized = normalizeWord(word);
+          if (!normalizedToOriginalMap.has(normalized)) {
+            normalizedToOriginalMap.set(normalized, word);
             return true;
           }
+          return false;
         });
-        // Create the word options array
-        const wordOptions = [...currentPhraseArray, ...additonalOptions].map((w, i) => ({
-          text: w,
-          id: i
+
+        // Shuffle the word library copy
+        (0, _index.shuffle)(wordLibraryCopy);
+
+        // Create a set of normalized words to ensure uniqueness
+        const wordSet = new Set(normalizedToOriginalMap.keys());
+
+        // Take up to five additional words as options
+        const additionalOptions = Array.from(wordSet).slice(currentPhraseArray.length, currentPhraseArray.length + 5);
+
+        // Create the word options array using the original formatting for display
+        const wordOptions = [...currentPhraseArray, ...additionalOptions.map(normalized => normalizedToOriginalMap.get(normalized))].map((text, id) => ({
+          text,
+          id
         }));
         (0, _index.shuffle)(wordOptions);
         setWordOptions(wordOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1142",
+  "version": "0.1.1143",
   "main": "dist/index.js",
   "files": [
     "dist",