@gamelearn/arcade-components 1.4.13 → 1.4.15

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

@@ -251,14 +251,19 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     var currentEdge = optionsEdges.find(function (edge) {
       return parseInt(edge.fromPointIndex) === currentId;
     });
-    var destinationEdge = lines.findIndex(function (l) {
-      return l.id === currentEdge.toId;
-    });
 
-    if (currentEdge.fromId === currentEdge.toId) {
-      reset();
-    } else if (destinationEdge >= 0) {
-      setCurrentLine(destinationEdge);
+    if (currentEdge) {
+      var destinationEdge = lines.findIndex(function (l) {
+        return l.id === currentEdge.toId;
+      });
+
+      if (currentEdge.fromId === currentEdge.toId) {
+        reset();
+      } else if (destinationEdge >= 0) {
+        setCurrentLine(destinationEdge);
+      } else {
+        finishConversation();
+      }
     } else {
       finishConversation();
     }

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

@@ -59,6 +59,7 @@ var isMobile = (0, _deviceDetection.DeviceDetection)();
 var crossFadeDuration = 0.5; // Mobile always zoom in?
 
 var raycast = new _three.Raycaster();
+var maxCharacterToSwitch = 70;
 raycast.firstHitOnly = true;
 
 var DialogComponent = function DialogComponent(_ref) {
@@ -86,6 +87,7 @@ var DialogComponent = function DialogComponent(_ref) {
     text: '',
     name: '',
     left: false,
+    top: false,
     inScene: false,
     thinkful: false,
     voiceOver: false,
@@ -328,11 +330,15 @@ var DialogComponent = function DialogComponent(_ref) {
       return l.id === currentEdge.toId;
     });
 
-    if (currentEdge.fromId === currentEdge.toId) {
-      reset();
-    } else if (destinationEdge >= 0) {
-      setCurrentMessage({});
-      changeLine(destinationEdge);
+    if (destinationEdge) {
+      if (currentEdge.fromId === currentEdge.toId) {
+        reset();
+      } else if (destinationEdge >= 0) {
+        setCurrentMessage({});
+        changeLine(destinationEdge);
+      } else {
+        finishConversation();
+      }
     } else {
       finishConversation();
     }
@@ -364,6 +370,7 @@ var DialogComponent = function DialogComponent(_ref) {
         inScene: false,
         voiceOver: true,
         thinkful: false,
+        top: false,
         avatar: '',
         show: true
       });
@@ -408,12 +415,13 @@ var DialogComponent = function DialogComponent(_ref) {
 
             setTimeout(function () {
               if (talkingCharacter.uid === element.uid) {
+                var showArrowTop = talkingCharacter.text.length > maxCharacterToSwitch;
                 var head = element.getObjectByName('Head_M');
                 var target = new _three.Object3D();
                 head.getWorldPosition(target.position);
                 target.applyQuaternion(camera.quaternion);
                 target.translateX(1.25);
-                target.translateY(2);
+                target.translateY(showArrowTop ? 1.25 : 2);
                 messagePosition.current = {
                   pos: target.position.toArray(),
                   child: head,
@@ -432,6 +440,7 @@ var DialogComponent = function DialogComponent(_ref) {
                     text: talkingCharacter.text,
                     name: talkingCharacter.alias || ((_talkingCharacter$cha = talkingCharacter.character) === null || _talkingCharacter$cha === void 0 ? void 0 : _talkingCharacter$cha.name),
                     left: true,
+                    top: showArrowTop,
                     inScene: true,
                     thinkful: talkingCharacter.emotion === 'thinkful',
                     avatar: '',
@@ -449,6 +458,7 @@ var DialogComponent = function DialogComponent(_ref) {
             text: talkingCharacter.text,
             name: talkingCharacter.alias || ((_talkingCharacter$cha2 = talkingCharacter.character) === null || _talkingCharacter$cha2 === void 0 ? void 0 : _talkingCharacter$cha2.name) || object.name,
             left: false,
+            top: talkingCharacter.text.length > maxCharacterToSwitch,
             inScene: false,
             thinkful: talkingCharacter.emotion === 'thinkful',
             avatar: getAvatarURL(talkingCharacter),
@@ -542,6 +552,7 @@ var DialogComponent = function DialogComponent(_ref) {
           setCurrentMessage(function (old) {
             return _objectSpread(_objectSpread({}, old), {}, {
               left: false,
+              top: false,
               inScene: !completeOutside,
               avatar: getAvatarURL(talkingCharacter),
               show: true

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

@@ -29,7 +29,7 @@ var SpeechBubbleComponent = /*#__PURE__*/_react.default.forwardRef(function (_re
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    className: "\n          speech-bubble\n          ".concat(message.left && message.inScene ? 'speech-bubble--arrow-left' : '', "\n          ").concat(!message.left && message.inScene ? 'speech-bubble--arrow-right' : '', "\n          ").concat(message.thinkful || message.voiceOver ? 'speech-bubble--italic' : '', "\n      ")
+    className: "\n          speech-bubble\n          ".concat(message.left && message.inScene ? 'speech-bubble--arrow-left' : '', "\n          ").concat(!message.left && message.inScene ? 'speech-bubble--arrow-right' : '', "\n          ").concat(message.top && message.inScene ? 'arrow-top' : '', "\n          ").concat(message.thinkful || message.voiceOver ? 'speech-bubble--italic' : '', "\n      ")
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "speech-bubble__content"
   }, /*#__PURE__*/_react.default.createElement("div", {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -64,7 +64,7 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-env": "7.12.11",
     "@babel/preset-react": "7.12.10",
-    "@gamelearn/arcade-styles": "0.5.9",
+    "@gamelearn/arcade-styles": "0.5.10",
     "@gamelearn/version": "^1.3.1",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",