@gamelearn/arcade-components 2.17.12 → 2.17.13

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

@@ -1,13 +1,11 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _arcadeThreeCore = require("@gamelearn/arcade-three-core");
 
@@ -15,19 +13,11 @@ var _SpeechBubbleComponent = _interopRequireDefault(require("./SpeechBubbleCompo
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var BubbleWrapper = function BubbleWrapper(_ref) {
   var currentMessage = _ref.currentMessage,
       translate = _ref.translate;
-  var group = (0, _react.useRef)();
-  var bubble = (0, _react.useRef)();
   var container = document.querySelector('.screens--container');
-  return /*#__PURE__*/_react.default.createElement("group", {
-    ref: group
-  }, /*#__PURE__*/_react.default.createElement(_arcadeThreeCore.HtmlPro, {
+  return /*#__PURE__*/_react.default.createElement("group", null, /*#__PURE__*/_react.default.createElement(_arcadeThreeCore.HtmlPro, {
     onOcclude: function onOcclude() {
       return null;
     },
@@ -45,7 +35,6 @@ var BubbleWrapper = function BubbleWrapper(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement(_SpeechBubbleComponent.default, {
     translate: translate,
-    ref: bubble,
     message: currentMessage
   })));
 };

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

@@ -37,12 +37,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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."); }
@@ -51,6 +45,12 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 _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."); }
@@ -116,12 +116,11 @@ var DialogComponent = function DialogComponent(_ref) {
       camera = _useThree2[0],
       scene = _useThree2[1];
 
-  var changedMats = (0, _react.useRef)([]);
-
   var _useTimeout = (0, _useTimeout2.default)(),
       start = _useTimeout.start,
       stop = _useTimeout.stop;
 
+  var changedMats = (0, _react.useRef)([]);
   var loader = (0, _react.useMemo)(function () {
     return new _GLTFLoader.GLTFLoader();
   }, []);
@@ -149,6 +148,7 @@ var DialogComponent = function DialogComponent(_ref) {
       voiceOver = _ref2.voiceOver,
       decision = _ref2.decision;
 
+  var lastTalking = (0, _react.useRef)({});
   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;
   });
@@ -428,6 +428,7 @@ var DialogComponent = function DialogComponent(_ref) {
     }
   }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.id, edges, finishConversation, lines]);
   var backLine = (0, _react.useCallback)(function () {
+    lastTalking.current = _objectSpread({}, talkingCharacter);
     resetTalkingAnimation();
     setAudioFailed(false);
 
@@ -439,8 +440,9 @@ var DialogComponent = function DialogComponent(_ref) {
       });
       changeLine(line - 1);
     }
-  }, [handleBranchDirection, isBranched, lastLine, line]);
+  }, [handleBranchDirection, isBranched, lastLine, line, talkingCharacter]);
   var nextLine = (0, _react.useCallback)(function (choice, reset) {
+    lastTalking.current = _objectSpread({}, talkingCharacter);
     resetTalkingAnimation();
     setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
     setAudioFailed(false);
@@ -459,7 +461,7 @@ var DialogComponent = function DialogComponent(_ref) {
     } else if (currentLineData.decision) {
       finishConversation();
     }
-  }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.decision, isBranched, line, lines.length, handleDecisionBranch, handleBranchDirection, finishConversation]);
+  }, [currentLineData === null || currentLineData === void 0 ? void 0 : currentLineData.decision, isBranched, line, lines.length, handleDecisionBranch, handleBranchDirection, finishConversation, talkingCharacter]);
 
   var manualBackLine = function manualBackLine() {
     setAutomatic(false);
@@ -507,19 +509,16 @@ var DialogComponent = function DialogComponent(_ref) {
     }
   }, [edges, isBranched, lines, mounted]);
 
-  var moveBubble = function moveBubble(element, showArrowTop) {
+  var moveBubble = function moveBubble(element) {
+    if (lastTalking.current.uid === element.uid) return;
     var target = new _three.Object3D();
-    element.updateMatrix();
-    element.updateMatrixWorld();
     var head = element.getObjectByName('Head_M');
     head.updateMatrixWorld();
-    head.getWorldPosition(target.position);
+    target.applyMatrix4(head.matrixWorld);
     target.applyQuaternion(camera.quaternion);
-    var distance = camera.position.distanceTo(target.position);
-    var staticDisplay = distance > 70 && !zoomInActor && !showArrowTop;
     var yDistance = zoomInActor ? 2.5 : 2;
     var xDistance = zoomInActor ? 1.2 : 1.5;
-    target.translateY(staticDisplay || showArrowTop ? 0 : yDistance);
+    target.translateY(yDistance);
     target.translateX(xDistance); // Check if character is left or right in the screen
 
     var vector = new _three.Vector3();
@@ -532,9 +531,6 @@ var DialogComponent = function DialogComponent(_ref) {
       parent: element,
       isLeft: isLeft
     };
-    return {
-      distance: distance
-    };
   }; // Position bubble over talking character/and switch emotions
 
 
@@ -588,17 +584,8 @@ var DialogComponent = function DialogComponent(_ref) {
 
         if (element && !lastSet.current) {
           loadEmotion(talkingCharacter, element, function (mixer, action, defaultAction) {
-            var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
-
-            if (startAction && action && startAction !== action) {
-              mixer.stopAllAction();
-              (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
-              element.userData.defaultAnim = action.getClip();
-            }
-
             if (talkingCharacter.uid === element.uid) {
-              var showArrowTop = talkingCharacter.text.length > maxCharacterToSwitch;
-              moveBubble(element, showArrowTop);
+              moveBubble(element);
 
               var setMessage = function setMessage() {
                 var _talkingCharacter$cha5;
@@ -620,6 +607,14 @@ var DialogComponent = function DialogComponent(_ref) {
                 setMessage();
               }
             }
+
+            var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
+
+            if (startAction && action && startAction !== action) {
+              mixer.stopAllAction();
+              (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
+              element.userData.defaultAnim = action.getClip();
+            }
           });
         } else {
           var _talkingCharacter$cha6;
@@ -769,7 +764,7 @@ var DialogComponent = function DialogComponent(_ref) {
     } else if (zoomStarted.current) {
       zoomStarted.current = false;
     }
-  }, [animationRunning]);
+  }, [animationRunning, camera]);
   var disableBackButton = (0, _react.useMemo)(function () {
     var disabled = line === 0 || previousLineWasDecision();
     return disabled;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.17.12",
+  "version": "2.17.13",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -22,7 +22,7 @@
     "@testing-library/react": "^13.1.1",
     "@testing-library/user-event": "13.5.0",
     "global": "^4.4.0",
-    "gsap": "^3.10.1",
+    "gsap": "^3.11.4",
     "hls.js": "0.12.4",
     "html-react-parser": "^1.4.0",
     "interactjs": "^1.10.11",