@gamelearn/arcade-components 0.21.3 → 0.21.5

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

@@ -17,6 +17,14 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -41,42 +49,43 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       info = _ref.info,
       disableExit = _ref.disableExit,
       soundActions = _ref.soundActions,
-      setResolveAction = _ref.setResolveAction;
+      setResolveAction = _ref.setResolveAction,
+      setShowPoints = _ref.setShowPoints;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       finished = _useState2[0],
       setFinished = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
-      failed = _useState4[0],
-      setFailed = _useState4[1];
+      passClass = _useState4[0],
+      setPassClass = _useState4[1];
 
   var _useState5 = (0, _react.useState)(''),
       _useState6 = _slicedToArray(_useState5, 2),
-      passClass = _useState6[0],
-      setPassClass = _useState6[1];
+      inputPassword = _useState6[0],
+      setInputPassword = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(''),
+  var _useState7 = (0, _react.useState)(false),
       _useState8 = _slicedToArray(_useState7, 2),
-      inputPassword = _useState8[0],
-      setInputPassword = _useState8[1];
+      feedbackResult = _useState8[0],
+      setFeedbackResult = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(''),
       _useState10 = _slicedToArray(_useState9, 2),
-      feedbackResult = _useState10[0],
-      setFeedbackResult = _useState10[1];
+      feedBackText = _useState10[0],
+      setFeedBackText = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(''),
+  var _useState11 = (0, _react.useState)(false),
       _useState12 = _slicedToArray(_useState11, 2),
-      feedBackText = _useState12[0],
-      setFeedBackText = _useState12[1];
+      feedbackIsShown = _useState12[0],
+      setFeedbackIsShown = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)([]),
       _useState14 = _slicedToArray(_useState13, 2),
-      feedbackIsShown = _useState14[0],
-      setFeedbackIsShown = _useState14[1];
+      accRewards = _useState14[0],
+      setRewards = _useState14[1];
 
   var translate = function translate(id) {
     return emitEvent({
@@ -90,50 +99,93 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
 
+  var closeFeedbackAndShowPoints = (0, _react.useCallback)(function (rewardsData) {
+    setFeedbackResult(false);
+    setFeedbackIsShown(false);
+    emitEvent({
+      type: 'hidePuzzleButtons',
+      payload: false
+    });
+    setShowPoints(rewardsData);
+  }, [emitEvent, setShowPoints]);
+
+  var handleFeedbackFuncionOnClose = function handleFeedbackFuncionOnClose() {
+    console.info('asdfsfd', feedbackResult);
+
+    if (feedbackResult) {
+      console.info('poraqui2');
+      setFinished(true);
+      var rewards = info.solution.right.rewards;
+      var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards));
+      playSound('score');
+      closeFeedbackAndShowPoints(rewardsData);
+    } else {
+      console.info('poraqui3');
+      emitEvent({
+        type: 'hidePuzzleButtons',
+        payload: false
+      });
+      setFeedbackResult(false);
+      disableExit(false);
+      setFeedbackIsShown(false);
+    }
+  };
+
   var checkPass = function checkPass(current) {
     if (current === password) {
       disableExit(false);
       setPassClass('success');
       playSound('score');
       setFeedbackResult(true);
-      setFeedBackText(info.solution.right.desc);
       setFeedbackIsShown(true);
-      setFinished(true);
-      setTimeout(function () {
-        setFeedbackIsShown(false);
-        emitEvent({
-          type: 'addPoints',
-          payload: failed ? info.solution.wrong.rewards : info.solution.right.rewards
-        });
-      }, 4000);
+
+      if (info.solution.right.desc === '') {
+        setTimeout(function () {
+          var rewards = info.solution.right.rewards;
+          var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards));
+          closeFeedbackAndShowPoints(rewardsData);
+        }, 3000);
+      } else {
+        setFeedBackText(info.solution.right.desc);
+      }
     } else {
-      setFailed(true);
       setFeedbackIsShown(true);
       setPassClass('failed');
       playSound('fail');
       setFeedbackResult(false);
-      setFeedBackText(info.solution.wrong.desc);
-      setTimeout(function () {
-        setFeedbackIsShown(false);
-        setPassClass('');
-        setInputPassword('');
-      }, 2000);
+      setRewards([].concat(_toConsumableArray(accRewards), _toConsumableArray(info.solution.wrong.rewards)));
+      emitEvent({
+        type: 'hidePuzzleButtons',
+        payload: false
+      });
+      setPassClass('');
+      setInputPassword('');
+      setFeedbackIsShown(true);
+
+      if (info.solution.wrong.desc !== '') {
+        setFeedBackText(info.solution.wrong.desc);
+      } else {
+        setTimeout(function () {
+          handleFeedbackFuncionOnClose();
+        }, 3000);
+      }
     }
   };
 
   (0, _react.useEffect)(function () {
-    setResolveAction(function (resolve) {
+    setResolveAction(function () {
       disableExit(false);
       playSound('score');
       setPassClass('success');
       setFeedbackResult(true);
       setFeedBackText(info.solution.right.desc);
       setFinished(true);
+      var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(info.resolve.rewards));
       setTimeout(function () {
-        resolve();
-      }, 4000);
+        closeFeedbackAndShowPoints(rewardsData);
+      }, 2000);
     });
-  }, [setResolveAction, disableExit, info.solution.right.desc, playSound]);
+  }, [setResolveAction, disableExit, info.solution.right.desc, playSound, info.resolve.rewards, accRewards, closeFeedbackAndShowPoints]);
 
   var handleNumbClick = function handleNumbClick(row, col) {
     var char = keyboard[row][col];
@@ -191,10 +243,10 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       }, col);
     }));
   })), feedbackIsShown && /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
