@threedddplus/logoeditor 0.0.78 → 0.0.80

package/dist/logoeditor.cjs.development.js

@@ -4697,41 +4697,33 @@ var initCanvas = function initCanvas() {
   var onObjectMoving = function onObjectMoving(e) {
     use3dddPlus.getState().updateModifaction(false);
     var obj = e.target;
-    if (isNaN(obj.left)) {
-      obj.left = -1;
-      obj.setCoords();
+    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 (isNaN(obj.top)) {
-      obj.top = -1;
-      obj.setCoords();
+    if (obj.getScaledHeight() > obj.canvas.height) {
+      //Objct height is too big
+      // obj.scaleToHeight(obj.canvas.height - 100);
+      return;
     }
-    console.log(e);
-    // if (
-    //   obj.getBoundingRect().width > obj.canvas.height ||
-    //   obj.getBoundingRect().height > obj.canvas.width
-    // ) {
-    //   return;
-    // }
-    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);
-      obj.setCoords();
+    if (obj.oCoords.br.x >= obj.canvas.width) {
+      obj.left = obj.left - (obj.oCoords.br.x - obj.canvas.width) - offsetLeft;
     }
-    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);
-      obj.setCoords();
+    if (obj.oCoords.br.y >= obj.canvas.height) {
+      obj.top = obj.top - (obj.oCoords.br.y - obj.canvas.height) - offsetTop;
     }
-    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 {
-      left1 = obj.left;
-      top1 = obj.top;
-      scale1x = obj.scaleX;
-      scale1y = obj.scaleY;
-      width1 = obj.width;
-      height1 = obj.height;
+    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();
     if (isObjectInCenter(e.target)) {
       use3dddPlus.getState().verticalLine.set({
         visible: true