@gamelearn/arcade-components 1.19.1 → 1.20.1

package/dist/components/cards-selector-puzzle-component/components/CardsSelectorPuzzleComponent.js

@@ -40,7 +40,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
-  var _info$solution2;
+  var _info$solution2, _info$resolve2;
 
   var emitEvent = _ref.emitEvent,
       info = _ref.info,
@@ -49,7 +49,8 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       disableExit = _ref.disableExit,
       setResolveAction = _ref.setResolveAction,
       soundActions = _ref.soundActions,
-      backgroundImage = _ref.backgroundImage;
+      backgroundImage = _ref.backgroundImage,
+      nodeId = _ref.nodeId;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -101,6 +102,7 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
     });
   };
 
+  var puzzleId = "cards-selector-puzzle_".concat(nodeId);
   var closeFeedbackAndShowPoints = (0, _react.useCallback)(function (rewardsData) {
     setFeedbackResult(false);
     setFeedbackIsShown(false);
@@ -254,10 +256,24 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
       setResolvePuzzle(true);
       var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(info === null || info === void 0 ? void 0 : (_info$resolve = info.resolve) === null || _info$resolve === void 0 ? void 0 : _info$resolve.rewards));
       setTimeout(function () {
-        closeFeedbackAndShowPoints(rewardsData);
+        setFeedbackResult(false);
+        setFeedbackIsShown(false);
+        emitEvent({
+          type: 'hidePuzzleButtons',
+          payload: false
+        });
+        emitEvent({
+          type: 'puzzleAction',
+          action: 'resolve',
+          payload: {
+            element: puzzleId,
+            rewards: rewardsData,
+            finish: true
+          }
+        });
       }, 2000);
     });
