catchup-library-web 1.21.12 → 1.21.15

package/dist/index.js

@@ -5388,32 +5388,48 @@ var GroupingActivityMaterialContent = ({
     ).answerMap = materialMap;
   }, [showCorrectAnswer, answer, materialMap]);
   (0, import_react20.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 findScrollableParent = (element) => {
+      let parent = element.parentElement;
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (overflow === "auto" || overflow === "scroll" || overflowY === "auto" || overflowY === "scroll") {
+          return parent;
+        }
+        parent = parent.parentElement;
       }
-    }
+      return document.documentElement;
+    };
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+    const elementTop = elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
+    const distance = targetScroll - startScroll;
+    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);
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
+      if (progress < 1) {
+        requestAnimationFrame(animate);
+      }
+    };
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
   const retrieveAnswerMap = () => {
     const foundIndex = answer.data.findIndex(
@@ -5822,17 +5838,27 @@ var MatchingActivityMaterialContent = ({
     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 findScrollableParent = (element) => {
+      let parent = element.parentElement;
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (overflow === "auto" || overflow === "scroll" || overflowY === "auto" || overflowY === "scroll") {
+          return parent;
+        }
+        parent = parent.parentElement;
+      }
+      return document.documentElement;
+    };
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+    const elementTop = elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
     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;
@@ -5841,14 +5867,11 @@ var MatchingActivityMaterialContent = ({
     };
     const animate = (currentTime) => {
       if (startTime === null) startTime = currentTime;
-      console.log("startTime:", startTime);
       const elapsed = currentTime - startTime;
-      console.log("elapsed:", elapsed);
       const progress = Math.min(elapsed / duration, 1);
-      console.log("progress:", progress);
       const easedProgress = easeInOutQuad(progress);
-      console.log("eased progressed: ", easedProgress);
-      window.scrollTo(0, startScroll + distance * easedProgress);
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
       if (progress < 1) {
         requestAnimationFrame(animate);
       }

package/dist/index.mjs

@@ -5172,32 +5172,48 @@ var GroupingActivityMaterialContent = ({
     ).answerMap = materialMap;
   }, [showCorrectAnswer, answer, materialMap]);
   useEffect10(() => {
-    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 findScrollableParent = (element) => {
+      let parent = element.parentElement;
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (overflow === "auto" || overflow === "scroll" || overflowY === "auto" || overflowY === "scroll") {
+          return parent;
+        }
+        parent = parent.parentElement;
       }
-    }
+      return document.documentElement;
+    };
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+    const elementTop = elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
+    const distance = targetScroll - startScroll;
+    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);
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
+      if (progress < 1) {
+        requestAnimationFrame(animate);
+      }
+    };
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
   const retrieveAnswerMap = () => {
     const foundIndex = answer.data.findIndex(
@@ -5606,17 +5622,27 @@ var MatchingActivityMaterialContent = ({
     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 findScrollableParent = (element) => {
+      let parent = element.parentElement;
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (overflow === "auto" || overflow === "scroll" || overflowY === "auto" || overflowY === "scroll") {
+          return parent;
+        }
+        parent = parent.parentElement;
+      }
+      return document.documentElement;
+    };
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+    const elementTop = elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
     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;
@@ -5625,14 +5651,11 @@ var MatchingActivityMaterialContent = ({
     };
     const animate = (currentTime) => {
       if (startTime === null) startTime = currentTime;
-      console.log("startTime:", startTime);
       const elapsed = currentTime - startTime;
-      console.log("elapsed:", elapsed);
       const progress = Math.min(elapsed / duration, 1);
-      console.log("progress:", progress);
       const easedProgress = easeInOutQuad(progress);
-      console.log("eased progressed: ", easedProgress);
-      window.scrollTo(0, startScroll + distance * easedProgress);
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
       if (progress < 1) {
         requestAnimationFrame(animate);
       }

package/package.json

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

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

@@ -65,42 +65,69 @@ const GroupingActivityMaterialContent = ({
   }, [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;
+
+    // Find the scrollable parent container
+    const findScrollableParent = (element: HTMLElement): HTMLElement | null => {
+      let parent = element.parentElement;
+
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (
+          overflow === "auto" ||
+          overflow === "scroll" ||
+          overflowY === "auto" ||
+          overflowY === "scroll"
+        ) {
+          return parent;
+        }
+        parent = parent.parentElement;
       }
-    }
+
+      return document.documentElement;
+    };
+
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
+
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+
+    const elementTop =
+      elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
+    const distance = targetScroll - startScroll;
+    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);
+
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
+      if (progress < 1) {
+        requestAnimationFrame(animate);
+      }
+    };
+
+    requestAnimationFrame(animate);
   }, [dropTargetKey]);
 
   const retrieveAnswerMap = () => {

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

@@ -68,23 +68,40 @@ const MatchingActivityMaterialContent = ({
     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;
+    // Find the scrollable parent container
+    const findScrollableParent = (element: HTMLElement): HTMLElement | null => {
+      let parent = element.parentElement;
+
+      while (parent) {
+        const { overflow, overflowY } = window.getComputedStyle(parent);
+        if (
+          overflow === "auto" ||
+          overflow === "scroll" ||
+          overflowY === "auto" ||
+          overflowY === "scroll"
+        ) {
+          return parent;
+        }
+        parent = parent.parentElement;
+      }
+
+      return document.documentElement;
+    };
 
-    console.log("Scrolling to element:", dropTargetKey);
-    console.log("Current scroll:", startScroll);
-    console.log("Target scroll:", targetScroll);
-    console.log("Distance:", distance);
+    const scrollContainer = findScrollableParent(dropZoneElement);
+    if (!scrollContainer) return;
 
-    // Don't animate if already roughly in position
+    const containerRect = scrollContainer.getBoundingClientRect();
+    const elementRect = dropZoneElement.getBoundingClientRect();
+
+    const elementTop =
+      elementRect.top - containerRect.top + scrollContainer.scrollTop;
+    const elementHeight = elementRect.height;
+    const containerHeight = containerRect.height;
+
+    const targetScroll = elementTop - containerHeight / 2 + elementHeight / 2;
+    const startScroll = scrollContainer.scrollTop;
+    const distance = targetScroll - startScroll;
     if (Math.abs(distance) < 10) return;
 
     const duration = 800;
@@ -97,16 +114,12 @@ const MatchingActivityMaterialContent = ({
     const animate = (currentTime: number) => {
       if (startTime === null) startTime = currentTime;
 
-      console.log("startTime:", startTime);
       const elapsed = currentTime - startTime;
-      console.log("elapsed:", elapsed);
       const progress = Math.min(elapsed / duration, 1);
-      console.log("progress:", progress);
       const easedProgress = easeInOutQuad(progress);
-      console.log("eased progressed: ", easedProgress);
-
-      window.scrollTo(0, startScroll + distance * easedProgress);
 
+      const newScrollTop = startScroll + distance * easedProgress;
+      scrollContainer.scrollTop = newScrollTop;
       if (progress < 1) {
         requestAnimationFrame(animate);
       }