@micromag/screen-quiz 0.3.646 → 0.3.651

package/es/index.js

@@ -450,14 +450,14 @@ var Question = function Question(_ref) {
   var answered = answeredIndex !== null;
   var answer = answeredIndex !== null && answers[answeredIndex] ? answers[answeredIndex] : null;
   var _ref3 = answer || {},
-    _ref3$customAnswerLab = _ref3.customAnswerLabel,
-    customAnswerLabel = _ref3$customAnswerLab === undefined ? null : _ref3$customAnswerLab,
+    _ref3$result = _ref3.result,
+    answerResult = _ref3$result === undefined ? null : _ref3$result,
     _ref3$answerImage = _ref3.answerImage,
     answerImage = _ref3$answerImage === undefined ? null : _ref3$answerImage;
-  var hasResult = isTextFilled(customAnswerLabel) || isTextFilled(result);
+  var hasResult = isTextFilled(answerResult) || isTextFilled(result);
   var hasResultVisual = isImageFilled(answerImage) || isImageFilled(resultImage);
   var defaultResult = isTextFilled(result) ? result : null;
-  var customResult = isTextFilled(customAnswerLabel) ? customAnswerLabel : null;
+  var customResult = isTextFilled(answerResult) ? answerResult : null;
   var finalResult = customResult || defaultResult;
   var _ref4 = finalResult || {},
     _ref4$textStyle = _ref4.textStyle,
@@ -1259,15 +1259,13 @@ var QuizMultipleScreen = function QuizMultipleScreen(_ref) {
   var currentAnsweredIndex = userAnswers !== null && typeof userAnswers[questionIndex] !== 'undefined' ? userAnswers[questionIndex] : null;
   var answer = currentAnsweredIndex !== null && typeof answers[currentAnsweredIndex] !== 'undefined' ? answers[currentAnsweredIndex] : null;
   var _ref5 = answer || {},
-    _ref5$customAnswerLab = _ref5.customAnswerLabel,
-    customAnswerLabel = _ref5$customAnswerLab === undefined ? null : _ref5$customAnswerLab;
-  var firstCustomAnswerLabel = (answers || []).find(function () {
-    var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      _ref6$customAnswerLab = _ref6.customAnswerLabel,
-      cal = _ref6$customAnswerLab === undefined ? null : _ref6$customAnswerLab;
-    return cal !== null;
+    _ref5$result = _ref5.result,
+    answerResult = _ref5$result === undefined ? null : _ref5$result;
+  var firstCustomResult = (answers || []).find(function () {
+    var it = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    return (it === null || it === undefined ? undefined : it.result) !== null;
   }) || null;
-  var hasResult = questionResult !== null || questionResultImage !== null || customAnswerLabel !== null || firstCustomAnswerLabel !== null;
+  var hasResult = questionResult !== null || questionResultImage !== null || answerResult !== null || firstCustomResult !== null;
   var onNextSlide = useCallback(function () {
     if (isEdit) {
       return;
@@ -1282,13 +1280,13 @@ var QuizMultipleScreen = function QuizMultipleScreen(_ref) {
   }, [questions, questionIndex, setQuestionIndex, isEdit]);
   var currentPoints = useMemo(function () {
     return userAnswers !== null ? Object.keys(userAnswers).reduce(function (totalPoints, answerQuestionIndex) {
-      var _ref7 = questions !== null ? questions[answerQuestionIndex] || {} : {},
-        _ref7$answers = _ref7.answers,
-        questionAnswers = _ref7$answers === undefined ? [] : _ref7$answers;
+      var _ref6 = questions !== null ? questions[answerQuestionIndex] || {} : {},
+        _ref6$answers = _ref6.answers,
+        questionAnswers = _ref6$answers === undefined ? [] : _ref6$answers;
       var answerIndex = userAnswers[answerQuestionIndex];
-      var _ref8 = questionAnswers[answerIndex] || {},
-        _ref8$points = _ref8.points,
-        points = _ref8$points === undefined ? 0 : _ref8$points;
+      var _ref7 = questionAnswers[answerIndex] || {},
+        _ref7$points = _ref7.points,
+        points = _ref7$points === undefined ? 0 : _ref7$points;
       return points + totalPoints;
     }, 0) : 0;
   }, [userAnswers, questions]);
@@ -1302,30 +1300,30 @@ var QuizMultipleScreen = function QuizMultipleScreen(_ref) {
     if (stateId === 'results') {
       return (results || [])[parseInt(stateIndex, 10)] || null;
     }
-    return (results || []).sort(function (_ref9, _ref10) {
+    return (results || []).sort(function (_ref8, _ref9) {
+      var _ref8$points = _ref8.points,
+        pointsA = _ref8$points === undefined ? 0 : _ref8$points;
       var _ref9$points = _ref9.points,
-        pointsA = _ref9$points === undefined ? 0 : _ref9$points;
-      var _ref10$points = _ref10.points,
-        pointsB = _ref10$points === undefined ? 0 : _ref10$points;
+        pointsB = _ref9$points === undefined ? 0 : _ref9$points;
       if (pointsA === pointsB) {
         return 0;
       }
       return pointsA > pointsB ? 1 : -1;
     }).reduce(function (lastResult, result) {
-      var _ref11 = lastResult || {},
+      var _ref10 = lastResult || {},
+        _ref10$points = _ref10.points,
+        lastPoints = _ref10$points === undefined ? 0 : _ref10$points;
+      var _ref11 = result || {},
         _ref11$points = _ref11.points,
-        lastPoints = _ref11$points === undefined ? 0 : _ref11$points;
-      var _ref12 = result || {},
-        _ref12$points = _ref12.points,
-        points = _ref12$points === undefined ? 0 : _ref12$points;
+        points = _ref11$points === undefined ? 0 : _ref11$points;
       return currentPoints >= (lastPoints || 0) && currentPoints >= points ? result : lastResult;
     }, null);
   }, [isResults, results, currentPoints, stateId, stateIndex]);
-  var _ref13 = currentResult || {},
-    _ref13$background = _ref13.background,
-    resultBackground = _ref13$background === undefined ? null : _ref13$background,
-    _ref13$layout = _ref13.layout,
-    resultLayout = _ref13$layout === undefined ? null : _ref13$layout;
+  var _ref12 = currentResult || {},
+    _ref12$background = _ref12.background,
+    resultBackground = _ref12$background === undefined ? null : _ref12$background,
+    _ref12$layout = _ref12.layout,
+    resultLayout = _ref12$layout === undefined ? null : _ref12$layout;
   var _useQuizCreate = useQuizCreate({
       screenId: screenId
     }),
@@ -1385,8 +1383,8 @@ var QuizMultipleScreen = function QuizMultipleScreen(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     scrolledBottom = _useState6[0],
     setScrolledBottom = _useState6[1];
-  var onScrolledBottom = useCallback(function (_ref14) {
-    var initial = _ref14.initial;
+  var onScrolledBottom = useCallback(function (_ref13) {
+    var initial = _ref13.initial;
     if (initial) {
       trackScreenEvent('scroll', 'Screen');
     }
@@ -1399,9 +1397,9 @@ var QuizMultipleScreen = function QuizMultipleScreen(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     hasScroll = _useState8[0],
     setHasScroll = _useState8[1];
-  var onScrollHeightChange = useCallback(function (_ref15) {
-    var _ref15$canScroll = _ref15.canScroll,
-      canScroll = _ref15$canScroll === undefined ? false : _ref15$canScroll;
+  var onScrollHeightChange = useCallback(function (_ref14) {
+    var _ref14$canScroll = _ref14.canScroll,
+      canScroll = _ref14$canScroll === undefined ? false : _ref14$canScroll;
     setHasScroll(canScroll);
   }, [setHasScroll]);
   var onQuizReset = useCallback(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-quiz",
-    "version": "0.3.646",
+    "version": "0.3.651",
     "private": false,
     "description": "",
     "keywords": [
@@ -63,19 +63,19 @@
         "@fortawesome/fontawesome-svg-core": "^6.5.2",
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.0",
-        "@micromag/core": "^0.3.637",
-        "@micromag/data": "^0.3.637",
-        "@micromag/element-background": "^0.3.637",
-        "@micromag/element-button": "^0.3.637",
-        "@micromag/element-container": "^0.3.637",
-        "@micromag/element-footer": "^0.3.637",
-        "@micromag/element-header": "^0.3.637",
-        "@micromag/element-heading": "^0.3.637",
-        "@micromag/element-layout": "^0.3.637",
-        "@micromag/element-scroll": "^0.3.646",
-        "@micromag/element-text": "^0.3.637",
-        "@micromag/element-visual": "^0.3.637",
-        "@micromag/transforms": "^0.3.637",
+        "@micromag/core": "^0.3.651",
+        "@micromag/data": "^0.3.651",
+        "@micromag/element-background": "^0.3.651",
+        "@micromag/element-button": "^0.3.651",
+        "@micromag/element-container": "^0.3.651",
+        "@micromag/element-footer": "^0.3.651",
+        "@micromag/element-header": "^0.3.651",
+        "@micromag/element-heading": "^0.3.651",
+        "@micromag/element-layout": "^0.3.651",
+        "@micromag/element-scroll": "^0.3.651",
+        "@micromag/element-text": "^0.3.651",
+        "@micromag/element-visual": "^0.3.651",
+        "@micromag/transforms": "^0.3.651",
         "@react-spring/core": "^9.6.1",
         "@react-spring/web": "^9.6.1",
         "classnames": "^2.2.6",
@@ -89,5 +89,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "65b02adf2537ee701442a62f8294f09f60b2f3b6"
+    "gitHead": "9639dccc046f7adfe9673f53ede77360b8b75d51"
 }