@gamelearn/arcade-components 0.25.19 → 0.25.21

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

@@ -64,6 +64,7 @@ var AnimationComponent = function AnimationComponent(_ref) {
           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);
 
           var finishCallback = function finishCallback() {

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

@@ -104,7 +104,7 @@ var CartelComponent = function CartelComponent(_ref) {
     className: "cartel__textwrap"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "cartel__text"
-  }, /*#__PURE__*/_react.default.createElement("span", null, text))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null))), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("span", null, text))) : null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "position--absolute top right"
   }, /*#__PURE__*/_react.default.createElement("button", {
     type: "button",

package/dist/components/frame-click-puzzle-component/components/Counter/index.js

@@ -18,7 +18,7 @@ var Counter = function Counter(_ref) {
       emitEvent = _ref.emitEvent;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tooltip ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
     emitEvent: emitEvent
-  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement("div", {
+  }) : null, /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle-frame__info--frames"
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "info-circle"

package/dist/components/hacker-puzzle-component/components/HackerPuzzleComponent.js

@@ -130,46 +130,6 @@ var HackerPuzzleComponent = function HackerPuzzleComponent(_ref) {
     return end > actual.length ? actual.length : end;
   };
 
-  var renderProgressBar = function renderProgressBar() {
-    var lines = _languages.default[type];
-
-    if (lines) {
-      var totalLength = lines.reduce(function (acc, current) {
-        return (acc.length ? acc.length : acc) + current.length;
-      });
-      var percentage = Math.floor(progress * 100 / totalLength);
-      var classProgressLabel = percentage === 100 ? 'puzzle--hacker__percentage percentage--label' : 'puzzle--hacker__percentage';
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: "puzzle--hacker__progress"
-      }, /*#__PURE__*/_react.default.createElement("span", {
-        className: "puzzle--hacker__progress--item",
-        style: {
-          width: "".concat(Math.floor(progress * 100 / totalLength), "%")
-        }
-      }, /*#__PURE__*/_react.default.createElement("span", {
-        className: classProgressLabel
-      }, percentage, "%")));
-    }
-
-    return null;
-  };
-
-  var renderCode = function renderCode() {
-    var text = codeContainer;
-    var split = text.split('<br>');
-
-    if (split.length > 0) {
-      return split.map(function (line, ind) {
-        var newLine = line.replace(/ /g, "\xA0");
-        return /*#__PURE__*/_react.default.createElement("p", {
-          key: "line_".concat(ind)
-        }, newLine);
-      });
-    }
-
-    return /*#__PURE__*/_react.default.createElement("p", null, text);
-  };
-
   var handleFinish = function handleFinish() {
     playSound('click-ui');
     var rewards = solution.right.rewards;
@@ -240,6 +200,46 @@ var HackerPuzzleComponent = function HackerPuzzleComponent(_ref) {
     writeCode();
   };
 
+  var ProgressBar = function ProgressBar() {
+    var lines = _languages.default[type];
+
+    if (lines) {
+      var totalLength = lines.reduce(function (acc, current) {
+        return (acc.length ? acc.length : acc) + current.length;
+      });
+      var percentage = Math.floor(progress * 100 / totalLength);
+      var classProgressLabel = percentage === 100 ? 'puzzle--hacker__percentage percentage--label' : 'puzzle--hacker__percentage';
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "puzzle--hacker__progress"
+      }, /*#__PURE__*/_react.default.createElement("span", {
+        className: "puzzle--hacker__progress--item",
+        style: {
+          width: "".concat(Math.floor(progress * 100 / totalLength), "%")
+        }
+      }, /*#__PURE__*/_react.default.createElement("span", {
+        className: classProgressLabel
+      }, percentage, "%")));
+    }
+
+    return null;
+  };
+
+  var Code = function Code() {
+    var text = codeContainer;
+    var split = text.split('<br>');
+
+    if (split.length > 0) {
+      return split.map(function (line, ind) {
+        var newLine = line.replace(/ /g, "\xA0");
+        return /*#__PURE__*/_react.default.createElement("p", {
+          key: "line_".concat(ind)
+        }, newLine);
+      });
+    }
+
+    return /*#__PURE__*/_react.default.createElement("p", null, text);
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     tabIndex: "0",
     "data-testid": "hacker",
@@ -256,7 +256,7 @@ var HackerPuzzleComponent = function HackerPuzzleComponent(_ref) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--hacker__code",
     ref: code
-  }, renderCode(), finished && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactTypist.default, {
+  }, /*#__PURE__*/_react.default.createElement(Code, null), finished ? /*#__PURE__*/_react.default.createElement(_reactTypist.default, {
     avgTypingDelay: 110,
     onCharacterTyped: function onCharacterTyped() {
       if (code.current) code.current.scrollTop = el.current.scrollHeight;
@@ -267,13 +267,13 @@ var HackerPuzzleComponent = function HackerPuzzleComponent(_ref) {
     className: "puzzle--hacker__result"
   }, /*#__PURE__*/_react.default.createElement(_reactTypist.default.Delay, {
     ms: 300
-  }), /*#__PURE__*/_react.default.createElement("span", null, "".concat(hackerPuzzleCompleted)), /*#__PURE__*/_react.default.createElement("br", null), solution.right.desc ? solution.right.desc : ''))), renderProgressBar()), finished && /*#__PURE__*/_react.default.createElement("div", {
+  }), /*#__PURE__*/_react.default.createElement("span", null, "".concat(hackerPuzzleCompleted)), /*#__PURE__*/_react.default.createElement("br", null), solution.right.desc ? solution.right.desc : '') : null), /*#__PURE__*/_react.default.createElement(ProgressBar, null)), finished ? /*#__PURE__*/_react.default.createElement("div", {
     className: "position--absolute bottom center"
   }, /*#__PURE__*/_react.default.createElement("button", {
     type: "button",
     className: "gat--btn gat--btn__primary gat--btn__cracker",
     onClick: handleFinish
-  }, translate('screens.continue'))));
+  }, translate('screens.continue'))) : null);
 };
 
 HackerPuzzleComponent.defaultProps = {

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

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _LectureButtons = _interopRequireDefault(require("./LectureButtons"));
 
+var _htmlReactParser = _interopRequireDefault(require("html-react-parser"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -122,11 +124,8 @@ var LecturesComponent = function LecturesComponent(_ref) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "readings--title"
   }, name), /*#__PURE__*/_react.default.createElement("div", {
-    className: "readings--text",
-    dangerouslySetInnerHTML: {
-      __html: currentLecture
-    }
-  }), !viewed ? /*#__PURE__*/_react.default.createElement(_LectureButtons.default, {
+    className: "readings--text"
+  }, currentLecture ? (0, _htmlReactParser.default)(currentLecture) : null), !viewed ? /*#__PURE__*/_react.default.createElement(_LectureButtons.default, {
     goToLecture: goToLecture,
     close: close,
     minutes: minutes,

package/dist/components/terminal-puzzle-component/components/Visor/index.js

@@ -120,7 +120,7 @@ var Visor = function Visor(_ref) {
     className: "gat--btn gat--btn__primary green",
     type: "button",
     onClick: resolvePuzzle
-  }, translate('screens.continue')) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null))));
+  }, translate('screens.continue')) : null)));
 };
 
 var _default = Visor;

