catchup-library-web 1.21.9 → 1.21.10

package/dist/index.js

@@ -5819,32 +5819,37 @@ var MatchingActivityMaterialContent = ({
     ).answerMap = materialMap;
   }, [showCorrectAnswer, answer, materialMap]);
   (0, import_react21.useEffect)(() => {
-    if (dropTargetKey && dropZoneRefs.current[dropTargetKey]) {
-      const dropZoneElement = dropZoneRefs.current[dropTargetKey];
-      if (dropZoneElement) {
-        const targetPosition = dropZoneElement.getBoundingClientRect().top + window.pageYOffset;
-        const startPosition = window.pageYOffset;
-        const distance = targetPosition - startPosition - window.innerHeight / 2 + dropZoneElement.offsetHeight / 2;
-        const duration = 800;
-        let start = null;
-        const easeInOutQuad = (t) => {
-          return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
-        };
-        const animation = (currentTime) => {
-          if (start === null) start = currentTime;
-          const timeElapsed = currentTime - start;
-          const progress = Math.min(timeElapsed / duration, 1);
-          window.scrollTo(
-            0,
-            startPosition + distance * easeInOutQuad(progress)
-          );
-          if (timeElapsed < duration) {
-            requestAnimationFrame(animation);
-          }
-        };
-        requestAnimationFrame(animation);
+    if (!dropTargetKey || !dropZoneRefs.current[dropTargetKey]) return;
+    const dropZoneElement = dropZoneRefs.current[dropTargetKey];
+    if (!dropZoneElement) return;
+    const rect = dropZoneElement.getBoundingClientRect();
+    const elementTop = rect.top + window.scrollY;
+    const elementHeight = rect.height;
+    const viewportHeight = window.innerHeight;
+    const targetScroll = elementTop - viewportHeight / 2 + elementHeight / 2;
+    const startScroll = window.scrollY;
+    const distance = targetScroll - startScroll;
+    console.log("Scrolling to element:", dropTargetKey);
+    console.log("Current scroll:", startScroll);
+    console.log("Target scroll:", targetScroll);
+    console.log("Distance:", distance);
+    if (Math.abs(distance) < 10) return;
+    const duration = 800;
+    let startTime = null;
+    const easeInOutQuad = (t) => {
+      return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
+    };
+    const animate = (currentTime) => {
+      if (startTime === null) startTime = currentTime;
+      const elapsed = currentTime - startTime;
+      const progress = Math.min(elapsed / duration, 1);
+      const easedProgress = easeInOutQuad(progress);
+      window.scrollTo(0, startScroll + distance * easedProgress);
+      if (progress < 1) {
+        requestAnimationFrame(animate);
       }
-    }
+    };
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
   const retrieveAnswerMap = () => {
     const foundIndex = answer.data.findIndex(

package/dist/index.mjs

@@ -5603,32 +5603,37 @@ var MatchingActivityMaterialContent = ({
     ).answerMap = materialMap;
   }, [showCorrectAnswer, answer, materialMap]);
   useEffect11(() => {
-    if (dropTargetKey && dropZoneRefs.current[dropTargetKey]) {
-      const dropZoneElement = dropZoneRefs.current[dropTargetKey];
-      if (dropZoneElement) {
-        const targetPosition = dropZoneElement.getBoundingClientRect().top + window.pageYOffset;
-        const startPosition = window.pageYOffset;
-        const distance = targetPosition - startPosition - window.innerHeight / 2 + dropZoneElement.offsetHeight / 2;
-        const duration = 800;
-        let start = null;
-        const easeInOutQuad = (t) => {
-          return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
-        };
-        const animation = (currentTime) => {
-          if (start === null) start = currentTime;
-          const timeElapsed = currentTime - start;
-          const progress = Math.min(timeElapsed / duration, 1);
-          window.scrollTo(
-            0,
-            startPosition + distance * easeInOutQuad(progress)
-          );
-          if (timeElapsed < duration) {
-            requestAnimationFrame(animation);
-          }
-        };
-        requestAnimationFrame(animation);
+    if (!dropTargetKey || !dropZoneRefs.current[dropTargetKey]) return;
+    const dropZoneElement = dropZoneRefs.current[dropTargetKey];
+    if (!dropZoneElement) return;
+    const rect = dropZoneElement.getBoundingClientRect();
+    const elementTop = rect.top + window.scrollY;
+    const elementHeight = rect.height;
+    const viewportHeight = window.innerHeight;
+    const targetScroll = elementTop - viewportHeight / 2 + elementHeight / 2;
+    const startScroll = window.scrollY;
+    const distance = targetScroll - startScroll;
+    console.log("Scrolling to element:", dropTargetKey);
+    console.log("Current scroll:", startScroll);
+    console.log("Target scroll:", targetScroll);
+    console.log("Distance:", distance);
+    if (Math.abs(distance) < 10) return;
+    const duration = 800;
+    let startTime = null;
+    const easeInOutQuad = (t) => {
+      return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
+    };
+    const animate = (currentTime) => {
+      if (startTime === null) startTime = currentTime;
+      const elapsed = currentTime - startTime;
+      const progress = Math.min(elapsed / duration, 1);
+      const easedProgress = easeInOutQuad(progress);
+      window.scrollTo(0, startScroll + distance * easedProgress);
+      if (progress < 1) {
+        requestAnimationFrame(animate);
       }
-    }
+    };
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
   const retrieveAnswerMap = () => {
     const foundIndex = answer.data.findIndex(

package/package.json

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

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

@@ -63,42 +63,52 @@ const MatchingActivityMaterialContent = ({
   }, [showCorrectAnswer, answer, materialMap]);
 
   useEffect(() => {
-    if (dropTargetKey && dropZoneRefs.current[dropTargetKey]) {
-      const dropZoneElement = dropZoneRefs.current[dropTargetKey];
-      if (dropZoneElement) {
-        const targetPosition =
-          dropZoneElement.getBoundingClientRect().top + window.pageYOffset;
-        const startPosition = window.pageYOffset;
-        const distance =
-          targetPosition -
-          startPosition -
-          window.innerHeight / 2 +
-          dropZoneElement.offsetHeight / 2;
-        const duration = 800; // Adjust this value (in milliseconds) to control speed
-        let start: number | null = null;
-
-        const easeInOutQuad = (t: number) => {
-          return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
-        };
-
-        const animation = (currentTime: number) => {
-          if (start === null) start = currentTime;
-          const timeElapsed = currentTime - start;
-          const progress = Math.min(timeElapsed / duration, 1);
-
-          window.scrollTo(
-            0,
-            startPosition + distance * easeInOutQuad(progress)
-          );
-
-          if (timeElapsed < duration) {
-            requestAnimationFrame(animation);
-          }
-        };
-
-        requestAnimationFrame(animation);
+    if (!dropTargetKey || !dropZoneRefs.current[dropTargetKey]) return;
+
+    const dropZoneElement = dropZoneRefs.current[dropTargetKey];
+    if (!dropZoneElement) return;
+
+    // Get the element's position relative to the viewport
+    const rect = dropZoneElement.getBoundingClientRect();
+    const elementTop = rect.top + window.scrollY;
+    const elementHeight = rect.height;
+    const viewportHeight = window.innerHeight;
+
+    // Calculate target scroll position (center the element in viewport)
+    const targetScroll = elementTop - viewportHeight / 2 + elementHeight / 2;
+    const startScroll = window.scrollY;
+    const distance = targetScroll - startScroll;
+
+    console.log("Scrolling to element:", dropTargetKey);
+    console.log("Current scroll:", startScroll);
+    console.log("Target scroll:", targetScroll);
+    console.log("Distance:", distance);
+
+    // Don't animate if already roughly in position
+    if (Math.abs(distance) < 10) return;
+
+    const duration = 800;
+    let startTime: number | null = null;
+
+    const easeInOutQuad = (t: number): number => {
+      return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t;
+    };
+
+    const animate = (currentTime: number) => {
+      if (startTime === null) startTime = currentTime;
+
+      const elapsed = currentTime - startTime;
+      const progress = Math.min(elapsed / duration, 1);
+      const easedProgress = easeInOutQuad(progress);
+
+      window.scrollTo(0, startScroll + distance * easedProgress);
+
+      if (progress < 1) {
+        requestAnimationFrame(animate);
       }
-    }
+    };
+
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
 
   const retrieveAnswerMap = () => {