@threedddplus/logoeditor 0.0.83 → 0.0.85

package/dist/logoeditor.cjs.development.js

@@ -4697,26 +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;
-    // }
-    console.log(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);
+    if (obj.getBoundingRect().top < 10) {
+      console.log('top < 10', obj.getBoundingRect().top < 10);
+      obj.top = Math.max(obj.top, obj.top - obj.getBoundingRect().top + 10);
       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().left < 45) {
+      console.log('left < 45', obj.getBoundingRect().left < 45);
+      obj.left = Math.max(obj.left, obj.left - obj.getBoundingRect().left + 45);
+      obj.setCoords();
+    }
+    if (obj.getBoundingRect().top + obj.getBoundingRect().height + 10 > obj.canvas.height) {
+      console.log(' top> obj.canvas.height ', obj.getBoundingRect().top + obj.getBoundingRect().height + 10 > obj.canvas.height);
+      obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top - 10);
+      obj.setCoords();
+    }
+    if (obj.getBoundingRect().left + obj.getBoundingRect().width + 45 > obj.canvas.width) {
+      console.log('left > obj.canvas.width', obj.getBoundingRect().left + obj.getBoundingRect().width + 45 > obj.canvas.width);
+      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('if condition');
+      // 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;
@@ -5021,7 +5031,7 @@ var initCanvas = function initCanvas() {
     var obj = e.target;
     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) {
+    if (brNew.width + brNew.left + 45 >= obj.canvas.width || brNew.height + brNew.top + 10 >= obj.canvas.height || brNew.left < 45 || brNew.top < 10) {
       obj.left = left1;
       obj.top = top1;
       obj.scaleX = scale1x;
@@ -6138,6 +6148,7 @@ var PopUpCanvas = function PopUpCanvas() {
         }, 100);
       }
     }
+    setColorFillCount(-1);
   }, [colorFill]);
   React.useEffect(function () {
     if (colorFillCount && colorFillCount > 0) {
@@ -8625,7 +8636,7 @@ var Rightmenu = function Rightmenu() {
     //   brNew = dublicateText.getBoundingRect();
     // }
     var brNew = dublicateText.getBoundingRect();
-    if (brNew.width + brNew.left >= textSelected.canvas.width || brNew.height + brNew.top >= textSelected.canvas.height || brNew.left < 0 || brNew.top < 0) {
+    if (brNew.width + brNew.left + 45 >= textSelected.canvas.width || brNew.height + brNew.top + 10 >= textSelected.canvas.height || brNew.left < 45 || brNew.top < 10) {
       if (currentSelection === 'path') {
         textSelected.set('fontSize', event.target.value - (Math.sign(toReduceSize) >= 0 ? toReduceSize : 1));
         textShapeChange(textSelected.shapeType, true);
@@ -8729,8 +8740,11 @@ var Rightmenu = function Rightmenu() {
   };
   var textSpacingHandler = function textSpacingHandler(e) {
     // setSpacinglineVal(e.target.valueAsNumber);
-    var brNew = textSelected.getBoundingRect();
-    if (brNew.width + brNew.left >= textSelected.canvas.width || brNew.height + brNew.top >= textSelected.canvas.height || brNew.left < 0 || brNew.top < 0) {
+    var dublicateText = textSelected;
+    var oldCharSpacing = dublicateText.charSpacing;
+    dublicateText.charSpacing = e.target.valueAsNumber;
+    var brNew = dublicateText.getBoundingRect();
+    if (brNew.width + brNew.left + 45 >= dublicateText.canvas.width || brNew.height + brNew.top >= dublicateText.canvas.height || brNew.left < 0 || brNew.top < 0) {
       if (textSelected.charSpacing > e.target.valueAsNumber) {
         textSelected.charSpacing = e.target.valueAsNumber;
         if (currentSelection === 'path') {
@@ -8752,6 +8766,10 @@ var Rightmenu = function Rightmenu() {
       use3dddPlus.getState().updateModifaction(true);
       use3dddPlus.getState().forIconCapture();
       textSelected.icon = use3dddPlus.getState().iconImage;
+      var _brNew = textSelected.getBoundingRect();
+      if (_brNew.width + _brNew.left + 45 >= dublicateText.canvas.width || _brNew.height + _brNew.top >= dublicateText.canvas.height || _brNew.left < 0 || _brNew.top < 0) {
+        textSelected.charSpacing = oldCharSpacing;
+      }
       canvas.renderAll();
       if (textSelected.aCoords.tr.x > 480) {
         return;