@gamelearn/arcade-components 1.22.10-hotfix-2 → 1.22.11

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

@@ -80,7 +80,6 @@ var ComicComponent = function ComicComponent(_ref) {
 
   var slide = slides === null || slides === void 0 ? void 0 : slides[slideCount];
   var close = (0, _react.useCallback)(function () {
-    setStarted(false);
     emitEvent({
       type: 'success'
     });
@@ -121,7 +120,7 @@ var ComicComponent = function ComicComponent(_ref) {
     goToPreviousSlide();
   };
 
-  (0, _useEkho.default)({
+  var stopEkho = (0, _useEkho.default)({
     audioType: slides === null || slides === void 0 ? void 0 : (_slides$slideCount = slides[slideCount]) === null || _slides$slideCount === void 0 ? void 0 : _slides$slideCount.audioType,
     voice: slides === null || slides === void 0 ? void 0 : (_slides$slideCount2 = slides[slideCount]) === null || _slides$slideCount2 === void 0 ? void 0 : _slides$slideCount2.voice,
     text: slides === null || slides === void 0 ? void 0 : (_slides$slideCount3 = slides[slideCount]) === null || _slides$slideCount3 === void 0 ? void 0 : (_slides$slideCount3$v = _slides$slideCount3.vignettes[0].textData) === null || _slides$slideCount3$v === void 0 ? void 0 : _slides$slideCount3$v.text,
@@ -138,6 +137,9 @@ var ComicComponent = function ComicComponent(_ref) {
       }
     }
   });
+  (0, _react.useEffect)(function () {
+    stopEkho();
+  }, [slideCount, stopEkho]);
   (0, _react.useEffect)(function () {
     if (automatic && ((slide === null || slide === void 0 ? void 0 : slide.audioType) === 'none' || audioFailed)) {
       var _slide$vignettes$, _slide$vignettes$$tex;

package/dist/components/conversational-pro-component/components/ConversationalProComponent.js

@@ -262,7 +262,6 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     }
   }, [currentLineData.id, edges, finishConversation, lines]);
   var handleClickNext = (0, _react.useCallback)(function (choice, reset) {
-    var isLast = false;
     setPreviousLineWasDecision(currentLineData.decision);
     setStarted(false);
     setAudioFailed(false);
@@ -280,14 +279,11 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       if (line + 1 <= maxLine) {
         setCurrentLine(line + 1);
       } else {
-        isLast = true;
         finishConversation();
       }
     }
 
-    if (!isLast) {
-      setStarted(true);
-    }
+    setStarted(true);
   }, [currentLine, currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.decision, finishConversation, handleBranchDirection, handleDecisionBranch, isBranched, lines.length]);
 
   var handleClickBack = function handleClickBack() {
@@ -317,7 +313,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
 
   var autoplayCond = automatic && !isDecision;
   var disableBackButton = currentLine === 0 || previousLineWasDecision || currentLine > 0 && (lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision);
-  (0, _useEkho.default)({
+  var stopEkho = (0, _useEkho.default)({
     audioType: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType,
     voice: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice,
     started: started,
@@ -333,7 +329,10 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
         handleClickNext();
       }
     }
-  }); // Autoplay logic
+  });
+  (0, _react.useEffect)(function () {
+    stopEkho();
+  }, [currentLine, stopEkho]); // Autoplay logic
 
   (0, _react.useEffect)(function () {
     if (autoplayCond && ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' || audioFailed)) {

package/dist/components/dialog-component/components/DialogComponent.js

@@ -540,9 +540,6 @@ var DialogComponent = function DialogComponent(_ref) {
   });
   (0, _react.useEffect)(function () {
     stopEkho();
-    return function () {
-      stopEkho();
-    };
   }, [line, stopEkho]); // Autoplay logic
 
   (0, _react.useEffect)(function () {

package/dist/helpers/useEkho.js

@@ -7,6 +7,12 @@ exports.default = void 0;
 
 var _react = require("react");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -65,7 +71,14 @@ var useEkho = function useEkho(_ref) {
       type: 'translate',
       payload: id
     });
-  }, [emitEvent]); // Get translated voices, todo: translate this in arcade translateProps i18n.helper.js
+  }, [emitEvent]); // Setted when is mounted
+
+  (0, _react.useEffect)(function () {
+    setIsMounted(true);
+    return function () {
+      setIsMounted(false);
+    };
+  }, []); // Get translated voices, todo: translate this in arcade translateProps i18n.helper.js
 
   var getVoice = (0, _react.useCallback)(function (_ref2) {
     var id = _ref2.id,
@@ -110,7 +123,7 @@ var useEkho = function useEkho(_ref) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(isMounted && payload.voiceId && payload.text)) {
+              if (!(payload.voiceId && payload.text)) {
                 _context.next = 7;
                 break;
               }
@@ -147,32 +160,21 @@ var useEkho = function useEkho(_ref) {
     return function (_x) {
       return _ref3.apply(this, arguments);
     };
-  }(), [emitEvent, isMounted, onError, setCurrentPlaying]);
+  }(), [emitEvent, onError, setCurrentPlaying]);
   var stopCurrentAudio = (0, _react.useCallback)(function () {
     if (currentPlaying.current.url) {
-      currentPlaying.current = {
-        url: '',
-        cc: 'tts'
-      };
+      currentPlaying.current = _objectSpread(_objectSpread({}, currentPlaying.current), {}, {
+        url: ''
+      });
       stop(currentPlaying.current.cc);
     }
-  }, [stop]); // Setted when is mounted
-
-  (0, _react.useEffect)(function () {
-    setIsMounted(true);
-    return function () {
-      setIsMounted(false);
-      stopCurrentAudio();
-    };
-  }, [stopCurrentAudio]);
+  }, [stop]);
   (0, _react.useEffect)(function () {
     if (noAudio) {
       stopCurrentAudio();
     }
   }, [noAudio, stopCurrentAudio]);
   (0, _react.useEffect)(function () {
-    stopCurrentAudio();
-
     if (isMounted && started) {
       if (audioType === 'voice' && voice !== null && voice !== void 0 && voice.id) {
         var voiceId = getVoice(voice);
@@ -186,7 +188,7 @@ var useEkho = function useEkho(_ref) {
         onError();
       }
     }
-  }, [getVoice, playSpeech, isMounted, voice, text, audioType, audio === null || audio === void 0 ? void 0 : audio.url, audio, setCurrentPlaying, onError, started, stopCurrentAudio]);
+  }, [getVoice, playSpeech, isMounted, voice, text, audioType, audio === null || audio === void 0 ? void 0 : audio.url, audio, setCurrentPlaying, onError, started]);
   return stopCurrentAudio;
 };
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "1.22.10-hotfix-2",
+  "version": "1.22.11",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -109,4 +109,4 @@
       "post-merge": "bash node_modules/@gamelearn/version/scripts/after_version_update.sh -p hooks.config"
     }
   }
-}
+}