@gamelearn/arcade-components 0.25.9 → 0.25.11

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

@@ -73,11 +73,6 @@ var Element = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var usingScale = size ? Object.values(size) : scale;
   var isCharacter = type === 'character';
 
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      loaded = _useState2[0],
-      setLoaded = _useState2[1];
-
   if (usingScale.length < 3) {
     usingScale.push(1);
   }
@@ -92,7 +87,7 @@ var Element = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       camera = _useThree2[1];
 
   (0, _react.useEffect)(function () {
-    if (modelClone && !loaded) {
+    if (modelClone) {
       modelClone.traverse(function (node) {
         if (node.isMesh) {
           node.receiveShadow = true;
@@ -126,9 +121,8 @@ var Element = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
         }
       });
       onLoad(modelClone, currentScene, camera);
-      setLoaded(true);
     }
-  }, [modelClone, material, loaded, 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({
     ref: ref,
     animationUrl: animationUrl,

package/dist/components/konva-components/Area/index.js

@@ -11,10 +11,30 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactKonva = require("react-konva");
 
+var _reactKonvaUtils = require("react-konva-utils");
+
 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; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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."); }
+
+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 Area = function Area(_ref) {
   var area = _ref.area,
       finished = _ref.finished,
@@ -25,6 +45,12 @@ var Area = function Area(_ref) {
       onClick = _ref.onClick,
       onClickOutside = _ref.onClickOutside;
   var areaRef = (0, _react.useRef)();
+
+  var _useState = (0, _react.useState)(),
+      _useState2 = _slicedToArray(_useState, 2),
+      projectionConfig = _useState2[0],
+      setProjectionConfig = _useState2[1];
+
   var fillColor = isBad ? 'rgba(255, 99, 77, 0.32)' : 'rgba(75, 215, 169, 0.32)';
   var strokeColor = isBad ? '#ff634d' : '#4bd7a9';
 
@@ -90,7 +116,37 @@ var Area = function Area(_ref) {
 
   var scaleX = area.scaleX ? area.scaleX : 1;
   var scaleY = area.scaleY ? area.scaleY : 1;
-  return /*#__PURE__*/_react.default.createElement(_reactKonva.Line, {
+  (0, _react.useLayoutEffect)(function () {
+    var stage = areaRef.current.getStage();
+    stage.on('stage-loaded', function () {
+      var rect = areaRef.current.getClientRect({
+        relativeTo: areaRef.current.getParent()
+      });
+      setProjectionConfig({
+        x: rect.x + rect.width / 2,
+        y: rect.y + rect.height / 2
+      });
+      stage.batchDraw();
+    });
+  }, [area]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, projectionConfig ? /*#__PURE__*/_react.default.createElement(_reactKonvaUtils.Html, {
+    transform: true,
+    groupProps: _objectSpread({
+      id: 'projection'
+    }, projectionConfig),
+    divProps: {
+      style: {
+        pointerEvents: 'none'
+      }
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: '50px',
+      height: '50px',
+      pointerEvents: 'none'
+    },
+    id: area.id
+  })) : null, /*#__PURE__*/_react.default.createElement(_reactKonva.Line, {
     name: area.id,
     ref: areaRef,
     onFocus: function onFocus() {
@@ -117,14 +173,14 @@ var Area = function Area(_ref) {
       y: area.skewY
     },
     rotation: area.rotation,
-    shape: "poly",
     points: area.points,
+    shape: "poly",
     fill: finished ? '' : fillColor,
     stroke: finished || isClicked ? strokeColor : '',
     strokeWidth: 2,
     opacity: finished || isClicked ? 1 : 0,
     closed: true
-  });
+  }));
 };
 
 Area.defaultProps = {

package/dist/components/konva-components/KonvaMapper.js

@@ -123,6 +123,7 @@ var KonvaMapper = function KonvaMapper(_ref) {
         if (imageRef.current) imageRef.current.setAttrs(commonConfig);
         stageRef.current.batchDraw();
         setImage(currentImage);
+        stageRef.current.fire('stage-loaded');
       }
     });
   }, [currentImage, height, imageUrl, width]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.25.9",
+  "version": "0.25.11",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -25,6 +25,7 @@
     "konva": "^7.2.5",
     "prop-types": "15.7.2",
     "react-konva": "^17.0.2-0",
+    "react-konva-utils": "^0.2.0",
     "react-pdf": "5.2.0",
     "react-promise-suspense": "0.3.3",
     "react-typist": "^2.0.5",