@gamelearn/arcade-components 2.28.0 → 2.29.3

package/dist/components/animation-component/components/AnimationComponent.js

@@ -64,13 +64,18 @@ var AnimationComponent = function AnimationComponent(_ref) {
           loader.load(animation.url, function (gltf) {
             var mixer = object.userData.mixer;
             var defaultAnim = object.userData.defaultAnim;
+            if (!object.userData.actionList) object.userData.actionList = {};
+            var actionList = object.userData.actionList;
+            if (!actionList.idle) {
+              var action = mixer.existingAction(defaultAnim, object);
+              actionList.idle = action;
+            }
             var currentAction = mixer.clipAction(gltf.animations[0], object);
-            var oldAction = mixer.clipAction(defaultAnim, object);
             currentAction.setLoop(_three.LoopRepeat, loopTimes);
-            mixer.stopAllAction();
-            (0, _helpers.executeCrossFade)(oldAction, currentAction, 0.5);
+            (0, _helpers.activateAction)(currentAction, 0);
+            (0, _helpers.executeCrossFade)(actionList.idle, currentAction);
             var finishCallback = function finishCallback() {
-              (0, _helpers.executeCrossFade)(currentAction, oldAction, 0.5);
+              (0, _helpers.executeCrossFade)(currentAction, actionList.idle);
               if (canInteract) emitEvent({
                 type: 'success'
               });

package/dist/components/cartel-component/components/CartelComponent.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _useEkho = _interopRequireDefault(require("../../../helpers/useEkho"));
+var _LangIsRtl = _interopRequireDefault(require("../../../helpers/LangIsRtl"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
@@ -105,16 +106,16 @@ var CartelComponent = function CartelComponent(_ref) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "cartel__text"
   }, /*#__PURE__*/_react.default.createElement("span", null, text))) : null)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "position--absolute top right"
+    className: "position--absolute center right"
   }, /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
-    className: "gat--btn__round gat--btn__close",
+    className: "gat--btn__round",
     onClick: function onClick() {
       return close();
     },
     "aria-label": translate('storylines.misc.closePiece')
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "icon-close"
+    className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
   }))));
 };
 var _default = CartelComponent;

package/dist/components/comic-component/components/ComicComponent.js

@@ -174,31 +174,22 @@ var ComicComponent = function ComicComponent(_ref) {
     "aria-label": (0, _LangIsRtl.default)() ? translate('comic.next') : translate('comic.previous')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _LangIsRtl.default)() ? 'icon-next' : 'icon-back'
-  })), slideCount + 1 < slides.length && /*#__PURE__*/_react.default.createElement("button", {
+  })), slideCount < slides.length && /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "comic-control comic-control--right gat--btn__round",
     "data-testid": "btn-nxt",
-    onClick: handleManualNext,
-    "aria-label": (0, _LangIsRtl.default)() ? translate('comic.previous') : translate('comic.next')
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
-  })), slideCount + 1 >= slides.length && /*#__PURE__*/_react.default.createElement("div", {
-    className: "position--absolute top right",
-    role: "heading",
-    "aria-level": "1",
-    "aria-label": "heading"
-  }, /*#__PURE__*/_react.default.createElement("button", {
-    type: "button",
-    className: "gat--btn__round gat--btn__close",
-    "data-testid": "btn-cls",
     onClick: function onClick() {
-      play('click-ui');
-      close();
+      if (slideCount + 1 < slides.length) {
+        handleManualNext();
+      } else {
+        play('click-ui');
+        close();
+      }
     },
-    "aria-label": translate('storylines.misc.closePiece')
+    "aria-label": (0, _LangIsRtl.default)() ? translate('comic.previous') : translate('comic.next')
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "icon-close"
-  })))));
+    className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
+  }))));
 };
 var _default = ComicComponent;
 exports.default = _default;

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

