@threedddplus/logoeditor 0.0.114-1 → 0.0.115

package/dist/logoeditor.cjs.development.js

@@ -3052,7 +3052,7 @@ var fabricSlice = function fabricSlice(set, get) {
             }
           });
           var canvas = use3dddPlus.getState().popupCanv;
-          var gridSize = 15; // Size of each grid cell
+          var gridSize = 83; // Size of each grid cell
           var canvasWidth = canvas.width;
           var canvasHeight = canvas.height;
           var numCols = Math.ceil(canvasWidth / gridSize);
@@ -4007,6 +4007,9 @@ var converterSlice = function converterSlice(set, get) {
       }
       //@ts-ignore
       var objImage = loadedObject == null ? void 0 : loadedObject._objects;
+      if (!objImage) {
+        objImage = [loadedObject];
+      }
       var _Fills = [];
       var fillCounts = {};
       var colorObjects = {};
@@ -4114,7 +4117,7 @@ var converterSlice = function converterSlice(set, get) {
         //@ts-ignore
         setControlVisible: false
       });
-      loadedObject.id = use3dddPlus.getState().guid();
+      // loadedObject.id = use3dddPlus.getState().guid();
       // loadedObject = new fabric.Group(objImage, options);
       (_use3dddPlus$getState = use3dddPlus.getState().popupCanv) == null ? void 0 : _use3dddPlus$getState.clear();
       // use3dddPlus
@@ -4136,7 +4139,7 @@ var converterSlice = function converterSlice(set, get) {
       //     }
       //   );
       // const canvas = use3dddPlus.getState().popupCanv;
-      var gridSize = 15; // Size of each grid cell
+      var gridSize = 83; // Size of each grid cell
       // var canvasWidth = canvas.width;
       // var canvasHeight = canvas.height;
       var numCols = Math.ceil(canvasWidth / gridSize);
@@ -4254,47 +4257,6 @@ var converterSlice = function converterSlice(set, get) {
       });
     },
     processImage: processImage,
