catchup-library-web 2.0.23 → 2.1.1

package/dist/index.js

@@ -5662,7 +5662,6 @@ var MatchingActivityMaterialContent = ({
   const [draggedElement, setDraggedElement] = (0, import_react21.useState)(
     null
   );
-  const [isShuffled, setIsShuffled] = (0, import_react21.useState)(false);
   const [shuffledMaterialList, setShuffledMaterialList] = (0, import_react21.useState)([]);
   const dragElementRef = (0, import_react21.useRef)(null);
   const [mousePosition, setMousePosition] = (0, import_react21.useState)({
@@ -5675,25 +5674,24 @@ var MatchingActivityMaterialContent = ({
   });
   const itemsRef = (0, import_react21.useRef)(null);
   const dropZoneRefs = (0, import_react21.useRef)({});
+  const hasShuffledRef = (0, import_react21.useRef)(false);
   (0, import_react21.useEffect)(() => {
+    if (hasShuffledRef.current) return;
     const shuffleArray2 = (array) => {
-      if (!isShuffled) {
-        const copyArray = JSON.parse(JSON.stringify(array));
-        for (let i = copyArray.length - 1; i > 0; i--) {
-          const j = Math.floor(Math.random() * (i + 1));
-          [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
-        }
-        setIsShuffled(true);
-        return copyArray;
+      const copyArray = JSON.parse(JSON.stringify(array));
+      for (let i = copyArray.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
       }
-      return array;
+      return copyArray;
     };
     const materialList = [];
     Object.keys(materialMap).forEach((materialKey) => {
       materialList.push(materialMap[materialKey]);
     });
     setShuffledMaterialList(shuffleArray2(materialList));
-  }, [materialMap, isShuffled]);
+    hasShuffledRef.current = true;
+  }, [materialMap]);
   (0, import_react21.useEffect)(() => {
     if (!showCorrectAnswer) return;
     answerMap = materialMap;
@@ -7083,7 +7081,9 @@ var ActivitySolutionContent = ({
     return null;
   let solutionMap;
   try {
-    solutionMap = JSON.parse(solutionMapString);
+    solutionMap = JSON.parse(
+      solutionMapString.replace("\n[ONAYLI CEVAP]\n", "").replace("\n[ONAYLI CEVAP]", "").replace("[ONAYLI CEVAP]\n", "").replace("[ONAYLI CEVAP]", "")
+    );
   } catch (error) {
     console.error("Error parsing solution map:", error);
     return null;

package/dist/index.mjs

@@ -5438,7 +5438,6 @@ var MatchingActivityMaterialContent = ({
   const [draggedElement, setDraggedElement] = useState20(
     null
   );
-  const [isShuffled, setIsShuffled] = useState20(false);
   const [shuffledMaterialList, setShuffledMaterialList] = useState20([]);
   const dragElementRef = useRef6(null);
   const [mousePosition, setMousePosition] = useState20({
@@ -5451,25 +5450,24 @@ var MatchingActivityMaterialContent = ({
   });
   const itemsRef = useRef6(null);
   const dropZoneRefs = useRef6({});
+  const hasShuffledRef = useRef6(false);
   useEffect11(() => {
+    if (hasShuffledRef.current) return;
     const shuffleArray2 = (array) => {
-      if (!isShuffled) {
-        const copyArray = JSON.parse(JSON.stringify(array));
-        for (let i = copyArray.length - 1; i > 0; i--) {
-          const j = Math.floor(Math.random() * (i + 1));
-          [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
-        }
-        setIsShuffled(true);
-        return copyArray;
+      const copyArray = JSON.parse(JSON.stringify(array));
+      for (let i = copyArray.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
       }
-      return array;
+      return copyArray;
     };
     const materialList = [];
     Object.keys(materialMap).forEach((materialKey) => {
       materialList.push(materialMap[materialKey]);
     });
     setShuffledMaterialList(shuffleArray2(materialList));
-  }, [materialMap, isShuffled]);
+    hasShuffledRef.current = true;
+  }, [materialMap]);
   useEffect11(() => {
     if (!showCorrectAnswer) return;
     answerMap = materialMap;
@@ -6859,7 +6857,9 @@ var ActivitySolutionContent = ({
     return null;
   let solutionMap;
   try {
-    solutionMap = JSON.parse(solutionMapString);
+    solutionMap = JSON.parse(
+      solutionMapString.replace("\n[ONAYLI CEVAP]\n", "").replace("\n[ONAYLI CEVAP]", "").replace("[ONAYLI CEVAP]\n", "").replace("[ONAYLI CEVAP]", "")
+    );
   } catch (error) {
     console.error("Error parsing solution map:", error);
     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catchup-library-web",
-  "version": "2.0.23",
+  "version": "2.1.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/components/activities/material-contents/MatchingActivityMaterialContent.tsx

@@ -21,7 +21,6 @@ const MatchingActivityMaterialContent = ({
   const [draggedElement, setDraggedElement] = useState<HTMLElement | null>(
     null
   );
-  const [isShuffled, setIsShuffled] = useState(false);
   const [shuffledMaterialList, setShuffledMaterialList] = useState<any[]>([]);
   const dragElementRef = useRef<HTMLDivElement>(null);
   const [mousePosition, setMousePosition] = useState<{ x: number; y: number }>({
@@ -34,26 +33,29 @@ const MatchingActivityMaterialContent = ({
   });
   const itemsRef = useRef<HTMLDivElement>(null);
   const dropZoneRefs = useRef<{ [key: string]: HTMLDivElement | null }>({});
+  const hasShuffledRef = useRef<boolean>(false);
 
   useEffect(() => {
+    // Only shuffle once, ever
+    if (hasShuffledRef.current) return;
+
     const shuffleArray = (array: any) => {
-      if (!isShuffled) {
-        const copyArray = JSON.parse(JSON.stringify(array));
-        for (let i = copyArray.length - 1; i > 0; i--) {
-          const j = Math.floor(Math.random() * (i + 1));
-          [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
-        }
-        setIsShuffled(true);
-        return copyArray;
+      const copyArray = JSON.parse(JSON.stringify(array));
+      for (let i = copyArray.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [copyArray[i], copyArray[j]] = [copyArray[j], copyArray[i]];
       }
-      return array;
+      return copyArray;
     };
+
     const materialList: any = [];
     Object.keys(materialMap).forEach((materialKey) => {
       materialList.push(materialMap[materialKey]);
     });
+
     setShuffledMaterialList(shuffleArray(materialList));
-  }, [materialMap, isShuffled]);
+    hasShuffledRef.current = true;
+  }, [materialMap]);
 
   useEffect(() => {
     if (!showCorrectAnswer) return;
@@ -66,7 +68,6 @@ const MatchingActivityMaterialContent = ({
     const dropZoneElement = dropZoneRefs.current[dropTargetKey];
     if (!dropZoneElement) return;
 
-    // Find the scrollable parent container
     const findScrollableParent = (element: HTMLElement): HTMLElement | null => {
       let parent = element.parentElement;
 
@@ -249,7 +250,6 @@ const MatchingActivityMaterialContent = ({
 
   return (
     <div onMouseMove={handleMouseMove} onMouseUp={handleMouseUp}>
-      {/* Floating drag preview for mouse */}
       {draggedValue && mousePosition.x > 0 && (
         <div
           className="fixed pointer-events-none z-50 opacity-80"
@@ -297,7 +297,6 @@ const MatchingActivityMaterialContent = ({
         </div>
       )}
 
-      {/* Floating drag preview for touch */}
       {draggedValue && touchPosition.x > 0 && (
         <div
           className="fixed pointer-events-none z-50 opacity-80"

package/src/components/activities/solution-contents/ActivitySolutionContent.tsx

@@ -32,7 +32,13 @@ const ActivitySolutionContent = ({
 
   let solutionMap;
   try {
-    solutionMap = JSON.parse(solutionMapString);
+    solutionMap = JSON.parse(
+      solutionMapString
+        .replace("\n[ONAYLI CEVAP]\n", "")
+        .replace("\n[ONAYLI CEVAP]", "")
+        .replace("[ONAYLI CEVAP]\n", "")
+        .replace("[ONAYLI CEVAP]", "")
+    );
   } catch (error) {
     console.error("Error parsing solution map:", error);
     return null;