@threedddplus/logoeditor 0.0.104 → 0.0.105

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.
@@ -3982,18 +3982,75 @@ var converterSlice = function converterSlice(set, get) {
3982
3982
  fabric.fabric.loadSVGFromString(
3983
3983
  //@ts-ignore
3984
3984
  new String(svgstr), function (objects, options) {
3985
+ var svgData = getDesignConceptSVGData(svgstr);
3986
+ console.log(svgData);
3985
3987
  var loadedObject = fabric.fabric.util.groupSVGElements(objects, options);
3986
- loadedObject.scaleToHeight(300);
3987
- loadedObject.scaleToWidth(300);
3988
+ svgData.forEach(function (resItem) {
3989
+ var path;
3990
+ var node;
3991
+ objects == null ? void 0 : objects.forEach(function (item) {
3992
+ //@ts-ignore
3993
+ // console.log(item.id, res[0].path.replace("#", ""));
3994
+ //@ts-ignore
3995
+ if (item.id === resItem.path) {
3996
+ path = item;
3997
+ //@ts-ignore
3998
+ } else if (item.id === resItem.element) {
3999
+ node = item;
4000
+ }
4001
+ });
4002
+ if (node && path) {
4003
+ var _resItem$node$childre, _resItem$node$childre2;
4004
+ 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', '');
4005
+ console.log('fontSize', resItem.node.children[0], fontSize, path.top, path.left, path.textWidth, path.width);
4006
+ node.set({
4007
+ path: path,
4008
+ top: path.top,
4009
+ left: path.left,
4010
+ pathStartOffset: path.width * parseFloat(resItem.node.startOffset.baseVal.valueAsString) / 100,
4011
+ // fontFamily: resItem.node.children[0].getAttribute("font-family"),
4012
+ fontSize: fontSize || 25 //convertToFabricUnits("25px"),
4013
+ // charSpacing: resItem.node.getAttribute("letter-spacing") //convertToFabricUnits(resItem.node.getAttribute("letter-spacing")),
4014
+ // stroke: resItem.node.children[0].getAttribute("stroke"),
4015
+ // fill: '#040404'
4016
+ });
4017
+
4018
+ node.setCoords();
4019
+ }
4020
+ });
4021
+ // loadedObject.scaleToHeight(300);
4022
+ // loadedObject.scaleToWidth(300);
4023
+ var canvas = use3dddPlus.getState().popupCanv;
4024
+ var canvasWidth = canvas.width;
4025
+ var canvasHeight = canvas.height;
4026
+ var val = 300;
4027
+ if ((loadedObject.width <= 200 || loadedObject.height <= 200) && (loadedObject.minX === -0 || loadedObject.minX)) {
4028
+ val = 600;
4029
+ }
4030
+ if (Math.ceil(loadedObject.width + loadedObject.left + 45) >= Math.floor(canvasWidth)) {
4031
+ loadedObject.scaleToWidth(val);
4032
+ } else if (Math.ceil(loadedObject.height + loadedObject.top + 10) >= Math.floor(canvasHeight)) {
4033
+ loadedObject.scaleToHeight(val);
4034
+ } else if (Math.ceil(loadedObject.left) < 0) {
4035
+ loadedObject.scaleToWidth(val);
4036
+ } else if (Math.ceil(loadedObject.top) < 0) {
4037
+ loadedObject.scaleToHeight(val);
4038
+ } else if (loadedObject.width < 200 || loadedObject.height < 200) {
4039
+ loadedObject.scaleToWidth(val);
4040
+ }
3988
4041
  //@ts-ignore
3989
4042
  var objImage = loadedObject == null ? void 0 : loadedObject._objects;
3990
4043
  var _Fills = [];
3991
4044
  var fillCounts = {};
4045
+ var colorObjects = {};
3992
4046
  if (objImage) {
3993
4047
  objImage.forEach(function (ele) {
3994
4048
  ele.set({
3995
4049
  strokeWidth: 0
3996
4050
  });
4051
+ ele.set({
4052
+ id: use3dddPlus.getState().guid()
4053
+ });
3997
4054
  if (typeof ele.fill === "string" && ele.fill !== "") {
3998
4055
  set({
3999
4056
  fillColor: [].concat(ele.fill)
@@ -4001,6 +4058,13 @@ var converterSlice = function converterSlice(set, get) {
4001
4058
  var fillColor = ele.fill.toString();
4002
4059
  var pixelCount = ele.width * ele.height;
4003
4060
  fillCounts[fillColor] = (fillCounts[fillColor] || 0) + pixelCount;
4061
+ if (colorObjects[fillColor]) {
4062
+ colorObjects[fillColor].objects.push(ele.get("id"));
4063
+ } else {
4064
+ colorObjects[fillColor] = {
4065
+ objects: [ele.get("id")]
4066
+ };
4067
+ }
4004
4068
  }
4005
4069
  });
4006
4070
  }
@@ -4011,12 +4075,17 @@ var converterSlice = function converterSlice(set, get) {
4011
4075
  return fillCounts[b] - fillCounts[a];
4012
4076
  });
4013
4077
  var topColors = sortedFillColors.slice(0, colorValue);
4078
+ var colorObjectsHex = {};
4014
4079
  topColors.map(function (e) {
4015
4080
  if (e.search("#") === -1) {
4016
4081
  var _C = get().RGBToHex(e);
4017
4082
  _Fills.push(_C);
4083
+ colorObjects[e].hex = _C;
4084
+ colorObjectsHex[_C] = colorObjects[e];
4018
4085
  } else {
4019
4086
  _Fills.push(e);
4087
+ colorObjects[e].hex = e;
4088
+ colorObjectsHex[e] = colorObjects[e];
4020
4089
  }
4021
4090
  });
4022
4091
  //@ts-ignore
@@ -4038,7 +4107,8 @@ var converterSlice = function converterSlice(set, get) {
4038
4107
  defaultCF.push({
4039
4108
  property: cf,
4040
4109
  "default": fillColors[cf],
4041
- updated: fillColors[cf]
4110
+ updated: fillColors[cf],
4111
+ objects: colorObjectsHex[fillColors[cf]].objects
4042
4112
  });
4043
4113
  });
4044
4114
  use3dddPlus.setState({
@@ -4097,10 +4167,10 @@ var converterSlice = function converterSlice(set, get) {
4097
4167
  // backgroundRepeat: 'repeat',
4098
4168
  // }
4099
4169
  // );
4100
- var canvas = use3dddPlus.getState().popupCanv;
4170
+ // const canvas = use3dddPlus.getState().popupCanv;
4101
4171
  var gridSize = 15; // Size of each grid cell
4102
- var canvasWidth = canvas.width;
4103
- var canvasHeight = canvas.height;
4172
+ // var canvasWidth = canvas.width;
4173
+ // var canvasHeight = canvas.height;
4104
4174
  var numCols = Math.ceil(canvasWidth / gridSize);
4105
4175
  var numRows = Math.ceil(canvasHeight / gridSize);
4106
4176
  // Function to create a rectangle with checkerboard pattern
@@ -4167,6 +4237,45 @@ var converterSlice = function converterSlice(set, get) {
4167
4237
  use3dddPlus.getState().popUpCanvasUpdateModification(true);
4168
4238
  });
4169
4239
  };
4240
+ // function convertToFabricUnits(valueWithUnit, canvasHeight = 500) {
4241
+ // // Parse the value and unit from the string
4242
+ // const matches = valueWithUnit.match(/^([\d.]+)(\D+)$/);
4243
+ // if (!matches) {
4244
+ // throw new Error("Invalid value format. Value must be in the format 'numberunit', e.g., '10px'.");
4245
+ // }
4246
+ // const value = parseFloat(matches[1]);
4247
+ // const unit = matches[2];
4248
+ // // Define conversion ratios for different units
4249
+ // const conversionTable = {
4250
+ // 'px': 1,
4251
+ // 'em': 16, // Assuming 1em = 16px (default browser font size)
4252
+ // 'rem': 16, // Same as em
4253
+ // 'vh': canvasHeight / 100 // 1vh is 1% of canvas height
4254
+ // };
4255
+ // // Convert the value to pixels
4256
+ // if (unit in conversionTable) {
4257
+ // return value * conversionTable[unit];
4258
+ // } else {
4259
+ // throw new Error("Unsupported unit. Supported units are 'px', 'em', 'rem', 'vh'.");
4260
+ // }
4261
+ // }
4262
+ var getDesignConceptSVGData = function getDesignConceptSVGData(svgData) {
4263
+ var parser = new DOMParser();
4264
+ var xmlDoc = parser.parseFromString(svgData, 'image/svg+xml');
4265
+ var textElements = xmlDoc.querySelectorAll('textPath');
4266
+ var href = [];
4267
+ textElements.forEach(function (textElement) {
4268
+ var _textElement$getAttri, _textElement$parentNo;
4269
+ var hrefValue = (_textElement$getAttri = textElement == null ? void 0 : textElement.getAttribute('xlink:href')) != null ? _textElement$getAttri : textElement == null ? void 0 : textElement.getAttribute('href');
4270
+ if (hrefValue) href.push({
4271
+ path: hrefValue.replace('#', ''),
4272
+ //@ts-ignore
4273
+ element: textElement == null ? void 0 : (_textElement$parentNo = textElement.parentNode) == null ? void 0 : _textElement$parentNo.id,
4274
+ node: textElement
4275
+ });
4276
+ });
4277
+ return href;
4278
+ };
4170
4279
  return {
4171
4280
  fillColor: [],
4172
4281
  file: {},
@@ -4361,7 +4470,7 @@ var converterSlice = function converterSlice(set, get) {
4361
4470
  changeSVGColor: function changeSVGColor(property, color) {
4362
4471
  use3dddPlus.getState().popUpCanvasUpdateModification(true);
4363
4472
  var fillColor = _extends({}, use3dddPlus.getState().colorFill);
4364
- var previousColor = fillColor[property];
4473
+ // const previousColor = fillColor[property];
4365
4474
  //const SelectedObjet = use3dddPlus.getState().activeSelection;
4366
4475
  // console.log("Color_CHANGING--->",SelectedObjet.colorFill);
4367
4476
  // let _newObj = SelectedObjet.colorFill;
@@ -4383,27 +4492,45 @@ var converterSlice = function converterSlice(set, get) {
4383
4492
  // .getState()
4384
4493
  // .popupCanv.getActiveObject()._objects;
4385
4494
  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) {
4495
+ // let objImage1 = use3dddPlus.getState().popupCanv.getObjects();
4496
+ var objImage = use3dddPlus.getState().popupCanv.getActiveObject();
4497
+ if (objImage && objImage._objects) {
4498
+ objImage._objects.forEach(function (ele) {
4499
+ var defaultColorObject = null;
4500
+ if (use3dddPlus.getState().defaultColorFill) {
4501
+ defaultColorObject = use3dddPlus.getState().defaultColorFill.find(function (dcf) {
4502
+ return dcf.property === property;
4503
+ });
4504
+ }
4505
+ if (ele.id && defaultColorObject && defaultColorObject.objects && defaultColorObject.objects.includes(ele.id) && typeof ele.fill === "string" && ele.fill !== "") {
4506
+ // const _C = (ele.fill === 'transparent' || (typeof ele.fill === 'string' && ele.fill.includes('#')) ? ele.fill : get().RGBToHex(ele.fill));
4507
+ // if (_C === previousColor) {
4391
4508
  ele.set({
4392
4509
  fill: color
4393
4510
  });
4511
+ // }
4394
4512
  }
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
- });
4513
+ // if(typeof ele.fill === "string" && ele.fill !== ""){
4514
+ // const _C = (ele.fill === 'transparent' || (typeof ele.fill === 'string' && ele.fill.includes('#')) ? ele.fill : get().RGBToHex(ele.fill));
4515
+ // if (_C === previousColor) {
4516
+ // ele.set({
4517
+ // fill: color,
4518
+ // });
4519
+ // }
4520
+ // }
4521
+ });
4522
+
4523
+ use3dddPlus.getState().popupCanv.renderAll();
4524
+ fillColor[property] = color;
4525
+ // Object.keys(fillColor).forEach((fc: any) => {
4526
+ // if(fillColor[fc] === previousColor){
4527
+ // fillColor[fc] = color;
4528
+ // }
4529
+ // });
4530
+ use3dddPlus.setState({
4531
+ colorFill: fillColor
4532
+ });
4533
+ }
4407
4534
  return true;
4408
4535
  } else {
4409
4536
  return false;
@@ -5380,7 +5507,6 @@ var initCanvas = function initCanvas() {
5380
5507
  });
5381
5508
  canv.on('object:scaling', function (e) {
5382
5509
  var obj = e.target;
5383
- console.log("++++", e);
5384
5510
  if (isNaN(e.pointer.x) || isNaN(e.pointer.y)) {
5385
5511
  obj.set({
5386
5512
  top: use3dddPlus.getState().lastPosition.top,
@@ -6503,10 +6629,14 @@ var PopUpCanvas = function PopUpCanvas() {
6503
6629
  setColorFillCount(Object.keys(colorFill).length);
6504
6630
  var defaultCF = [];
6505
6631
  Object.keys(colorFill).map(function (cf) {
6632
+ var _defaultColorFill$fin;
6506
6633
  defaultCF.push({
6507
6634
  property: cf,
6508
6635
  "default": colorFill[cf],
6509
- updated: colorFill[cf]
6636
+ updated: colorFill[cf],
6637
+ objects: (_defaultColorFill$fin = defaultColorFill.find(function (dcf) {
6638
+ return dcf.property === cf;
6639
+ })) == null ? void 0 : _defaultColorFill$fin.objects
6510
6640
  });
6511
6641
  });
6512
6642
  setDefaultColorFill(defaultCF);
@@ -6543,21 +6673,20 @@ var PopUpCanvas = function PopUpCanvas() {
6543
6673
  // }
6544
6674
  if (changeSVGColor(property, color)) {
6545
6675
  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
- }));
6676
+ return c.property === property ? _extends({}, c, {
6677
+ updated: color
6678
+ }) : c;
6679
+ }
6680
+ // colorFill[property] === c.updated ? { ...c, updated: color } : c
6681
+ ));
6682
+
6553
6683
  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
- }));
6684
+ return c.property === property ? _extends({}, c, {
6685
+ updated: color
6686
+ }) : c;
6687
+ }
6688
+ // colorFill[property] === c.updated ? { ...c, updated: color } : c
6689
+ ));
6561
6690
  }
6562
6691
  };
