@gamelearn/arcade-components 2.17.13 → 2.18.0

package/dist/components/chained-image-click-puzzle-component/components/ChainedImageClickPuzzleComponent.js

@@ -63,6 +63,9 @@ var ChainedImageClickPuzzleComponent = function ChainedImageClickPuzzleComponent
       payload: puzzleId
     });
   }, [emitEvent, puzzleId]);
+  var totalCorrects = list.reduce(function (acc, current) {
+    return acc + current.areas.length;
+  }, 0);
   var currentPuzzleProps = {
     list: list,
     description: description,
@@ -79,11 +82,9 @@ var ChainedImageClickPuzzleComponent = function ChainedImageClickPuzzleComponent
     slidesCompleted: slidesCompleted,
     setSlidesCompleted: setSlidesCompleted,
     loadPuzzleStatus: loadPuzzleStatus,
-    keyboardControl: keyboardControl
+    keyboardControl: keyboardControl,
+    totalCorrects: totalCorrects
   };
-  var totalCorrects = list.reduce(function (acc, current) {
-    return acc + current.areas.length;
-  }, 0);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--image__click"
   }, showFrames ? /*#__PURE__*/_react.default.createElement("div", {

package/dist/components/chained-image-click-puzzle-component/components/CurrentImagePuzzle.js

@@ -62,7 +62,8 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
       setIndex = _ref.setIndex,
       slidesCompleted = _ref.slidesCompleted,
       setSlidesCompleted = _ref.setSlidesCompleted,
-      keyboardControl = _ref.keyboardControl;
+      keyboardControl = _ref.keyboardControl,
+      totalCorrects = _ref.totalCorrects;
   var accRewards = (0, _react.useRef)([]);
   var correctClicked = (0, _react.useRef)(0);
   var currentSelected = (0, _react.useRef)(0);
@@ -160,6 +161,10 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
   }, [slidesCompleted, specificFeedbacks, currentImageProps.hasClickOnce, currentImageProps.areas.length, currentImageProps.hasClickOrder, selected, setSelected, index, list.length, setSlidesCompleted, handleFinish, setIndex, emitEvent]);
 
   var onResolve = function onResolve() {
+    if (index >= list.length - 1) {
+      setSelected(totalCorrects);
+    }
+
     playSound('score');
     emitEvent({
       type: 'puzzleAction',
@@ -178,10 +183,10 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
     }));
   }, [info, puzzleId, setInfo]);
   (0, _react.useEffect)(function () {
-    if (loadPuzzleStatus) {
-      onComplete([], true, true);
+    if (loadPuzzleStatus && index !== list.length - 1) {
+      onComplete([], true, false);
     }
-  }, [slidesCompleted, loadPuzzleStatus, onComplete]);
+  }, [index, list.length, loadPuzzleStatus, onComplete]);
 
   var checkSelectedAreas = function checkSelectedAreas() {
     var areasSelected = currentImageProps.hasClickOnce ? currentImageProps.areas.length : 1;

package/dist/components/frame-click-puzzle-component/components/CurrentFramePuzzle.js

@@ -67,7 +67,8 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
       resetValues = _ref.resetValues,
       setResetValues = _ref.setResetValues,
       pause = _ref.pause,
-      keyboardControl = _ref.keyboardControl;
+      keyboardControl = _ref.keyboardControl,
+      totalCorrects = _ref.totalCorrects;
 
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
@@ -154,6 +155,10 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
     }
   }, [framesCompleted, specificFeedbacks === null || specificFeedbacks === void 0 ? void 0 : (_specificFeedbacks$co2 = specificFeedbacks.correctFeedbacks) === null || _specificFeedbacks$co2 === void 0 ? void 0 : _specificFeedbacks$co2.length, props.hasClickOnce, props.areas.length, props.hasClickOrder, setRewards, selected, puzzlesAutoCompleted, setSelected, index, list.length, setFramesCompleted, setIndex, handleFinish, emitEvent]);
   var handleResolve = (0, _react.useCallback)(function () {
+    if (index >= list.length - 1) {
+      setSelected(totalCorrects);
+    }
+
     playSound('score');
     emitEvent({
       type: 'hidePuzzleButtons',
@@ -167,10 +172,11 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
       action: 'resolve',
       payload: {
         element: puzzleId,
-        rewards: info.resolve.rewards
+        rewards: info.resolve.rewards,
+        finish: index + 1 >= list.length
       }
     });
-  }, [playSound, emitEvent, setPuzzlesAutoCompleted, puzzleId, info.resolve.rewards, index]);
+  }, [index, list.length, playSound, emitEvent, setPuzzlesAutoCompleted, puzzleId, info.resolve.rewards, setSelected, totalCorrects]);
   var handleResetPuzzle = (0, _react.useCallback)(function () {
     setFramesCompleted({});
     correctClicked.current = 0;
@@ -178,10 +184,10 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
     emitResetPuzzle();
   }, [emitResetPuzzle, setFramesCompleted]);
   (0, _react.useEffect)(function () {
-    if (loadPuzzleStatus) {
-      onComplete([], true, true);
+    if (loadPuzzleStatus && index !== list.length - 1) {
+      onComplete([], true, false);
     }
-  }, [framesCompleted, loadPuzzleStatus, onComplete]);
+  }, [framesCompleted, index, list.length, loadPuzzleStatus, onComplete]);
 
   var checkSelectedAreas = function checkSelectedAreas() {
     var areasSelected = props.hasClickOnce ? props.areas.length : 1;

package/dist/components/frame-click-puzzle-component/components/FrameClickPuzzleComponent.js

@@ -173,7 +173,8 @@ var FrameImageClickComponent = function FrameImageClickComponent(_ref) {
     puzzlesAutoCompleted: puzzlesAutoCompleted,
     emitOpenPopupCounterInfo: onInitPuzzle,
     pause: pause,
-    keyboardControl: keyboardControl
+    keyboardControl: keyboardControl,
+    totalCorrects: totalCorrects
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle-frame"

package/dist/components/image-click-wrapper-component/components/ImageClickWrapperComponent.js

@@ -469,15 +469,18 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
   }, [createStartAndEndDate, defaultCompleted, firstTryForFrame, puzzlesAutoCompleted, slideNumber, timer]);
   (0, _react.useEffect)(function () {
     if (timer && countDownTime === 0) feedbackError();
-  }, [countDownTime, feedbackError, timer]);
+  }, [countDownTime, feedbackError, timer]); // only for frameclick
+
   (0, _react.useEffect)(function () {
-    if (pause) {
-      clearIntervalForCountDown();
-      pauseTheCounter();
-    } else {
-      startCountDown();
+    if (timer) {
+      if (pause) {
+        clearIntervalForCountDown();
+        pauseTheCounter();
+      } else {
+        startCountDown();
+      }
     }
-  }, [clearIntervalForCountDown, listenerForActualDate, pause, pauseTheCounter, startCountDown]);
+  }, [clearIntervalForCountDown, listenerForActualDate, pause, pauseTheCounter, startCountDown, timer]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: className
   }, feedbackData.show ? /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.17.13",
+  "version": "2.18.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@gamelearn/arcade-styles": "2.11.2",
+    "@gamelearn/arcade-styles": "2.12.0",
     "@gamelearn/arcade-three-core": "1.17.2",
     "@react-three/drei": "9.4.3",
     "@react-three/fiber": "8.0.17",