@gamelearn/arcade-components 1.4.0 → 1.4.2

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

@@ -88,7 +88,7 @@ var DecisionBody = function DecisionBody(_ref) {
       type: "button",
       className: "gat--btn gat--btn__primary ".concat(selectedChoice.id !== undefined ? '' : 'disabled'),
       onClick: function onClick() {
-        return canNext ? onNext(selectedChoice) : onBack();
+        return canNext ? onNext(selectedChoice) : onBack(selectedChoice);
       }
     }, canNext || selectedChoice.id === undefined ? translate('screens.continue') : translate('tests.retry'))));
   };

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

@@ -55,7 +55,7 @@ var DecisionComponent = function DecisionComponent(_ref) {
       inheritProps = _props$inheritProps === void 0 ? {} : _props$inheritProps,
       required = props.required,
       question = props.question,
-      onFinish = props.onFinish;
+      _onFinish = props.onFinish;
   var inherited = Object.keys(inheritProps).length > 0;
 
   var _useState = (0, _react.useState)('options'),
@@ -115,39 +115,64 @@ var DecisionComponent = function DecisionComponent(_ref) {
       setResultChoice(option);
       selectView('options');
     },
-    onBack: function onBack() {
+    onBack: function onBack(choice) {
       playSound('click-ui');
 
       if (failed) {
-        setResultChoice({});
-        selectView('options');
+        emitEvent({
+          type: 'addPoints',
+          payload: choice.rewards,
+          finish: false,
+          complex: true,
+          onFinish: function onFinish() {
+            setResultChoice({});
+            selectView('options');
+          }
+        });
       }
     },
     onNext: function onNext(choice) {
       playSound('click-ui');
 
       if (!failed && selectedView === 'results') {
-        setResultChoice({});
-        selectView('options');
-        emitEvent({
-          type: 'addPoints',
-          payload: choice.rewards,
-          finish: true,
-          complex: true,
-          onFinish: onFinish
-        });
-      } else if (Object.keys(choice).length > 0) {
-        if (choice.right) {
-          playSound('score');
+        if (inherited) {
+          emitEvent({
+            type: 'addPoints',
+            payload: choice.rewards,
+            finish: true,
+            complex: true,
+            onFinish: function onFinish() {
+              if (_onFinish) {
+                _onFinish();
+              }
+
+              setResultChoice({});
+              selectView('options');
+            }
+          });
         } else {
-          playSound('fail');
           emitEvent({
             type: 'addPoints',
             payload: choice.rewards,
-            finish: false,
+            finish: true,
             complex: true
           });
         }
+      } else if (Object.keys(choice).length > 0) {
+        if (choice.right) {
+          playSound('score');
+        } else {
+          playSound('fail');
+
+          if (!required || inherited) {
+            emitEvent({
+              type: 'addPoints',
+              payload: choice.rewards,
+              finish: false,
+              complex: true
+            });
+          }
+        }
 
         setResultChoice(choice);
         playCurrentAudio(choice);

package/dist/components/referral-component/components/StepOne.js

@@ -53,6 +53,11 @@ var StepOne = function StepOne(_ref) {
       emailWithErrors = _useState4[0],
       setEmailWithErrors = _useState4[1];
 
+  var _useState5 = (0, _react.useState)(0),
+      _useState6 = _slicedToArray(_useState5, 2),
+      emailsRepeated = _useState6[0],
+      setEmailsRepeated = _useState6[1];
+
   var emailRef = (0, _react.useRef)(null);
 
   var deleteItem = function deleteItem(e, itemToRemove, emailPillIndex) {
@@ -64,6 +69,10 @@ var StepOne = function StepOne(_ref) {
     if (itemToRemove.error) {
       setEmailWithErrors(emailWithErrors - 1);
     }
+
+    if (itemToRemove.isRepeat) {
+      setEmailsRepeated(emailsRepeated - 1);
+    }
   };
 
   var focusInInput = function focusInInput() {
@@ -95,11 +104,12 @@ var StepOne = function StepOne(_ref) {
         if (emailsPills.find(function (item) {
           return item.text === inputValue;
         })) {
+          setEmailsRepeated(emailsRepeated + 1);
           setEmailsPills([].concat(_toConsumableArray(emailsPills), [{
             text: inputValue,
-            error: true
+            error: true,
+            isRepeat: true
           }]));
-          setEmailWithErrors(emailWithErrors + 1);
         } else {
           setEmailsPills([].concat(_toConsumableArray(emailsPills), [{
             text: inputValue
@@ -153,7 +163,7 @@ var StepOne = function StepOne(_ref) {
     className: "referrals-piece__footervalidation"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "referrals-piece__errormessage"
-  }, emailWithErrors > 0 ? translate('puzzles.referrals.inviter.errorMessage') : null), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", null, emailsRepeated > 0 ? translate('puzzles.referrals.inviter.errorEmailRepeat') : null), /*#__PURE__*/_react.default.createElement("div", null, emailWithErrors > 0 ? translate('puzzles.referrals.inviter.errorMessage') : null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "referrals-piece__counter",
     "data-testid": "pillcounter"
   }, emailsPills.length, "/10")))), /*#__PURE__*/_react.default.createElement("div", {
@@ -163,7 +173,7 @@ var StepOne = function StepOne(_ref) {
     type: "button",
     onClick: handleCancel
   }, translate('puzzles.referrals.inviter.skipButton')), /*#__PURE__*/_react.default.createElement("button", {
-    className: "gat--btn gat--btn__primary ".concat(emailWithErrors > 0 || emailsPills.length === 0 ? ' disabled' : ''),
+    className: "gat--btn gat--btn__primary ".concat(emailsRepeated > 0 || emailWithErrors > 0 || emailsPills.length === 0 ? ' disabled' : ''),
     type: "button",
     disabled: emailWithErrors > 0 || emailsPills.length === 0,
     onClick: function onClick() {

package/dist/components/referral-component/components/StepTwo.js

@@ -48,9 +48,9 @@ var StepTwo = function StepTwo(_ref) {
     className: "referrals-piece__title"
   }, translate('puzzles.referrals.inviter.titleStep2')), /*#__PURE__*/_react.default.createElement("ul", {
     className: "referrals-piece__feedback"
-  }, valid.current && /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement("div", {
+  }, !!valid.current && /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement("div", {
     className: "referrals-piece__feedbackicon icon-check-circle-black color--success"
-  }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, valid.current), " ", translate("puzzles.referrals.inviter.".concat(validLabel)))), invalid.current && /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement("div", {
+  }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, valid.current), " ", translate("puzzles.referrals.inviter.".concat(validLabel)))), !!invalid.current && /*#__PURE__*/_react.default.createElement("li", null, /*#__PURE__*/_react.default.createElement("div", {
     className: "referrals-piece__feedbackicon icon-error-circle-black color--error"
   }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("strong", null, invalid.current), " ", translate("puzzles.referrals.inviter.".concat(notValidLabel))), /*#__PURE__*/_react.default.createElement("button", {
     className: "un-button",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -65,7 +65,7 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-env": "7.12.11",
     "@babel/preset-react": "7.12.10",
-    "@gamelearn/arcade-styles": "0.5.2",
+    "@gamelearn/arcade-styles": "0.5.5",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",
     "@storybook/addon-essentials": "6.1.11",