@threedddplus/logoeditor 0.0.103 → 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.
- package/dist/logoeditor.cjs.development.js +295 -150
- package/dist/logoeditor.cjs.development.js.map +1 -1
- package/dist/logoeditor.cjs.production.min.js +1 -1
- package/dist/logoeditor.cjs.production.min.js.map +1 -1
- package/dist/logoeditor.esm.js +295 -150
- package/dist/logoeditor.esm.js.map +1 -1
- package/package.json +1 -1
@@ -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
|
-
|
3987
|
-
|
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
|
-
|
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
|
-
|
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
|
-
|
4387
|
-
objImage.
|
4388
|
-
|
4389
|
-
|
4390
|
-
|
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
|
-
|
4398
|
-
|
4399
|
-
|
4400
|
-
|
4401
|
-
|
4402
|
-
|
4403
|
-
|
4404
|
-
|
4405
|
-
|
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,
|
@@ -5405,6 +5531,7 @@ var initCanvas = function initCanvas() {
|
|
5405
5531
|
width1 = obj.width;
|
5406
5532
|
height1 = obj.height;
|
5407
5533
|
}
|
5534
|
+
obj.setCoords();
|
5408
5535
|
use3dddPlus.getState().setLastPosition({
|
5409
5536
|
top: obj.top,
|
5410
5537
|
left: obj.left
|
@@ -6502,10 +6629,14 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6502
6629
|
setColorFillCount(Object.keys(colorFill).length);
|
6503
6630
|
var defaultCF = [];
|
6504
6631
|
Object.keys(colorFill).map(function (cf) {
|
6632
|
+
var _defaultColorFill$fin;
|
6505
6633
|
defaultCF.push({
|
6506
6634
|
property: cf,
|
6507
6635
|
"default": colorFill[cf],
|
6508
|
-
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
|
6509
6640
|
});
|
6510
6641
|
});
|
6511
6642
|
setDefaultColorFill(defaultCF);
|
@@ -6542,21 +6673,20 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6542
6673
|
// }
|
6543
6674
|
if (changeSVGColor(property, color)) {
|
6544
6675
|
setDefaultColorFill(defaultColorFill.map(function (c) {
|
6545
|
-
return (
|
6546
|
-
|
6547
|
-
|
6548
|
-
|
6549
|
-
|
6550
|
-
|
6551
|
-
|
6676
|
+
return c.property === property ? _extends({}, c, {
|
6677
|
+
updated: color
|
6678
|
+
}) : c;
|
6679
|
+
}
|
6680
|
+
// colorFill[property] === c.updated ? { ...c, updated: color } : c
|
6681
|
+
));
|
6682
|
+
|
6552
6683
|
setDefaultColorFillCopy(defaultColorFillCopy.map(function (c) {
|
6553
|
-
return (
|
6554
|
-
|
6555
|
-
|
6556
|
-
|
6557
|
-
|
6558
|
-
|
6559
|
-
}));
|
6684
|
+
return c.property === property ? _extends({}, c, {
|
6685
|
+
updated: color
|
6686
|
+
}) : c;
|
6687
|
+
}
|
6688
|
+
// colorFill[property] === c.updated ? { ...c, updated: color } : c
|
6689
|
+
));
|
6560
6690
|
}
|
6561
6691
|
};
|
6562
6692
|
// const colors = [
|
@@ -8760,7 +8890,7 @@ var Rightmenu = function Rightmenu() {
|
|
8760
8890
|
};
|
8761
8891
|
var textShapeChange = /*#__PURE__*/function () {
|
8762
8892
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e, textChange, fontSize, charSpacing, strokeWidth, fontWeight, textAlign, fontStyle) {
|
8763
|
-
var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims
|
8893
|
+
var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims;
|
8764
8894
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
8765
8895
|
while (1) switch (_context2.prev = _context2.next) {
|
8766
8896
|
case 0:
|
@@ -9083,27 +9213,30 @@ var Rightmenu = function Rightmenu() {
|
|
9083
9213
|
updateStoreAllObject(newTextPath);
|
9084
9214
|
}
|
9085
9215
|
canvas.renderAll();
|
9086
|
-
|
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
|
+
// }
|
9087
9239
|
case 103:
|
9088
|
-
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)) {
|
9089
|
-
_context2.next = 117;
|
9090
|
-
break;
|
9091
|
-
}
|
9092
|
-
textSelected.set('fontSize', textSelected.fontSize - 0.1);
|
9093
|
-
canvas.remove(canvas.getActiveObject());
|
9094
|
-
_context2.next = 108;
|
9095
|
-
return textShapeChange(textSelected.shapeType, true);
|
9096
|
-
case 108:
|
9097
|
-
_activeObj = canvas.getActiveObject();
|
9098
|
-
brNew.left = _activeObj.left;
|
9099
|
-
brNew.width = _activeObj.width;
|
9100
|
-
brNew.top = _activeObj.top;
|
9101
|
-
brNew.height = _activeObj.height;
|
9102
|
-
textSelected.setCoords();
|
9103
|
-
canvas.renderAll();
|
9104
|
-
_context2.next = 103;
|
9105
|
-
break;
|
9106
|
-
case 117:
|
9107
9240
|
case "end":
|
9108
9241
|
return _context2.stop();
|
9109
9242
|
}
|
@@ -9148,9 +9281,44 @@ var Rightmenu = function Rightmenu() {
|
|
9148
9281
|
return;
|
9149
9282
|
}
|
9150
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
|
+
*/
|
9151
9319
|
var reduceFontSize = /*#__PURE__*/function () {
|
9152
9320
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
9153
|
-
var brNew, canvasWidth, canvasHeight,
|
9321
|
+
var brNew, canvasWidth, canvasHeight, _activeObj;
|
9154
9322
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
9155
9323
|
while (1) switch (_context3.prev = _context3.next) {
|
9156
9324
|
case 0:
|
@@ -9164,35 +9332,16 @@ var Rightmenu = function Rightmenu() {
|
|
9164
9332
|
canvasWidth = canvas.width;
|
9165
9333
|
canvasHeight = canvas.height;
|
9166
9334
|
}
|
9167
|
-
|
9168
|
-
|
9169
|
-
|
9170
|
-
|
9171
|
-
|
9172
|
-
|
9173
|
-
|
9174
|
-
_context3.next = 17;
|
9175
|
-
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();
|
9176
9342
|
}
|
9177
|
-
_context3.next = 9;
|
9178
|
-
return textShapeChange(textSelected.shapeType, true);
|
9179
|
-
case 9:
|
9180
9343
|
canvas.renderAll();
|
9181
|
-
|
9182
|
-
brNew.left = _activeObj2.left;
|
9183
|
-
brNew.width = _activeObj2.width;
|
9184
|
-
brNew.top = _activeObj2.top;
|
9185
|
-
brNew.height = _activeObj2.height;
|
9186
|
-
_context3.next = 18;
|
9187
|
-
break;
|
9188
|
-
case 17:
|
9189
|
-
brNew = textSelected.getBoundingRect();
|
9190
|
-
case 18:
|
9191
|
-
textSelected.setCoords();
|
9192
|
-
// canvas.renderAll();
|
9193
|
-
_context3.next = 4;
|
9194
|
-
break;
|
9195
|
-
case 21:
|
9344
|
+
case 6:
|
9196
9345
|
case "end":
|
9197
9346
|
return _context3.stop();
|
9198
9347
|
}
|
@@ -9309,71 +9458,67 @@ var Rightmenu = function Rightmenu() {
|
|
9309
9458
|
// // setSliderValue(event.target.value);
|
9310
9459
|
// }
|
9311
9460
|
// };
|
9312
|
-
|
9313
|
-
|
9314
|
-
|
9315
|
-
|
9316
|
-
|
9317
|
-
|
9318
|
-
|
9319
|
-
|
9320
|
-
|
9321
|
-
|
9322
|
-
|
9323
|
-
|
9324
|
-
|
9325
|
-
|
9326
|
-
|
9327
|
-
|
9328
|
-
|
9329
|
-
|
9330
|
-
|
9331
|
-
|
9332
|
-
|
9333
|
-
|
9334
|
-
|
9335
|
-
|
9336
|
-
|
9337
|
-
|
9338
|
-
brNew.top = _activeObj3.top;
|
9339
|
-
brNew.height = _activeObj3.height;
|
9340
|
-
_context5.next = 17;
|
9341
|
-
break;
|
9342
|
-
case 16:
|
9343
|
-
brNew = textSelected.getBoundingRect();
|
9344
|
-
case 17:
|
9345
|
-
textSelected.setCoords();
|
9346
|
-
canvas.renderAll();
|
9347
|
-
_context5.next = 3;
|
9348
|
-
break;
|
9349
|
-
case 21:
|
9350
|
-
case "end":
|
9351
|
-
return _context5.stop();
|
9352
|
-
}
|
9353
|
-
}, _callee5);
|
9354
|
-
}));
|
9355
|
-
return function reduceLeft() {
|
9356
|
-
return _ref5.apply(this, arguments);
|
9357
|
-
};
|
9358
|
-
}();
|
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
|
+
// };
|
9359
9487
|
var fontChange = function fontChange(e) {
|
9360
9488
|
fontFamilies.map(function (item) {
|
9361
9489
|
if (item.name == e.target.value) {
|
9362
9490
|
var font = new FontFace(item.name, "url('" + item.src + "')");
|
9363
|
-
font.load().then(function (
|
9364
|
-
var
|
9365
|
-
|
9366
|
-
|
9367
|
-
|
9368
|
-
|
9369
|
-
|
9370
|
-
|
9371
|
-
|
9372
|
-
|
9373
|
-
|
9374
|
-
|
9375
|
-
|
9376
|
-
|
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
|
+
}());
|
9377
9522
|
}
|
9378
9523
|
});
|
9379
9524
|
};
|