lido-player 0.0.2-beta-24 → 0.0.2-beta-25-dev

package/dist/collection/utils/utilsHandlers/slideHandler.js

@@ -160,6 +160,7 @@ export function slidingWithScaling(element) {
     };
     // Start observing the element
     observer.observe(parentElement, observerConfig);
+    let mostOverlappedElement;
     const onMove = (event) => {
         if (!isDragging)
             return;
@@ -180,12 +181,14 @@ export function slidingWithScaling(element) {
         // Get the dimensions and scale-corrected position of the container and element
         const containerRect = parentElement.getBoundingClientRect();
         const elementRect = element.getBoundingClientRect();
-        const numbers = element.style.transform.match(/-?\d+(\.\d+)?/g);
-        const result = numbers.map(Number);
-        const initialElementLeftPx = elementRect.left / parentElementScale - result[0];
-        const initialElementTopPx = elementRect.top - result[1];
-        const initialElementRightPx = elementRect.right / parentElementScale - result[0];
-        const initialElementBottomPx = elementRect.bottom - result[1];
+        // Firefox serializes translate(x, 0) as translate(x), so parsing the
+        // inline string can lose Y and produce NaN. Read the computed matrix instead.
+        const transform = window.getComputedStyle(element).transform;
+        const translation = new DOMMatrixReadOnly(transform === 'none' ? undefined : transform);
+        const initialElementLeftPx = elementRect.left / parentElementScale - translation.m41;
+        const initialElementTopPx = elementRect.top - translation.m42;
+        const initialElementRightPx = elementRect.right / parentElementScale - translation.m41;
+        const initialElementBottomPx = elementRect.bottom - translation.m42;
         const maxRight = containerRect.right - initialElementRightPx;
         const maxLeft = containerRect.left - initialElementLeftPx;
         const maxTop = containerRect.top - initialElementTopPx;
@@ -195,7 +198,7 @@ export function slidingWithScaling(element) {
         // Apply transform with translation within boundaries
         element.style.transform = `translate(${newLeftClamp}px, ${newTopClamp}px)`;
         // Check for overlaps and highlight only the most overlapping element
-        let mostOverlappedElement = findMostoverlappedElement(element, 'slide');
+        mostOverlappedElement = findMostoverlappedElement(element, 'slide');
         // Apply styles only to the most overlapped element
         if (mostOverlappedElement) {
             if (mostOverlappedElement != element) {
@@ -256,6 +259,7 @@ export function slidingWithScaling(element) {
         setTimeout(() => {
             if (overlapElement) {
                 void slideCompleted(element);
+                updateReorderCorrectness(container, element, mostOverlappedElement);
                 overlapElement = false;
             }
         }, 300);
@@ -298,18 +302,50 @@ export const isArrangeLettersComplete = (slideValues, objectiveString) => {
     return slideValues.length === objectiveValues.length
         && slideValues.every((value, index) => value === objectiveValues[index]);
 };
-export const updateReorderCorrectness = (container, slideValues, objectiveValues) => {
-    const slideElements = Array.from(container.querySelectorAll('[type="slide"]'));
-    slideElements.forEach((element, index) => {
-        const isCorrect = index < objectiveValues.length && slideValues[index] === objectiveValues[index].trim();
-        if (isCorrect) {
-            applyBorderToClickableCell(element, '#65BC46');
-        }
-        else {
-            element.style.removeProperty('box-shadow');
-        }
-    });
+export const updateReorderCorrectness = (container, slideElement, overlappedElement) => {
+    const allSlideElements = Array.from(container.querySelectorAll('[type="slide"]'));
+    const elementIndex = allSlideElements.indexOf(slideElement);
+    const overlappedElementIndex = allSlideElements.indexOf(overlappedElement);
+    const objectiveString = document.getElementById(LidoContainer)['objective'];
+    const objectiveArray = objectiveString.split(',');
+    const slideValues = getSlideValuesForValidation(container, allSlideElements);
+    const isCorrect = elementIndex >= 0 && elementIndex < objectiveArray.length
+        ? matchStringPattern(slideValues[elementIndex], [objectiveArray[elementIndex].trim()])
+        : false;
+    const isCorrectOverlap = overlappedElementIndex >= 0 && overlappedElementIndex < objectiveArray.length
+        ? matchStringPattern(slideValues[overlappedElementIndex], [objectiveArray[overlappedElementIndex].trim()])
+        : false;
+    if (isCorrect && isCorrectOverlap) {
+        updateElementCategoryClass(slideElement, true);
+        updateElementCategoryClass(overlappedElement, true);
+    }
+    else if (isCorrect) {
+        updateElementCategoryClass(slideElement, true);
+        updateElementCategoryClass(overlappedElement, false);
+    }
+    else if (isCorrectOverlap) {
+        updateElementCategoryClass(slideElement, false);
+        updateElementCategoryClass(overlappedElement, true);
+    }
+    else {
+        updateElementCategoryClass(slideElement, false);
+        updateElementCategoryClass(overlappedElement, false);
+    }
 };
+function updateElementCategoryClass(element, isCorrect) {
+    if (!element)
+        return;
+    const correctClass = 'category-dropped-onCorrect';
+    const incorrectClass = 'category-dropped-onInCorrect';
+    if (isCorrect) {
+        element.classList.add(correctClass);
+        element.classList.remove(incorrectClass);
+    }
+    else {
+        element.classList.add(incorrectClass);
+        element.classList.remove(correctClass);
+    }
+}
 export const isReorderComplete = (slideValues, objectiveString) => {
     if (!objectiveString)
         return false;
@@ -337,7 +373,10 @@ const slideCompleted = async (slideElement) => {
         updateArrangeLettersCorrectness(container, slideValues, objectiveArray);
     }
     else if (isReorderContainer(container)) {
-        updateReorderCorrectness(container, slideValues, objectiveArray);
+        if (isReorderComplete(slideValues, objectiveString)) {
+            allSlideElements.forEach(item => updateElementCategoryClass(item, true));
+        }
+        // updateReorderCorrectness(container, slideValues, objectiveArray);
     }
     if (container.getAttribute('is-continue-on-correct') === 'true') {
         storingEachActivityScore(true);