6563
6692
  // const colors = [
@@ -8761,7 +8890,7 @@ var Rightmenu = function Rightmenu() {
8761
8890
  };
8762
8891
  var textShapeChange = /*#__PURE__*/function () {
8763
8892
  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;
8893
+ var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims;
8765
8894
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
8766
8895
  while (1) switch (_context2.prev = _context2.next) {
8767
8896
  case 0:
@@ -9084,27 +9213,30 @@ var Rightmenu = function Rightmenu() {
9084
9213
  updateStoreAllObject(newTextPath);
9085
9214
  }
9086
9215
  canvas.renderAll();
9087
- brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
9216
+ // setTimeout(() => {
9217
+ // reduceFontSize();
9218
+ // }, 500);
9219
+ reduceFontSize();
9220
+ // canvas.renderAll();
9221
+ // let brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
9222
+ // while (
9223
+ // Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvas.width) ||
9224
+ // Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvas.height) ||
9225
+ // Math.ceil(brNew.left) < 0 ||
9226
+ // Math.ceil(brNew.top) < 0
9227
+ // ) {
9228
+ // textSelected.set('fontSize', textSelected.fontSize - 0.1);
9229
+ // canvas.remove(canvas.getActiveObject());
9230
+ // await textShapeChange(textSelected.shapeType, true);
9231
+ // const activeObj = canvas.getActiveObject();
9232
+ // brNew.left = activeObj.left;
9233
+ // brNew.width = activeObj.width;
9234
+ // brNew.top = activeObj.top;
9235
+ // brNew.height = activeObj.height;
9236
+ // textSelected.setCoords();
9237
+ // canvas.renderAll();
9238
+ // }
9088
9239
  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
9240
  case "end":
9109
9241
  return _context2.stop();
9110
9242
  }
@@ -9149,9 +9281,44 @@ var Rightmenu = function Rightmenu() {
9149
9281
  return;
9150
9282
  }
9151
9283
  };
