@threedddplus/logoeditor 0.0.80 → 0.0.82

package/dist/logoeditor.cjs.development.js

@@ -4697,33 +4697,43 @@ var initCanvas = function initCanvas() {
   var onObjectMoving = function onObjectMoving(e) {
     use3dddPlus.getState().updateModifaction(false);
     var obj = e.target;
-    var offsetLeft = 10;
-    var offsetTop = 20;
-    obj.setCoords();
-    // var curZoom = obj.canvas.getZoom();
-    if (obj.getScaledWidth() > obj.canvas.width) {
-      //Objct width is too big
-      // obj.scaleToWidth(obj.canvas.width - 100);
-      return;
-    }
-    if (obj.getScaledHeight() > obj.canvas.height) {
-      //Objct height is too big
-      // obj.scaleToHeight(obj.canvas.height - 100);
-      return;
+    if (obj.left < 0 || isNaN(obj.left)) {
+      obj.left = 0;
     }
-    if (obj.oCoords.br.x >= obj.canvas.width) {
-      obj.left = obj.left - (obj.oCoords.br.x - obj.canvas.width) - offsetLeft;
+    if (obj.top < 0 || isNaN(obj.top)) {
+      obj.top = 0;
     }
-    if (obj.oCoords.br.y >= obj.canvas.height) {
-      obj.top = obj.top - (obj.oCoords.br.y - obj.canvas.height) - offsetTop;
+    console.log('before set Corrds', e);
+    obj.setCoords();
+    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.left - obj.width * obj.scaleX / 2 < 0) {
-      obj.left = offsetLeft + obj.width * obj.scaleX / 2;
+    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();
     }
-    if (obj.top - obj.height * obj.scaleY / 2 < 0) {
-      obj.top = offsetTop + obj.height * obj.scaleY / 2;
+    var brNew = obj.getBoundingRect();
+    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;
+      scale1y = obj.scaleY;
+      width1 = obj.width;
+      height1 = obj.height;
     }
-    obj.setCoords();
     if (isObjectInCenter(e.target)) {
       use3dddPlus.getState().verticalLine.set({
         visible: true