-  }, [setResolveAction, disableExit, accRewards, info.resolve.rewards, emitEvent, closeFeedbackAndShowPoints]);
+  }, [setResolveAction, disableExit, accRewards, info === null || info === void 0 ? void 0 : (_info$resolve2 = info.resolve) === null || _info$resolve2 === void 0 ? void 0 : _info$resolve2.rewards, emitEvent, puzzleId]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "cards-selector ".concat(backgroundImage !== null && backgroundImage !== void 0 && backgroundImage.url ? 'cards-selector--with-custom-bg' : ''),
     style: backgroundImage !== null && backgroundImage !== void 0 && backgroundImage.url ? {

package/dist/components/cracker-puzzle-component/components/CrackerPuzzleComponent.js

@@ -138,7 +138,7 @@ var CrackerPuzzleComponent = function CrackerPuzzleComponent(_ref) {
     }
   }, [finished, disableExit]);
   (0, _react.useEffect)(function () {
-    setResolveAction(function () {
+    setResolveAction(function (callback) {
       playSound('score');
       setFinished(true);
       setTimeout(function () {
@@ -146,12 +146,7 @@ var CrackerPuzzleComponent = function CrackerPuzzleComponent(_ref) {
           type: 'hidePuzzleButtons',
           payload: false
         });
-        emitEvent({
-          type: 'addPoints',
-          complex: true,
-          finish: true,
-          payload: info.resolve.rewards
-        });
+        callback();
       }, 0);
     });
   }, [setResolveAction, playSound]);

package/dist/components/hacker-puzzle-component/components/HackerPuzzleComponent.js

@@ -146,19 +146,14 @@ var HackerPuzzleComponent = function HackerPuzzleComponent(_ref) {
     }
   }, [finished]);
   (0, _react.useEffect)(function () {
-    setResolveAction(function () {
+    setResolveAction(function (callback) {
       playSound('score');
       setFinished(true);
       emitEvent({
         type: 'hidePuzzleButtons',
         payload: false
       });
-      emitEvent({
-        type: 'addPoints',
-        complex: true,
-        finish: true,
-        payload: info.resolve.rewards
-      });
+      callback();
     });
   }, [setResolveAction]);
 

package/dist/components/hanged-puzzle-component/components/HangedPuzzleComponent.js

@@ -103,7 +103,8 @@ var HangedPuzzleComponent = function HangedPuzzleComponent(_ref4) {
       info = _ref4.info,
       answer = _ref4.answer,
       hintUsed = _ref4.hintUsed,
-      setResolveAction = _ref4.setResolveAction;
+      setResolveAction = _ref4.setResolveAction,
+      setHintAction = _ref4.setHintAction;
 
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
@@ -175,23 +176,23 @@ var HangedPuzzleComponent = function HangedPuzzleComponent(_ref4) {
 
     return [].concat(_toConsumableArray(newPool), _toConsumableArray(extraPool));
   }, [answerPanel]);
-  var setHiddenAnswer = (0, _react.useCallback)(function () {
-    var hiddenAnswer = answer.toUpperCase().split('').map(function (char, index) {
-      if ((0, _utils.restrictCharacters)(char, 'or')) {
-        return {
-          index: index,
-          letter: char,
-          char: char,
-          fixed: true
-        };
-      }
-
+  var hiddenAnswer = answer.toUpperCase().split('').map(function (char, index) {
+    if ((0, _utils.restrictCharacters)(char, 'or')) {
       return {
         index: index,
         letter: char,
-        char: ''
+        char: char,
+        fixed: true
       };
-    });
+    }
+
+    return {
+      index: index,
+      letter: char,
+      char: ''
+    };
+  });
+  var setHiddenAnswer = (0, _react.useCallback)(function () {
     var newPool = resetPool();
 
     var _loop = function _loop() {
@@ -226,7 +227,7 @@ var HangedPuzzleComponent = function HangedPuzzleComponent(_ref4) {
 
     setAnswer(hiddenAnswer);
     setPoolLetters(newPool);
-  }, [answer, hintUsed, resetPool]);
+  }, [hiddenAnswer, hintUsed, resetPool]);
 
   var removedPool = function removedPool(character, ind) {
     var newPool = poolLetters.map(function (letter, index) {
@@ -405,23 +406,28 @@ var HangedPuzzleComponent = function HangedPuzzleComponent(_ref4) {
       setHiddenAnswer();
     }
 
-    setResolveAction(function () {
+    setResolveAction(function (callback) {
       setCorrectSolution(true);
       setTimeout(function () {
-        var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(info.resolve.rewards));
         emitEvent({
           type: 'hidePuzzleButtons',
           payload: false
         });
-        emitEvent({
-          type: 'addPoints',
-          complex: true,
-          finish: true,
-          payload: rewardsData
-        });
+        callback();
       }, 2000);
     });
-  }, [setHiddenAnswer, mounted, answer, setResolveAction, emitEvent, accRewards, info.resolve.rewards]);
+    setHintAction(function (callback) {
+      var newPool = [];
+      hiddenAnswer.forEach(function (_ref6) {
+        var letter = _ref6.letter;
+        if (letter !== ' ') newPool.push({
+          char: letter
+        });
+      });
+      setPoolLetters(newPool);
+      callback();
+    });
+  }, [setHiddenAnswer, mounted, answer, setResolveAction, emitEvent, accRewards, info.resolve.rewards, hiddenAnswer, setHintAction]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--hanged",
     style: {

package/dist/components/hanged-puzzle-component/mocks/mockForStory.js

@@ -16,6 +16,7 @@ var mockProps = {
   soundActions: _mocker.soundActions,
   disableExit: disableExit,
   setResolveAction: function setResolveAction() {},
+  setHintAction: function setHintAction() {},
   image: {
     img: {
       // eslint-disable-next-line max-len

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

@@ -185,6 +185,7 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
     clearListenerForActualDate();
   }, [clearListenerForActualDate]);
   var listenerForActualDate = (0, _react.useCallback)(function () {
+    clearInterval(intervalForActualDate.current);
     intervalForActualDate.current = setInterval(function () {
       actualDate.current = Date.now(); // show timerFeedback when finish the time
 
@@ -202,7 +203,7 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
         setTimeExpired(true);
         clearListenerForActualDate();
       }
-    }, 0);
+    }, 250);
   }, [clearListenerForActualDate, info === null || info === void 0 ? void 0 : (_info$timerFeedback3 = info.timerFeedback) === null || _info$timerFeedback3 === void 0 ? void 0 : _info$timerFeedback3.desc, info === null || info === void 0 ? void 0 : (_info$timerFeedback4 = info.timerFeedback) === null || _info$timerFeedback4 === void 0 ? void 0 : _info$timerFeedback4.rewards]);
   (0, _react.useEffect)(function () {
     if ((areas.length === clickedZones.length || hasClickOnce && clickedZones.length > 0) && !completed) {

package/dist/components/keyboard-puzzle-component/components/KeyboardPuzzleComponent.js

@@ -49,7 +49,8 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       info = _ref.info,
       disableExit = _ref.disableExit,
       soundActions = _ref.soundActions,
-      setResolveAction = _ref.setResolveAction;
+      setResolveAction = _ref.setResolveAction,
+      nodeId = _ref.nodeId;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -93,6 +94,7 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
     });
   };
 
+  var puzzleId = "keyboard-puzzle_".concat(nodeId);
   var imageURL = ((_image$img = image.img) === null || _image$img === void 0 ? void 0 : _image$img.url) || defaultImage;
 
   var _soundActions = _slicedToArray(soundActions, 1),
@@ -185,10 +187,24 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       setFinished(true);
       var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(info.resolve.rewards));
       setTimeout(function () {
-        closeFeedbackAndShowPoints(rewardsData);
+        setFeedbackResult(false);
+        setFeedbackIsShown(false);
+        emitEvent({
+          type: 'hidePuzzleButtons',
+          payload: false
+        });
+        emitEvent({
+          type: 'puzzleAction',
+          action: 'resolve',
+          payload: {
+            element: puzzleId,
+            rewards: rewardsData,
+            finish: true
+          }
+        });
       }, 2000);
     });
-  }, [setResolveAction, disableExit, info.solution.right.desc, playSound, info.resolve.rewards, accRewards, closeFeedbackAndShowPoints, password]);
+  }, [setResolveAction, disableExit, info.solution.right.desc, playSound, info.resolve.rewards, accRewards, password, emitEvent, puzzleId]);
 
   var handleNumbClick = function handleNumbClick(row, col) {
     var char = keyboard[row][col];

package/dist/components/login-puzzle-component/components/LoginPuzzleComponent.js

@@ -49,7 +49,8 @@ var LoginPuzzleComponent = function LoginPuzzleComponent(_ref) {
       login = _ref.login,
       password = _ref.password,
       image = _ref.image,
-      setResolveAction = _ref.setResolveAction;
+      setResolveAction = _ref.setResolveAction,
+      nodeId = _ref.nodeId;
 
   var translate = function translate(id) {
     return emitEvent({
@@ -58,6 +59,7 @@ var LoginPuzzleComponent = function LoginPuzzleComponent(_ref) {
     });
   };
 
+  var puzzleId = "login-puzzle_".concat(nodeId);
   var isRtl = (0, _LangIsRtl.default)();
 
   var _useState = (0, _react.useState)(''),
@@ -173,14 +175,17 @@ var LoginPuzzleComponent = function LoginPuzzleComponent(_ref) {
           payload: false
         });
         emitEvent({
-          type: 'addPoints',
-          complex: true,
-          finish: true,
-          payload: rewardsData
+          type: 'puzzleAction',
+          action: 'resolve',
+          payload: {
+            element: puzzleId,
+            rewards: rewardsData,
+            finish: true
+          }
         });
       }, 2000);
     });
