@gamelearn/arcade-components 0.11.0 → 0.11.2

package/dist/components/arcade-render/background/scene-elements/index.js

@@ -51,7 +51,16 @@ var SceneElements = function SceneElements(_ref) {
     if ((_object$userData = object.userData) !== null && _object$userData !== void 0 && _object$userData.isPrimitive) {
       return /*#__PURE__*/_react.default.createElement("mesh", _extends({
         key: object.uid || i
-      }, object), /*#__PURE__*/_react.default.createElement(_customGeometry.default, {
+      }, object, {
+        onBeforeRender: function onBeforeRender() {
+          _three.DefaultLoadingManager.onStart(1, 0, 1);
+        },
+        onAfterRender: function onAfterRender() {
+          _three.DefaultLoadingManager.onProgress(1, 1, 1);
+
+          _three.DefaultLoadingManager.onLoad();
+        }
+      }), /*#__PURE__*/_react.default.createElement(_customGeometry.default, {
         type: object.userData.primitiveType,
         args: object.userData.props
       }), /*#__PURE__*/_react.default.createElement("meshLambertMaterial", material));

package/dist/components/arcade-render/elements-list/ClickableArea.js

@@ -51,6 +51,10 @@ var ClickableArea = function ClickableArea(_ref) {
       loaded = _useState2[0],
       setLoaded = _useState2[1];
 
+  if (usingScale.length === 2) {
+    usingScale.push(1);
+  }
+
   (0, _react.useEffect)(function () {
     setLoaded(true);
   }, []);

package/dist/components/arcade-render/scene/ConfigController.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _fiber = require("@react-three/fiber");
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]); if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var ConfigController = function ConfigController(_ref) {
+  var current = _ref.current;
+
+  var _useThree = (0, _fiber.useThree)(function (state) {
+    return [state.gl, state.scene, state.invalidate];
+  }),
+      _useThree2 = _slicedToArray(_useThree, 3),
+      gl = _useThree2[0],
+      scene = _useThree2[1],
+      invalidate = _useThree2[2];
+
+  (0, _fiber.useFrame)(function (_ref2) {
+    var gl = _ref2.gl,
+        scene = _ref2.scene,
+        camera = _ref2.camera;
+    gl.render(scene, camera);
+
+    if (!current.animate) {
+      invalidate();
+    }
+  }, 1);
+  (0, _react.useEffect)(function () {
+    gl.shadowMap.enabled = current.shadows;
+
+    if (!current.animate) {
+      invalidate();
+    }
+  }, [gl, scene, current, invalidate]);
+  return null;
+};
+
+var _default = ConfigController;
+exports.default = _default;

package/dist/components/arcade-render/scene/index.js

@@ -19,6 +19,8 @@ var _background = _interopRequireDefault(require("../background"));
 
 var _loading = _interopRequireWildcard(require("../loading"));
 
+var _ConfigController = _interopRequireDefault(require("./ConfigController"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -37,61 +39,30 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var ConfigController = function ConfigController(_ref) {
-  var current = _ref.current;
-
-  var _useThree = (0, _fiber.useThree)(function (state) {
-    return [state.gl, state.scene, state.invalidate];
-  }),
-      _useThree2 = _slicedToArray(_useThree, 3),
-      gl = _useThree2[0],
-      scene = _useThree2[1],
-      invalidate = _useThree2[2];
-
-  (0, _fiber.useFrame)(function (_ref2) {
-    var gl = _ref2.gl,
-        scene = _ref2.scene,
-        camera = _ref2.camera;
-    gl.render(scene, camera);
-
-    if (!current.animate) {
-      invalidate();
-    }
-  }, 1);
-  (0, _react.useEffect)(function () {
-    gl.shadowMap.enabled = current.shadows;
-
-    if (!current.animate) {
-      invalidate();
-    }
-  }, [gl, scene, current, invalidate]);
-  return null;
-};
-
-var Scene = function Scene(_ref3) {
-  var _ref3$elements = _ref3.elements,
-      elements = _ref3$elements === void 0 ? [] : _ref3$elements,
-      _ref3$hasControls = _ref3.hasControls,
-      hasControls = _ref3$hasControls === void 0 ? false : _ref3$hasControls,
-      _ref3$backgroundData = _ref3.backgroundData,
-      backgroundData = _ref3$backgroundData === void 0 ? {} : _ref3$backgroundData,
-      _ref3$loadingText = _ref3.loadingText,
-      loadingText = _ref3$loadingText === void 0 ? '' : _ref3$loadingText,
-      _ref3$toggleShadows = _ref3.toggleShadows,
-      toggleShadows = _ref3$toggleShadows === void 0 ? true : _ref3$toggleShadows,
-      _ref3$stopAnimate = _ref3.stopAnimate,
-      stopAnimate = _ref3$stopAnimate === void 0 ? false : _ref3$stopAnimate,
-      _ref3$emitEvent = _ref3.emitEvent,
-      emitEvent = _ref3$emitEvent === void 0 ? function () {} : _ref3$emitEvent;
+var Scene = function Scene(_ref) {
+  var _ref$elements = _ref.elements,
+      elements = _ref$elements === void 0 ? [] : _ref$elements,
+      _ref$hasControls = _ref.hasControls,
+      hasControls = _ref$hasControls === void 0 ? false : _ref$hasControls,
+      _ref$backgroundData = _ref.backgroundData,
+      backgroundData = _ref$backgroundData === void 0 ? {} : _ref$backgroundData,
+      _ref$loadingText = _ref.loadingText,
+      loadingText = _ref$loadingText === void 0 ? '' : _ref$loadingText,
+      _ref$toggleShadows = _ref.toggleShadows,
+      toggleShadows = _ref$toggleShadows === void 0 ? true : _ref$toggleShadows,
+      _ref$stopAnimate = _ref.stopAnimate,
+      stopAnimate = _ref$stopAnimate === void 0 ? false : _ref$stopAnimate,
+      _ref$emitEvent = _ref.emitEvent,
+      emitEvent = _ref$emitEvent === void 0 ? function () {} : _ref$emitEvent;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
       showLoad = _useState2[0],
       setShowLoad = _useState2[1];
 
-  var handleOnCreate = function handleOnCreate(_ref4) {
-    var gl = _ref4.gl,
-        raycaster = _ref4.raycaster;
+  var handleOnCreate = function handleOnCreate(_ref2) {
+    var gl = _ref2.gl,
+        raycaster = _ref2.raycaster;
     raycaster.layers.set(1);
     gl.outputEncoding = 3001;
     gl.gammaFactor = 2.2;
@@ -101,13 +72,12 @@ var Scene = function Scene(_ref3) {
     gl.physicallyCorrectLights = true;
   };
 
-  var handleLoadFinish = function handleLoadFinish() {
+  var handleLoadFinish = (0, _react.useCallback)(function () {
     emitEvent({
       type: 'sceneLoaded'
     });
     setShowLoad(false);
-  };
-
+  }, [emitEvent]);
   (0, _react.useEffect)(function () {
     setShowLoad(true);
   }, [backgroundData, elements]);
@@ -126,7 +96,7 @@ var Scene = function Scene(_ref3) {
     frameloop: "demand",
     onCreated: handleOnCreate,
     tabIndex: 0
-  }, /*#__PURE__*/_react.default.createElement(ConfigController, {
+  }, /*#__PURE__*/_react.default.createElement(_ConfigController.default, {
     current: {
       shadows: toggleShadows,
       animate: stopAnimate

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

@@ -120,6 +120,9 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       var flexedPosition = characters.findIndex(function (char) {
         return char.uid === currentMessage.uid;
       });
+      characters.forEach(function (c) {
+        if (c.uid === currentMessage.uid) c.name = currentMessage.alias;
+      });
       currentMessage.position = isFlex ? flexedPosition : notFlexedPosition;
     }
   }

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

@@ -87,7 +87,7 @@ var SlotList = function SlotList(_ref) {
     slots: slots,
     flex: flex,
     currentMessage: currentMessage
-  }), children ? children : /*#__PURE__*/_react.default.createElement(Slots, null));
+  }), children && children.ref ? children : /*#__PURE__*/_react.default.createElement(Slots, null));
 };
 
 SlotList.propTypes = {

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

@@ -32,12 +32,14 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 var defaultCamPos = [0, 14.63, 16];
 
 function Panel(_ref) {
+  var _character$resource, _character$resource$a;
+
   var character = _ref.character,
       active = _ref.active;
   var cameraRef = (0, _react.useRef)(null);
   var sceneRef = (0, _react.useRef)(null);
   var isCharacter = character.type === 'character';
-  var emotion = isCharacter ? character.resource.animations[character.emotion || 'neutral'] : {};
+  var emotion = isCharacter ? (character === null || character === void 0 ? void 0 : (_character$resource = character.resource) === null || _character$resource === void 0 ? void 0 : (_character$resource$a = _character$resource.animations) === null || _character$resource$a === void 0 ? void 0 : _character$resource$a[character.emotion || 'neutral']) || {} : {};
   var onLoadElement = (0, _react.useCallback)(function (model) {
     if (cameraRef.current) {
       var boundingBox = new _three.Box3();
@@ -90,13 +92,13 @@ function Panel(_ref) {
     ref: sceneRef
   }, /*#__PURE__*/_react.default.createElement(_react.Suspense, {
     fallback: null
-  }, /*#__PURE__*/_react.default.createElement(_element.default, {
+  }, character.resource.url ? /*#__PURE__*/_react.default.createElement(_element.default, {
     name: "char_".concat(character.uid),
     url: character.resource.url,
     animationUrl: emotion.url,
     position: [0, 0, 0],
     onLoad: onLoadElement
-  })), /*#__PURE__*/_react.default.createElement(_drei.PerspectiveCamera, {
+  }) : null), /*#__PURE__*/_react.default.createElement(_drei.PerspectiveCamera, {
     name: "camera_".concat(character.uid),
     fov: 35,
     focus: 10,

package/dist/components/decision-component/components/DecisionBody.js

@@ -131,45 +131,5 @@ var DecisionBody = function DecisionBody(_ref) {
   return /*#__PURE__*/_react.default.createElement(BasicDecision, null, children);
 };
 
-DecisionBody.defaultProps = {
-  options: [],
-  currentSelectedChoice: {},
-  showingResults: false,
-  question: '',
-  changeOption: noop,
-  onExit: noop,
-  onNext: noop,
-  onBack: noop,
-  inherited: false,
-  failed: false,
-  children: [],
-  hasRewards: []
-};
-DecisionBody.propTypes = {
-  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]),
-  options: _propTypes.default.arrayOf(_propTypes.default.shape({
-    id: _propTypes.default.number,
-    feedback: _propTypes.default.string,
-    slot: _propTypes.default.bool,
-    text: _propTypes.default.string,
-    rewards: _propTypes.default.arrayOf(_propTypes.default.shape())
-  })),
-  currentSelectedChoice: _propTypes.default.shape({
-    id: _propTypes.default.number,
-    rewards: _propTypes.default.arrayOf(_propTypes.default.shape()),
-    feedback: _propTypes.default.string,
-    slot: _propTypes.default.bool,
-    text: _propTypes.default.string
-  }),
-  changeOption: _propTypes.default.func,
-  onExit: _propTypes.default.func,
-  onNext: _propTypes.default.func,
-  onBack: _propTypes.default.func,
-  question: _propTypes.default.string,
-  inherited: _propTypes.default.bool,
-  failed: _propTypes.default.bool,
-  showingResults: _propTypes.default.bool,
-  hasRewards: _propTypes.default.arrayOf(_propTypes.default.shape())
-};
 var _default = DecisionBody;
 exports.default = _default;

package/dist/components/decision-component/components/DecisionComponent.js

@@ -9,8 +9,6 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _SlotList = _interopRequireDefault(require("../../conversational-pro-component/components/SlotList"));
 
 var _DecisionBody = _interopRequireDefault(require("./DecisionBody"));
@@ -57,7 +55,8 @@ var DecisionComponent = function DecisionComponent(_ref) {
   var emitEvent = _ref.emitEvent,
       props = _objectWithoutProperties(_ref, ["emitEvent"]);
 
-  var inheritProps = props.inheritProps,
+  var _props$inheritProps = props.inheritProps,
+      inheritProps = _props$inheritProps === void 0 ? {} : _props$inheritProps,
       required = props.required,
       question = props.question,
       onFinish = props.onFinish;
@@ -200,33 +199,5 @@ var DecisionComponent = function DecisionComponent(_ref) {
   return /*#__PURE__*/_react.default.createElement(BackgroundWrapper, null, /*#__PURE__*/_react.default.createElement(Body, null));
 };
 
-DecisionComponent.defaultProps = {
-  inheritProps: {},
-  required: false,
-  onFinish: null,
-  question: '',
-  options: []
-};
-DecisionComponent.propTypes = {
-  required: _propTypes.default.bool,
-  onFinish: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.oneOf([null])]),
-  inheritProps: _propTypes.default.shape({
-    background: _propTypes.default.string,
-    flex: _propTypes.default.bool,
-    voiceOver: _propTypes.default.shape({}),
-    name: _propTypes.default.string,
-    text: _propTypes.default.string,
-    slots: _propTypes.default.arrayOf({})
-  }),
-  options: _propTypes.default.arrayOf(_propTypes.default.shape({
-    id: _propTypes.default.number,
-    feedback: _propTypes.default.string,
-    slot: _propTypes.default.bool,
-    text: _propTypes.default.string,
-    audioId: _propTypes.default.string,
-    rewards: _propTypes.default.arrayOf(_propTypes.default.shape())
-  })),
-  question: _propTypes.default.string
-};
 var _default = DecisionComponent;
 exports.default = _default;

package/dist/components/decision-component/components/Feedback.js

@@ -1,13 +1,11 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -15,31 +13,26 @@ var _RewardsComponent = _interopRequireDefault(require("../../rewards-component/
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 FeedBack = function FeedBack(_ref) {
   var choice = _ref.choice,
       inherited = _ref.inherited,
       rewards = _ref.rewards,
       emitEvent = _ref.emitEvent;
-  var noFeedBack = choice.feedback === '' || !choice.feedback;
-  var centerRewards = noFeedBack;
 
   var Wrapper = function Wrapper(_ref2) {
     var children = _ref2.children;
     return inherited ? /*#__PURE__*/_react.default.createElement("div", {
-      className: "conversation--feedback ".concat(centerRewards ? 'only--rewards' : '')
-    }, children) : centerRewards ? /*#__PURE__*/_react.default.createElement("div", {
+      className: "conversation--feedback ".concat(!choice.feedback ? 'only--rewards' : '')
+    }, children) : !choice.feedback ? /*#__PURE__*/_react.default.createElement("div", {
       className: "popup__basicDecision__only--rewards only--rewards"
-    }, children) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
+    }, children) : children;
   };
 
   var noRewards = rewards.filter(function (reward) {
     return reward.type !== 'grade';
   }).length === 0;
-  return noFeedBack && noRewards ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null) : /*#__PURE__*/_react.default.createElement(Wrapper, null, !noFeedBack ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+  if (!choice.feedback && noRewards) return null;
+  return /*#__PURE__*/_react.default.createElement(Wrapper, null, !!choice.feedback ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--feedback__title"
   }, "Feedback"), /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--feedback__text"
@@ -53,23 +46,5 @@ var FeedBack = function FeedBack(_ref) {
   }) : null);
 };
 
-FeedBack.defaultProps = {
-  rewards: [],
-  choice: {},
-  inherited: false,
-  nodeId: 0
-};
-FeedBack.propTypes = {
-  inherited: _propTypes.default.bool,
-  rewards: _propTypes.default.arrayOf(_propTypes.default.shape({})),
-  choice: _propTypes.default.shape({
-    id: _propTypes.default.number,
-    rewards: _propTypes.default.arrayOf(_propTypes.default.shape()),
-    feedback: _propTypes.default.string,
-    slot: _propTypes.default.bool,
-    right: _propTypes.default.bool,
-    text: _propTypes.default.string
-  })
-};
 var _default = FeedBack;
 exports.default = _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -55,7 +55,7 @@
     "@babel/cli": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/preset-react": "7.12.10",
-    "@gamelearn/ui-components-core": "5.21.0",
+    "@gamelearn/ui-components-core": "5.22.0",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",
     "@storybook/addon-essentials": "6.1.11",