@threedddplus/logoeditor 0.0.112-2 → 0.0.112-3

package/dist/logoeditor.cjs.development.js

@@ -8845,6 +8845,7 @@ var Rightmenu = function Rightmenu() {
     }
     var newTextPath = new fabric.fabric.Path(p.output());
     // add new textPath
+    console.log("---<", textSelected, textSelected.width, textSelected.height);
     canvas.add(newTextPath);
     newTextPath['pathData'] = textSelected.pathData;
     newTextPath['colorFill'] = textSelected.colorFill;
@@ -8863,16 +8864,18 @@ var Rightmenu = function Rightmenu() {
     newTextPath['textAlign'] = textSelected.textAlign;
     newTextPath['fontStyle'] = textSelected.fontStyle;
     newTextPath['text'] = textSelected.text;
+    //@ts-ignore
+    var dims = newTextPath._calcDimensions();
     // Set the same position scale matching with existing text
     newTextPath.left = textSelected.left;
     newTextPath.top = textSelected.top;
     newTextPath.width = textSelected.width;
     newTextPath.height = textSelected.height;
-    newTextPath.scaleX = textSelected.scaleX;
-    newTextPath.scaleY = textSelected.scaleY;
+    newTextPath.scaleX = textSelected.scaleX * (textSelected.width / dims.width);
+    newTextPath.scaleY = textSelected.scaleY * (textSelected.width / dims.width);
     newTextPath.setCoords();
     //@ts-ignore
-    var dims = newTextPath._calcDimensions();
+    // let dims = newTextPath._calcDimensions();
     newTextPath.width = dims.width;
     newTextPath.height = dims.height;
     // delete the text object
@@ -8913,7 +8916,7 @@ var Rightmenu = function Rightmenu() {
   };
   var textShapeChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e, textChange, fontSize, charSpacing, strokeWidth, fontWeight, textAlign, fontStyle) {
-      var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims;
+      var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, _dims, activeObj;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -9003,6 +9006,7 @@ var Rightmenu = function Rightmenu() {
               colorFill: textSelected.colorFill,
               fontWeight: fontWeight
             });
+            // let dims = fabricPath._calcDimensions();
             text.left = textSelected.left;
             text.top = textSelected.top;
             text.width = textSelected.width;
@@ -9065,10 +9069,10 @@ var Rightmenu = function Rightmenu() {
             });
             _text.left = textSelected.left;
             _text.top = textSelected.top;
-            _text.width = _text.getBoundingRect().width;
-            _text.height = _text.getBoundingRect().height;
-            _text.scaleX = textSelected.scaleX;
-            _text.scaleY = textSelected.scaleY;
+            _text.scaleX = textSelected.scaleX * (textSelected.width / _text.width);
+            _text.scaleY = textSelected.scaleY * (textSelected.width / _text.width);
+            window["textObj"] = _text;
+            _text.setCoords();
             _text.id = textSelected.id;
             // delete the active text object
             canvas.remove(textSelected);
