@gamelearn/arcade-components 1.3.10 → 1.3.12

package/README.md

@@ -28,6 +28,18 @@ export default class App extends Component {
 
 ```
 
+## Generar version hotfix para arcade/master-stg
+
+Para generar una version hotfix nos vamos al commit que desplego la version que utiliza actualmente arcade/master-stg y creamos una rama sobre ella.
+
+Generamos los cambios o hacemos cherrypick de ellos si ya estan creados y una vez terminemos con los cambios tendremos que cambiar la version del package.json a una tal que asi : 
+
+`"version": "1.3.5-fix-1",`
+
+Habiendo cambiado ya la version pasaremos a publicarla usando el comando
+
+`npm publish`
+
 ## Available Scripts
 
 Para ver Storybook en local

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

@@ -121,13 +121,13 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     return !decision ? getCurrentMessage() : {};
   }, [getCurrentMessage, decision]);
   var playSpeech = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var payload;
+    var payload, url;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             if (!(currentLineData.voice.id && currentMessage)) {
-              _context.next = 5;
+              _context.next = 7;
               break;
             }
 
@@ -137,23 +137,27 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
             };
 
             if (!(payload.voiceId && payload.text)) {
-              _context.next = 5;
+              _context.next = 7;
               break;
             }
 
             _context.next = 5;
             return emitEvent({
-              type: 'playSpeech',
+              type: 'getSpeech',
               payload: payload
             });
 
           case 5:
+            url = _context.sent;
+            playSound(url, 'tts');
+
+          case 7:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
-  })), [currentLineData.voice, currentMessage, emitEvent, getVoice]); // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
+  })), [currentLineData.voice, currentMessage, emitEvent, getVoice, playSound]); // Recupera la antigua linea de la conversacion para conservar los personajes en voice-over
 
   var leftWithSlots = lines.slice(0, currentLine + 1).reverse().find(function (line) {
     return line.slots;
@@ -261,13 +265,18 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     } else if (currentLineData !== null && currentLineData !== void 0 && (_currentLineData$audi = currentLineData.audio) !== null && _currentLineData$audi !== void 0 && _currentLineData$audi.url) {
       var _currentLineData$audi2;
 
-      playSound(currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$audi2 = currentLineData.audio) === null || _currentLineData$audi2 === void 0 ? void 0 : _currentLineData$audi2.url);
+      playSound(currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$audi2 = currentLineData.audio) === null || _currentLineData$audi2 === void 0 ? void 0 : _currentLineData$audi2.url, 'tts');
     }
 
     return function () {
-      stop();
+      stop('tts');
     };
   }, [currentLineData, currentMessage, finished, lines, playSound, playSpeech, stop]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      stop('tts');
+    };
+  }, [stop]);
 
   var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
     onFinish: handleClickNext,

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

@@ -149,13 +149,13 @@ var DialogComponent = function DialogComponent(_ref) {
     return null;
   }, [translate]);
   var playSpeech = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var payload;
+    var payload, url;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             if (!currentLine.voice.id) {
-              _context.next = 5;
+              _context.next = 7;
               break;
             }
 
@@ -165,23 +165,32 @@ var DialogComponent = function DialogComponent(_ref) {
             };
 
             if (!(payload.voiceId && payload.text)) {
-              _context.next = 5;
+              _context.next = 7;
               break;
             }
 
             _context.next = 5;
             return emitEvent({
-              type: 'playSpeech',
+              type: 'getSpeech',
               payload: payload
             });
 
           case 5:
+            url = _context.sent;
+            playSound(url, 'tts');
+
+          case 7:
+            return _context.abrupt("return", function () {
+              stop('tts');
+            });
+
+          case 8:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
-  })), [currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice, getVoice, currentMessage.text, emitEvent]);
+  })), [currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice, getVoice, currentMessage.text, playSound, emitEvent, stop]);
   var getCurrentVisible = (0, _react.useCallback)(function (uid) {
     var object;
     scene.traverseVisible(function (node) {
@@ -227,7 +236,7 @@ var DialogComponent = function DialogComponent(_ref) {
     } else {
       onLoadAnim();
     }
-  }, [loader]); // Reset currentEmotion to defaultAnim
+  }, [loader]);
 
   var executeAnimation = function executeAnimation(element) {
     var mixer = element.userData.mixer;
@@ -244,30 +253,16 @@ var DialogComponent = function DialogComponent(_ref) {
 
       element.userData.currentEmotion = defaultAction;
     }
-  };
-
-  var resetAnims = (0, _react.useCallback)(function () {
-    var end = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  }; // Reset currentEmotion to defaultAnim
 
-    if (end) {
-      scene.traverseVisible(function (node) {
-        if (node.userData.mixer && node.userData.currentEmotion) {
-          executeAnimation(node);
-        }
-      });
-    } else if (lastLine !== null && lastLine !== void 0 && lastLine.slots) {
-      var slottedCharacters = lastLine.slots.filter(function (slot) {
-        return slot.uid;
-      });
-      slottedCharacters.forEach(function (slot) {
-        var element = getCurrentVisible(slot.uid);
 
-        if (element && element.userData.currentEmotion) {
-          executeAnimation(element);
-        }
-      });
-    }
-  }, [getCurrentVisible, lastLine === null || lastLine === void 0 ? void 0 : lastLine.slots, scene]);
+  var resetAnims = (0, _react.useCallback)(function () {
+    scene.traverseVisible(function (node) {
+      if (node.userData.mixer && node.userData.currentEmotion) {
+        executeAnimation(node);
+      }
+    });
+  }, [scene]);
   var resetCameraView = (0, _react.useCallback)(function () {
     messagePosition.current.child = null;
     messagePosition.current.parent = null;
@@ -284,7 +279,7 @@ var DialogComponent = function DialogComponent(_ref) {
       setCurrentMessage({});
       changeLine(line + 1);
     } else {
-      resetAnims(true);
+      resetAnims();
       lastSet.current = true;
       setCurrentMessage({});
       resetCameraView();
@@ -318,8 +313,7 @@ var DialogComponent = function DialogComponent(_ref) {
       });
       var slottedCharacters = currentLine.slots.filter(function (slot) {
         return slot.uid && !slot.talking;
-      });
-      resetAnims(false); // Check not talking elements emotion
+      }); // Check not talking elements emotion
 
       slottedCharacters.forEach(function (slot) {
         var element = getCurrentVisible(slot.uid);
@@ -408,7 +402,7 @@ var DialogComponent = function DialogComponent(_ref) {
         });
       }
     }
-  }, [actors, camera, currentLine, zoomInActor, getCurrentVisible, translate, getAvatarURL, loadEmotion, resetAnims, resetCameraView]); // Sound logic
+  }, [actors, camera, currentLine, zoomInActor, getCurrentVisible, translate, getAvatarURL, loadEmotion, resetCameraView]); // Sound logic
 
   (0, _react.useEffect)(function () {
     var _currentLine$audio;
@@ -418,13 +412,18 @@ var DialogComponent = function DialogComponent(_ref) {
     } else if (currentLine !== null && currentLine !== void 0 && (_currentLine$audio = currentLine.audio) !== null && _currentLine$audio !== void 0 && _currentLine$audio.url) {
       var _currentLine$audio2;
 
-      playSound(currentLine === null || currentLine === void 0 ? void 0 : (_currentLine$audio2 = currentLine.audio) === null || _currentLine$audio2 === void 0 ? void 0 : _currentLine$audio2.url);
+      playSound(currentLine === null || currentLine === void 0 ? void 0 : (_currentLine$audio2 = currentLine.audio) === null || _currentLine$audio2 === void 0 ? void 0 : _currentLine$audio2.url, 'tts');
     }
 
     return function () {
-      stop();
+      stop('tts');
+    };
+  }, [currentLine === null || currentLine === void 0 ? void 0 : (_currentLine$audio3 = currentLine.audio) === null || _currentLine$audio3 === void 0 ? void 0 : _currentLine$audio3.url, currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType, currentMessage, lines, playSound, playSpeech, stop]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      stop('tts');
     };
-  }, [currentLine === null || currentLine === void 0 ? void 0 : (_currentLine$audio3 = currentLine.audio) === null || _currentLine$audio3 === void 0 ? void 0 : _currentLine$audio3.url, currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType, currentMessage, lines, playSound, playSpeech, stop]); // Autoplay logic
+  }, [stop]); // Autoplay logic
 
   (0, _react.useEffect)(function () {
     var timeout;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "main": "dist/index.js",
   "files": [
     "dist",