-    shortText: true,
     translate: translate,
     text: feedBackText,
-    success: feedbackResult
+    success: feedbackResult,
+    functionOnClose: handleFeedbackFuncionOnClose
   }));
 };
 

package/dist/components/web-builder-puzzle-component/components/Feedback/index.js

@@ -17,7 +17,10 @@ var FeedbackResult = function FeedbackResult(_ref) {
   var title = success ? translate('webbuilder.feedback.successTitle') : translate('webbuilder.feedback.failTitle');
   var desc = success ? translate('webbuilder.feedback.success') : translate('webbuilder.feedback.fail');
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "puzzle--webBuilder__feedback bottom ".concat(success ? 'success' : 'failed')
+    className: "puzzle--webBuilder__feedback bottom ".concat(success ? 'success' : 'failed'),
+    style: success ? {
+      zIndex: '11'
+    } : {}
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
     className: "title"
   }, title), /*#__PURE__*/_react.default.createElement("div", {
@@ -25,7 +28,10 @@ var FeedbackResult = function FeedbackResult(_ref) {
   }, desc)), showButton ? /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "gat--btn gat--btn__secondary ".concat(success ? 'green' : 'red'),
-    onClick: onNext
+    onClick: onNext,
+    style: {
+      marginRight: '64px'
+    }
   }, translate('webbuilder.continue')) : null);
 };
 

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

@@ -217,11 +217,6 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
         exist = _checkCorrect.exist,
         equal = _checkCorrect.equal;
 
-    emitEvent({
-      type: 'hidePuzzleButtons',
-      payload: true
-    });
-
     if (exist && !equal) {
       if (showPublish) {
         setShowPublish(false);
@@ -305,19 +300,11 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
   (0, _react.useEffect)(function () {
     setResolveAction(function (resolve) {
       console.info(resolve);
-      emitEvent({
-        type: 'hidePuzzleButtons',
-        payload: true
-      });
       setResolved(true);
       showCurrentFeed('success');
       showReference(false);
       setTimeout(function () {
         showCurrentFeed('');
-        emitEvent({
-          type: 'hidePuzzleButtons',
-          payload: false
-        });
         setShowPoints(info.resolve.rewards);
       }, 4000);
     });

package/package.json

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