9284
+ /*
9285
+ const reduceFontSize = async () => {
9286
+ let brNew = textSelected.getBoundingRect();
9287
+ let canvasWidth = 0;
9288
+ let canvasHeight = 0;
9289
+ if (textSelected && textSelected.canvas && textSelected.canvas.width) {
9290
+ canvasWidth = textSelected.canvas.width;
9291
+ canvasHeight = textSelected.canvas.height;
9292
+ } else {
9293
+ canvasWidth = canvas.width;
9294
+ canvasHeight = canvas.height;
9295
+ }
9296
+ while (
9297
+ Math.ceil(brNew.width + brNew.left + 45) > Math.floor(canvasWidth) ||
9298
+ Math.ceil(brNew.height + brNew.top + 10) > Math.floor(canvasHeight) ||
9299
+ Math.ceil(brNew.left) < 0 ||
9300
+ Math.ceil(brNew.top) < 0
9301
+ ) {
9302
+ textSelected.set('fontSize', textSelected.fontSize - 0.1);
9303
+ if (currentSelection === 'path') {
9304
+ await textShapeChange(textSelected.shapeType, true);
9305
+ canvas.renderAll();
9306
+ const activeObj = canvas.getActiveObject();
9307
+ brNew.left = activeObj.left;
9308
+ brNew.width = activeObj.width;
9309
+ brNew.top = activeObj.top;
9310
+ brNew.height = activeObj.height;
9311
+ } else {
9312
+ brNew = textSelected.getBoundingRect();
9313
+ }
9314
+ textSelected.setCoords();
9315
+ // canvas.renderAll();
9316
+ }
9317
+ };
9318
+ */
9152
9319
  var reduceFontSize = /*#__PURE__*/function () {
9153
9320
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
9154
- var brNew, canvasWidth, canvasHeight, _activeObj2;
9321
+ var brNew, canvasWidth, canvasHeight, _activeObj;
9155
9322
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
9156
9323
  while (1) switch (_context3.prev = _context3.next) {
9157
9324
  case 0:
@@ -9165,35 +9332,16 @@ var Rightmenu = function Rightmenu() {
9165
9332
  canvasWidth = canvas.width;
9166
9333
  canvasHeight = canvas.height;
9167
9334
  }
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;
9335
+ 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) {
9336
+ _activeObj = canvas.getActiveObject();
9337
+ _activeObj.scale(_activeObj.scaleX * 0.99);
9338
+ _activeObj.setCoords();
9339
+ _activeObj = canvas.getActiveObject();
9340
+ brNew = _activeObj.getBoundingRect();
9341
+ canvas.renderAll();
9177
9342
  }
9178
- _context3.next = 9;
9179
- return textShapeChange(textSelected.shapeType, true);
9180
- case 9:
9181
9343
  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:
9344
+ case 6:
9197
9345
  case "end":
9198
9346
  return _context3.stop();
9199
9347
  }
