@threedddplus/logoeditor 0.0.104 → 0.0.106

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2803,8 +2803,19 @@ var fabricSlice = function fabricSlice(set, get) {
2803
2803
  defaultColorFillCopy: dcf
2804
2804
  });
2805
2805
  },
2806
+ // updateModifaction: (toSet) => {
2807
+ // if (toSet) {
2808
+ // get().storeHistory.push(get().applyColorFill());
2809
+ // }
2810
+ // },
2806
2811
  updateModifaction: function updateModifaction(toSet) {
2807
2812
  if (toSet) {
2813
+ if (get().count > 1 && get().storeHistory.length > 1) {
2814
+ for (var i = 1; i < get().count; i++) {
2815
+ get().storeHistory.pop();
2816
+ }
2817
+ get().count = 1;
2818
+ }
2808
2819
  get().storeHistory.push(get().applyColorFill());
2809
2820
  }
2810
2821
  },
@@ -3982,18 +3993,75 @@ var converterSlice = function converterSlice(set, get) {
3982
3993
  fabric.fabric.loadSVGFromString(
3983
3994
  //@ts-ignore
3984
3995
  new String(svgstr), function (objects, options) {
3996
+ var svgData = getDesignConceptSVGData(svgstr);
3997
+ console.log(svgData);
3985
3998
  var loadedObject = fabric.fabric.util.groupSVGElements(objects, options);
3986
- loadedObject.scaleToHeight(300);
3987
- loadedObject.scaleToWidth(300);
3999
+ svgData.forEach(function (resItem) {
4000
+ var path;
4001
+ var node;
4002
+ objects == null ? void 0 : objects.forEach(function (item) {
4003
+ //@ts-ignore
4004
+ // console.log(item.id, res[0].path.replace("#", ""));
4005
+ //@ts-ignore
4006
+ if (item.id === resItem.path) {
4007
+ path = item;
4008
+ //@ts-ignore
4009
+ } else if (item.id === resItem.element) {
4010
+ node = item;
4011
+ }
4012
+ });
4013
+ if (node && path) {
4014
+ var _resItem$node$childre, _resItem$node$childre2;
4015
+ var fontSize = (_resItem$node$childre = resItem.node.children[0]) == null ? void 0 : (_resItem$node$childre2 = _resItem$node$childre.getAttribute('font-size')) == null ? void 0 : _resItem$node$childre2.replace('px', '');
4016
+ console.log('fontSize', resItem.node.children[0], fontSize, path.top, path.left, path.textWidth, path.width);
4017
+ node.set({
4018
+ path: path,
4019
+ top: path.top,
4020
+ left: path.left,
4021
+ pathStartOffset: path.width * parseFloat(resItem.node.startOffset.baseVal.valueAsString) / 100,
4022
+ // fontFamily: resItem.node.children[0].getAttribute("font-family"),
4023
+ fontSize: fontSize || 25 //convertToFabricUnits("25px"),
4024
+ // charSpacing: resItem.node.getAttribute("letter-spacing") //convertToFabricUnits(resItem.node.getAttribute("letter-spacing")),
4025
+ // stroke: resItem.node.children[0].getAttribute("stroke"),
4026
+ // fill: '#040404'
4027
+ });
4028
+
4029
+ node.setCoords();
4030
+ }
4031
+ });
4032
+ // loadedObject.scaleToHeight(300);
4033
+ // loadedObject.scaleToWidth(300);
4034
+ var canvas = use3dddPlus.getState().popupCanv;
4035
+ var canvasWidth = canvas.width;
4036
+ var canvasHeight = canvas.height;
4037
+ var val = 300;
4038
+ if ((loadedObject.width <= 200 || loadedObject.height <= 200) && (loadedObject.minX === -0 || loadedObject.minX)) {
4039
+ val = 600;
4040
+ }
4041
+ if (Math.ceil(loadedObject.width + loadedObject.left + 45) >= Math.floor(canvasWidth)) {
4042
+ loadedObject.scaleToWidth(val);
4043
+ } else if (Math.ceil(loadedObject.height + loadedObject.top + 10) >= Math.floor(canvasHeight)) {
4044
+ loadedObject.scaleToHeight(val);
4045
+ } else if (Math.ceil(loadedObject.left) < 0) {
4046
+ loadedObject.scaleToWidth(val);
4047
+ } else if (Math.ceil(loadedObject.top) < 0) {
4048
+ loadedObject.scaleToHeight(val);
4049
+ } else if (loadedObject.width < 200 || loadedObject.height < 200) {
4050
+ loadedObject.scaleToWidth(val);
4051
+ }
3988
4052
  //@ts-ignore
3989
4053
  var objImage = loadedObject == null ? void 0 : loadedObject._objects;
3990
4054
  var _Fills = [];
3991
4055
  var fillCounts = {};
4056
+ var colorObjects = {};
3992
4057
  if (objImage) {
3993
4058
  objImage.forEach(function (ele) {
3994
4059
  ele.set({
3995
4060
  strokeWidth: 0
3996
4061
  });
4062
+ ele.set({
4063
+ id: use3dddPlus.getState().guid()
4064
+ });
3997
4065
  if (typeof ele.fill === "string" && ele.fill !== "") {
3998
4066
  set({
3999
4067
  fillColor: [].concat(ele.fill)
@@ -4001,6 +4069,13 @@ var converterSlice = function converterSlice(set, get) {
4001
4069
  var fillColor = ele.fill.toString();
4002
4070
  var pixelCount = ele.width * ele.height;
4003
4071
  fillCounts[fillColor] = (fillCounts[fillColor] || 0) + pixelCount;
4072
+ if (colorObjects[fillColor]) {
4073
+ colorObjects[fillColor].objects.push(ele.get("id"));
4074
+ } else {
4075
+ colorObjects[fillColor] = {
4076
+ objects: [ele.get("id")]
4077
+ };
4078
+ }
4004
4079
  }
4005
4080
  });
4006
4081
  }
@@ -4011,12 +4086,17 @@ var converterSlice = function converterSlice(set, get) {
4011
4086
  return fillCounts[b] - fillCounts[a];
4012
4087
  });
4013
4088
  var topColors = sortedFillColors.slice(0, colorValue);
4089
+ var colorObjectsHex = {};
4014
4090
  topColors.map(function (e) {
4015
4091
  if (e.search("#") === -1) {
4016
4092
  var _C = get().RGBToHex(e);
4017
4093
  _Fills.push(_C);
4094
+ colorObjects[e].hex = _C;
4095
+ colorObjectsHex[_C] = colorObjects[e];
4018
4096
  } else {
4019
4097
  _Fills.push(e);
4098
+ colorObjects[e].hex = e;
4099
+ colorObjectsHex[e] = colorObjects[e];
4020
4100
  }
4021
4101
  });
4022
4102
  //@ts-ignore
@@ -4038,7 +4118,8 @@ var converterSlice = function converterSlice(set, get) {
4038
4118
  defaultCF.push({
4039
4119
  property: cf,
4040
4120
  "default": fillColors[cf],
4041
- updated: fillColors[cf]
4121
+ updated: fillColors[cf],
4122
+ objects: colorObjectsHex[fillColors[cf]].objects
4042
4123
  });
4043
4124
  });
4044
4125
  use3dddPlus.setState({
@@ -4097,10 +4178,10 @@ var converterSlice = function converterSlice(set, get) {
4097
4178
  // backgroundRepeat: 'repeat',
4098
4179
  // }
4099
4180
  // );
4100
- var canvas = use3dddPlus.getState().popupCanv;
4181
+ // const canvas = use3dddPlus.getState().popupCanv;
4101
4182
  var gridSize = 15; // Size of each grid cell
4102
- var canvasWidth = canvas.width;
4103
- var canvasHeight = canvas.height;
4183
+ // var canvasWidth = canvas.width;
4184
+ // var canvasHeight = canvas.height;
4104
4185
  var numCols = Math.ceil(canvasWidth / gridSize);
4105
4186
  var numRows = Math.ceil(canvasHeight / gridSize);
4106
4187
  // Function to create a rectangle with checkerboard pattern
@@ -4167,6 +4248,45 @@ var converterSlice = function converterSlice(set, get) {
4167
4248
  use3dddPlus.getState().popUpCanvasUpdateModification(true);
4168
4249
  });
4169
4250
  };
4251
+ // function convertToFabricUnits(valueWithUnit, canvasHeight = 500) {
4252
+ // // Parse the value and unit from the string
4253
+ // const matches = valueWithUnit.match(/^([\d.]+)(\D+)$/);
4254
+ // if (!matches) {
4255
+ // throw new Error("Invalid value format. Value must be in the format 'numberunit', e.g., '10px'.");
4256
+ // }
4257
+ // const value = parseFloat(matches[1]);
4258
+ // const unit = matches[2];
4259
+ // // Define conversion ratios for different units
4260
+ // const conversionTable = {
4261
+ // 'px': 1,
4262
+ // 'em': 16, // Assuming 1em = 16px (default browser font size)
4263
+ // 'rem': 16, // Same as em
4264
+ // 'vh': canvasHeight / 100 // 1vh is 1% of canvas height
4265
+ // };
4266
+ // // Convert the value to pixels
4267
+ // if (unit in conversionTable) {
4268
+ // return value * conversionTable[unit];
4269
+ // } else {
4270
+ // throw new Error("Unsupported unit. Supported units are 'px', 'em', 'rem', 'vh'.");
4271
+ // }
4272
+ // }
4273
+ var getDesignConceptSVGData = function getDesignConceptSVGData(svgData) {
4274
+ var parser = new DOMParser();
4275
+ var xmlDoc = parser.parseFromString(svgData, 'image/svg+xml');
4276
+ var textElements = xmlDoc.querySelectorAll('textPath');
4277
+ var href = [];
4278
+ textElements.forEach(function (textElement) {
4279
+ var _textElement$getAttri, _textElement$parentNo;
4280
+ var hrefValue = (_textElement$getAttri = textElement == null ? void 0 : textElement.getAttribute('xlink:href')) != null ? _textElement$getAttri : textElement == null ? void 0 : textElement.getAttribute('href');
4281
+ if (hrefValue) href.push({
4282
+ path: hrefValue.replace('#', ''),
4283
+ //@ts-ignore
4284
+ element: textElement == null ? void 0 : (_textElement$parentNo = textElement.parentNode) == null ? void 0 : _textElement$parentNo.id,
4285
+ node: textElement
4286
+ });
4287
+ });
4288
+ return href;
4289
+ };
4170
4290
  return {
4171
4291
  fillColor: [],
4172
4292
  file: {},
@@ -4361,7 +4481,7 @@ var converterSlice = function converterSlice(set, get) {
4361
4481
  changeSVGColor: function changeSVGColor(property, color) {
4362
4482
  use3dddPlus.getState().popUpCanvasUpdateModification(true);
4363
4483
  var fillColor = _extends({}, use3dddPlus.getState().colorFill);
4364
- var previousColor = fillColor[property];
4484
+ // const previousColor = fillColor[property];
4365
4485
  //const SelectedObjet = use3dddPlus.getState().activeSelection;
4366
4486
  // console.log("Color_CHANGING--->",SelectedObjet.colorFill);
4367
4487
  // let _newObj = SelectedObjet.colorFill;
@@ -4383,27 +4503,45 @@ var converterSlice = function converterSlice(set, get) {
4383
4503
  // .getState()
4384
4504
  // .popupCanv.getActiveObject()._objects;
4385
4505
  if (use3dddPlus.getState().loadedObject) {
4386
- var objImage = use3dddPlus.getState().popupCanv.getObjects();
4387
- objImage.forEach(function (ele) {
4388
- if (typeof ele.fill === "string" && ele.fill !== "") {
4389
- var _C = ele.fill === 'transparent' || typeof ele.fill === 'string' && ele.fill.includes('#') ? ele.fill : get().RGBToHex(ele.fill);
4390
- if (_C === previousColor) {
4506
+ // let objImage1 = use3dddPlus.getState().popupCanv.getObjects();
4507
+ var objImage = use3dddPlus.getState().popupCanv.getActiveObject();
4508
+ if (objImage && objImage._objects) {
4509
+ objImage._objects.forEach(function (ele) {
4510
+ var defaultColorObject = null;
4511
+ if (use3dddPlus.getState().defaultColorFill) {
4512
+ defaultColorObject = use3dddPlus.getState().defaultColorFill.find(function (dcf) {
4513
+ return dcf.property === property;
4514
+ });
4515
+ }
4516
+ if (ele.id && defaultColorObject && defaultColorObject.objects && defaultColorObject.objects.includes(ele.id) && typeof ele.fill === "string" && ele.fill !== "") {
4517
+ // const _C = (ele.fill === 'transparent' || (typeof ele.fill === 'string' && ele.fill.includes('#')) ? ele.fill : get().RGBToHex(ele.fill));
4518
+ // if (_C === previousColor) {
4391
4519
  ele.set({
4392
4520
  fill: color
4393
4521
  });
4522
+ // }
4394
4523
  }
4395
- }
4396
- });
4397
- use3dddPlus.getState().popupCanv.renderAll();
4398
- // fillColor[property] = color;
4399
- Object.keys(fillColor).forEach(function (fc) {
4400
- if (fillColor[fc] === previousColor) {
4401
- fillColor[fc] = color;
4402
- }
4403
- });
4404
- use3dddPlus.setState({
4405
- colorFill: fillColor
4406
- });
4524
+ // if(typeof ele.fill === "string" && ele.fill !== ""){
4525
+ // const _C = (ele.fill === 'transparent' || (typeof ele.fill === 'string' && ele.fill.includes('#')) ? ele.fill : get().RGBToHex(ele.fill));
4526
+ // if (_C === previousColor) {
4527
+ // ele.set({
4528
+ // fill: color,
4529
+ // });
4530
+ // }
4531
+ // }
4532
+ });
4533
+
4534
+ use3dddPlus.getState().popupCanv.renderAll();
4535
+ fillColor[property] = color;
4536
+ // Object.keys(fillColor).forEach((fc: any) => {
4537
+ // if(fillColor[fc] === previousColor){
4538
+ // fillColor[fc] = color;
4539
+ // }
4540
+ // });
4541
+ use3dddPlus.setState({
4542
+ colorFill: fillColor
4543
+ });
4544
+ }
4407
4545
  return true;
4408
4546
  } else {
4409
4547
  return false;
@@ -5380,7 +5518,6 @@ var initCanvas = function initCanvas() {
5380
5518
  });
5381
5519
  canv.on('object:scaling', function (e) {
5382
5520
  var obj = e.target;
5383
- console.log("++++", e);
5384
5521
  if (isNaN(e.pointer.x) || isNaN(e.pointer.y)) {
5385
5522
  obj.set({
5386
5523
  top: use3dddPlus.getState().lastPosition.top,
@@ -6503,10 +6640,14 @@ var PopUpCanvas = function PopUpCanvas() {
6503
6640
  setColorFillCount(Object.keys(colorFill).length);
6504
6641
  var defaultCF = [];
6505
6642
  Object.keys(colorFill).map(function (cf) {
6643
+ var _defaultColorFill$fin;
6506
6644
  defaultCF.push({
6507
6645
  property: cf,
6508
6646
  "default": colorFill[cf],
6509
- updated: colorFill[cf]
6647
+ updated: colorFill[cf],
6648
+ objects: (_defaultColorFill$fin = defaultColorFill.find(function (dcf) {
6649
+ return dcf.property === cf;
6650
+ })) == null ? void 0 : _defaultColorFill$fin.objects
6510
6651
  });
6511
6652
  });
6512
6653
  setDefaultColorFill(defaultCF);
@@ -6543,21 +6684,20 @@ var PopUpCanvas = function PopUpCanvas() {
6543
6684
  // }
6544
6685
  if (changeSVGColor(property, color)) {
6545
6686
  setDefaultColorFill(defaultColorFill.map(function (c) {
6546
- return (
6547
- // c.property === property ? { ...c, updated: color } : c
6548
- colorFill[property] === c.updated ? _extends({}, c, {
6549
- updated: color
6550
- }) : c
6551
- );
6552
- }));
6687
+ return c.property === property ? _extends({}, c, {
6688
+ updated: color
6689
+ }) : c;
6690
+ }
6691
+ // colorFill[property] === c.updated ? { ...c, updated: color } : c
6692
+ ));
6693
+
6553
6694
  setDefaultColorFillCopy(defaultColorFillCopy.map(function (c) {
6554
- return (
6555
- // c.property === property ? { ...c, updated: color } : c
6556
- colorFill[property] === c.updated ? _extends({}, c, {
6557
- updated: color
6558
- }) : c
6559
- );
6560
- }));
6695
+ return c.property === property ? _extends({}, c, {
6696
+ updated: color
6697
+ }) : c;
6698
+ }
6699
+ // colorFill[property] === c.updated ? { ...c, updated: color } : c
6700
+ ));
6561
6701
  }
6562
6702
  };
6563
6703
  // const colors = [
@@ -8761,7 +8901,7 @@ var Rightmenu = function Rightmenu() {
8761
8901
  };
8762
8902
  var textShapeChange = /*#__PURE__*/function () {
8763
8903
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e, textChange, fontSize, charSpacing, strokeWidth, fontWeight, textAlign, fontStyle) {
8764
- var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims, brNew, _activeObj;
8904
+ var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims;
8765
8905
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
8766
8906
  while (1) switch (_context2.prev = _context2.next) {
8767
8907
  case 0:
@@ -9084,27 +9224,30 @@ var Rightmenu = function Rightmenu() {
9084
9224
  updateStoreAllObject(newTextPath);
9085
9225
  }
9086
9226
  canvas.renderAll();
9087
- brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
9227
+ // setTimeout(() => {
9228
+ // reduceFontSize();
9229
+ // }, 500);
9230
+ reduceFontSize();
9231
+ // canvas.renderAll();
9232
+ // let brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
9233
+ // while (
9234
+ // Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvas.width) ||
9235
+ // Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvas.height) ||
9236
+ // Math.ceil(brNew.left) < 0 ||
9237
+ // Math.ceil(brNew.top) < 0
9238
+ // ) {
9239
+ // textSelected.set('fontSize', textSelected.fontSize - 0.1);
9240
+ // canvas.remove(canvas.getActiveObject());
9241
+ // await textShapeChange(textSelected.shapeType, true);
9242
+ // const activeObj = canvas.getActiveObject();
9243
+ // brNew.left = activeObj.left;
9244
+ // brNew.width = activeObj.width;
9245
+ // brNew.top = activeObj.top;
9246
+ // brNew.height = activeObj.height;
9247
+ // textSelected.setCoords();
9248
+ // canvas.renderAll();
9249
+ // }
9088
9250
  case 103:
9089
- if (!(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)) {
9090
- _context2.next = 117;
9091
- break;
9092
- }
9093
- textSelected.set('fontSize', textSelected.fontSize - 0.1);
9094
- canvas.remove(canvas.getActiveObject());
9095
- _context2.next = 108;
9096
- return textShapeChange(textSelected.shapeType, true);
9097
- case 108:
9098
- _activeObj = canvas.getActiveObject();
9099
- brNew.left = _activeObj.left;
9100
- brNew.width = _activeObj.width;
9101
- brNew.top = _activeObj.top;
9102
- brNew.height = _activeObj.height;
9103
- textSelected.setCoords();
9104
- canvas.renderAll();
9105
- _context2.next = 103;
9106
- break;
9107
- case 117:
9108
9251
  case "end":
9109
9252
  return _context2.stop();
9110
9253
  }
@@ -9149,9 +9292,44 @@ var Rightmenu = function Rightmenu() {
9149
9292
  return;
9150
9293
  }
9151
9294
  };
9295
+ /*
9296
+ const reduceFontSize = async () => {
9297
+ let brNew = textSelected.getBoundingRect();
9298
+ let canvasWidth = 0;
9299
+ let canvasHeight = 0;
9300
+ if (textSelected && textSelected.canvas && textSelected.canvas.width) {
9301
+ canvasWidth = textSelected.canvas.width;
9302
+ canvasHeight = textSelected.canvas.height;
9303
+ } else {
9304
+ canvasWidth = canvas.width;
9305
+ canvasHeight = canvas.height;
9306
+ }
9307
+ while (
9308
+ Math.ceil(brNew.width + brNew.left + 45) > Math.floor(canvasWidth) ||
9309
+ Math.ceil(brNew.height + brNew.top + 10) > Math.floor(canvasHeight) ||
9310
+ Math.ceil(brNew.left) < 0 ||
9311
+ Math.ceil(brNew.top) < 0
9312
+ ) {
9313
+ textSelected.set('fontSize', textSelected.fontSize - 0.1);
9314
+ if (currentSelection === 'path') {
9315
+ await textShapeChange(textSelected.shapeType, true);
9316
+ canvas.renderAll();
9317
+ const activeObj = canvas.getActiveObject();
9318
+ brNew.left = activeObj.left;
9319
+ brNew.width = activeObj.width;
9320
+ brNew.top = activeObj.top;
9321
+ brNew.height = activeObj.height;
9322
+ } else {
9323
+ brNew = textSelected.getBoundingRect();
9324
+ }
9325
+ textSelected.setCoords();
9326
+ // canvas.renderAll();
9327
+ }
9328
+ };
9329
+ */
9152
9330
  var reduceFontSize = /*#__PURE__*/function () {
9153
9331
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
9154
- var brNew, canvasWidth, canvasHeight, _activeObj2;
9332
+ var brNew, canvasWidth, canvasHeight, _activeObj;
9155
9333
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
9156
9334
  while (1) switch (_context3.prev = _context3.next) {
9157
9335
  case 0:
@@ -9165,35 +9343,16 @@ var Rightmenu = function Rightmenu() {
9165
9343
  canvasWidth = canvas.width;
9166
9344
  canvasHeight = canvas.height;
9167
9345
  }
9168
- case 4:
9169
- if (!(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)) {
9170
- _context3.next = 21;
9171
- break;
9172
- }
9173
- textSelected.set('fontSize', textSelected.fontSize - 0.1);
9174
- if (!(currentSelection === 'path')) {
9175
- _context3.next = 17;
9176
- break;
9346
+ 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) {
9347
+ _activeObj = canvas.getActiveObject();
9348
+ _activeObj.scale(_activeObj.scaleX * 0.99);
9349
+ _activeObj.setCoords();
9350
+ _activeObj = canvas.getActiveObject();
9351
+ brNew = _activeObj.getBoundingRect();
9352
+ canvas.renderAll();
9177
9353
  }
9178
- _context3.next = 9;
9179
- return textShapeChange(textSelected.shapeType, true);
9180
- case 9:
9181
9354
  canvas.renderAll();
9182
- _activeObj2 = canvas.getActiveObject();
9183
- brNew.left = _activeObj2.left;
9184
- brNew.width = _activeObj2.width;
9185
- brNew.top = _activeObj2.top;
9186
- brNew.height = _activeObj2.height;
9187
- _context3.next = 18;
9188
- break;
9189
- case 17:
9190
- brNew = textSelected.getBoundingRect();
9191
- case 18:
9192
- textSelected.setCoords();
9193
- // canvas.renderAll();
9194
- _context3.next = 4;
9195
- break;
9196
- case 21:
9355
+ case 6:
9197
9356
  case "end":
9198
9357
  return _context3.stop();
9199
9358
  }
@@ -9232,10 +9391,10 @@ var Rightmenu = function Rightmenu() {
9232
9391
  canvas.renderAll();
9233
9392
  reduceFontSize();
9234
9393
  canvas.renderAll();
9235
- // use3dddPlus.getState().updateModifaction(true);
9394
+ use3dddPlus.getState().updateModifaction(true);
9236
9395
  use3dddPlus.getState().forIconCapture();
9237
9396
  textSelected.icon = use3dddPlus.getState().iconImage;
9238
- case 14:
9397
+ case 15:
9239
9398
  case "end":
9240
9399
  return _context4.stop();
9241
9400
  }
@@ -9252,7 +9411,7 @@ var Rightmenu = function Rightmenu() {
9252
9411
  if (currentSelection === 'path') {
9253
9412
  textShapeChange(textSelected.shapeType, true);
9254
9413
  }
9255
- // use3dddPlus.getState().updateModifaction(true);
9414
+ use3dddPlus.getState().updateModifaction(true);
9256
9415
  use3dddPlus.getState().forIconCapture();
9257
9416
  textSelected.icon = use3dddPlus.getState().iconImage;
9258
9417
  canvas.renderAll();
@@ -9310,71 +9469,68 @@ var Rightmenu = function Rightmenu() {
9310
9469
  // // setSliderValue(event.target.value);
9311
9470
  // }
9312
9471
  // };
9313
- var reduceLeft = /*#__PURE__*/function () {
9314
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
9315
- var canvasWidth, canvasHeight, brNew, _activeObj3;
9316
- return _regeneratorRuntime().wrap(function _callee5$(_context5) {
9317
- while (1) switch (_context5.prev = _context5.next) {
9318
- case 0:
9319
- canvasWidth = textSelected.canvas.width;
9320
- canvasHeight = textSelected.canvas.height;
9321
- brNew = textSelected.getBoundingRect();
9322
- case 3:
9323
- if (!(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)) {
9324
- _context5.next = 21;
9325
- break;
9326
- }
9327
- textSelected.set('fontSize', textSelected.fontSize - 0.1);
9328
- if (!(currentSelection === 'path')) {
9329
- _context5.next = 16;
9330
- break;
9331
- }
9332
- _context5.next = 8;
9333
- return textShapeChange(textSelected.shapeType, true);
9334
- case 8:
9335
- canvas.renderAll();
9336
- _activeObj3 = canvas.getActiveObject();
9337
- brNew.left = _activeObj3.left;
9338
- brNew.width = _activeObj3.width;
9339
- brNew.top = _activeObj3.top;
9340
- brNew.height = _activeObj3.height;
9341
- _context5.next = 17;
9342
- break;
9343
- case 16:
9344
- brNew = textSelected.getBoundingRect();
9345
- case 17:
9346
- textSelected.setCoords();
9347
- canvas.renderAll();
9348
- _context5.next = 3;
9349
- break;
9350
- case 21:
9351
- case "end":
9352
- return _context5.stop();
9353
- }
9354
- }, _callee5);
9355
- }));
9356
- return function reduceLeft() {
9357
- return _ref5.apply(this, arguments);
9358
- };
9359
- }();
9472
+ // const reduceLeft = async () => {
9473
+ // const canvasWidth = textSelected.canvas.width;
9474
+ // const canvasHeight = textSelected.canvas.height;
9475
+ // let brNew = textSelected.getBoundingRect();
9476
+ // while (
9477
+ // Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvasWidth) ||
9478
+ // Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvasHeight) ||
9479
+ // Math.ceil(brNew.left) < 0 ||
9480
+ // Math.ceil(brNew.top) < 0
9481
+ // ) {
9482
+ // textSelected.set('fontSize', textSelected.fontSize - 0.1);
9483
+ // if (currentSelection === 'path') {
9484
+ // await textShapeChange(textSelected.shapeType, true);
9485
+ // canvas.renderAll();
9486
+ // const activeObj = canvas.getActiveObject();
9487
+ // brNew.left = activeObj.left;
9488
+ // brNew.width = activeObj.width;
9489
+ // brNew.top = activeObj.top;
9490
+ // brNew.height = activeObj.height;
9491
+ // } else {
9492
+ // brNew = textSelected.getBoundingRect();
9493
+ // }
9494
+ // textSelected.setCoords();
9495
+ // canvas.renderAll();
9496
+ // }
9497
+ // };
9360
9498
  var fontChange = function fontChange(e) {
9361
9499
  fontFamilies.map(function (item) {
9362
9500
  if (item.name == e.target.value) {
9363
9501
  var font = new FontFace(item.name, "url('" + item.src + "')");
9364
- font.load().then(function (value) {
9365
- var _document$fonts;
9366
- //@ts-ignore
9367
- (_document$fonts = document.fonts) == null ? void 0 : _document$fonts.add(value);
9368
- document.body.classList.add('fonts-loaded');
9369
- textSelected.set('fontFamily', item.name);
9370
- if (currentSelection === 'path') {
9371
- textShapeChange(textSelected.shapeType, true);
9372
- }
9373
- canvas.renderAll();
9374
- use3dddPlus.getState().forIconCapture();
9375
- textSelected.icon = use3dddPlus.getState().iconImage;
9376
- reduceLeft();
9377
- });
9502
+ font.load().then( /*#__PURE__*/function () {
9503
+ var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value) {
9504
+ var _document$fonts;
9505
+ return _regeneratorRuntime().wrap(function _callee5$(_context5) {
9506
+ while (1) switch (_context5.prev = _context5.next) {
9507
+ case 0:
9508
+ //@ts-ignore
9509
+ (_document$fonts = document.fonts) == null ? void 0 : _document$fonts.add(value);
9510
+ document.body.classList.add('fonts-loaded');
9511
+ textSelected.set('fontFamily', item.name);
9512
+ if (!(currentSelection === 'path')) {
9513
+ _context5.next = 6;
9514
+ break;
9515
+ }
9516
+ _context5.next = 6;
9517
+ return textShapeChange(textSelected.shapeType, true);
9518
+ case 6:
9519
+ canvas.renderAll();
9520
+ use3dddPlus.getState().forIconCapture();
9521
+ textSelected.icon = use3dddPlus.getState().iconImage;
9522
+ reduceFontSize();
9523
+ use3dddPlus.getState().updateModifaction(true);
9524
+ case 11:
9525
+ case "end":
9526
+ return _context5.stop();
9527
+ }
9528
+ }, _callee5);
9529
+ }));
9530
+ return function (_x11) {
9531
+ return _ref5.apply(this, arguments);
9532
+ };
9533
+ }());
9378
9534
  }
9379
9535
  });
9380
9536
  };
@@ -9417,7 +9573,7 @@ var Rightmenu = function Rightmenu() {
9417
9573
  if (currentSelection === 'path') {
9418
9574
  textShapeChange(textSelected.shapeType, true);
9419
9575
  }
9420
- // use3dddPlus.getState().updateModifaction(true);
9576
+ use3dddPlus.getState().updateModifaction(true);
9421
9577
  use3dddPlus.getState().forIconCapture();
9422
9578
  textSelected.icon = use3dddPlus.getState().iconImage;
9423
9579
  canvas.renderAll();
@@ -9442,7 +9598,7 @@ var Rightmenu = function Rightmenu() {
9442
9598
  if (currentSelection === 'path') {
9443
9599
  textShapeChange(textSelected.shapeType, true);
9444
9600
  }
9445
- // use3dddPlus.getState().updateModifaction(true);
9601
+ use3dddPlus.getState().updateModifaction(true);
9446
9602
  use3dddPlus.getState().forIconCapture();
9447
9603
  textSelected.icon = use3dddPlus.getState().iconImage;
9448
9604
  canvas.renderAll();
@@ -9455,13 +9611,13 @@ var Rightmenu = function Rightmenu() {
9455
9611
  if (currentSelection === 'path') {
9456
9612
  textShapeChange(textSelected.shapeType, true);
9457
9613
  }
9458
- // use3dddPlus.getState().updateModifaction(true);
9459
9614
  use3dddPlus.getState().forIconCapture();
9460
9615
  textSelected.icon = use3dddPlus.getState().iconImage;
9461
9616
  var _brNew = textSelected.getBoundingRect();
9462
9617
  if (_brNew.width + _brNew.left + 45 >= dublicateText.canvas.width || _brNew.height + _brNew.top >= dublicateText.canvas.height || _brNew.left < 0 || _brNew.top < 0) {
9463
9618
  textSelected.charSpacing = oldCharSpacing;
9464
9619
  }
9620
+ use3dddPlus.getState().updateModifaction(true);
9465
9621
  canvas.renderAll();
9466
9622
  if (textSelected.aCoords.tr.x > 480) {
9467
9623
  return;
@@ -9494,6 +9650,7 @@ var Rightmenu = function Rightmenu() {
9494
9650
  }
9495
9651
  canvas.sendToBack(use3dddPlus.getState().verticalLine);
9496
9652
  canvas.sendToBack(use3dddPlus.getState().horizontalLine);
9653
+ use3dddPlus.getState().updateModifaction(true);
9497
9654
  };
9498
9655
  var changeArr = function changeArr(arr, fromIndex, toIndex) {
9499
9656
  var element = arr.splice(fromIndex, 1)[0];
@@ -9503,6 +9660,7 @@ var Rightmenu = function Rightmenu() {
9503
9660
  var deleteElement = function deleteElement(item) {
9504
9661
  canvas.remove(item);
9505
9662
  canvas.requestRenderAll();
9663
+ use3dddPlus.getState().updateModifaction(true);
9506
9664
  removeItem(item);
9507
9665
  };
9508
9666
  var removeItem = function removeItem(value) {