@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.
- package/dist/logoeditor.cjs.development.js +314 -156
- 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 +314 -156
- package/dist/logoeditor.esm.js.map +1 -1
- package/package.json +1 -1
package/dist/logoeditor.esm.js
CHANGED
@@ -2795,8 +2795,19 @@ var fabricSlice = function fabricSlice(set, get) {
|
|
2795
2795
|
defaultColorFillCopy: dcf
|
2796
2796
|
});
|
2797
2797
|
},
|
2798
|
+
// updateModifaction: (toSet) => {
|
2799
|
+
// if (toSet) {
|
2800
|
+
// get().storeHistory.push(get().applyColorFill());
|
2801
|
+
// }
|
2802
|
+
// },
|
2798
2803
|
updateModifaction: function updateModifaction(toSet) {
|
2799
2804
|
if (toSet) {
|
2805
|
+
if (get().count > 1 && get().storeHistory.length > 1) {
|
2806
|
+
for (var i = 1; i < get().count; i++) {
|
2807
|
+
get().storeHistory.pop();
|
2808
|
+
}
|
2809
|
+
get().count = 1;
|
2810
|
+
}
|
2800
2811
|
get().storeHistory.push(get().applyColorFill());
|
2801
2812
|
}
|
2802
2813
|
},
|
@@ -3974,18 +3985,75 @@ var converterSlice = function converterSlice(set, get) {
|
|
3974
3985
|
fabric.loadSVGFromString(
|
3975
3986
|
//@ts-ignore
|
3976
3987
|
new String(svgstr), function (objects, options) {
|
3988
|
+
var svgData = getDesignConceptSVGData(svgstr);
|
3989
|
+
console.log(svgData);
|
3977
3990
|
var loadedObject = fabric.util.groupSVGElements(objects, options);
|
3978
|
-
|
3979
|
-
|
3991
|
+
svgData.forEach(function (resItem) {
|
3992
|
+
var path;
|
3993
|
+
var node;
|
3994
|
+
objects == null ? void 0 : objects.forEach(function (item) {
|
3995
|
+
//@ts-ignore
|
3996
|
+
// console.log(item.id, res[0].path.replace("#", ""));
|
3997
|
+
//@ts-ignore
|
3998
|
+
if (item.id === resItem.path) {
|
3999
|
+
path = item;
|
4000
|
+
//@ts-ignore
|
4001
|
+
} else if (item.id === resItem.element) {
|
4002
|
+
node = item;
|
4003
|
+
}
|
4004
|
+
});
|
4005
|
+
if (node && path) {
|
4006
|
+
var _resItem$node$childre, _resItem$node$childre2;
|
4007
|
+
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', '');
|
4008
|
+
console.log('fontSize', resItem.node.children[0], fontSize, path.top, path.left, path.textWidth, path.width);
|
4009
|
+
node.set({
|
4010
|
+
path: path,
|
4011
|
+
top: path.top,
|
4012
|
+
left: path.left,
|
4013
|
+
pathStartOffset: path.width * parseFloat(resItem.node.startOffset.baseVal.valueAsString) / 100,
|
4014
|
+
// fontFamily: resItem.node.children[0].getAttribute("font-family"),
|
4015
|
+
fontSize: fontSize || 25 //convertToFabricUnits("25px"),
|
4016
|
+
// charSpacing: resItem.node.getAttribute("letter-spacing") //convertToFabricUnits(resItem.node.getAttribute("letter-spacing")),
|
4017
|
+
// stroke: resItem.node.children[0].getAttribute("stroke"),
|
4018
|
+
// fill: '#040404'
|
4019
|
+
});
|
4020
|
+
|
4021
|
+
node.setCoords();
|
4022
|
+
}
|
4023
|
+
});
|
4024
|
+
// loadedObject.scaleToHeight(300);
|
4025
|
+
// loadedObject.scaleToWidth(300);
|
4026
|
+
var canvas = use3dddPlus.getState().popupCanv;
|
4027
|
+
var canvasWidth = canvas.width;
|
4028
|
+
var canvasHeight = canvas.height;
|
4029
|
+
var val = 300;
|
4030
|
+
if ((loadedObject.width <= 200 || loadedObject.height <= 200) && (loadedObject.minX === -0 || loadedObject.minX)) {
|
4031
|
+
val = 600;
|
4032
|
+
}
|
4033
|
+
if (Math.ceil(loadedObject.width + loadedObject.left + 45) >= Math.floor(canvasWidth)) {
|
4034
|
+
loadedObject.scaleToWidth(val);
|
4035
|
+
} else if (Math.ceil(loadedObject.height + loadedObject.top + 10) >= Math.floor(canvasHeight)) {
|
4036
|
+
loadedObject.scaleToHeight(val);
|
4037
|
+
} else if (Math.ceil(loadedObject.left) < 0) {
|
4038
|
+
loadedObject.scaleToWidth(val);
|
4039
|
+
} else if (Math.ceil(loadedObject.top) < 0) {
|
4040
|
+
loadedObject.scaleToHeight(val);
|
4041
|
+
} else if (loadedObject.width < 200 || loadedObject.height < 200) {
|
4042
|
+
loadedObject.scaleToWidth(val);
|
4043
|
+
}
|
3980
4044
|
//@ts-ignore
|
3981
4045
|
var objImage = loadedObject == null ? void 0 : loadedObject._objects;
|
3982
4046
|
var _Fills = [];
|
3983
4047
|
var fillCounts = {};
|
4048
|
+
var colorObjects = {};
|
3984
4049
|
if (objImage) {
|
3985
4050
|
objImage.forEach(function (ele) {
|
3986
4051
|
ele.set({
|
3987
4052
|
strokeWidth: 0
|
3988
4053
|
});
|
4054
|
+
ele.set({
|
4055
|
+
id: use3dddPlus.getState().guid()
|
4056
|
+
});
|
3989
4057
|
if (typeof ele.fill === "string" && ele.fill !== "") {
|
3990
4058
|
set({
|
3991
4059
|
fillColor: [].concat(ele.fill)
|
@@ -3993,6 +4061,13 @@ var converterSlice = function converterSlice(set, get) {
|
|
3993
4061
|
var fillColor = ele.fill.toString();
|
3994
4062
|
var pixelCount = ele.width * ele.height;
|
3995
4063
|
fillCounts[fillColor] = (fillCounts[fillColor] || 0) + pixelCount;
|
4064
|
+
if (colorObjects[fillColor]) {
|
4065
|
+
colorObjects[fillColor].objects.push(ele.get("id"));
|
4066
|
+
} else {
|
4067
|
+
colorObjects[fillColor] = {
|
4068
|
+
objects: [ele.get("id")]
|
4069
|
+
};
|
4070
|
+
}
|
3996
4071
|
}
|
3997
4072
|
});
|
3998
4073
|
}
|
@@ -4003,12 +4078,17 @@ var converterSlice = function converterSlice(set, get) {
|
|
4003
4078
|
return fillCounts[b] - fillCounts[a];
|
4004
4079
|
});
|
4005
4080
|
var topColors = sortedFillColors.slice(0, colorValue);
|
4081
|
+
var colorObjectsHex = {};
|
4006
4082
|
topColors.map(function (e) {
|
4007
4083
|
if (e.search("#") === -1) {
|
4008
4084
|
var _C = get().RGBToHex(e);
|
4009
4085
|
_Fills.push(_C);
|
4086
|
+
colorObjects[e].hex = _C;
|
4087
|
+
colorObjectsHex[_C] = colorObjects[e];
|
4010
4088
|
} else {
|
4011
4089
|
_Fills.push(e);
|
4090
|
+
colorObjects[e].hex = e;
|
4091
|
+
colorObjectsHex[e] = colorObjects[e];
|
4012
4092
|
}
|
4013
4093
|
});
|
4014
4094
|
//@ts-ignore
|
@@ -4030,7 +4110,8 @@ var converterSlice = function converterSlice(set, get) {
|
|
4030
4110
|
defaultCF.push({
|
4031
4111
|
property: cf,
|
4032
4112
|
"default": fillColors[cf],
|
4033
|
-
updated: fillColors[cf]
|
4113
|
+
updated: fillColors[cf],
|
4114
|
+
objects: colorObjectsHex[fillColors[cf]].objects
|
4034
4115
|
});
|
4035
4116
|
});
|
4036
4117
|
use3dddPlus.setState({
|
@@ -4089,10 +4170,10 @@ var converterSlice = function converterSlice(set, get) {
|
|
4089
4170
|
// backgroundRepeat: 'repeat',
|
4090
4171
|
// }
|
4091
4172
|
// );
|
4092
|
-
|
4173
|
+
// const canvas = use3dddPlus.getState().popupCanv;
|
4093
4174
|
var gridSize = 15; // Size of each grid cell
|
4094
|
-
var canvasWidth = canvas.width;
|
4095
|
-
var canvasHeight = canvas.height;
|
4175
|
+
// var canvasWidth = canvas.width;
|
4176
|
+
// var canvasHeight = canvas.height;
|
4096
4177
|
var numCols = Math.ceil(canvasWidth / gridSize);
|
4097
4178
|
var numRows = Math.ceil(canvasHeight / gridSize);
|
4098
4179
|
// Function to create a rectangle with checkerboard pattern
|
@@ -4159,6 +4240,45 @@ var converterSlice = function converterSlice(set, get) {
|
|
4159
4240
|
use3dddPlus.getState().popUpCanvasUpdateModification(true);
|
4160
4241
|
});
|
4161
4242
|
};
|
4243
|
+
// function convertToFabricUnits(valueWithUnit, canvasHeight = 500) {
|
4244
|
+
// // Parse the value and unit from the string
|
4245
|
+
// const matches = valueWithUnit.match(/^([\d.]+)(\D+)$/);
|
4246
|
+
// if (!matches) {
|
4247
|
+
// throw new Error("Invalid value format. Value must be in the format 'numberunit', e.g., '10px'.");
|
4248
|
+
// }
|
4249
|
+
// const value = parseFloat(matches[1]);
|
4250
|
+
// const unit = matches[2];
|
4251
|
+
// // Define conversion ratios for different units
|
4252
|
+
// const conversionTable = {
|
4253
|
+
// 'px': 1,
|
4254
|
+
// 'em': 16, // Assuming 1em = 16px (default browser font size)
|
4255
|
+
// 'rem': 16, // Same as em
|
4256
|
+
// 'vh': canvasHeight / 100 // 1vh is 1% of canvas height
|
4257
|
+
// };
|
4258
|
+
// // Convert the value to pixels
|
4259
|
+
// if (unit in conversionTable) {
|
4260
|
+
// return value * conversionTable[unit];
|
4261
|
+
// } else {
|
4262
|
+
// throw new Error("Unsupported unit. Supported units are 'px', 'em', 'rem', 'vh'.");
|
4263
|
+
// }
|
4264
|
+
// }
|
4265
|
+
var getDesignConceptSVGData = function getDesignConceptSVGData(svgData) {
|
4266
|
+
var parser = new DOMParser();
|
4267
|
+
var xmlDoc = parser.parseFromString(svgData, 'image/svg+xml');
|
4268
|
+
var textElements = xmlDoc.querySelectorAll('textPath');
|
4269
|
+
var href = [];
|
4270
|
+
textElements.forEach(function (textElement) {
|
4271
|
+
var _textElement$getAttri, _textElement$parentNo;
|
4272
|
+
var hrefValue = (_textElement$getAttri = textElement == null ? void 0 : textElement.getAttribute('xlink:href')) != null ? _textElement$getAttri : textElement == null ? void 0 : textElement.getAttribute('href');
|
4273
|
+
if (hrefValue) href.push({
|
4274
|
+
path: hrefValue.replace('#', ''),
|
4275
|
+
//@ts-ignore
|
4276
|
+
element: textElement == null ? void 0 : (_textElement$parentNo = textElement.parentNode) == null ? void 0 : _textElement$parentNo.id,
|
4277
|
+
node: textElement
|
4278
|
+
});
|
4279
|
+
});
|
4280
|
+
return href;
|
4281
|
+
};
|
4162
4282
|
return {
|
4163
4283
|
fillColor: [],
|
4164
4284
|
file: {},
|
@@ -4353,7 +4473,7 @@ var converterSlice = function converterSlice(set, get) {
|
|
4353
4473
|
changeSVGColor: function changeSVGColor(property, color) {
|
4354
4474
|
use3dddPlus.getState().popUpCanvasUpdateModification(true);
|
4355
4475
|
var fillColor = _extends({}, use3dddPlus.getState().colorFill);
|
4356
|
-
|
4476
|
+
// const previousColor = fillColor[property];
|
4357
4477
|
//const SelectedObjet = use3dddPlus.getState().activeSelection;
|
4358
4478
|
// console.log("Color_CHANGING--->",SelectedObjet.colorFill);
|
4359
4479
|
// let _newObj = SelectedObjet.colorFill;
|
@@ -4375,27 +4495,45 @@ var converterSlice = function converterSlice(set, get) {
|
|
4375
4495
|
// .getState()
|
4376
4496
|
// .popupCanv.getActiveObject()._objects;
|
4377
4497
|
if (use3dddPlus.getState().loadedObject) {
|
4378
|
-
|
4379
|
-
objImage.
|
4380
|
-
|
4381
|
-
|
4382
|
-
|
4498
|
+
// let objImage1 = use3dddPlus.getState().popupCanv.getObjects();
|
4499
|
+
var objImage = use3dddPlus.getState().popupCanv.getActiveObject();
|
4500
|
+
if (objImage && objImage._objects) {
|
4501
|
+
objImage._objects.forEach(function (ele) {
|
4502
|
+
var defaultColorObject = null;
|
4503
|
+
if (use3dddPlus.getState().defaultColorFill) {
|
4504
|
+
defaultColorObject = use3dddPlus.getState().defaultColorFill.find(function (dcf) {
|
4505
|
+
return dcf.property === property;
|
4506
|
+
});
|
4507
|
+
}
|
4508
|
+
if (ele.id && defaultColorObject && defaultColorObject.objects && defaultColorObject.objects.includes(ele.id) && typeof ele.fill === "string" && ele.fill !== "") {
|
4509
|
+
// const _C = (ele.fill === 'transparent' || (typeof ele.fill === 'string' && ele.fill.includes('#')) ? ele.fill : get().RGBToHex(ele.fill));
|
4510
|
+
// if (_C === previousColor) {
|
4383
4511
|
ele.set({
|
4384
4512
|
fill: color
|
4385
4513
|
});
|
4514
|
+
// }
|
4386
4515
|
}
|
4387
|
-
|
4388
|
-
|
4389
|
-
|
4390
|
-
|
4391
|
-
|
4392
|
-
|
4393
|
-
|
4394
|
-
|
4395
|
-
|
4396
|
-
|
4397
|
-
|
4398
|
-
|
4516
|
+
// if(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) {
|
4519
|
+
// ele.set({
|
4520
|
+
// fill: color,
|
4521
|
+
// });
|
4522
|
+
// }
|
4523
|
+
// }
|
4524
|
+
});
|
4525
|
+
|
4526
|
+
use3dddPlus.getState().popupCanv.renderAll();
|
4527
|
+
fillColor[property] = color;
|
4528
|
+
// Object.keys(fillColor).forEach((fc: any) => {
|
4529
|
+
// if(fillColor[fc] === previousColor){
|
4530
|
+
// fillColor[fc] = color;
|
4531
|
+
// }
|
4532
|
+
// });
|
4533
|
+
use3dddPlus.setState({
|
4534
|
+
colorFill: fillColor
|
4535
|
+
});
|
4536
|
+
}
|
4399
4537
|
return true;
|
4400
4538
|
} else {
|
4401
4539
|
return false;
|
@@ -5372,7 +5510,6 @@ var initCanvas = function initCanvas() {
|
|
5372
5510
|
});
|
5373
5511
|
canv.on('object:scaling', function (e) {
|
5374
5512
|
var obj = e.target;
|
5375
|
-
console.log("++++", e);
|
5376
5513
|
if (isNaN(e.pointer.x) || isNaN(e.pointer.y)) {
|
5377
5514
|
obj.set({
|
5378
5515
|
top: use3dddPlus.getState().lastPosition.top,
|
@@ -6495,10 +6632,14 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6495
6632
|
setColorFillCount(Object.keys(colorFill).length);
|
6496
6633
|
var defaultCF = [];
|
6497
6634
|
Object.keys(colorFill).map(function (cf) {
|
6635
|
+
var _defaultColorFill$fin;
|
6498
6636
|
defaultCF.push({
|
6499
6637
|
property: cf,
|
6500
6638
|
"default": colorFill[cf],
|
6501
|
-
updated: colorFill[cf]
|
6639
|
+
updated: colorFill[cf],
|
6640
|
+
objects: (_defaultColorFill$fin = defaultColorFill.find(function (dcf) {
|
6641
|
+
return dcf.property === cf;
|
6642
|
+
})) == null ? void 0 : _defaultColorFill$fin.objects
|
6502
6643
|
});
|
6503
6644
|
});
|
6504
6645
|
setDefaultColorFill(defaultCF);
|
@@ -6535,21 +6676,20 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6535
6676
|
// }
|
6536
6677
|
if (changeSVGColor(property, color)) {
|
6537
6678
|
setDefaultColorFill(defaultColorFill.map(function (c) {
|
6538
|
-
return (
|
6539
|
-
|
6540
|
-
|
6541
|
-
|
6542
|
-
|
6543
|
-
|
6544
|
-
|
6679
|
+
return c.property === property ? _extends({}, c, {
|
6680
|
+
updated: color
|
6681
|
+
}) : c;
|
6682
|
+
}
|
6683
|
+
// colorFill[property] === c.updated ? { ...c, updated: color } : c
|
6684
|
+
));
|
6685
|
+
|
6545
6686
|
setDefaultColorFillCopy(defaultColorFillCopy.map(function (c) {
|
6546
|
-
return (
|
6547
|
-
|
6548
|
-
|
6549
|
-
|
6550
|
-
|
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
|
+
));
|
6553
6693
|
}
|
6554
6694
|
};
|
6555
6695
|
// const colors = [
|
@@ -8753,7 +8893,7 @@ var Rightmenu = function Rightmenu() {
|
|
8753
8893
|
};
|
8754
8894
|
var textShapeChange = /*#__PURE__*/function () {
|
8755
8895
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e, textChange, fontSize, charSpacing, strokeWidth, fontWeight, textAlign, fontStyle) {
|
8756
|
-
var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims
|
8896
|
+
var pathData, p, shapeType, text, _text, fabricPath, dims, newTextPath, activeObj, _dims;
|
8757
8897
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
8758
8898
|
while (1) switch (_context2.prev = _context2.next) {
|
8759
8899
|
case 0:
|
@@ -9076,27 +9216,30 @@ var Rightmenu = function Rightmenu() {
|
|
9076
9216
|
updateStoreAllObject(newTextPath);
|
9077
9217
|
}
|
9078
9218
|
canvas.renderAll();
|
9079
|
-
|
9219
|
+
// setTimeout(() => {
|
9220
|
+
// reduceFontSize();
|
9221
|
+
// }, 500);
|
9222
|
+
reduceFontSize();
|
9223
|
+
// canvas.renderAll();
|
9224
|
+
// let brNew = use3dddPlus.getState().activeSelection.getBoundingRect();
|
9225
|
+
// while (
|
9226
|
+
// Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvas.width) ||
|
9227
|
+
// Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvas.height) ||
|
9228
|
+
// Math.ceil(brNew.left) < 0 ||
|
9229
|
+
// Math.ceil(brNew.top) < 0
|
9230
|
+
// ) {
|
9231
|
+
// textSelected.set('fontSize', textSelected.fontSize - 0.1);
|
9232
|
+
// canvas.remove(canvas.getActiveObject());
|
9233
|
+
// await textShapeChange(textSelected.shapeType, true);
|
9234
|
+
// const activeObj = canvas.getActiveObject();
|
9235
|
+
// brNew.left = activeObj.left;
|
9236
|
+
// brNew.width = activeObj.width;
|
9237
|
+
// brNew.top = activeObj.top;
|
9238
|
+
// brNew.height = activeObj.height;
|
9239
|
+
// textSelected.setCoords();
|
9240
|
+
// canvas.renderAll();
|
9241
|
+
// }
|
9080
9242
|
case 103:
|
9081
|
-
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)) {
|
9082
|
-
_context2.next = 117;
|
9083
|
-
break;
|
9084
|
-
}
|
9085
|
-
textSelected.set('fontSize', textSelected.fontSize - 0.1);
|
9086
|
-
canvas.remove(canvas.getActiveObject());
|
9087
|
-
_context2.next = 108;
|
9088
|
-
return textShapeChange(textSelected.shapeType, true);
|
9089
|
-
case 108:
|
9090
|
-
_activeObj = canvas.getActiveObject();
|
9091
|
-
brNew.left = _activeObj.left;
|
9092
|
-
brNew.width = _activeObj.width;
|
9093
|
-
brNew.top = _activeObj.top;
|
9094
|
-
brNew.height = _activeObj.height;
|
9095
|
-
textSelected.setCoords();
|
9096
|
-
canvas.renderAll();
|
9097
|
-
_context2.next = 103;
|
9098
|
-
break;
|
9099
|
-
case 117:
|
9100
9243
|
case "end":
|
9101
9244
|
return _context2.stop();
|
9102
9245
|
}
|
@@ -9141,9 +9284,44 @@ var Rightmenu = function Rightmenu() {
|
|
9141
9284
|
return;
|
9142
9285
|
}
|
9143
9286
|
};
|
9287
|
+
/*
|
9288
|
+
const reduceFontSize = async () => {
|
9289
|
+
let brNew = textSelected.getBoundingRect();
|
9290
|
+
let canvasWidth = 0;
|
9291
|
+
let canvasHeight = 0;
|
9292
|
+
if (textSelected && textSelected.canvas && textSelected.canvas.width) {
|
9293
|
+
canvasWidth = textSelected.canvas.width;
|
9294
|
+
canvasHeight = textSelected.canvas.height;
|
9295
|
+
} else {
|
9296
|
+
canvasWidth = canvas.width;
|
9297
|
+
canvasHeight = canvas.height;
|
9298
|
+
}
|
9299
|
+
while (
|
9300
|
+
Math.ceil(brNew.width + brNew.left + 45) > Math.floor(canvasWidth) ||
|
9301
|
+
Math.ceil(brNew.height + brNew.top + 10) > Math.floor(canvasHeight) ||
|
9302
|
+
Math.ceil(brNew.left) < 0 ||
|
9303
|
+
Math.ceil(brNew.top) < 0
|
9304
|
+
) {
|
9305
|
+
textSelected.set('fontSize', textSelected.fontSize - 0.1);
|
9306
|
+
if (currentSelection === 'path') {
|
9307
|
+
await textShapeChange(textSelected.shapeType, true);
|
9308
|
+
canvas.renderAll();
|
9309
|
+
const activeObj = canvas.getActiveObject();
|
9310
|
+
brNew.left = activeObj.left;
|
9311
|
+
brNew.width = activeObj.width;
|
9312
|
+
brNew.top = activeObj.top;
|
9313
|
+
brNew.height = activeObj.height;
|
9314
|
+
} else {
|
9315
|
+
brNew = textSelected.getBoundingRect();
|
9316
|
+
}
|
9317
|
+
textSelected.setCoords();
|
9318
|
+
// canvas.renderAll();
|
9319
|
+
}
|
9320
|
+
};
|
9321
|
+
*/
|
9144
9322
|
var reduceFontSize = /*#__PURE__*/function () {
|
9145
9323
|
var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
|
9146
|
-
var brNew, canvasWidth, canvasHeight,
|
9324
|
+
var brNew, canvasWidth, canvasHeight, _activeObj;
|
9147
9325
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
9148
9326
|
while (1) switch (_context3.prev = _context3.next) {
|
9149
9327
|
case 0:
|
@@ -9157,35 +9335,16 @@ var Rightmenu = function Rightmenu() {
|
|
9157
9335
|
canvasWidth = canvas.width;
|
9158
9336
|
canvasHeight = canvas.height;
|
9159
9337
|
}
|
9160
|
-
|
9161
|
-
|
9162
|
-
|
9163
|
-
|
9164
|
-
|
9165
|
-
|
9166
|
-
|
9167
|
-
_context3.next = 17;
|
9168
|
-
break;
|
9338
|
+
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) {
|
9339
|
+
_activeObj = canvas.getActiveObject();
|
9340
|
+
_activeObj.scale(_activeObj.scaleX * 0.99);
|
9341
|
+
_activeObj.setCoords();
|
9342
|
+
_activeObj = canvas.getActiveObject();
|
9343
|
+
brNew = _activeObj.getBoundingRect();
|
9344
|
+
canvas.renderAll();
|
9169
9345
|
}
|
9170
|
-
_context3.next = 9;
|
9171
|
-
return textShapeChange(textSelected.shapeType, true);
|
9172
|
-
case 9:
|
9173
9346
|
canvas.renderAll();
|
9174
|
-
|
9175
|
-
brNew.left = _activeObj2.left;
|
9176
|
-
brNew.width = _activeObj2.width;
|
9177
|
-
brNew.top = _activeObj2.top;
|
9178
|
-
brNew.height = _activeObj2.height;
|
9179
|
-
_context3.next = 18;
|
9180
|
-
break;
|
9181
|
-
case 17:
|
9182
|
-
brNew = textSelected.getBoundingRect();
|
9183
|
-
case 18:
|
9184
|
-
textSelected.setCoords();
|
9185
|
-
// canvas.renderAll();
|
9186
|
-
_context3.next = 4;
|
9187
|
-
break;
|
9188
|
-
case 21:
|
9347
|
+
case 6:
|
9189
9348
|
case "end":
|
9190
9349
|
return _context3.stop();
|
9191
9350
|
}
|
@@ -9224,10 +9383,10 @@ var Rightmenu = function Rightmenu() {
|
|
9224
9383
|
canvas.renderAll();
|
9225
9384
|
reduceFontSize();
|
9226
9385
|
canvas.renderAll();
|
9227
|
-
|
9386
|
+
use3dddPlus.getState().updateModifaction(true);
|
9228
9387
|
use3dddPlus.getState().forIconCapture();
|
9229
9388
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
9230
|
-
case
|
9389
|
+
case 15:
|
9231
9390
|
case "end":
|
9232
9391
|
return _context4.stop();
|
9233
9392
|
}
|
@@ -9244,7 +9403,7 @@ var Rightmenu = function Rightmenu() {
|
|
9244
9403
|
if (currentSelection === 'path') {
|
9245
9404
|
textShapeChange(textSelected.shapeType, true);
|
9246
9405
|
}
|
9247
|
-
|
9406
|
+
use3dddPlus.getState().updateModifaction(true);
|
9248
9407
|
use3dddPlus.getState().forIconCapture();
|
9249
9408
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
9250
9409
|
canvas.renderAll();
|
@@ -9302,71 +9461,68 @@ var Rightmenu = function Rightmenu() {
|
|
9302
9461
|
// // setSliderValue(event.target.value);
|
9303
9462
|
// }
|
9304
9463
|
// };
|
9305
|
-
|
9306
|
-
|
9307
|
-
|
9308
|
-
|
9309
|
-
|
9310
|
-
|
9311
|
-
|
9312
|
-
|
9313
|
-
|
9314
|
-
|
9315
|
-
|
9316
|
-
|
9317
|
-
|
9318
|
-
|
9319
|
-
|
9320
|
-
|
9321
|
-
|
9322
|
-
|
9323
|
-
|
9324
|
-
|
9325
|
-
|
9326
|
-
|
9327
|
-
|
9328
|
-
|
9329
|
-
|
9330
|
-
|
9331
|
-
brNew.top = _activeObj3.top;
|
9332
|
-
brNew.height = _activeObj3.height;
|
9333
|
-
_context5.next = 17;
|
9334
|
-
break;
|
9335
|
-
case 16:
|
9336
|
-
brNew = textSelected.getBoundingRect();
|
9337
|
-
case 17:
|
9338
|
-
textSelected.setCoords();
|
9339
|
-
canvas.renderAll();
|
9340
|
-
_context5.next = 3;
|
9341
|
-
break;
|
9342
|
-
case 21:
|
9343
|
-
case "end":
|
9344
|
-
return _context5.stop();
|
9345
|
-
}
|
9346
|
-
}, _callee5);
|
9347
|
-
}));
|
9348
|
-
return function reduceLeft() {
|
9349
|
-
return _ref5.apply(this, arguments);
|
9350
|
-
};
|
9351
|
-
}();
|
9464
|
+
// const reduceLeft = async () => {
|
9465
|
+
// const canvasWidth = textSelected.canvas.width;
|
9466
|
+
// const canvasHeight = textSelected.canvas.height;
|
9467
|
+
// let brNew = textSelected.getBoundingRect();
|
9468
|
+
// while (
|
9469
|
+
// Math.ceil(brNew.width + brNew.left + 45) >= Math.floor(canvasWidth) ||
|
9470
|
+
// Math.ceil(brNew.height + brNew.top + 10) >= Math.floor(canvasHeight) ||
|
9471
|
+
// Math.ceil(brNew.left) < 0 ||
|
9472
|
+
// Math.ceil(brNew.top) < 0
|
9473
|
+
// ) {
|
9474
|
+
// textSelected.set('fontSize', textSelected.fontSize - 0.1);
|
9475
|
+
// if (currentSelection === 'path') {
|
9476
|
+
// await textShapeChange(textSelected.shapeType, true);
|
9477
|
+
// canvas.renderAll();
|
9478
|
+
// const activeObj = canvas.getActiveObject();
|
9479
|
+
// brNew.left = activeObj.left;
|
9480
|
+
// brNew.width = activeObj.width;
|
9481
|
+
// brNew.top = activeObj.top;
|
9482
|
+
// brNew.height = activeObj.height;
|
9483
|
+
// } else {
|
9484
|
+
// brNew = textSelected.getBoundingRect();
|
9485
|
+
// }
|
9486
|
+
// textSelected.setCoords();
|
9487
|
+
// canvas.renderAll();
|
9488
|
+
// }
|
9489
|
+
// };
|
9352
9490
|
var fontChange = function fontChange(e) {
|
9353
9491
|
fontFamilies.map(function (item) {
|
9354
9492
|
if (item.name == e.target.value) {
|
9355
9493
|
var font = new FontFace(item.name, "url('" + item.src + "')");
|
9356
|
-
font.load().then(function (
|
9357
|
-
var
|
9358
|
-
|
9359
|
-
|
9360
|
-
|
9361
|
-
|
9362
|
-
|
9363
|
-
|
9364
|
-
|
9365
|
-
|
9366
|
-
|
9367
|
-
|
9368
|
-
|
9369
|
-
|
9494
|
+
font.load().then( /*#__PURE__*/function () {
|
9495
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value) {
|
9496
|
+
var _document$fonts;
|
9497
|
+
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
9498
|
+
while (1) switch (_context5.prev = _context5.next) {
|
9499
|
+
case 0:
|
9500
|
+
//@ts-ignore
|
9501
|
+
(_document$fonts = document.fonts) == null ? void 0 : _document$fonts.add(value);
|
9502
|
+
document.body.classList.add('fonts-loaded');
|
9503
|
+
textSelected.set('fontFamily', item.name);
|
9504
|
+
if (!(currentSelection === 'path')) {
|
9505
|
+
_context5.next = 6;
|
9506
|
+
break;
|
9507
|
+
}
|
9508
|
+
_context5.next = 6;
|
9509
|
+
return textShapeChange(textSelected.shapeType, true);
|
9510
|
+
case 6:
|
9511
|
+
canvas.renderAll();
|
9512
|
+
use3dddPlus.getState().forIconCapture();
|
9513
|
+
textSelected.icon = use3dddPlus.getState().iconImage;
|
9514
|
+
reduceFontSize();
|
9515
|
+
use3dddPlus.getState().updateModifaction(true);
|
9516
|
+
case 11:
|
9517
|
+
case "end":
|
9518
|
+
return _context5.stop();
|
9519
|
+
}
|
9520
|
+
}, _callee5);
|
9521
|
+
}));
|
9522
|
+
return function (_x11) {
|
9523
|
+
return _ref5.apply(this, arguments);
|
9524
|
+
};
|
9525
|
+
}());
|
9370
9526
|
}
|
9371
9527
|
});
|
9372
9528
|
};
|
@@ -9409,7 +9565,7 @@ var Rightmenu = function Rightmenu() {
|
|
9409
9565
|
if (currentSelection === 'path') {
|
9410
9566
|
textShapeChange(textSelected.shapeType, true);
|
9411
9567
|
}
|
9412
|
-
|
9568
|
+
use3dddPlus.getState().updateModifaction(true);
|
9413
9569
|
use3dddPlus.getState().forIconCapture();
|
9414
9570
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
9415
9571
|
canvas.renderAll();
|
@@ -9434,7 +9590,7 @@ var Rightmenu = function Rightmenu() {
|
|
9434
9590
|
if (currentSelection === 'path') {
|
9435
9591
|
textShapeChange(textSelected.shapeType, true);
|
9436
9592
|
}
|
9437
|
-
|
9593
|
+
use3dddPlus.getState().updateModifaction(true);
|
9438
9594
|
use3dddPlus.getState().forIconCapture();
|
9439
9595
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
9440
9596
|
canvas.renderAll();
|
@@ -9447,13 +9603,13 @@ var Rightmenu = function Rightmenu() {
|
|
9447
9603
|
if (currentSelection === 'path') {
|
9448
9604
|
textShapeChange(textSelected.shapeType, true);
|
9449
9605
|
}
|
9450
|
-
// use3dddPlus.getState().updateModifaction(true);
|
9451
9606
|
use3dddPlus.getState().forIconCapture();
|
9452
9607
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
9453
9608
|
var _brNew = textSelected.getBoundingRect();
|
9454
9609
|
if (_brNew.width + _brNew.left + 45 >= dublicateText.canvas.width || _brNew.height + _brNew.top >= dublicateText.canvas.height || _brNew.left < 0 || _brNew.top < 0) {
|
9455
9610
|
textSelected.charSpacing = oldCharSpacing;
|
9456
9611
|
}
|
9612
|
+
use3dddPlus.getState().updateModifaction(true);
|
9457
9613
|
canvas.renderAll();
|
9458
9614
|
if (textSelected.aCoords.tr.x > 480) {
|
9459
9615
|
return;
|
@@ -9486,6 +9642,7 @@ var Rightmenu = function Rightmenu() {
|
|
9486
9642
|
}
|
9487
9643
|
canvas.sendToBack(use3dddPlus.getState().verticalLine);
|
9488
9644
|
canvas.sendToBack(use3dddPlus.getState().horizontalLine);
|
9645
|
+
use3dddPlus.getState().updateModifaction(true);
|
9489
9646
|
};
|
9490
9647
|
var changeArr = function changeArr(arr, fromIndex, toIndex) {
|
9491
9648
|
var element = arr.splice(fromIndex, 1)[0];
|
@@ -9495,6 +9652,7 @@ var Rightmenu = function Rightmenu() {
|
|
9495
9652
|
var deleteElement = function deleteElement(item) {
|
9496
9653
|
canvas.remove(item);
|
9497
9654
|
canvas.requestRenderAll();
|
9655
|
+
use3dddPlus.getState().updateModifaction(true);
|
9498
9656
|
removeItem(item);
|
9499
9657
|
};
|
9500
9658
|
var removeItem = function removeItem(value) {
|