@gamelearn/arcade-components 0.22.10 → 0.22.12

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

@@ -93,26 +93,17 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
   var info = currentImageProps.info,
       specificFeedbacks = currentImageProps.specificFeedbacks;
   info.description = description;
-  var handleResolve = (0, _react.useCallback)(function () {
-    emitEvent({
-      type: 'puzzleAction',
-      action: 'resolve',
-      payload: {
-        element: puzzleId,
-        rewards: info.resolve.rewards
-      }
-    });
-  }, [emitEvent, puzzleId, info.resolve.rewards]);
   (0, _react.useEffect)(function () {
     correctClicked.current = 0;
   }, [index]);
   var onComplete = (0, _react.useCallback)(function (rw) {
     var correct = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var finish = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
     if (correct) {
       var _specificFeedbacks$co;
 
-      if ((_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length && !currentImageProps.hasClickOnce) {
+      if (specificFeedbacks !== null && specificFeedbacks !== void 0 && (_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length && !currentImageProps.hasClickOnce && !finish) {
         correctClicked.current += 1;
         setSelected(selected + 1);
       } else {
@@ -145,9 +136,14 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
 
   var onResolve = function onResolve() {
     playSound('score');
-    setTimeout(function () {
-      handleResolve();
-    }, 2000);
+    emitEvent({
+      type: 'puzzleAction',
+      action: 'resolve',
+      payload: {
+        element: puzzleId,
+        rewards: info.resolve.rewards
+      }
+    });
   };
 
   (0, _react.useEffect)(function () {
@@ -156,19 +152,9 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
     }));
   }, [info, setInfo, puzzleId]);
   (0, _react.useEffect)(function () {
-    var timeout;
-
     if (currentPuzzleStatus) {
-      timeout = setTimeout(function () {
-        onComplete([], false);
-      }, 2000);
+      onComplete([], true, true);
     }
-
-    return function () {
-      if (timeout) {
-        clearTimeout(timeout);
-      }
-    };
   }, [onComplete, puzzleId, currentPuzzleStatus]);
   return /*#__PURE__*/_react.default.createElement(_imageClickWrapperComponent.default, _extends({
     key: index

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

@@ -80,13 +80,14 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
   }, [index]);
   var onComplete = (0, _react.useCallback)(function (rw) {
     var correct = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    var finish = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
     var updatedCompleted = _objectSpread({}, framesCompleted);
 
     if (correct) {
       var _specificFeedbacks$co;
 
-      if ((_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length && !props.hasClickOnce) {
+      if (specificFeedbacks !== null && specificFeedbacks !== void 0 && (_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length && !props.hasClickOnce && !finish) {
         correctClicked.current += 1;
         setSelected(selected + 1);
       } else {
@@ -135,9 +136,7 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
   }, [emitEvent, puzzleId, playSound, info.resolve.rewards]);
   (0, _react.useEffect)(function () {
     if (loadPuzzleStatus) {
-      setTimeout(function () {
-        onComplete([]);
-      }, 2000);
+      onComplete([], true, true);
     }
   }, [loadPuzzleStatus, onComplete]);
   return /*#__PURE__*/_react.default.createElement(_imageClickWrapperComponent.default, _extends({

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

@@ -156,7 +156,7 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
         return feed.id === lastClicked.id;
       });
 
-      if (!((_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length) || specificFeedbacks.correctFeedbacks.some(function (feed) {
+      if (!(specificFeedbacks !== null && specificFeedbacks !== void 0 && (_specificFeedbacks$co = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co !== void 0 && _specificFeedbacks$co.length) || specificFeedbacks !== null && specificFeedbacks !== void 0 && specificFeedbacks.correctFeedbacks.some(function (feed) {
         return !feed.desc;
       }) || hasClickOnce) {
         setFeedbackData(function (oldState) {
@@ -194,7 +194,7 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
           desc = _solution$wrong.desc;
       var feedback = desc;
       var rewards = wrongRewards;
-      var specific = (_specificFeedbacks$wr = specificFeedbacks.wrongFeedbacks) === null || _specificFeedbacks$wr === void 0 ? void 0 : _specificFeedbacks$wr.find(function (feed) {
+      var specific = specificFeedbacks === null || specificFeedbacks === void 0 ? void 0 : (_specificFeedbacks$wr = specificFeedbacks.wrongFeedbacks) === null || _specificFeedbacks$wr === void 0 ? void 0 : _specificFeedbacks$wr.find(function (feed) {
         return feed.id === area.id;
       });
 
@@ -255,7 +255,7 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
       if (hasClickOrder && area.index === clickedZones.length || !hasClickOrder) {
         var _specificFeedbacks$co2;
 
-        if ((_specificFeedbacks$co2 = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co2 !== void 0 && _specificFeedbacks$co2.length) {
+        if (specificFeedbacks !== null && specificFeedbacks !== void 0 && (_specificFeedbacks$co2 = specificFeedbacks.correctFeedbacks) !== null && _specificFeedbacks$co2 !== void 0 && _specificFeedbacks$co2.length) {
           var _specificFeedbacks$co3;
 
           var specific = (_specificFeedbacks$co3 = specificFeedbacks.correctFeedbacks) === null || _specificFeedbacks$co3 === void 0 ? void 0 : _specificFeedbacks$co3.find(function (feed) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.22.10",
+  "version": "0.22.12",
   "main": "dist/index.js",
   "files": [
     "dist",