@threedddplus/logoeditor 0.0.49 → 0.0.51

package/dist/logoeditor.cjs.development.js

@@ -2301,6 +2301,7 @@ var fabricSlice = function fabricSlice(set, get) {
     nameCounter: 0,
     duplicateObject: function duplicateObject() {
       if (get().fabricCanvas.getActiveObject()) {
+        var activeObj = get().fabricCanvas.getActiveObject();
         var clipboard;
         get().fabricCanvas.getActiveObject().clone(function (cloned) {
           clipboard = cloned;
@@ -2308,35 +2309,37 @@ var fabricSlice = function fabricSlice(set, get) {
         clipboard.clone(function (clonedObj) {
           get().fabricCanvas.discardActiveObject();
           clonedObj.set({
-            left: clonedObj.left + 20,
-            top: clonedObj.top + 20,
             evented: true
           });
           if (clonedObj.type === 'activeSelection') {
             clonedObj.canvas = get().fabricCanvas;
-            clonedObj.forEachObject(function (obj) {
+            clonedObj.forEachObject(function (obj, index) {
+              obj.colorFill = activeObj._objects[index].colorFill;
               get().fabricCanvas.add(obj);
             });
             clonedObj.setCoords();
           } else {
+            clonedObj.colorFill = activeObj.colorFill;
             get().fabricCanvas.add(clonedObj);
           }
           clipboard.top += 20;
           clipboard.left += 20;
-          // get().fabricCanvas.setActiveObject(clonedObj);
+          get().fabricCanvas.setActiveObject(clonedObj);
+          clonedObj.set({
+            left: clonedObj.left + 20,
+            top: clonedObj.top + 20
+          });
           // get().fabricCanvas.requestRenderAll();
           //     clonedObj._objects.map((data) => {
           //     get().forStoringAllObject(data);
           //   });
           if (clipboard && clipboard._objects && clipboard._objects.length > 0 && clipboard._objects[0]._objects || clipboard._objects && clipboard._objects[0].type === "text") {
             clonedObj._objects.map(function (data) {
-              data.icon = use3dddPlus.getState().iconImage;
+              data.icon = data.toDataURL('image/png');
               get().forStoringAllObject(data);
             });
-          } else if (clonedObj._objects && clipboard._objects.length > 0) {
-            clonedObj._objects[0].icon = use3dddPlus.getState().iconImage;
-            get().forStoringAllObject(clonedObj._objects[0]);
           } else {
+            use3dddPlus.getState().forIconCapture();
             clonedObj.icon = use3dddPlus.getState().iconImage;
             get().forStoringAllObject(clonedObj);
           }
@@ -3535,7 +3538,7 @@ var converterSlice = function converterSlice(set, get) {
       //  .getState()
       //  .popupCanv.getActiveObject()._objects;
       if (use3dddPlus.getState().loadedObject) {
-        var objImage = use3dddPlus.getState().loadedObject;
+        var objImage = use3dddPlus.getState().popupCanv.getObjects();
         objImage.forEach(function (ele) {
           var _C = ele.fill === 'transparent' ? ele.fill : ele.fill.includes('#') ? ele.fill : get().RGBToHex(ele.fill);
           if (_C === previousColor) {
@@ -4106,7 +4109,7 @@ var initCanvas = function initCanvas() {
     use3dddPlus.setState({
       activeSelection: canv.getActiveObject()
     });
-    canv.getActiveObject().viewportCenter();
+    // canv.getActiveObject().viewportCenter();
     getAllColors();
   };
   var onObjectDeselected = function onObjectDeselected() {
@@ -5117,7 +5120,7 @@ var ToolTip = function ToolTip(_ref) {
     placement: 'top'
   });
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(reakit.TooltipReference, Object.assign({}, tooltip, {
-    className: className + "  flex relative items-center justify-center align-middle w-auto text-sm font-semibold h-5 first:rounded-l last:rounded-r focus:outline-none",
+    className: className + "  flex relative items-center justify-center align-middle w-auto text-sm font-semibold first:rounded-l last:rounded-r focus:outline-none",
     "aria-label": label
   }), children),
   //@ts-ignore
@@ -5234,7 +5237,19 @@ var ColorImpl = function ColorImpl(props) {
     setColor(color);
     props.handleChange(props.property, color);
   };
-  return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
+  var getLable = function getLable(colorCode) {
+    var color = defaultColorNames.find(function (c) {
+      return colorCode === c.color;
+    });
+    if (color && color.name) {
+      return color.name;
+    } else {
+      return colorCode;
+    }
+  };
+  return React__default.createElement(ToolTip, {
+    label: getLable(props.color)
+  }, React__default.createElement("div", {
     className: props.mClass
   }, React__default.createElement("div", {
     className: "border border-gray-600 w-[30px] h-[30px] group",
@@ -5785,13 +5800,14 @@ var PopUpCanvas = function PopUpCanvas() {
     return React__default.createElement("div", {
       className: "flex flex-row items-center",
       key: index
+    }, React__default.createElement(ToolTip, {
+      label: item["default"]
     }, React__default.createElement("div", {
       className: "w-[30px] h-[30px] m-2 border-[1px] border-[#000000]",
       style: {
         background: item["default"]
-      },
-      title: item["default"]
-    }), React__default.createElement("div", {
+      }
+    })), React__default.createElement("div", {
       className: "mx-[20px]  text-[#c2c2c2]"
     }, React__default.createElement(cg.CgArrowRight, null)), React__default.createElement("div", {
       className: "flex flex-row border-[1px] border-[#D6D6D6]"
@@ -7711,8 +7727,11 @@ var Rightmenu = function Rightmenu() {
           colorFill: colorFill
         });
       }
-      use3dddPlus.getState().forIconCapture();
-      data.icon = use3dddPlus.getState().iconImage;
+      if (data && data.icon) {
+        data.icon = data.toDataURL('image/png');
+      } else {
+        data._objects[0].icon = data.toDataURL('image/png');
+      }
     });
     canvas.renderAll();
     // use3dddPlus.getState().updateModifaction(true);