@@ -9310,71 +9458,67 @@ var Rightmenu = function Rightmenu() {
9310
9458
  // // setSliderValue(event.target.value);
9311
9459
  // }
9312
9460
  // };
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
- }();
9461
+ // const reduceLeft = async () => {
9462
+ // const canvasWidth = textSelected.canvas.width;
9463
+ // const canvasHeight = textSelected.canvas.height;
9464
+ // let brNew = textSelected.getBoundingRect();
9465
+ // while (
9466
+ // Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvasWidth) ||
9467
+ // Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvasHeight) ||
9468
+ // Math.ceil(brNew.left) < 0 ||
9469
+ // Math.ceil(brNew.top) < 0
9470
+ // ) {
9471
+ // textSelected.set('fontSize', textSelected.fontSize - 0.1);
9472
+ // if (currentSelection === 'path') {
9473
+ // await textShapeChange(textSelected.shapeType, true);
9474
+ // canvas.renderAll();
9475
+ // const activeObj = canvas.getActiveObject();
9476
+ // brNew.left = activeObj.left;
9477
+ // brNew.width = activeObj.width;
9478
+ // brNew.top = activeObj.top;
9479
+ // brNew.height = activeObj.height;
9480
+ // } else {
9481
+ // brNew = textSelected.getBoundingRect();
9482
+ // }
9483
+ // textSelected.setCoords();
9484
+ // canvas.renderAll();
9485
+ // }
9486
+ // };
9360
9487
  var fontChange = function fontChange(e) {
9361
9488
  fontFamilies.map(function (item) {
9362
9489
  if (item.name == e.target.value) {
9363
9490
  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
- });
9491
+ font.load().then( /*#__PURE__*/function () {
9492
+ var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value) {
9493
+ var _document$fonts;
9494
+ return _regeneratorRuntime().wrap(function _callee5$(_context5) {
9495
+ while (1) switch (_context5.prev = _context5.next) {
9496
+ case 0:
9497
+ //@ts-ignore
9498
+ (_document$fonts = document.fonts) == null ? void 0 : _document$fonts.add(value);
9499
+ document.body.classList.add('fonts-loaded');
9500
+ textSelected.set('fontFamily', item.name);
9501
+ if (!(currentSelection === 'path')) {
9502
+ _context5.next = 6;
9503
+ break;
9504
+ }
9505
+ _context5.next = 6;
9506
+ return textShapeChange(textSelected.shapeType, true);
9507
+ case 6:
9508
+ canvas.renderAll();
9509
+ use3dddPlus.getState().forIconCapture();
9510
+ textSelected.icon = use3dddPlus.getState().iconImage;
9511
+ reduceFontSize();
9512
+ case 10:
9513
+ case "end":
9514
+ return _context5.stop();
9515
+ }
9516
+ }, _callee5);
9517
+ }));
9518
+ return function (_x11) {
9519
+ return _ref5.apply(this, arguments);
9520
+ };
9521
+ }());
9378
9522
  }
9379
9523
  });
9380
9524
  };