@threedddplus/logoeditor 0.0.81 → 0.0.82

package/dist/logoeditor.cjs.development.js

@@ -4697,25 +4697,36 @@ var initCanvas = function initCanvas() {
   var onObjectMoving = function onObjectMoving(e) {
     use3dddPlus.getState().updateModifaction(false);
     var obj = e.target;
-    // if (
-    //   obj.getBoundingRect().width > obj.canvas.height ||
-    //   obj.getBoundingRect().height > obj.canvas.width
-    // ) {
-    //   return;
-    // }
+    if (obj.left < 0 || isNaN(obj.left)) {
+      obj.left = 0;
+    }
+    if (obj.top < 0 || isNaN(obj.top)) {
+      obj.top = 0;
+    }
+    console.log('before set Corrds', e);
     obj.setCoords();
-    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);
+    debugger;
+    console.log('after set correds', e);
+    if (obj.getBoundingRect().top < 10 || obj.getBoundingRect().left < 45) {
+      obj.top = Math.max(obj.top, obj.top - obj.getBoundingRect().top + 10);
+      obj.left = Math.max(obj.left, obj.left - obj.getBoundingRect().left + 45);
       obj.setCoords();
     }
-    if (obj.getBoundingRect().top + obj.getBoundingRect().height > obj.canvas.height || obj.getBoundingRect().left + obj.getBoundingRect().width > obj.canvas.width) {
-      obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top);
-      obj.left = Math.min(obj.left, obj.canvas.width - obj.getBoundingRect().width + obj.left - obj.getBoundingRect().left);
+    if (obj.getBoundingRect().top + obj.getBoundingRect().height + 10 > obj.canvas.height || obj.getBoundingRect().left + obj.getBoundingRect().width + 45 > obj.canvas.width) {
+      obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top - 10);
+      obj.left = Math.min(obj.left, obj.canvas.width - obj.getBoundingRect().width + obj.left - obj.getBoundingRect().left - 45);
       obj.setCoords();
     }
     var brNew = obj.getBoundingRect();
-    if (brNew.width + brNew.left >= obj.canvas.width || brNew.height + brNew.top >= obj.canvas.height || brNew.left < 0 || brNew.top < 0) ; else {
+    if (brNew.width + brNew.left + 45 >= obj.canvas.width || brNew.height + brNew.top + 10 >= obj.canvas.height || brNew.left < 45 || brNew.top < 10) {
+      console.log(obj.left, obj.top, obj.scaleX, obj.scaleY, obj.width, obj.height);
+      // obj.left = left1;
+      // obj.top = top1;
+      // obj.scaleX = scale1x;
+      // obj.scaleY = scale1y;
+      // obj.width = width1;
+      // obj.height = height1;
+    } else {
       left1 = obj.left;
       top1 = obj.top;
       scale1x = obj.scaleX;