@@ -74,11 +74,14 @@ var DecisionBody = function DecisionBody(_ref) {
       className: "popup--buttons"
     }, (required ? !failed : selectedChoice.id !== undefined) ? /*#__PURE__*/_react.default.createElement("button", {
       type: "button",
-      className: "gat--btn gat--btn__primary ".concat(selectedChoice.id !== undefined ? '' : 'disabled'),
+      className: "gat--btn__navigation ".concat(selectedChoice.id !== undefined ? '' : 'disabled'),
       onClick: function onClick() {
-        return onNext(selectedChoice);
-      }
-    }, translate('screens.continue')) : null));
+        return selectedChoice.id !== undefined && onNext(selectedChoice);
+      },
+      "aria-label": translate('storylines.misc.closePiece')
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
+    })) : null));
   };
   var ComplexDecision = function ComplexDecision() {
     return /*#__PURE__*/_react.default.createElement("div", {

package/dist/components/feedback-component/components/FeedbackComponent.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _LangIsRtl = _interopRequireDefault(require("../../../helpers/LangIsRtl"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -83,16 +85,7 @@ var FeedbackComponent = function FeedbackComponent(_ref) {
   }, !text || !shortText ? /*#__PURE__*/_react.default.createElement("div", {
     title: translate("tooltip.".concat(success ? 'correct' : 'incorrect')),
     className: "".concat(statusIcon())
-  }) : text), text && functionOnClose && explain && /*#__PURE__*/_react.default.createElement("button", {
-    type: "button",
-    className: "feedback-layer__closeX",
-    onClick: function onClick() {
-      return functionOnClose();
-    },
-    "aria-label": translate('storylines.misc.closePiece')
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "icon-close"
-  })), shortText && /*#__PURE__*/_react.default.createElement("button", {
+  }) : text), shortText && /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "feedback-layer__closeX",
     onClick: function onClick() {
@@ -107,7 +100,21 @@ var FeedbackComponent = function FeedbackComponent(_ref) {
     className: "feedback-layer__explain"
   }, /*#__PURE__*/_react.default.createElement("div", {
     dir: "auto"
-  }, text)))));
+  }, text), text && functionOnClose && explain && /*#__PURE__*/_react.default.createElement("button", {
+    type: "button",
+    className: "gat--btn__navigation",
+    onClick: function onClick() {
+      return functionOnClose();
+    },
+    "aria-label": translate('storylines.misc.closePiece'),
+    style: {
+      display: 'flex',
+      margin: 'auto',
+      marginTop: '24px'
+    }
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
+  }))))));
 };
 FeedbackComponent.defaultProps = {
   text: '',

package/dist/components/lectures-component/components/LectureButtons.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _LangIsRtl = _interopRequireDefault(require("../../../helpers/LangIsRtl"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var LectureButtons = function LectureButtons(_ref) {
   var goToLecture = _ref.goToLecture,
@@ -16,11 +17,14 @@ var LectureButtons = function LectureButtons(_ref) {
     className: "readings--buttons"
   }, goToLecture ? /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
-    className: "gat--btn gat--btn__primary",
+    className: "gat--btn__navigation",
     onClick: function onClick() {
       return close();
-    }
-  }, /*#__PURE__*/_react.default.createElement("span", null, btnText)) : /*#__PURE__*/_react.default.createElement("button", {
+    },
+    "aria-label": btnText
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
+  })) : /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "gat--btn__count",
     "data-testid": "countdown"
@@ -30,8 +34,7 @@ LectureButtons.defaultProps = {
   goToLecture: false,
   close: function close() {},
   minutes: 0,
-  seconds: 0,
-  btnText: 'continue'
+  seconds: 0
 };
 var _default = LectureButtons;
 exports.default = _default;

package/dist/helpers/index.js

@@ -159,11 +159,9 @@ function prepareCrossfade(root, startAction, endAction) {
 }
 function syncCrossfade(mixer, startAction, endAction) {
   mixer.addEventListener('loop', onLoopFinished);
-  function onLoopFinished(event) {
-    if (event.action === startAction) {
-      mixer.removeEventListener('loop', onLoopFinished);
-      executeCrossFade(startAction, endAction);
-    }
+  function onLoopFinished() {
+    mixer.removeEventListener('loop', onLoopFinished);
+    executeCrossFade(startAction, endAction);
   }
 }
 function resetActions(mixer, active) {

package/dist/helpers/useStateMachine.js

@@ -70,14 +70,17 @@ function useStateMachine(lines) {
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var _slot$character3;
             var slot = _step2.value;
             if (!slot.uid) continue;
             if (!urls[slot.uid]) {
-              urls[slot.uid] = _defineProperty({}, slot.emotion, slot.character.resource.animations[slot.emotion].url);
+              var _slot$character;
+              urls[slot.uid] = _defineProperty({}, slot.emotion, (_slot$character = slot.character) === null || _slot$character === void 0 ? void 0 : _slot$character.resource.animations[slot.emotion].url);
             } else {
-              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, slot.emotion, slot.character.resource.animations[slot.emotion].url));
+              var _slot$character2;
+              urls[slot.uid] = _objectSpread(_objectSpread({}, urls[slot.uid]), {}, _defineProperty({}, slot.emotion, (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[slot.emotion].url));
             }
-            urls[slot.uid].talking = slot.character.resource.animations.talking.url;
+            urls[slot.uid].talking = (_slot$character3 = slot.character) === null || _slot$character3 === void 0 ? void 0 : _slot$character3.resource.animations.talking.url;
           }
         } catch (err) {
           _iterator2.e(err);
@@ -95,7 +98,6 @@ function useStateMachine(lines) {
   var resetActives = function resetActives() {
     Object.keys(active).forEach(function (uid) {
       startAnimation(uid, 'idle');
-      setActive(uid, 'idle');
     });
   };
   (0, _react.useEffect)(function () {
@@ -122,11 +124,12 @@ function useStateMachine(lines) {
         mixer = _root$userData.mixer,
         actionList = _root$userData.actionList;
       var currentActive = active[uid];
+      if (emotion === currentActive) return;
       var startAction = actionList[currentActive];
       var endAction = actionList[emotion];
+      setActive(uid, emotion);
       (0, _.resetActions)(mixer, startAction);
       (0, _.executeCrossFade)(startAction, endAction);
-      setActive(uid, emotion);
     }
   }, [scene, loaded, active, setActive]);
   var processAnimations = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
@@ -154,7 +157,6 @@ function useStateMachine(lines) {
                     if (!actionList.idle) {
                       defaultAction = mixer.existingAction(defaultAnim, root);
                       actionList.idle = defaultAction;
-                      (0, _.activateAction)(defaultAction, 1);
                       setActive(uid, 'idle');
                     }
                     loadEmotion = /*#__PURE__*/function () {

package/package.json

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