-  }, [accRewards, info.resolve.rewards, emitEvent, setResolveAction]);
+  }, [accRewards, info.resolve.rewards, emitEvent, setResolveAction, puzzleId]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--layer",
     style: {

package/dist/components/terminal-puzzle-component/components/TerminalPuzzleComponent.js

@@ -67,7 +67,8 @@ var TerminalPuzzleComponent = function TerminalPuzzleComponent(_ref) {
       info = _ref.info,
       disableExit = _ref.disableExit,
       soundActions = _ref.soundActions,
-      setResolveAction = _ref.setResolveAction;
+      setResolveAction = _ref.setResolveAction,
+      nodeId = _ref.nodeId;
 
   // todo: PREPROCESS BACKGROUND IMAGE IN ARCADE
   var _useState = (0, _react.useState)({}),
@@ -96,6 +97,7 @@ var TerminalPuzzleComponent = function TerminalPuzzleComponent(_ref) {
     });
   };
 
+  var puzzleId = "terminal-puzzle_".concat(nodeId);
   var initFile = (0, _react.useMemo)(function () {
     return {
       name: 'init',
@@ -148,13 +150,16 @@ var TerminalPuzzleComponent = function TerminalPuzzleComponent(_ref) {
         payload: false
       });
       emitEvent({
-        type: 'addPoints',
-        complex: true,
-        finish: true,
-        payload: rewards
+        type: 'puzzleAction',
+        action: 'resolve',
+        payload: {
+          element: puzzleId,
+          rewards: rewards,
+          finish: true
+        }
       });
     });
-  }, [setResolveAction, info.resolve.rewards, emitEvent]);
+  }, [setResolveAction, info.resolve.rewards, emitEvent, puzzleId]);
 
   var backFile = function backFile() {
     accRewards.current = [].concat(_toConsumableArray(accRewards.current), _toConsumableArray(info.solution.wrong.rewards));

package/dist/components/text-click-puzzle-component/components/TextClickPuzzleComponent.js

@@ -386,23 +386,17 @@ var TextClickPuzzleComponent = function TextClickPuzzleComponent(_ref) {
     }
   }, [currentSlide, description, getnumberAllCorrectFragments, list, recursiveStuff, setInfo]);
   (0, _react.useEffect)(function () {
-    setResolveAction(function () {
+    setResolveAction(function (callback) {
       emitEvent({
         type: 'hidePuzzleButtons',
         payload: true
       });
-      var resolveRewards = list[currentSlide].info.resolve.rewards;
       setTimeout(function () {
         emitEvent({
           type: 'hidePuzzleButtons',
           payload: false
         });
-        emitEvent({
-          type: 'addPoints',
-          complex: true,
-          finish: true,
-          payload: resolveRewards
-        });
+        callback();
       }, 2000);
     });
   }, [setResolveAction, emitEvent, list, currentSlide]);

package/dist/components/web-builder-puzzle-component/components/WebBuilderPuzzleComponent.js

@@ -307,18 +307,13 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    setResolveAction(function () {
+    setResolveAction(function (callback) {
       setResolved(true);
       showCurrentFeed('success');
       showReference(false);
       setTimeout(function () {
         showCurrentFeed('');
-        emitEvent({
-          type: 'addPoints',
-          complex: true,
-          finish: true,
-          payload: info.resolve.rewards
-        });
+        callback();
       }, 4000);
     });
     disableExit(true);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "1.19.1",
+  "version": "1.20.1",
   "main": "dist/index.js",
   "files": [
     "dist",