@gamelearn/arcade-components 1.24.3 → 1.25.1

package/dist/components/chained-image-click-puzzle-component/components/CurrentImagePuzzle.js

@@ -64,6 +64,7 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
       index = _useState2[0],
       setIndex = _useState2[1];
 
+  var resolvedItems = (0, _react.useRef)({});
   var puzzleId = "chained-image-click-puzzle_".concat(index, "_").concat(nodeId);
 
   var _soundActions = _slicedToArray(soundActions, 1),
@@ -152,7 +153,8 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
       action: 'resolve',
       payload: {
         element: puzzleId,
-        rewards: info.resolve.rewards
+        rewards: info.resolve.rewards,
+        finish: index + 1 >= list.length
       }
     });
   };
@@ -163,8 +165,9 @@ var CurrentImageClickPuzzle = function CurrentImageClickPuzzle(_ref) {
     }));
   }, [info, setInfo, puzzleId]);
   (0, _react.useEffect)(function () {
-    if (currentPuzzleStatus) {
+    if (currentPuzzleStatus && !resolvedItems.current[puzzleId]) {
       onComplete([], true, true);
+      resolvedItems.current[puzzleId] = true;
     }
   }, [onComplete, puzzleId, currentPuzzleStatus]);
   return /*#__PURE__*/_react.default.createElement(_imageClickWrapperComponent.default, _extends({

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

@@ -382,7 +382,36 @@ var DialogComponent = function DialogComponent(_ref) {
         }
       }
     }
-  }, [edges, isBranched, lines, mounted]); // Position bubble over talking character/and switch emotions
+  }, [edges, isBranched, lines, mounted]);
+
+  var moveBubble = function moveBubble(element, target, showArrowTop) {
+    element.updateMatrix();
+    element.updateMatrixWorld();
+    var head = element.getObjectByName('Head_M');
+    head.updateMatrix();
+    head.updateMatrixWorld();
+    head.getWorldPosition(target.position);
+    target.applyQuaternion(camera.quaternion);
+    var distance = camera.position.distanceTo(target.position);
+    var staticDisplay = distance > 70 && !zoomInActor && !showArrowTop;
+    target.translateY(staticDisplay || showArrowTop ? 0 : 2); // Detectar posicion de personaje a izq o derecha de pantalla
+
+    var vector = new _three.Vector3();
+    vector.setFromMatrixPosition(head.matrixWorld);
+    var p = vector.project(defaultCamera);
+    target.translateX(headSize);
+    var isLeft = p.x < 0;
+    messagePosition.current = {
+      pos: target.position.toArray(),
+      child: head,
+      parent: element,
+      isLeft: isLeft
+    };
+    return {
+      distance: distance
+    };
+  }; // Position bubble over talking character/and switch emotions
+
 
   (0, _react.useEffect)(function () {
     if (isDecision) {
@@ -450,29 +479,8 @@ var DialogComponent = function DialogComponent(_ref) {
             setTimeout(function () {
               if (talkingCharacter.uid === element.uid) {
                 var showArrowTop = talkingCharacter.text.length > maxCharacterToSwitch;
-                element.updateMatrix();
-                element.updateMatrixWorld();
-                var head = element.getObjectByName('Head_M');
                 var target = new _three.Object3D();
-                head.updateMatrix();
-                head.updateMatrixWorld();
-                head.getWorldPosition(target.position);
-                target.applyQuaternion(camera.quaternion);
-                var distance = camera.position.distanceTo(target.position);
-                var staticDisplay = distance > 70 && !zoomInActor && !showArrowTop;
-                target.translateY(staticDisplay || showArrowTop ? 0 : 3); // Detectar posicion de personaje a izq o derecha de pantalla
-
-                var vector = new _three.Vector3();
-                vector.setFromMatrixPosition(head.matrixWorld);
-                var p = vector.project(defaultCamera);
-                target.translateX(headSize);
-                var isLeft = p.x < 0;
-                messagePosition.current = {
-                  pos: target.position.toArray(),
-                  child: head,
-                  parent: element,
-                  isLeft: isLeft
-                };
+                moveBubble(element, target, showArrowTop);
 
                 if (zoomInActor) {
                   setAnimationRunning(true);
@@ -482,7 +490,9 @@ var DialogComponent = function DialogComponent(_ref) {
                 setTimeout(function () {
                   var _talkingCharacter$cha;
 
-                  distance = camera.position.distanceTo(target.position);
+                  var _moveBubble = moveBubble(element, target, showArrowTop),
+                      distance = _moveBubble.distance;
+
                   setCurrentMessage({
                     text: talkingCharacter.text,
                     name: talkingCharacter.alias || ((_talkingCharacter$cha = talkingCharacter.character) === null || _talkingCharacter$cha === void 0 ? void 0 : _talkingCharacter$cha.name),
@@ -571,7 +581,9 @@ var DialogComponent = function DialogComponent(_ref) {
       var y = bubbleRect.y - bubbleRect.height;
 
       if (!messagePosition.current.isLeft || (x < 0 || x > window.innerWidth) && currentMessage.inScene) {
-        var child = messagePosition.current.child;
+        var _messagePosition$curr = messagePosition.current,
+            child = _messagePosition$curr.child,
+            parent = _messagePosition$curr.parent;
 
         if (child) {
           var target = new _three.Object3D();
@@ -579,6 +591,7 @@ var DialogComponent = function DialogComponent(_ref) {
           target.applyQuaternion(camera.quaternion);
           groupRef.current.position.copy(target.position);
           groupRef.current.updateMatrixWorld();
+          moveBubble(parent, target, false);
           var divider = isMobile ? 10 : 6;
           var distanceX = bubbleRect.width + bubbleRect.width / divider;
           bubbleRef.current.parentNode.style.transform = "translate3d(-".concat(distanceX, "px, -").concat(bubbleRect.height, "px, 0px)");

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "1.24.3",
+  "version": "1.25.1",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@gamelearn/arcade-styles": "0.12.0",
-    "@gamelearn/arcade-three-core": "1.10.4",
+    "@gamelearn/arcade-three-core": "1.13.0",
     "@react-three/drei": "9.4.3",
     "@react-three/fiber": "8.0.10",
-    "@testing-library/jest-dom": "5.11.4",
-    "@testing-library/react": "11.1.0",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.1.1",
     "@testing-library/user-event": "13.5.0",
     "global": "^4.4.0",
     "gsap": "^3.10.1",