@threedddplus/logoeditor 0.0.90 → 0.0.91

package/dist/logoeditor.cjs.development.js

@@ -2537,7 +2537,7 @@ var fabricSlice = function fabricSlice(set, get) {
         canvasGetobject.forEach(function (element) {
           if (element.type !== 'line') {
             use3dddPlus.getState().forStoringAllObject(element);
-            if (element.type === 'text') {
+            if (element.type === "text" || "path") {
               get().fabricCanvas.setActiveObject(element);
               use3dddPlus.getState().forIconCapture();
               //@ts-ignore
@@ -2590,9 +2590,9 @@ var fabricSlice = function fabricSlice(set, get) {
         use3dddPlus.getState().clearLayers();
         var canvasGetobject = get().fabricCanvas.getObjects();
         canvasGetobject.forEach(function (element) {
-          if (element.type !== 'line') {
+          if (element.type !== "line") {
             use3dddPlus.getState().forStoringAllObject(element);
-            if (element.type === 'text') {
+            if (element.type === "text" || "path") {
               get().fabricCanvas.setActiveObject(element);
               use3dddPlus.getState().forIconCapture();
               //@ts-ignore
@@ -3826,11 +3826,13 @@ var converterSlice = function converterSlice(set, get) {
         });
         colorMap[color] = closestColor;
       });
-      objImage.forEach(function (ele) {
-        ele.set({
-          fill: colorMap[ele.fill.toString()]
+      if (objImage) {
+        objImage.forEach(function (ele) {
+          ele.set({
+            fill: colorMap[ele.fill.toString()]
+          });
         });
-      });
+      }
       loadedObject.set({
         colorFill: fillColors,
         //@ts-ignore
@@ -3945,7 +3947,7 @@ var converterSlice = function converterSlice(set, get) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               formData = new FormData();
-              formData.append('ai_file', aiFile);
+              formData.append('file', aiFile);
               url = 'https://m2dev.richardsonsports.com/rest/V1/file-conversion';
               config = {
                 headers: {
@@ -3997,9 +3999,7 @@ var converterSlice = function converterSlice(set, get) {
       if (convert === void 0) {
         convert = true;
       }
-      use3dddPlus.setState({
-        uploadImageModalDisplay: true
-      });
+      // use3dddPlus.setState({ uploadImageModalDisplay: true });
       use3dddPlus.setState({
         loading: true
       });
@@ -6834,52 +6834,60 @@ var UploadLogo = function UploadLogo() {
           case 0:
             // canvas.discardActiveObject();
             ext = data.name.substring(data.name.lastIndexOf('.') + 1);
+            use3dddPlus.setState({
+              uploadImageModalDisplay: true
+            });
             if (!(ext === 'svg')) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
             imageToSVG(data, ext, true);
-            _context.next = 22;
+            _context.next = 23;
             break;
-          case 5:
+          case 6:
             if (!(ext === 'tif' || ext === 'tiff')) {
-              _context.next = 12;
+              _context.next = 13;
               break;
             }
-            _context.next = 8;
+            _context.next = 9;
             return tiffConvert(data);
-          case 8:
+          case 9:
             tiffData = _context.sent;
             imageToSVG(tiffData, ext);
-            _context.next = 22;
+            _context.next = 23;
             break;
-          case 12:
+          case 13:
             if (!(ext === 'ai' || ext === 'pdf')) {
-              _context.next = 20;
+              _context.next = 21;
               break;
             }
             // console.log(loadImageFromURL);
             use3dddPlus.setState({
               loading: true
             });
-            _context.next = 16;
+            _context.next = 17;
             return aiConvert(data);
-          case 16:
+          case 17:
             aiToSvg = _context.sent;
             // console.log(aiToSvg)
-            fetch(aiToSvg.s3_file_url).then(function (response) {
+            fetch(aiToSvg.s3_file_url + '?timestamp=' + Date.now()).then(function (response) {
               return response.text();
             }).then(function (svgText) {
               imageToSVG(svgText, ext, false, false);
+            })["catch"](function (ex) {
+              console.log(ex);
+              use3dddPlus.setState({
+                loading: false
+              });
             });
-            _context.next = 22;
+            _context.next = 23;
             break;
-          case 20:
+          case 21:
             objectURL = URL.createObjectURL(data);
             imageToSVG(objectURL, ext);
-          case 22:
-            setSelectedFile(null);
           case 23:
+            setSelectedFile(null);
+          case 24:
           case "end":
             return _context.stop();
         }