@gamelearn/arcade-components 0.14.4 → 0.14.6

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

@@ -1,31 +1,22 @@
 "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 _sceneElements = _interopRequireDefault(require("./scene-elements"));
 
 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 Background = function Background(_ref) {
   var _ref$data = _ref.data,
       data = _ref$data === void 0 ? {} : _ref$data;
-  var objects = (0, _react.useMemo)(function () {
-    return Object.values(data);
-  }, [data]);
   if (Object.keys(data).length === 0) return null;
   return /*#__PURE__*/_react.default.createElement(_sceneElements.default, {
-    objects: objects
+    objects: Object.values(data)
   });
 };
 

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

@@ -50,7 +50,7 @@ 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
+        key: object.uid || "".concat(object.name, "_").concat(i)
       }, object, {
         onBeforeRender: function onBeforeRender() {
           _three.DefaultLoadingManager.onStart(1, 0, 1);
@@ -68,7 +68,7 @@ var SceneElements = function SceneElements(_ref) {
 
     if (object.url && object.userData.resourceId) {
       return /*#__PURE__*/_react.default.createElement(_element.default, _extends({
-        key: object.uid || i,
+        key: object.uid || "".concat(object.name, "_").concat(i),
         url: object.url,
         position: object.position,
         rotation: object.rotation,

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

@@ -21,7 +21,7 @@ var _three = require("three");
 
 var _Projection = _interopRequireDefault(require("./Projection"));
 
-var _useGLB2 = _interopRequireDefault(require("../../../helpers/useGLB"));
+var _useGLB = _interopRequireDefault(require("../../../helpers/useGLB"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -66,12 +66,10 @@ var Element = function Element(_ref) {
       userData = _ref.userData,
       props = _objectWithoutProperties(_ref, ["url", "animationUrl", "position", "rotation", "scale", "size", "material", "layers", "type", "onLoad", "userData"]);
 
-  var _useGLB = (0, _useGLB2.default)(url),
-      scene = _useGLB.scene;
-
-  var model = (0, _react.useMemo)(function () {
-    return _SkeletonUtils.SkeletonUtils.clone(scene);
-  }, [scene]);
+  var model = (0, _useGLB.default)(url);
+  var modelClone = (0, _react.useMemo)(function () {
+    return _SkeletonUtils.SkeletonUtils.clone(model.scene);
+  }, [model]);
   var usingScale = size ? Object.values(size) : scale;
   var isCharacter = type === 'character';
 
@@ -79,7 +77,7 @@ var Element = function Element(_ref) {
     usingScale.push(1);
   }
 
-  model.userData.url = url;
+  modelClone.userData.url = url;
 
   var _useThree = (0, _fiber.useThree)(function (state) {
     return [state.scene, state.camera];
@@ -89,8 +87,8 @@ var Element = function Element(_ref) {
       camera = _useThree2[1];
 
   (0, _react.useEffect)(function () {
-    if (model) {
-      model.traverse(function (node) {
+    if (modelClone) {
+      modelClone.traverse(function (node) {
         if (node.isMesh) {
           node.receiveShadow = true;
           node.castShadow = true;
@@ -118,24 +116,24 @@ var Element = function Element(_ref) {
           node.material.needsUpdate = true;
         }
       });
-      onLoad(model, currentScene, camera);
+      onLoad(modelClone, currentScene, camera);
     }
-  }, [model, material, onLoad, currentScene, camera, layers, isCharacter]);
+  }, [modelClone, material, onLoad, currentScene, camera, layers, isCharacter]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, animationUrl ? /*#__PURE__*/_react.default.createElement(_AnimateElement.default, _extends({
     animationUrl: animationUrl,
-    model: model,
+    model: modelClone,
     position: position,
     rotation: rotation,
     scale: usingScale,
     raycast: _drei.meshBounds
   }, props)) : /*#__PURE__*/_react.default.createElement("primitive", _extends({
-    object: model,
+    object: modelClone,
     position: position,
     rotation: rotation,
     scale: usingScale,
     raycast: _drei.meshBounds
   }, props)), props.uid && /*#__PURE__*/_react.default.createElement(_Projection.default, {
-    object: model,
+    object: modelClone,
     element: props
   }));
 };

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

@@ -41,13 +41,13 @@ var ConfigController = function ConfigController(_ref) {
       camera = _useThree2[2],
       invalidate = _useThree2[3];
 
-  var windowSize = (0, _useWindowSize.useWindowSize)();
   var cameraRotation = (0, _react.useRef)({
     left: 0,
     center: 0,
     right: 0
   });
   var movingCamera = (0, _react.useRef)(false);
+  var windowSize = (0, _useWindowSize.useWindowSize)();
   var setCameraRotationView = (0, _react.useCallback)(function () {
     var ratio = window.innerWidth / window.innerHeight;
 
@@ -58,10 +58,11 @@ var ConfigController = function ConfigController(_ref) {
     var threshold = (STD_RESOLUTION - ratio) / MOTION_LIMITER;
 
     if (camera.rotation) {
+      var euler = camera.rotation.clone();
       cameraRotation.current = {
-        center: (0, _helpers.roundFloat)(camera.rotation.y, 3),
-        left: (0, _helpers.roundFloat)(camera.rotation.y + threshold, 3),
-        right: (0, _helpers.roundFloat)(camera.rotation.y - threshold, 3)
+        center: (0, _helpers.roundFloat)(euler.y, 3),
+        left: (0, _helpers.roundFloat)(euler.y - threshold, 3),
+        right: (0, _helpers.roundFloat)(euler.y + threshold, 3)
       };
     }
   }, [camera]);

package/dist/components/survey-component/components/SurveyComponent.js

@@ -54,7 +54,7 @@ var PAGES = [{
 }, {
   component: _TextBox.default,
   id: 'suggestions',
-  disableContinue: false
+  disableContinue: true
 }];
 
 var SurveyComponent = function SurveyComponent(_ref) {
@@ -133,7 +133,7 @@ var SurveyComponent = function SurveyComponent(_ref) {
     id: "survey-button",
     type: "button",
     onClick: function onClick() {
-      if (!finished) {
+      if (!finished && !disabled) {
         finish();
         emitEvent({
           type: 'saveSurvey',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.14.4",
+  "version": "0.14.6",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -12,7 +12,7 @@
     "url": "https://github.com/gamelearn/arcade-components"
   },
   "dependencies": {
-    "@react-three/drei": "6.1.1",
+    "@react-three/drei": "6.2.2",
     "@react-three/fiber": "6.2.3",
     "@testing-library/jest-dom": "5.11.4",
     "@testing-library/react": "11.1.0",
@@ -76,4 +76,4 @@
       "^react-pdf$": "react-pdf/dist/umd/entry.jest"
     }
   }
-}
+}