@gamelearn/arcade-components 1.18.0 → 1.18.1

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

@@ -73,12 +73,15 @@ var ComicComponent = function ComicComponent(_ref) {
   var _soundActions = _slicedToArray(soundActions, 1),
       play = _soundActions[0];
 
+  var slide = slides === null || slides === void 0 ? void 0 : slides[slideCount];
   var close = (0, _react.useCallback)(function () {
     emitEvent({
       type: 'success'
     });
   }, [emitEvent]);
   var goToNextSlide = (0, _react.useCallback)(function () {
+    setAudioFailed(false);
+
     if (slideCount + 1 < slides.length) {
       setTransition('slide-animation');
       setCount(slideCount + 1);
@@ -87,6 +90,8 @@ var ComicComponent = function ComicComponent(_ref) {
     }
   }, [close, slideCount, slides === null || slides === void 0 ? void 0 : slides.length]);
   var goToPreviousSlide = (0, _react.useCallback)(function () {
+    setAudioFailed(false);
+
     if (slideCount - 1 >= 0) {
       setTransition('slide-animation');
       setCount(slideCount - 1);
@@ -117,9 +122,7 @@ var ComicComponent = function ComicComponent(_ref) {
       setAudioFailed(true);
     },
     onFinish: function onFinish() {
-      var _slides$slideCount5;
-
-      if (automatic && (slides === null || slides === void 0 ? void 0 : (_slides$slideCount5 = slides[slideCount]) === null || _slides$slideCount5 === void 0 ? void 0 : _slides$slideCount5.audioType) !== 'none') {
+      if (automatic) {
         goToNextSlide();
       }
     }
@@ -128,8 +131,6 @@ var ComicComponent = function ComicComponent(_ref) {
     stopEkho();
   }, [slideCount, stopEkho]);
   (0, _react.useEffect)(function () {
-    var slide = slides === null || slides === void 0 ? void 0 : slides[slideCount];
-
     if (automatic && ((slide === null || slide === void 0 ? void 0 : slide.audioType) === 'none' || audioFailed)) {
       var _slide$vignettes$, _slide$vignettes$$tex;
 
@@ -140,7 +141,7 @@ var ComicComponent = function ComicComponent(_ref) {
     return function () {
       stop();
     };
-  }, [audioFailed, automatic, goToNextSlide, slideCount, slides, start, stop]);
+  }, [audioFailed, automatic, goToNextSlide, slide === null || slide === void 0 ? void 0 : slide.audioType, slide === null || slide === void 0 ? void 0 : slide.vignettes, start, stop]);
   if (!(slides !== null && slides !== void 0 && slides.length)) return null;
   return /*#__PURE__*/_react.default.createElement("div", {
     dir: (0, _LangIsRtl.default)() ? 'rtl' : 'auto',

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

@@ -289,9 +289,9 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   };
 
   var autoplayCond = automatic && !isDecision;
-  (0, _useEkho.default)({
+  var stopEkho = (0, _useEkho.default)({
     audioType: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType,
-    voice: currentMessage !== null && currentMessage !== void 0 && currentMessage.text ? currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice : null,
+    voice: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice,
     text: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.text,
     audio: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audio,
     soundActions: soundActions,
@@ -304,7 +304,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

@@ -224,7 +224,9 @@ var DialogComponent = function DialogComponent(_ref) {
   var finishConversation = (0, _react.useCallback)(function () {
     resetAnims();
     lastSet.current = true;
-    setCurrentMessage({});
+    setCurrentMessage({
+      show: false
+    });
     resetCameraView();
     setTimeout(function () {
       changeLine(0);
@@ -249,7 +251,9 @@ var DialogComponent = function DialogComponent(_ref) {
       });
 
       if (destination >= 0) {
-        setCurrentMessage({});
+        setCurrentMessage({
+          show: false
+        });
         changeLine(destination);
       } else {
         finishConversation();
@@ -262,7 +266,9 @@ var DialogComponent = function DialogComponent(_ref) {
     if (isBranched) {
       handleBranchDirection(false);
     } else if (lastLine && !(lastLine !== null && lastLine !== void 0 && lastLine.decision) || lastLine.type && !lastLine.type !== 'conversationalDecision') {
-      setCurrentMessage({});
+      setCurrentMessage({
+        show: false
+      });
       changeLine(line - 1);
     }
   }, [handleBranchDirection, isBranched, lastLine, line]);
@@ -282,7 +288,9 @@ var DialogComponent = function DialogComponent(_ref) {
       if ((currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.fromId) === (currentEdge === null || currentEdge === void 0 ? void 0 : currentEdge.toId)) {
         reset();
       } else {
-        setCurrentMessage({});
+        setCurrentMessage({
+          show: false
+        });
         changeLine(destinationEdge);
       }
     } else {
@@ -299,7 +307,9 @@ var DialogComponent = function DialogComponent(_ref) {
         handleBranchDirection();
       }
     } else if (line < lines.length - 1) {
-      setCurrentMessage({});
+      setCurrentMessage({
+        show: false
+      });
       changeLine(line + 1);
     } else {
       finishConversation();
@@ -454,9 +464,10 @@ var DialogComponent = function DialogComponent(_ref) {
   var audio = Object.keys(currentLine.audio || {}).length;
   var voice = Object.keys(currentLine.voice || {}).length; // Sound logic
 
-  (0, _useEkho.default)({
+  var stopEkho = (0, _useEkho.default)({
     audioType: currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType,
-    voice: currentMessage !== null && currentMessage !== void 0 && currentMessage.text ? currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice : null,
+    voice: currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice,
+    started: currentMessage.show,
     text: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.text,
     audio: currentLine === null || currentLine === void 0 ? void 0 : currentLine.audio,
     soundActions: soundActions,
@@ -469,7 +480,10 @@ var DialogComponent = function DialogComponent(_ref) {
         nextLine();
       }
     }
-  }); // Autoplay logic
+  });
+  (0, _react.useEffect)(function () {
+    stopEkho();
+  }, [line, stopEkho]); // Autoplay logic
 
   (0, _react.useEffect)(function () {
     if (autoPlayCond && currentMessage.show && ((currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType) === 'none' || audioFailed)) {

package/dist/helpers/useEkho.js

@@ -33,6 +33,8 @@ var useEkho = function useEkho(_ref) {
       audioType = _ref.audioType,
       _ref$loop = _ref.loop,
       loop = _ref$loop === void 0 ? false : _ref$loop,
+      _ref$started = _ref.started,
+      started = _ref$started === void 0 ? true : _ref$started,
       audio = _ref.audio,
       soundActions = _ref.soundActions,
       emitEvent = _ref.emitEvent,
@@ -139,9 +141,7 @@ var useEkho = function useEkho(_ref) {
               break;
 
             case 7:
-              if (!payload.voiceId) {
-                onError();
-              }
+              onError();
 
             case 8:
             case "end":
@@ -166,7 +166,7 @@ var useEkho = function useEkho(_ref) {
     }
   }, [noAudio, stopCurrentAudio]);
   (0, _react.useEffect)(function () {
-    if (isMounted) {
+    if (isMounted && started) {
       if (audioType === 'voice' && voice !== null && voice !== void 0 && voice.id) {
         var voiceId = getVoice(voice);
         playSpeech({
@@ -179,7 +179,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]);
+  }, [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.18.0",
+  "version": "1.18.1",
   "main": "dist/index.js",
   "files": [
     "dist",