@gamelearn/arcade-components 2.4.4 → 2.5.1

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

@@ -150,6 +150,7 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
         correctClicked.current = 0;
       }
 
+      setSelected(0);
       emitEvent({
         type: 'failPuzzle'
       });

package/dist/components/decision-component/components/DecisionBody.js

@@ -37,9 +37,9 @@ var DecisionBody = function DecisionBody(_ref) {
   var options = _ref.options,
       question = _ref.question,
       inherited = _ref.inherited,
+      branched = _ref.branched,
       changeOption = _ref.changeOption,
       onNext = _ref.onNext,
-      onBack = _ref.onBack,
       failed = _ref.failed,
       showingResults = _ref.showingResults,
       currentSelectedChoice = _ref.currentSelectedChoice,
@@ -68,7 +68,7 @@ var DecisionBody = function DecisionBody(_ref) {
   var optionsProps = {
     inherited: inherited,
     selectedChoice: selectedChoice,
-    selectChoice: failed ? choose : noop,
+    selectChoice: (!required || branched) && selectedChoice.id !== undefined || required && !failed ? noop : choose,
     options: options,
     showingResults: showingResults
   };
@@ -90,11 +90,11 @@ var DecisionBody = function DecisionBody(_ref) {
       dir: "auto"
     }, /*#__PURE__*/_react.default.createElement(_Options.default, optionsProps)), /*#__PURE__*/_react.default.createElement("div", {
       className: "popup--buttons"
-    }, !failed ? /*#__PURE__*/_react.default.createElement("button", {
+    }, (required ? !failed : selectedChoice.id !== undefined) ? /*#__PURE__*/_react.default.createElement("button", {
       type: "button",
       className: "gat--btn gat--btn__primary ".concat(selectedChoice.id !== undefined ? '' : 'disabled'),
       onClick: function onClick() {
-        return required && canNext ? onNext(selectedChoice) : onBack(selectedChoice);
+        return onNext(selectedChoice);
       }
     }, translate('screens.continue')) : null));
   };

package/dist/components/decision-component/components/DecisionComponent.js

@@ -119,22 +119,6 @@ var DecisionComponent = function DecisionComponent(_ref) {
       setResultChoice(option);
       selectView('options');
     },
-    onBack: function onBack(choice) {
-      playSound('click-ui');
-
-      if (failed) {
-        emitEvent({
-          type: 'addPoints',
-          payload: choice.rewards,
-          finish: false,
-          complex: true,
-          onFinish: function onFinish() {
-            setResultChoice({});
-            selectView('options');
-          }
-        });
-      }
-    },
     onNext: function onNext(choice) {
       playSound('click-ui');
 
@@ -186,14 +170,14 @@ var DecisionComponent = function DecisionComponent(_ref) {
             playSound('fail');
 
             if (!branched) {
-              emitEvent({
-                type: 'addPoints',
-                payload: choice.rewards,
-                finish: false,
-                complex: true
-              });
-
-              if (!required) {
+              if (inherited || required) {
+                emitEvent({
+                  type: 'addPoints',
+                  payload: choice.rewards,
+                  finish: false,
+                  complex: true
+                });
+              } else if (!required) {
                 setResultChoice({});
                 selectView('options');
               }

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

@@ -38,6 +38,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
+  var _specificFeedbacks$co2;
+
   var list = _ref.list,
       index = _ref.index,
       puzzlesCompiledRef = _ref.puzzlesCompiledRef,
@@ -62,6 +64,8 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
       setPuzzlesAutoCompleted = _ref.setPuzzlesAutoCompleted,
       puzzlesAutoCompleted = _ref.puzzlesAutoCompleted,
       emitOpenPopupCounterInfo = _ref.emitOpenPopupCounterInfo,
+      resetValues = _ref.resetValues,
+      setResetValues = _ref.setResetValues,
       pause = _ref.pause;
 
   var _soundActions = _slicedToArray(soundActions, 1),
@@ -82,6 +86,14 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
       hintId: puzzleId
     }));
   }, [setInfo, info, puzzleId]);
+  (0, _react.useEffect)(function () {
+    if (resetValues) {
+      correctClicked.current = 0;
+      currentSelected.current = 0;
+      setSelected(0);
+      setResetValues(false);
+    }
+  }, [resetValues, setResetValues, setSelected]);
   (0, _react.useEffect)(function () {
     correctClicked.current = 0;
     currentSelected.current = 0;
@@ -105,7 +117,12 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
         }
 
         correctClicked.current = props.areas.length;
-        setSelected(total + correctClicked.current);
+
+        if (puzzlesAutoCompleted[0] && Object.entries(framesCompleted).length === 0) {
+          setSelected(correctClicked.current);
+        } else {
+          setSelected(total + correctClicked.current);
+        }
       }
 
       if (correctClicked.current === props.areas.length) {
@@ -134,7 +151,7 @@ var CurrentFramePuzzle = function CurrentFramePuzzle(_ref) {
         correctClicked.current = 0;
       }
     }
-  }, [emitEvent, specificFeedbacks, framesCompleted, props.hasClickOrder, props.hasClickOnce, props.areas.length, list.length, selected, setSelected, setRewards, index, setFramesCompleted, setIndex, handleFinish]);
+  }, [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 () {
     playSound('score');
     emitEvent({

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

@@ -85,6 +85,11 @@ var FrameImageClickComponent = function FrameImageClickComponent(_ref) {
       firstTryForFrame = _useState12[0],
       setFirstTryForFrame = _useState12[1];
 
+  var _useState13 = (0, _react.useState)(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      resetValues = _useState14[0],
+      setResetValues = _useState14[1];
+
   var totalCorrects = list.reduce(function (acc, current) {
     return acc + current.areas.length;
   }, 0);
@@ -118,6 +123,7 @@ var FrameImageClickComponent = function FrameImageClickComponent(_ref) {
     setIndex(0);
     setFramesCompleted({});
     setHideTooltipRef(true);
+    setResetValues(true);
   }, []);
 
   var translateFromParent = function translateFromParent(id) {
@@ -160,6 +166,8 @@ var FrameImageClickComponent = function FrameImageClickComponent(_ref) {
     emitEvent: emitEvent,
     nodeId: nodeId,
     emitResetPuzzle: resetPuzzle,
+    resetValues: resetValues,
+    setResetValues: setResetValues,
     setPuzzlesAutoCompleted: setPuzzlesAutoCompleted,
     puzzlesAutoCompleted: puzzlesAutoCompleted,
     emitOpenPopupCounterInfo: onInitPuzzle,

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

@@ -319,14 +319,16 @@ var ImageClickWrapperComponent = function ImageClickWrapperComponent(props) {
         rewards = specific.rewards;
       }
 
-      if (hasClickOrder && notInOrder) {
-        var _info$orderFeedback;
-
+      if (hasClickOrder) {
         setClickedZones([]);
 
-        if (info !== null && info !== void 0 && (_info$orderFeedback = info.orderFeedback) !== null && _info$orderFeedback !== void 0 && _info$orderFeedback.desc) {
-          feedback = info.orderFeedback.desc;
-          rewards = info.orderFeedback.rewards;
+        if (notInOrder) {
+          var _info$orderFeedback;
+
+          if (info !== null && info !== void 0 && (_info$orderFeedback = info.orderFeedback) !== null && _info$orderFeedback !== void 0 && _info$orderFeedback.desc) {
+            feedback = info.orderFeedback.desc;
+            rewards = info.orderFeedback.rewards;
+          }
         }
       }
 

package/package.json

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