@@ -9161,16 +9165,15 @@ var Rightmenu = function Rightmenu() {
               fabricPath['fontStyle'] = textSelected.fontStyle;
               fabricPath['text'] = textSelected.text;
               fabricPath['id'] = textSelected.id;
-              // Set the same position scale matching with existing text
+              //@ts-ignore
+              dims = fabricPath._calcDimensions(); // Set the same position scale matching with existing text
               fabricPath.left = textSelected.left;
               fabricPath.top = textSelected.top;
               fabricPath.width = textSelected.width;
               fabricPath.height = textSelected.height;
-              fabricPath.scaleX = textSelected.scaleX;
-              fabricPath.scaleY = textSelected.scaleY;
+              fabricPath.scaleX = textSelected.scaleX * (textSelected.width / dims.width);
+              fabricPath.scaleY = textSelected.scaleY * (textSelected.width / dims.width);
               fabricPath.setCoords();
-              //@ts-ignore
-              dims = fabricPath._calcDimensions();
               fabricPath.width = dims.width;
               fabricPath.height = dims.height;
               // var sel = new fabric.ActiveSelection(fabricPath, { canvas: canvas });
@@ -9210,8 +9213,10 @@ var Rightmenu = function Rightmenu() {
               newTextPath['top'] = textSelected.top;
               newTextPath['width'] = textSelected.width;
               newTextPath['height'] = textSelected.height;
-              newTextPath['scaleX'] = textSelected.scaleX;
-              newTextPath['scaleY'] = textSelected.scaleY;
+              //@ts-ignore
+              _dims = newTextPath._calcDimensions();
+              newTextPath['scaleX'] = textSelected.scaleX * (textSelected.width / _dims.width);
+              newTextPath['scaleY'] = textSelected.scaleY * (textSelected.width / _dims.width);
               newTextPath['id'] = textSelected.id;
               // delete the active text object
               activeObj = canvas.getActiveObject();
@@ -9226,8 +9231,6 @@ var Rightmenu = function Rightmenu() {
                 activeSelection: newTextPath
               });
               newTextPath.setCoords();
-              //@ts-ignore
-              _dims = newTextPath._calcDimensions();
               newTextPath.width = _dims.width;
               newTextPath.height = _dims.height;
               canvas.renderAll();
@@ -9236,29 +9239,7 @@ var Rightmenu = function Rightmenu() {
               updateStoreAllObject(newTextPath);
             }
             canvas.renderAll();
-            // setTimeout(() => {
-            //   reduceFontSize();
-            // }, 500);
             reduceFontSize();
-            // canvas.renderAll();
-            // let brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
-            // while (
-            //   Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvas.width) ||
-            //   Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvas.height) ||
-            //   Math.ceil(brNew.left) < 0 ||
-            //   Math.ceil(brNew.top) < 0
-            // ) {
-            //   textSelected.set('fontSize', textSelected.fontSize - 0.1);
-            //   canvas.remove(canvas.getActiveObject());
-            //   await textShapeChange(textSelected.shapeType, true);
-            //   const activeObj = canvas.getActiveObject();
-            //   brNew.left = activeObj.left;
-            //   brNew.width = activeObj.width;
-            //   brNew.top = activeObj.top;
-            //   brNew.height = activeObj.height;
-            //   textSelected.setCoords();
-            //   canvas.renderAll();
-            // }
           case 103:
           case "end":
             return _context2.stop();
@@ -9304,41 +9285,6 @@ var Rightmenu = function Rightmenu() {
       return;
     }
   };
-  /*
-  const reduceFontSize = async () => {
-    let brNew = textSelected.getBoundingRect();
-    let canvasWidth = 0;
-    let canvasHeight = 0;
-    if (textSelected && textSelected.canvas && textSelected.canvas.width) {
-      canvasWidth = textSelected.canvas.width;
-      canvasHeight = textSelected.canvas.height;
-    } else {
-      canvasWidth = canvas.width;
-      canvasHeight = canvas.height;
-    }
-    while (
-      Math.ceil(brNew.width + brNew.left + 45) > Math.floor(canvasWidth) ||
-      Math.ceil(brNew.height + brNew.top + 10) > Math.floor(canvasHeight) ||
-      Math.ceil(brNew.left) < 0 ||
-      Math.ceil(brNew.top) < 0
-    ) {
-      textSelected.set('fontSize', textSelected.fontSize - 0.1);
-      if (currentSelection === 'path') {
-        await textShapeChange(textSelected.shapeType, true);
-        canvas.renderAll();
-        const activeObj = canvas.getActiveObject();
-        brNew.left = activeObj.left;
-        brNew.width = activeObj.width;
-        brNew.top = activeObj.top;
-        brNew.height = activeObj.height;
-      } else {
-        brNew = textSelected.getBoundingRect();
-      }
-      textSelected.setCoords();
-      // canvas.renderAll();
-    }
-  };
-  */
   var reduceFontSize = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var brNew, canvasWidth, canvasHeight, _activeObj;