@gamelearn/arcade-components 2.15.1 → 2.15.2

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

@@ -145,6 +145,7 @@ var DialogComponent = function DialogComponent(_ref) {
   var lastLine = lines[line - 1];
   var lastSet = (0, _react.useRef)(false);
   var isBranched = !!edges;
+  var onZoomEnd = (0, _react.useRef)(function () {});
 
   var _ref2 = currentLineData || {},
       voiceOver = _ref2.voiceOver,
@@ -302,7 +303,10 @@ var DialogComponent = function DialogComponent(_ref) {
   var resetCameraView = (0, _react.useCallback)(function () {
     messagePosition.current.child = null;
     messagePosition.current.parent = null;
-    if (zoomInActor) setAnimationRunning(true);
+
+    if (zoomInActor) {
+      setAnimationRunning(true);
+    }
   }, [zoomInActor]);
 
   var resetTalkingAnimation = function resetTalkingAnimation() {
@@ -530,6 +534,7 @@ var DialogComponent = function DialogComponent(_ref) {
 
   (0, _react.useEffect)(function () {
     if (isDecision) {
+      zoomStarted.current = false;
       resetCameraView();
     } else if (isVoiceOver) {
       resetCameraView();
@@ -592,11 +597,7 @@ var DialogComponent = function DialogComponent(_ref) {
               var showArrowTop = talkingCharacter.text.length > maxCharacterToSwitch;
               moveBubble(element, showArrowTop);
 
-              if (zoomInActor) {
-                setAnimationRunning(true);
-              }
-
-              setTimeout(function () {
+              var setMessage = function setMessage() {
                 var _talkingCharacter$cha5;
 
                 setCurrentMessage({
@@ -607,7 +608,14 @@ var DialogComponent = function DialogComponent(_ref) {
                   avatar: getAvatarURL(talkingCharacter),
                   show: true
                 });
-              }, zoomInActor ? 1200 : 0);
+              };
+
+              if (zoomInActor) {
+                onZoomEnd.current = setMessage;
+                setAnimationRunning(true);
+              } else {
+                setMessage();
+              }
             }
           });
         } else {
@@ -697,7 +705,6 @@ var DialogComponent = function DialogComponent(_ref) {
   }, [currentMessage, nextLine, start, stop, currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.audioType, autoPlayCond, audio, voice, audioFailed]);
   (0, _react.useEffect)(function () {
     if (animationRunning && !zoomStarted.current) {
-      zoomStarted.current = true;
       var cam = camera;
       var targetPosition = messagePosition.current.child ? messagePosition.current.pos : defaultCamera.position.toArray();
       animationTarget.current.position.fromArray(targetPosition);
@@ -717,7 +724,14 @@ var DialogComponent = function DialogComponent(_ref) {
       _gsap.default.to(cam.position, {
         duration: 1,
         ease: 'power3.easeInOut',
+        onStart: function onStart() {
+          zoomStarted.current = true;
+        },
         onComplete: function onComplete() {
+          onZoomEnd.current();
+
+          onZoomEnd.current = function () {};
+
           zoomStarted.current = false;
           setAnimationRunning(false);
           raycast.set(cam.getWorldPosition(new _three.Vector3(0, 0, 0)), cam.getWorldDirection(new _three.Vector3()));

package/package.json

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