@gamelearn/arcade-components 1.35.2 → 1.35.5

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

@@ -35,6 +35,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -103,18 +111,50 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var backgroundImage = (background === null || background === void 0 ? void 0 : (_background$img = background.img) === null || _background$img === void 0 ? void 0 : _background$img.url) || null;
   var currentLineData = lines[currentLine];
   var voiceOverSlots = [];
+  var isBranched = !!edges;
+  var isVoiceOver = voiceOver || currentLineData.type === 'conversationalNarration';
+  var isDecision = decision || currentLineData.type === 'conversationalDecision';
   var voiceOver = currentLineData.voiceOver,
       decision = currentLineData.decision;
-  var isBranched = !!edges;
+  var isFlex = currentLineData.flex;
+  var listProps = {
+    characters: currentCharacters,
+    lodSettings: lodSettings,
+    actors: actors,
+    currentMessage: currentMessage || {},
+    slots: !isVoiceOver ? currentLineData.slots : voiceOverSlots,
+    flex: isFlex
+  };
 
-  var _useState13 = (0, _react.useState)(false),
+  var _useState13 = (0, _react.useState)([]),
       _useState14 = _slicedToArray(_useState13, 2),
-      previousLineWasDecision = _useState14[0],
-      setPreviousLineWasDecision = _useState14[1];
+      edgesHistory = _useState14[0],
+      setEdgesHistory = _useState14[1];
+
+  var lastNodeId = (0, _react.useMemo)(function () {
+    return edgesHistory[edgesHistory.length - 1];
+  }, [edgesHistory]);
+  var findLastLineBranched = (0, _react.useCallback)(function () {
+    var lastEdge = edges.find(function (edge) {
+      return edge.fromId === lastNodeId;
+    });
+    var lastLine = lines.find(function (line) {
+      return line.id === lastEdge.fromId;
+    });
+    return lastLine;
+  }, [edges, lines, lastNodeId]);
+  var previousLineWasDecision = (0, _react.useCallback)(function () {
+    if (isBranched) {
+      // if we have edges, we need to check if the previous line was a decision
+      var lastLine = findLastLineBranched();
+      return lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision;
+    } else {
+      // if there is no branching, the previous line is the previous one
+      var _lastLine = lines[currentLine - 1] ? lines[currentLine - 1] : {};
 
-  var isVoiceOver = voiceOver || currentLineData.type === 'conversationalNarration';
-  var isDecision = decision || currentLineData.type === 'conversationalDecision';
-  var isFlex = currentLineData.flex;
+      return currentLine > 0 && (_lastLine === null || _lastLine === void 0 ? void 0 : _lastLine.decision);
+    }
+  }, [currentLine, isBranched, lines, lastNodeId, edges]);
   var translate = (0, _react.useCallback)(function (id) {
     return emitEvent({
       type: 'translate',
@@ -146,7 +186,6 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var leftWithSlots = lines.slice(0, currentLine + 1).reverse().find(function (line) {
     return line.slots;
   });
-  var lastLine = lines[currentLine - 1] ? lines[currentLine - 1] : {};
   var hasCharacters = !isDecision && ((_currentLineData$slot = currentLineData.slots) === null || _currentLineData$slot === void 0 ? void 0 : _currentLineData$slot.filter(function (slot) {
     return slot.uid;
   }).length);
@@ -209,14 +248,6 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     }
   }
 
-  var listProps = {
-    characters: currentCharacters,
-    lodSettings: lodSettings,
-    actors: actors,
-    currentMessage: currentMessage || {},
-    slots: !isVoiceOver ? currentLineData.slots : voiceOverSlots,
-    flex: isFlex
-  };
   var finishConversation = (0, _react.useCallback)(function () {
     emitEvent({
       type: 'success'
@@ -250,12 +281,20 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var handleBranchDirection = (0, _react.useCallback)(function () {
     var forward = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     var keys = forward ? ['fromId', 'toId'] : ['toId', 'fromId'];
-    var foundEdge = edges.find(function (edge) {
+    var foundEdges = edges.filter(function (edge) {
       return edge[keys[0]] === currentLineData.id;
     });
+    var foundEdge = foundEdges.length === 1 ? foundEdges[0] : foundEdges.find(function (edge) {
+      return edge[keys[1]] === lastNodeId;
+    });
 
     if (!(foundEdge !== null && foundEdge !== void 0 && foundEdge[keys[0]])) {
       return;
+    } // if going backwards, we need to remove the last node from the history
+
+
+    if (!forward) {
+      setEdgesHistory(edgesHistory.slice(0, -1));
     }
 
     var destination = lines.findIndex(function (line) {
@@ -271,7 +310,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var handleClickNext = (0, _react.useCallback)(function (choice, reset) {
     var isLast = false;
     setTTsStart(false);
-    setPreviousLineWasDecision(currentLineData.decision);
+    setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
     setStarted(false);
     setAudioFailed(false);
 
@@ -297,7 +336,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     if (!isLast) {
       setStarted(true);
     }
-  }, [currentLine, currentLineData.decision, finishConversation, handleBranchDirection, handleDecisionBranch, isBranched, lines.length]);
+  }, [currentLine, currentLineData.decision, finishConversation, handleBranchDirection, handleDecisionBranch, isBranched, lines.length, edgesHistory]);
 
   var handleClickBack = function handleClickBack() {
     setStarted(false);
@@ -313,10 +352,20 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     setStarted(true);
   };
 
+  var isEndNode = function isEndNode() {
+    if (isBranched) {
+      return currentLineData && currentLineData.type !== 'conversationalDecision' && !edges.find(function (edge) {
+        return edge.fromId === currentLineData.id;
+      });
+    }
+
+    return currentLine === lines.length - 1;
+  };
+
   var manualClickNext = function manualClickNext() {
     playSound('click-ui');
 
-    if (currentLine === lines.length - 1) {
+    if (isEndNode()) {
       finishConversation();
     } else {
       setAutomatic(false);
@@ -331,7 +380,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);
+  var disableBackButton = currentLine === 0 || previousLineWasDecision();
   (0, _useEkho.default)({
     audioType: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType,
     volume: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioVolume,
@@ -342,7 +391,9 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     soundActions: soundActions,
     emitEvent: emitEvent,
     onStart: function onStart() {
-      if (currentMessage.emotion.includes('think')) return;
+      var _currentMessage$emoti;
+
+      if (currentMessage !== null && currentMessage !== void 0 && (_currentMessage$emoti = currentMessage.emotion) !== null && _currentMessage$emoti !== void 0 && _currentMessage$emoti.includes('think')) return;
       setTTsStart(true);
     },
     onError: function onError() {
@@ -357,19 +408,22 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     }
   });
   (0, _react.useEffect)(function () {
-    var _currentMessage$emoti;
+    var _currentMessage$emoti2;
 
-    if ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' && !((_currentMessage$emoti = currentMessage.emotion) !== null && _currentMessage$emoti !== void 0 && _currentMessage$emoti.includes('think'))) {
+    if ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' && !(currentMessage !== null && currentMessage !== void 0 && (_currentMessage$emoti2 = currentMessage.emotion) !== null && _currentMessage$emoti2 !== void 0 && _currentMessage$emoti2.includes('think'))) {
       setTTsStart(true);
     }
-  }, [currentLineData, currentMessage.emotion]); // Autoplay logic
+  }, [currentLineData, currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.emotion]); // Autoplay logic
 
   (0, _react.useEffect)(function () {
     if (autoplayCond && ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' || audioFailed)) {
       var _currentMessage$text;
 
-      var time = characterMs * ((currentMessage === null || currentMessage === void 0 ? void 0 : (_currentMessage$text = currentMessage.text) === null || _currentMessage$text === void 0 ? void 0 : _currentMessage$text.length) || 0);
-      start(handleClickNext, time < minMs ? minMs : time);
+      var time = characterMs * ((currentMessage === null || currentMessage === void 0 ? void 0 : (_currentMessage$text = currentMessage.text) === null || _currentMessage$text === void 0 ? void 0 : _currentMessage$text.length) || 0); // if it's not last node
+
+      if (!isEndNode()) {
+        start(handleClickNext, time < minMs ? minMs : time);
+      }
     }
 
     return function () {
@@ -440,7 +494,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _LangIsRtl.default)() ? 'icon-next' : 'icon-back'
   })), /*#__PURE__*/_react.default.createElement("button", {
-    className: "gat--btn__round ".concat(automatic && currentLine === lines.length - 1 ? 'glowing-animation' : ''),
+    className: "gat--btn__round ".concat(automatic && isEndNode() ? 'glowing-animation' : ''),
     type: "button",
     onClick: manualClickNext
   }, /*#__PURE__*/_react.default.createElement("span", {

package/dist/components/conversational-pro-component/components/scene/Panel.js

@@ -152,7 +152,9 @@ function Panel(_ref) {
     fov: 35,
     focus: 10,
     ref: cameraRef,
-    position: defaultCamPos
+    position: defaultCamPos,
+    makeDefault: true,
+    defaultCamera: true
   }), /*#__PURE__*/_react.default.createElement(_LightSet.default, null));
 }
 

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

@@ -79,7 +79,7 @@ var maxCharacterToSwitch = 70;
 raycast.firstHitOnly = true;
 
 var DialogComponent = function DialogComponent(_ref) {
-  var _currentLine$slots;
+  var _currentLineData$slot;
 
   var emitEvent = _ref.emitEvent,
       lines = _ref.lines,
@@ -146,23 +146,23 @@ var DialogComponent = function DialogComponent(_ref) {
       setAnimationRunning = _useState12[1];
 
   var animationTarget = (0, _react.useRef)(new _three.Object3D());
-  var currentLine = lines[line];
+  var currentLineData = lines[line];
   var lastLine = lines[line - 1];
   var lastSet = (0, _react.useRef)(false);
   var isBranched = !!edges;
 
-  var _ref2 = currentLine || {},
+  var _ref2 = currentLineData || {},
       voiceOver = _ref2.voiceOver,
       decision = _ref2.decision;
 
-  var talkingCharacter = currentLine === null || currentLine === void 0 ? void 0 : (_currentLine$slots = currentLine.slots) === null || _currentLine$slots === void 0 ? void 0 : _currentLine$slots.find(function (slot) {
+  var talkingCharacter = currentLineData === null || currentLineData === void 0 ? void 0 : (_currentLineData$slot = currentLineData.slots) === null || _currentLineData$slot === void 0 ? void 0 : _currentLineData$slot.find(function (slot) {
     return slot.talking;
   });
-  var autoPlayCond = automatic && !(currentLine !== null && currentLine !== void 0 && currentLine.decision);
-  var audio = Object.keys((currentLine === null || currentLine === void 0 ? void 0 : currentLine.audio) || {}).length;
-  var voice = Object.keys((currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice) || {}).length;
-  var isVoiceOver = voiceOver || (currentLine === null || currentLine === void 0 ? void 0 : currentLine.type) === 'conversationalNarration';
-  var isDecision = decision || (currentLine === null || currentLine === void 0 ? void 0 : currentLine.type) === 'conversationalDecision';
+  var autoPlayCond = automatic && !(currentLineData !== null && currentLineData !== void 0 && currentLineData.decision);
+  var audio = Object.keys((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audio) || {}).length;
+  var voice = Object.keys((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice) || {}).length;
+  var isVoiceOver = voiceOver || (currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.type) === 'conversationalNarration';
+  var isDecision = decision || (currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.type) === 'conversationalDecision';
 
   var _useState13 = (0, _react.useState)({
     text: '',
@@ -200,11 +200,36 @@ var DialogComponent = function DialogComponent(_ref) {
     });
   }, [emitEvent]);
 
-  var _useState15 = (0, _react.useState)(false),
+  var _useState15 = (0, _react.useState)([]),
       _useState16 = _slicedToArray(_useState15, 2),
-      previousLineWasDecision = _useState16[0],
-      setPreviousLineWasDecision = _useState16[1];
+      edgesHistory = _useState16[0],
+      setEdgesHistory = _useState16[1];
+
+  var lastNodeId = (0, _react.useMemo)(function () {
+    return edgesHistory[edgesHistory.length - 1];
+  }, [edgesHistory]);
+  var findLastLineBranched = (0, _react.useCallback)(function () {
+    var lastEdge = edges.find(function (edge) {
+      return edge.fromId === lastNodeId;
+    });
+    var lastLine = lines.find(function (line) {
+      return line.id === lastEdge.fromId;
+    });
+    return lastLine;
+  }, [edges, lines, lastNodeId]);
+  var previousLineWasDecision = (0, _react.useCallback)(function () {
+    if (isBranched) {
+      // if we have edges, we need to check if the previous line was a decision
+      var _lastLine = findLastLineBranched();
+
+      return _lastLine === null || _lastLine === void 0 ? void 0 : _lastLine.decision;
+    } else {
+      // if there is no branching, the previous line is the previous one
+      var _lastLine2 = lines[currentLineData - 1] ? lines[currentLineData - 1] : {};
 
+      return currentLineData > 0 && (_lastLine2 === null || _lastLine2 === void 0 ? void 0 : _lastLine2.decision);
+    }
+  }, [currentLineData, isBranched, lines, lastNodeId, edges]);
   var getCurrentVisible = (0, _react.useCallback)(function (uid) {
     if (!uid) return null;
     var object;
@@ -255,7 +280,7 @@ var DialogComponent = function DialogComponent(_ref) {
   }, [loader]); // Force default animation without transition
 
   var executeDefaultAnimation = function executeDefaultAnimation(element) {
-    if (element.uid === talkingCharacter.uid) return;
+    if (!talkingCharacter || element.uid === talkingCharacter.uid) return;
 
     if (element.userData.mixer && element.userData.defaultAnim) {
       var mixer = element.userData.mixer;
@@ -324,12 +349,20 @@ var DialogComponent = function DialogComponent(_ref) {
   var handleBranchDirection = (0, _react.useCallback)(function () {
     var forward = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     var keys = forward ? ['fromId', 'toId'] : ['toId', 'fromId'];
-    var foundEdge = edges.find(function (edge) {
-      return edge[keys[0]] === (currentLine === null || currentLine === void 0 ? void 0 : currentLine.id);
+    var foundEdges = edges.filter(function (edge) {
+      return edge[keys[0]] === currentLineData.id;
+    });
+    var foundEdge = foundEdges.length === 1 ? foundEdges[0] : foundEdges.find(function (edge) {
+      return edge[keys[1]] === lastNodeId;
     });
 
     if (!(foundEdge !== null && foundEdge !== void 0 && foundEdge[keys[0]])) {
       return;
+    } // if going backwards remove last edge from history
+
+
+    if (!forward) {
+      setEdgesHistory(edgesHistory.slice(0, edgesHistory.length - 1));
     }
 
     var destination = lines.findIndex(function (l) {
@@ -344,11 +377,11 @@ var DialogComponent = function DialogComponent(_ref) {
     } else {
       finishConversation();
     }
-  }, [currentLine === null || currentLine === void 0 ? void 0 : currentLine.id, edges, finishConversation, lines]);
+  }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.id, edges, finishConversation, lines]);
   var handleDecisionBranch = (0, _react.useCallback)(function (choice, reset) {
     var currentId = [3, 2, 1][choice.id];
     var optionsEdges = edges.filter(function (edge) {
-      return edge.fromId === (currentLine === null || currentLine === void 0 ? void 0 : currentLine.id);
+      return edge.fromId === (currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.id);
     });
     var currentEdge = optionsEdges.find(function (edge) {
       return parseInt(edge.fromPointIndex) === currentId;
@@ -369,14 +402,14 @@ var DialogComponent = function DialogComponent(_ref) {
     } else {
       finishConversation();
     }
-  }, [currentLine === null || currentLine === void 0 ? void 0 : currentLine.id, edges, finishConversation, lines]);
+  }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.id, edges, finishConversation, lines]);
   var backLine = (0, _react.useCallback)(function () {
     restTalkingAnimation();
     setAudioFailed(false);
 
     if (isBranched) {
       handleBranchDirection(false);
-    } else if (lastLine && !(lastLine !== null && lastLine !== void 0 && lastLine.decision) || lastLine.type && !lastLine.type !== 'conversationalDecision') {
+    } else if (previousLineWasDecision()) {
       setCurrentMessage({
         show: false
       });
@@ -385,7 +418,7 @@ var DialogComponent = function DialogComponent(_ref) {
   }, [handleBranchDirection, isBranched, lastLine, line]);
   var nextLine = (0, _react.useCallback)(function (choice, reset) {
     restTalkingAnimation();
-    setPreviousLineWasDecision(currentLine.decision);
+    setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
     setAudioFailed(false);
 
     if (isBranched) {
@@ -399,18 +432,29 @@ var DialogComponent = function DialogComponent(_ref) {
         show: false
       });
       changeLine(line + 1);
-    } else if (currentLine.decision) {
+    } else if (currentLineData.decision) {
       finishConversation();
     }
-  }, [currentLine === null || currentLine === void 0 ? void 0 : currentLine.decision, isBranched, line, lines.length, handleDecisionBranch, handleBranchDirection, finishConversation]);
+  }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.decision, isBranched, line, lines.length, handleDecisionBranch, handleBranchDirection, finishConversation]);
 
   var manualBackLine = function manualBackLine() {
     setAutomatic(false);
     backLine();
   };
 
+  var isEndNode = function isEndNode() {
+    if (isBranched) {
+      return currentLineData && currentLineData.type !== 'conversationalDecision' && !edges.find(function (edge) {
+        return edge.fromId === currentLineData.id;
+      });
+    }
+
+    return line === lines.length - 1;
+  };
+
   var manualNextLine = function manualNextLine() {
-    if (line === lines.length - 1) {
+    if (isEndNode()) {
+      startTalking(false);
       finishConversation();
     } else {
       setAutomatic(false);
@@ -476,8 +520,8 @@ var DialogComponent = function DialogComponent(_ref) {
     } else if (isVoiceOver) {
       resetCameraView();
       setCurrentMessage({
-        text: currentLine === null || currentLine === void 0 ? void 0 : currentLine.text,
-        name: (currentLine === null || currentLine === void 0 ? void 0 : currentLine.alias) || (currentLine === null || currentLine === void 0 ? void 0 : currentLine.name) || "[ ".concat(translate('storylines.misc.voiceOver'), " ]"),
+        text: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.text,
+        name: (currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.alias) || (currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.name) || "[ ".concat(translate('storylines.misc.voiceOver'), " ]"),
         left: false,
         inScene: false,
         voiceOver: true,
@@ -487,7 +531,7 @@ var DialogComponent = function DialogComponent(_ref) {
         show: true
       });
     } else if (!lastSet.current) {
-      var slottedCharacters = currentLine === null || currentLine === void 0 ? void 0 : currentLine.slots.filter(function (slot) {
+      var slottedCharacters = currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.slots.filter(function (slot) {
         return slot.uid && !slot.talking;
       });
       var currentParticipants = [].concat(_toConsumableArray(slottedCharacters.map(function (slot) {
@@ -531,7 +575,7 @@ var DialogComponent = function DialogComponent(_ref) {
               element.userData.defaultAnim = action.getClip();
             }
 
-            if ((currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType) === 'none' && talkingCharacter.emotion !== 'thinkful') {
+            if ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' && talkingCharacter.emotion !== 'thinkful') {
               startTalking(true);
             }
 
@@ -584,19 +628,21 @@ var DialogComponent = function DialogComponent(_ref) {
         });
       }
     }
-  }, [actors, camera, currentLine, zoomInActor, getCurrentVisible, translate, getAvatarURL, loadEmotion, resetCameraView, isDecision, isVoiceOver, charactersInvolved]); // Sound logic
+  }, [actors, camera, currentLineData, zoomInActor, getCurrentVisible, translate, getAvatarURL, loadEmotion, resetCameraView, isDecision, isVoiceOver, charactersInvolved]); // Sound logic
 
   var stopEkho = (0, _useEkho.default)({
-    audioType: currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType,
-    volume: currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioVolume,
-    voice: currentLine === null || currentLine === void 0 ? void 0 : currentLine.voice,
+    audioType: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType,
+    volume: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioVolume,
+    voice: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.voice,
     started: currentMessage.show,
     text: currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.text,
-    audio: currentLine === null || currentLine === void 0 ? void 0 : currentLine.audio,
+    audio: currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audio,
     soundActions: soundActions,
     emitEvent: emitEvent,
     onStart: function onStart() {
-      if (talkingCharacter.emotion.includes('think')) return;
+      var _talkingCharacter$emo;
+
+      if (talkingCharacter !== null && talkingCharacter !== void 0 && (_talkingCharacter$emo = talkingCharacter.emotion) !== null && _talkingCharacter$emo !== void 0 && _talkingCharacter$emo.includes('think')) return;
       startTalking(true);
     },
     onError: function onError() {
@@ -618,23 +664,26 @@ var DialogComponent = function DialogComponent(_ref) {
   }, [line, stopEkho]); // Autoplay logic
 
   (0, _react.useEffect)(function () {
-    if (autoPlayCond && currentMessage.show && ((currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType) === 'none' || audioFailed)) {
+    if (autoPlayCond && currentMessage.show && ((currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType) === 'none' || audioFailed)) {
       var _currentMessage$text;
 
-      var time = characterMs * ((currentMessage === null || currentMessage === void 0 ? void 0 : (_currentMessage$text = currentMessage.text) === null || _currentMessage$text === void 0 ? void 0 : _currentMessage$text.length) || 0);
-      start(nextLine, time < minMs ? minMs : time);
+      var time = characterMs * ((currentMessage === null || currentMessage === void 0 ? void 0 : (_currentMessage$text = currentMessage.text) === null || _currentMessage$text === void 0 ? void 0 : _currentMessage$text.length) || 0); // if it's not last node
+
+      if (!isEndNode()) {
+        start(nextLine, time < minMs ? minMs : time);
+      }
     }
 
     return function () {
       stop();
     };
-  }, [currentMessage, nextLine, start, stop, currentLine === null || currentLine === void 0 ? void 0 : currentLine.audioType, autoPlayCond, audio, voice, audioFailed]); // Positioning Bubble Message logic
+  }, [currentMessage, nextLine, start, stop, currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType, autoPlayCond, audio, voice, audioFailed]); // Positioning Bubble Message logic
 
   var checkBubbleBounds = (0, _react.useCallback)(function (group, bubble) {
     groupRef.current = group === null || group === void 0 ? void 0 : group.current;
     bubbleRef.current = bubble === null || bubble === void 0 ? void 0 : bubble.current;
 
-    if (currentLine !== null && currentLine !== void 0 && currentLine.slots && currentMessage.show && bubble !== null && bubble !== void 0 && bubble.current) {
+    if (currentLineData !== null && currentLineData !== void 0 && currentLineData.slots && currentMessage.show && bubble !== null && bubble !== void 0 && bubble.current) {
       var bubbleRect = bubble.current.getBoundingClientRect();
       var x = bubbleRect.x + bubbleRect.width;
       var y = bubbleRect.y - bubbleRect.height;
@@ -674,7 +723,7 @@ var DialogComponent = function DialogComponent(_ref) {
         bubble.current.parentNode.style.transform = '';
       }
     }
-  }, [camera.quaternion, currentLine === null || currentLine === void 0 ? void 0 : currentLine.slots, currentMessage.inScene, getAvatarURL]);
+  }, [camera.quaternion, currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.slots, currentMessage.inScene, getAvatarURL]);
   (0, _react.useEffect)(function () {
     if (animationRunning) {
       var cam = camera;
@@ -745,10 +794,10 @@ var DialogComponent = function DialogComponent(_ref) {
     height: '100vh',
     position: 'static'
   };
-  var disableBackButton = line === 0 || previousLineWasDecision || line > 0 && (lastLine === null || lastLine === void 0 ? void 0 : lastLine.decision);
+  var disableBackButton = line === 0 || previousLineWasDecision();
 
   if (isDecision) {
-    var decisionPayload = _objectSpread(_objectSpread({}, currentLine.payload), {}, {
+    var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
       inheritProps: {
         slots: [],
         disableBackground: true
@@ -806,7 +855,7 @@ var DialogComponent = function DialogComponent(_ref) {
     type: "button",
     onClick: manualNextLine,
     disabled: animationRunning,
-    className: "gat--btn__round \n              ".concat(animationRunning ? 'disabled' : '', "\n              ").concat(automatic && line === lines.length - 1 ? 'glowing-animation' : '')
+    className: "gat--btn__round \n              ".concat(animationRunning ? 'disabled' : '', "\n              ").concat(automatic && isEndNode() ? 'glowing-animation' : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
   })))));

package/package.json

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