-    //   return new Promise((resolve, reject) => {
-    //     if (data) {
-    //       const reader = new FileReader();
-    //       reader.onload = async () => {
-    //         const buffer = reader.result;
-    //         try {
-    //           const _B = await get().convertPdfToImages(buffer);
-    //           resolve(_B);
-    //         } catch (error) {
-    //           reject(error);
-    //         }
-    //       };
-    //       reader.readAsArrayBuffer(data);
-    //     } else {
-    //       reject(new Error('No data provided.'));
-    //     }
-    //   });
-    // },
-    // convertPdfToImages: async (buffer) => {
-    //   const pdf = await pdfjsLib.getDocument({ data: new Uint8Array(buffer) })
-    //     .promise;
-    //   const scale = 2;
-    //   for (let pageNum = 1; pageNum <= pdf.numPages; pageNum++) {
-    //     const page = await pdf.getPage(pageNum);
-    //     const viewport = page.getViewport({ scale });
-    //     const canvasEl = document.createElement('canvas');
-    //     canvasEl.width = viewport.width;
-    //     canvasEl.height = viewport.height;
-    //     const context = canvasEl.getContext('2d');
-    //     await page.render({
-    //       canvasContext: context,
-    //       viewport,
-    //       background: 'rgba(0,0,0,0)',
-    //     }).promise;
-    //     // let objectURL = URL.createObjectURL(canvasEl);
-    //     const imageUrl = canvasEl.toDataURL();
-    //     return imageUrl;
-    //     // svgConverter(imageUrl);
-    //     /* */
-    //   }
-    // },
     tiffConvert: function () {
       var _tiffConvert = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
         var tiffParser, canvasEl, arrayBuffer, tiffCanvas, imageUrl;
@@ -4448,27 +4410,6 @@ var converterSlice = function converterSlice(set, get) {
     changeSVGColor: function changeSVGColor(property, color) {
       use3dddPlus.getState().popUpCanvasUpdateModification(true);
       var fillColor = _extends({}, use3dddPlus.getState().colorFill);
-      // const previousColor = fillColor[property];
-      //const SelectedObjet = use3dddPlus.getState().activeSelection;
-      // console.log("Color_CHANGING--->",SelectedObjet.colorFill);
-      // let _newObj = SelectedObjet.colorFill;
-      /* Object.entries(_newObj).forEach(([key, value]) => {
-      if(`${value}` === previousColor){
-      console.log(`${key}: ${value}` , previousColor);
-      _newObj[`${key}`] = color;
-      }
-      // console.log(`${key}: ${value}`)
-      });*/
-      // const sel = new fabric.ActiveSelection(popupCanvas.getObjects(), {
-      //   popupCanvas: popupCanvas,
-      // });
-      // popupCanvas.setActiveObject(sel);
-      // popupCanvas.requestRenderAll();
-      //  let objImage = SelectedObjet._objects;if(use3dddPlus.getState().popupCanv.getActiveObject()){
-      // if(use3dddPlus.getState().popupCanv.getActiveObject()){
-      // let objImage = use3dddPlus
-      //  .getState()
-      //  .popupCanv.getActiveObject()._objects;
       if (use3dddPlus.getState().loadedObject) {
         // let objImage1 = use3dddPlus.getState().popupCanv.getObjects();
         var objImage = use3dddPlus.getState().popupCanv.getObjects();
@@ -6955,7 +6896,7 @@ var PopUpCanvas = function PopUpCanvas() {
       }
     });
     var canvas = use3dddPlus.getState().popupCanv;
-    var gridSize = 15; // Size of each grid cell
+    var gridSize = 83; // Size of each grid cell
     var canvasWidth = canvas.width;
     var canvasHeight = canvas.height;
     var numCols = Math.ceil(canvasWidth / gridSize);
@@ -7174,7 +7115,7 @@ var PopUpCanvas = function PopUpCanvas() {
     className: "border border-[#E11A38] p-1 bg-white mr-2 text-[#E11A38] "
   }, React__default.createElement(EyeDropper, null)), React__default.createElement("span", {
     className: "text-[#E11A38] text-[13px] font-bold "
-  }, "Use the eyedropper tool do clicking on a color you wish to remove from you image")))), React__default.createElement("div", {
+  }, "Use the eyedropper tool by clicking on a color you wish to remove from your image.")))), React__default.createElement("div", {
     className: "text-left flex-1 h-[100%] px-[25px] pt-[31px] pb-[5px] w-[30%]"
   }, React__default.createElement("div", {
     className: "flex flex-col gap-y-3 h-full"
@@ -9266,7 +9207,7 @@ var Properties = function Properties(_ref2) {
               _context5.next = 42;
               break;
             }
-            if (!(textSelected.text && textSelected.text.trim() === '')) {
+            if (!(textSelected.text == '' || textSelected.text.trim() == '')) {
               _context5.next = 27;
               break;
             }
@@ -9333,7 +9274,7 @@ var Properties = function Properties(_ref2) {
             return _context5.abrupt("return");
           case 48:
             _context5.t0 = shapeType;
-            _context5.next = _context5.t0 === 'None' ? 51 : _context5.t0 === 'Arc' ? 75 : _context5.t0 === 'Bridge' ? 79 : _context5.t0 === 'Bowtie' ? 84 : _context5.t0 === 'Vertical Arch' ? 89 : _context5.t0 === 'Reverse Vertical Arch' ? 93 : 97;
+            _context5.next = _context5.t0 === 'None' ? 51 : _context5.t0 === 'Arc' ? 76 : _context5.t0 === 'Bridge' ? 80 : _context5.t0 === 'Bowtie' ? 85 : _context5.t0 === 'Vertical Arch' ? 90 : _context5.t0 === 'Reverse Vertical Arch' ? 94 : 98;
             break;
           case 51:
             setShapeSizeVal(0);
@@ -9364,13 +9305,15 @@ var Properties = function Properties(_ref2) {
               colorFill: textSelected.colorFill,
               fontWeight: fontWeight
             });
-            _text.left = textSelected.left;
-            _text.top = textSelected.top;
             _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;
+            // set rotation angle & position 
+            _text.rotate(textSelected.angle);
+            _text.left = textSelected.left;
+            _text.top = textSelected.top;
             // delete the active text object
             canvas.remove(textSelected);
             textSelected._removeCacheCanvas();
@@ -9393,15 +9336,15 @@ var Properties = function Properties(_ref2) {
             canvas.renderAll();
             // cancel performing further functions & return back from function
             return _context5.abrupt("return");
-          case 75:
+          case 76:
             setShapeSizeVal(50);
             textSelected.shapeType = 'Arc';
             p.warp({
               type: 'WARP_ARC',
               bend: 50 / 100 
             });
-            return _context5.abrupt("break", 98);
-          case 79:
+            return _context5.abrupt("break", 99);
+          case 80:
             setShapeSizeVal(-25);
             bridgeShapeChange();
             textSelected.shapeType = 'Bridge';
@@ -9409,8 +9352,8 @@ var Properties = function Properties(_ref2) {
               type: 'WARP_ARC_LOWER',
               bend: bridgeshapeBendSize / 100 || 0
             });
-            return _context5.abrupt("break", 98);
-          case 84:
+            return _context5.abrupt("break", 99);
+          case 85:
             setShapeSizeVal(-12);
             bridgeShapeChange();
             textSelected.shapeType = 'Bowtie';
@@ -9418,26 +9361,26 @@ var Properties = function Properties(_ref2) {
               type: 'WARP_BULGE',
               bend: bowtieshapeBendSize / 100 || 0
             });
-            return _context5.abrupt("break", 98);
-          case 89:
+            return _context5.abrupt("break", 99);
+          case 90:
             setShapeSizeVal(35);
             textSelected.shapeType = 'Vertical Arch';
             p.warp({
               type: 'WARP_ARCH',
               bend: 35 / 100 
             });
-            return _context5.abrupt("break", 98);
-          case 93:
+            return _context5.abrupt("break", 99);
+          case 94:
             setShapeSizeVal(-35);
             textSelected.shapeType = 'Reverse Vertical Arch';
             p.warp({
               type: 'WARP_ARCH',
               bend: -35 / 100 
             });
-            return _context5.abrupt("break", 98);
-          case 97:
-            return _context5.abrupt("break", 98);
+            return _context5.abrupt("break", 99);
           case 98:
+            return _context5.abrupt("break", 99);
+          case 99:
             // take out the update path with shape type deformation
             fabricPath = new fabric.fabric.Path(p.output());
             textSelected['pathData'] = pathData;
@@ -9464,8 +9407,6 @@ var Properties = function Properties(_ref2) {
               fabricPath['id'] = textSelected.id;
               //@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 * (textSelected.width / dims.width);
@@ -9473,8 +9414,10 @@ var Properties = function Properties(_ref2) {
               fabricPath.setCoords();
               fabricPath.width = dims.width;
               fabricPath.height = dims.height;
-              // var sel = new fabric.ActiveSelection(fabricPath, { canvas: canvas });
-              // canvas.setActiveObject(sel).requestRenderAll();
+              // set rotation angle & position 
+              fabricPath.rotate(textSelected.angle);
+              fabricPath.left = textSelected.left;
+              fabricPath.top = textSelected.top;
               // delete the text object
               canvas.remove(textSelected);
               // set active object as path text
@@ -9506,8 +9449,6 @@ var Properties = function Properties(_ref2) {
               newTextPath['fontStyle'] = textSelected.fontStyle;
               newTextPath['text'] = textSelected.text;
               // set same position & scale
-              newTextPath['left'] = textSelected.left;
-              newTextPath['top'] = textSelected.top;
               newTextPath['width'] = textSelected.width;
               newTextPath['height'] = textSelected.height;
               //@ts-ignore
@@ -9515,6 +9456,10 @@ var Properties = function Properties(_ref2) {
               newTextPath['scaleX'] = textSelected.scaleX * (textSelected.width / _dims.width);
               newTextPath['scaleY'] = textSelected.scaleY * (textSelected.width / _dims.width);
               newTextPath['id'] = textSelected.id;
+              // set rotation angle & position 
+              newTextPath.rotate(textSelected.angle);
+              newTextPath['left'] = textSelected.left;
+              newTextPath['top'] = textSelected.top;
               // delete the active text object
               activeObj = canvas.getActiveObject();
               canvas.remove(activeObj);
@@ -9537,7 +9482,7 @@ var Properties = function Properties(_ref2) {
             }
             canvas.renderAll();
             reduceFontSize();
-          case 103:
+          case 104:
           case "end":
             return _context5.stop();
         }