package/dist/components/test-component/components/Container.js

@@ -134,7 +134,7 @@ var Container = function Container(_ref) {
     className: "test--timer ".concat(time < 10 ? 'test--timer--finalseconds' : '')
   }, /*#__PURE__*/_react.default.createElement("div", {
     id: "test-time"
-  }, minutes < 10 ? "0".concat(minutes) : minutes, " : ", seconds < 10 ? "0".concat(seconds) : seconds)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null)), /*#__PURE__*/_react.default.createElement(_Questions.default, {
+  }, minutes < 10 ? "0".concat(minutes) : minutes, " : ", seconds < 10 ? "0".concat(seconds) : seconds)) : null), /*#__PURE__*/_react.default.createElement(_Questions.default, {
     key: questions[currentQuestionId].id,
     result: result,
     disabled: disabled,

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

@@ -27,7 +27,7 @@ var WebBuilderTopBar = function WebBuilderTopBar(_ref) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--webBuilder__topbar"
-  }, displayButton ? /*#__PURE__*/_react.default.createElement(CurrentButton, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement("div", {
+  }, displayButton ? /*#__PURE__*/_react.default.createElement(CurrentButton, null) : null, /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--webBuilder__title"
   }, "web builder 3.0"));
 };

package/dist/helpers/index.js

@@ -87,14 +87,18 @@ var getObjectPosition = function getObjectPosition(object, camera, canvas) {
 
 exports.getObjectPosition = getObjectPosition;
 
-var executeCrossFade = function executeCrossFade(startAction, endAction, duration) {
-  startAction.reset(); // const ratio = endAction.getClip().duration / startAction.getClip().duration;
+var setWeight = function setWeight(action, weight) {
+  action.enabled = true;
+  action.setEffectiveTimeScale(1);
+  action.setEffectiveWeight(weight);
+};
 
-  endAction.time = 1.0;
-  endAction.enabled = true;
+var executeCrossFade = function executeCrossFade(startAction, endAction, duration) {
+  startAction.play();
+  startAction.reset();
   endAction.reset();
-  endAction.setEffectiveTimeScale(1.0);
-  endAction.setEffectiveWeight(1.0);
+  endAction.time = 0;
+  setWeight(endAction, 1);
   endAction.crossFadeFrom(startAction, duration, true);
   endAction.play();
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.25.19",
+  "version": "0.25.21",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "@testing-library/user-event": "12.1.10",
     "global": "^4.4.0",
     "hls.js": "0.12.4",
-    "html-react-parser": "^0.10.2",
+    "html-react-parser": "^1.4.0",
     "interactjs": "^1.10.11",
     "konva": "^7.2.5",
     "prop-types": "15.7.2",