@threedddplus/logoeditor 0.0.73 → 0.0.75

package/dist/logoeditor.cjs.development.js

@@ -4697,22 +4697,28 @@ var initCanvas = function initCanvas() {
   var onObjectMoving = function onObjectMoving(e) {
     use3dddPlus.getState().updateModifaction(false);
     var obj = e.target;
-    if (isNaN(obj.left)) {
-      obj.left = obj.left - 1;
-      obj.setCoords();
-    }
-    if (isNaN(obj.top)) {
-      obj.top = obj.top - 1;
-      obj.setCoords();
-    }
-    console.log(e);
     // if (
     //   obj.getBoundingRect().width > obj.canvas.height ||
     //   obj.getBoundingRect().height > obj.canvas.width
     // ) {
     //   return;
     // }
+    var offsetLeft = 1;
+    var offsetTop = 2;
+    if (obj.oCoords.br.x >= obj.canvas.width) {
+      obj.left = obj.left - (obj.oCoords.br.x - obj.canvas.width) - offsetLeft;
+    }
+    if (obj.oCoords.br.y >= obj.canvas.height) {
+      obj.top = obj.top - (obj.oCoords.br.y - obj.canvas.height) - offsetTop;
+    }
+    if (obj.left - obj.width * obj.scaleX / 2 < 0) {
+      obj.left = offsetLeft + obj.width * obj.scaleX / 2;
+    }
+    if (obj.top - obj.height * obj.scaleY / 2 < 0) {
+      obj.top = offsetTop + obj.height * obj.scaleY / 2;
+    }
     obj.setCoords();
+    console.log(e);
     if (obj.getBoundingRect().top < 0 || obj.getBoundingRect().left < 0) {
       obj.top = Math.max(obj.top, obj.top - obj.getBoundingRect().top);
       obj.left = Math.max(obj.left, obj.left - obj.getBoundingRect().left);
@@ -4795,14 +4801,14 @@ var initCanvas = function initCanvas() {
     return Math.abs(scaledObjCenterX - canvasCenterX) < threshold;
   }
   var horizontalLine = new fabric.fabric.Line([0, canv.height / 2, canv.height, canv.height / 2], {
-    stroke: "red",
+    stroke: 'red',
     scaleX: 11,
     visible: false,
     selectable: false,
     type: 'line'
   });
   var verticalLine = new fabric.fabric.Line([canv.width / 2, 0, canv.width / 2, canv.width], {
-    stroke: "red",
+    stroke: 'red',
     visible: false,
     selectable: false,
     type: 'line'
@@ -4923,13 +4929,14 @@ var initCanvas = function initCanvas() {
   }
 
   var removeItem = function removeItem(value) {
-    //@ts-ignore    
+    //@ts-ignore
     var index = use3dddPlus.getState().storeAllObject.findIndex(function (obj) {
       return obj.id === value.id;
     });
     if (index === -1 && value && value._objects && value._objects.length > 0) {
+      var index = use3dddPlus.getState()
       //@ts-ignore
-      var index = use3dddPlus.getState().storeAllObject.indexOf(value._objects[0]);
+      .storeAllObject.indexOf(value._objects[0]);
     }
     if (index > -1) {
       use3dddPlus.getState().storeAllObject.splice(index, 1);