@threedddplus/logoeditor 0.0.86 → 0.0.87
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 +247 -116
- 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 +247 -116
- package/dist/logoeditor.esm.js.map +1 -1
- package/package.json +1 -1
package/dist/logoeditor.esm.js
CHANGED
@@ -4687,6 +4687,7 @@ var initCanvas = function initCanvas() {
|
|
4687
4687
|
getAllColors();
|
4688
4688
|
};
|
4689
4689
|
var onObjectMoving = function onObjectMoving(e) {
|
4690
|
+
console.log(e);
|
4690
4691
|
use3dddPlus.getState().updateModifaction(false);
|
4691
4692
|
var obj = e.target;
|
4692
4693
|
// if (
|
@@ -4696,18 +4697,18 @@ var initCanvas = function initCanvas() {
|
|
4696
4697
|
// return;
|
4697
4698
|
// }
|
4698
4699
|
obj.setCoords();
|
4699
|
-
if (obj.getBoundingRect().top <
|
4700
|
-
obj.top = Math.max(obj.top, obj.top - obj.getBoundingRect().top);
|
4701
|
-
obj.left = Math.max(obj.left, obj.left - obj.getBoundingRect().left);
|
4700
|
+
if (obj.getBoundingRect().top < 10 || obj.getBoundingRect().left < 45) {
|
4701
|
+
obj.top = Math.max(obj.top, obj.top - obj.getBoundingRect().top + 10);
|
4702
|
+
obj.left = Math.max(obj.left, obj.left - obj.getBoundingRect().left + 45);
|
4702
4703
|
obj.setCoords();
|
4703
4704
|
}
|
4704
|
-
if (obj.getBoundingRect().top + obj.getBoundingRect().height > obj.canvas.height || obj.getBoundingRect().left + obj.getBoundingRect().width > obj.canvas.width) {
|
4705
|
-
obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top);
|
4706
|
-
obj.left = Math.min(obj.left, obj.canvas.width - obj.getBoundingRect().width + obj.left - obj.getBoundingRect().left);
|
4705
|
+
if (obj.getBoundingRect().top + obj.getBoundingRect().height + 10 > obj.canvas.height || obj.getBoundingRect().left + obj.getBoundingRect().width + 45 > obj.canvas.width) {
|
4706
|
+
obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top - 10);
|
4707
|
+
obj.left = Math.min(obj.left, obj.canvas.width - obj.getBoundingRect().width + obj.left - obj.getBoundingRect().left - 45);
|
4707
4708
|
obj.setCoords();
|
4708
4709
|
}
|
4709
4710
|
var brNew = obj.getBoundingRect();
|
4710
|
-
if (brNew.width + brNew.left >= obj.canvas.width || brNew.height + brNew.top >= obj.canvas.height || brNew.left <
|
4711
|
+
if (brNew.width + brNew.left + 45 >= obj.canvas.width || brNew.height + brNew.top + 10 >= obj.canvas.height || brNew.left < 45 || brNew.top < 10) ; else {
|
4711
4712
|
left1 = obj.left;
|
4712
4713
|
top1 = obj.top;
|
4713
4714
|
scale1x = obj.scaleX;
|
@@ -4778,14 +4779,14 @@ var initCanvas = function initCanvas() {
|
|
4778
4779
|
return Math.abs(scaledObjCenterX - canvasCenterX) < threshold;
|
4779
4780
|
}
|
4780
4781
|
var horizontalLine = new fabric.Line([0, canv.height / 2, canv.height, canv.height / 2], {
|
4781
|
-
stroke:
|
4782
|
+
stroke: 'red',
|
4782
4783
|
scaleX: 11,
|
4783
4784
|
visible: false,
|
4784
4785
|
selectable: false,
|
4785
4786
|
type: 'line'
|
4786
4787
|
});
|
4787
4788
|
var verticalLine = new fabric.Line([canv.width / 2, 0, canv.width / 2, canv.width], {
|
4788
|
-
stroke:
|
4789
|
+
stroke: 'red',
|
4789
4790
|
visible: false,
|
4790
4791
|
selectable: false,
|
4791
4792
|
type: 'line'
|
@@ -4906,13 +4907,14 @@ var initCanvas = function initCanvas() {
|
|
4906
4907
|
}
|
4907
4908
|
|
4908
4909
|
var removeItem = function removeItem(value) {
|
4909
|
-
//@ts-ignore
|
4910
|
+
//@ts-ignore
|
4910
4911
|
var index = use3dddPlus.getState().storeAllObject.findIndex(function (obj) {
|
4911
4912
|
return obj.id === value.id;
|
4912
4913
|
});
|
4913
4914
|
if (index === -1 && value && value._objects && value._objects.length > 0) {
|
4915
|
+
var index = use3dddPlus.getState()
|
4914
4916
|
//@ts-ignore
|
4915
|
-
|
4917
|
+
.storeAllObject.indexOf(value._objects[0]);
|
4916
4918
|
}
|
4917
4919
|
if (index > -1) {
|
4918
4920
|
use3dddPlus.getState().storeAllObject.splice(index, 1);
|
@@ -4978,6 +4980,7 @@ var initCanvas = function initCanvas() {
|
|
4978
4980
|
canv.on('selection:updated', onObjectUpdated);
|
4979
4981
|
canv.on('object:moving', onObjectMoving);
|
4980
4982
|
canv.on('object:modified', function (e) {
|
4983
|
+
e.target.lockRotation = false;
|
4981
4984
|
use3dddPlus.getState().updateModifaction(true);
|
4982
4985
|
if (isObjectInCenter(e.target)) {
|
4983
4986
|
use3dddPlus.getState().verticalLine.set({
|
@@ -5011,7 +5014,7 @@ var initCanvas = function initCanvas() {
|
|
5011
5014
|
var obj = e.target;
|
5012
5015
|
obj.setCoords();
|
5013
5016
|
var brNew = obj.getBoundingRect();
|
5014
|
-
if (brNew.width + brNew.left >= obj.canvas.width || brNew.height + brNew.top >= obj.canvas.height || brNew.left <
|
5017
|
+
if (brNew.width + brNew.left + 45 >= obj.canvas.width || brNew.height + brNew.top + 10 >= obj.canvas.height || brNew.left < 45 || brNew.top < 10) {
|
5015
5018
|
obj.left = left1;
|
5016
5019
|
obj.top = top1;
|
5017
5020
|
obj.scaleX = scale1x;
|
@@ -5035,9 +5038,13 @@ var initCanvas = function initCanvas() {
|
|
5035
5038
|
obj.setCoords();
|
5036
5039
|
}
|
5037
5040
|
if (obj.getBoundingRect().top + obj.getBoundingRect().height > obj.canvas.height || obj.getBoundingRect().left + obj.getBoundingRect().width > obj.canvas.width) {
|
5038
|
-
|
5039
|
-
|
5040
|
-
|
5041
|
+
if (obj.getBoundingRect().top < 0 || obj.getBoundingRect().left < 0) {
|
5042
|
+
obj.lockRotation = true;
|
5043
|
+
} else {
|
5044
|
+
obj.top = Math.min(obj.top, obj.canvas.height - obj.getBoundingRect().height + obj.top - obj.getBoundingRect().top);
|
5045
|
+
obj.left = Math.min(obj.left, obj.canvas.width - obj.getBoundingRect().width + obj.left - obj.getBoundingRect().left);
|
5046
|
+
obj.setCoords();
|
5047
|
+
}
|
5041
5048
|
}
|
5042
5049
|
});
|
5043
5050
|
return canv;
|
@@ -5890,7 +5897,7 @@ var ColorPalette = function ColorPalette(_ref) {
|
|
5890
5897
|
};
|
5891
5898
|
return React.createElement(React.Fragment, null, React.createElement("div", {
|
5892
5899
|
id: "colorPalette",
|
5893
|
-
className: "right-[10.6rem] z-10 max-h-[16.4375rem] border border-[#FCE8EB] before:bg-[#ffffff] shadow-[0px_3px_6px_rgba(0,0,0,0.16)] py-[1.8125rem] px-[1.4063rem] bg-[#fff] mt-[1.875rem] mr-[1rem] absolute h-[300px]",
|
5900
|
+
className: "colorPalette right-[10.6rem] z-10 max-h-[16.4375rem] border border-[#FCE8EB] before:bg-[#ffffff] shadow-[0px_3px_6px_rgba(0,0,0,0.16)] py-[1.8125rem] px-[1.4063rem] bg-[#fff] mt-[1.875rem] mr-[1rem] absolute h-[300px]",
|
5894
5901
|
style: style
|
5895
5902
|
}, (colorList == null ? void 0 : colorList.length) > 0 && React.createElement(React.Fragment, null, React.createElement("p", {
|
5896
5903
|
className: TEXT_SIZE_9 + " leading-[1.125rem] font-bold pb-[1.125rem] text-left"
|
@@ -5956,24 +5963,6 @@ var ColorBox = function ColorBox(_ref2) {
|
|
5956
5963
|
};
|
5957
5964
|
|
5958
5965
|
var ColorImpl = function ColorImpl(props) {
|
5959
|
-
var _useState = useState(props.displayPallet ? true : false),
|
5960
|
-
displayPallet = _useState[0],
|
5961
|
-
setdisplayPallet = _useState[1];
|
5962
|
-
var _useState2 = useState(props.color),
|
5963
|
-
setColor = _useState2[1];
|
5964
|
-
var _useState3 = useState(props.position),
|
5965
|
-
position = _useState3[0],
|
5966
|
-
setPosition = _useState3[1];
|
5967
|
-
useEffect(function () {
|
5968
|
-
if (!displayPallet && props.onClose) {
|
5969
|
-
props.onClose();
|
5970
|
-
}
|
5971
|
-
}, [displayPallet]);
|
5972
|
-
var handleColorClick = function handleColorClick(color) {
|
5973
|
-
// console.log(color);
|
5974
|
-
setColor(color);
|
5975
|
-
props.handleChange(props.property, color);
|
5976
|
-
};
|
5977
5966
|
var getLable = function getLable(colorCode) {
|
5978
5967
|
var color = defaultColorNames.find(function (c) {
|
5979
5968
|
return colorCode === c.color;
|
@@ -5996,16 +5985,16 @@ var ColorImpl = function ColorImpl(props) {
|
|
5996
5985
|
onClick: function onClick(event) {
|
5997
5986
|
event.stopPropagation();
|
5998
5987
|
event.preventDefault();
|
5999
|
-
|
6000
|
-
|
5988
|
+
props.setDisplayPallet({
|
5989
|
+
visible: true,
|
5990
|
+
property: props.property,
|
5991
|
+
color: '',
|
5992
|
+
callback: props.callback
|
6001
5993
|
});
|
6002
|
-
setPosition({
|
5994
|
+
props.setPosition({
|
6003
5995
|
x: event.clientX,
|
6004
5996
|
y: event.clientY
|
6005
5997
|
});
|
6006
|
-
},
|
6007
|
-
onBlur: function onBlur() {
|
6008
|
-
return setdisplayPallet(false);
|
6009
5998
|
}
|
6010
5999
|
}, props.color === 'transparent' && React.createElement("div", {
|
6011
6000
|
style: {
|
@@ -6016,31 +6005,7 @@ var ColorImpl = function ColorImpl(props) {
|
|
6016
6005
|
marginLeft: '13px',
|
6017
6006
|
marginTop: '-6px'
|
6018
6007
|
}
|
6019
|
-
}, "\xA0")
|
6020
|
-
mainClass: "left-0 " + props.mClass,
|
6021
|
-
handleColorChange: handleColorClick,
|
6022
|
-
style: position ? {
|
6023
|
-
position: 'fixed',
|
6024
|
-
left: position.x - 450,
|
6025
|
-
top: position.y - 5,
|
6026
|
-
width: '450px'
|
6027
|
-
} : {}
|
6028
|
-
})
|
6029
|
-
// <div
|
6030
|
-
// className="absolute"
|
6031
|
-
// style={{ zIndex: '100' }}
|
6032
|
-
// tabIndex={0}
|
6033
|
-
// onBlur={() => setdisplayPallet(false)}
|
6034
|
-
// >
|
6035
|
-
// <ChromePicker
|
6036
|
-
// color={color.hex}
|
6037
|
-
// onChangeComplete={onChangeComplete}
|
6038
|
-
// onChange={onChangeComplete}
|
6039
|
-
// disableAlpha={true}
|
6040
|
-
// />
|
6041
|
-
// <hr />
|
6042
|
-
// </div>
|
6043
|
-
)));
|
6008
|
+
}, "\xA0"))));
|
6044
6009
|
};
|
6045
6010
|
|
6046
6011
|
var Initpopup = function Initpopup() {
|
@@ -6115,6 +6080,26 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6115
6080
|
isNextClicked = _useState4[0],
|
6116
6081
|
setIsNextClicked = _useState4[1];
|
6117
6082
|
var defaultColorFillRef = useRef([]);
|
6083
|
+
var _useState5 = useState({
|
6084
|
+
visible: false,
|
6085
|
+
property: '',
|
6086
|
+
color: '',
|
6087
|
+
callback: null
|
6088
|
+
}),
|
6089
|
+
displayPallet = _useState5[0],
|
6090
|
+
setDisplayPallet = _useState5[1];
|
6091
|
+
var _useState6 = useState(null),
|
6092
|
+
position = _useState6[0],
|
6093
|
+
setPosition = _useState6[1];
|
6094
|
+
useEffect(function () {
|
6095
|
+
if (!displayPallet || !displayPallet.visible) {
|
6096
|
+
setDefaultColorFill(defaultColorFill.map(function (cf) {
|
6097
|
+
return _extends({}, cf, {
|
6098
|
+
hasPallet: false
|
6099
|
+
});
|
6100
|
+
}));
|
6101
|
+
}
|
6102
|
+
}, [displayPallet]);
|
6118
6103
|
useEffect(function () {
|
6119
6104
|
defaultColorFillRef.current = defaultColorFill;
|
6120
6105
|
}, [defaultColorFill]);
|
@@ -6146,6 +6131,7 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6146
6131
|
}, 100);
|
6147
6132
|
}
|
6148
6133
|
}
|
6134
|
+
setColorFillCount(-1);
|
6149
6135
|
}, [colorFill]);
|
6150
6136
|
useEffect(function () {
|
6151
6137
|
if (colorFillCount && colorFillCount > 0) {
|
@@ -6213,10 +6199,12 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6213
6199
|
}
|
6214
6200
|
};
|
6215
6201
|
var removeColorPalatte = function removeColorPalatte() {
|
6216
|
-
|
6217
|
-
|
6218
|
-
|
6219
|
-
|
6202
|
+
setDisplayPallet({
|
6203
|
+
visible: false,
|
6204
|
+
property: '',
|
6205
|
+
color: '',
|
6206
|
+
callback: null
|
6207
|
+
});
|
6220
6208
|
};
|
6221
6209
|
useEffect(function () {
|
6222
6210
|
fabric.Object.prototype.hasControls = false;
|
@@ -6430,16 +6418,26 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6430
6418
|
x: event.clientX,
|
6431
6419
|
y: event.clientY
|
6432
6420
|
}
|
6433
|
-
}) : cf
|
6434
|
-
}));
|
6435
|
-
};
|
6436
|
-
var onClosePalette = function onClosePalette() {
|
6437
|
-
setDefaultColorFill(defaultColorFill.map(function (c) {
|
6438
|
-
return _extends({}, c, {
|
6421
|
+
}) : _extends({}, cf, {
|
6439
6422
|
hasPallet: false
|
6440
6423
|
});
|
6441
6424
|
}));
|
6425
|
+
setDisplayPallet({
|
6426
|
+
visible: true,
|
6427
|
+
property: item.property,
|
6428
|
+
color: item.updated,
|
6429
|
+
callback: onColorUpdate
|
6430
|
+
});
|
6431
|
+
setPosition({
|
6432
|
+
x: event.clientX,
|
6433
|
+
y: event.clientY
|
6434
|
+
});
|
6442
6435
|
};
|
6436
|
+
// const onClosePalette = () => {
|
6437
|
+
// setDefaultColorFill(
|
6438
|
+
// defaultColorFill.map((c: any) => ({ ...c, hasPallet: false }))
|
6439
|
+
// );
|
6440
|
+
// };
|
6443
6441
|
var onPopUpCanvasUndo = function onPopUpCanvasUndo() {
|
6444
6442
|
var colors = popUpCanvasUndo();
|
6445
6443
|
if (colors !== null) {
|
@@ -6625,9 +6623,10 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6625
6623
|
handleChange: onColorUpdate,
|
6626
6624
|
property: item.property,
|
6627
6625
|
color: item.updated,
|
6628
|
-
onClose
|
6629
|
-
|
6630
|
-
|
6626
|
+
// onClose={onClosePalette}
|
6627
|
+
setDisplayPallet: setDisplayPallet,
|
6628
|
+
setPosition: setPosition,
|
6629
|
+
callback: onColorUpdate
|
6631
6630
|
}) : React.createElement(IconButton, {
|
6632
6631
|
label: "Select Color",
|
6633
6632
|
icon: React.createElement(GiDrop, null),
|
@@ -6643,7 +6642,10 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6643
6642
|
handleChange: onColorUpdate,
|
6644
6643
|
property: item.property,
|
6645
6644
|
color: item.updated,
|
6646
|
-
onClose
|
6645
|
+
// onClose={onClosePalette}
|
6646
|
+
setDisplayPallet: setDisplayPallet,
|
6647
|
+
setPosition: setPosition,
|
6648
|
+
callback: onColorUpdate
|
6647
6649
|
})), React.createElement("span", {
|
6648
6650
|
className: "py-[5px] pl-[10px] pr-[6px] font-medium text-[13px] bg-[#F1F1F1]"
|
6649
6651
|
}, "Select Color")), React.createElement("span", {
|
@@ -6746,7 +6748,26 @@ var PopUpCanvas = function PopUpCanvas() {
|
|
6746
6748
|
style: {
|
6747
6749
|
marginTop: '10px'
|
6748
6750
|
}
|
6749
|
-
}, "Cancel")))))))))
|
6751
|
+
}, "Cancel"))))))))), displayPallet && displayPallet.visible && React.createElement(ColorPalette, {
|
6752
|
+
mainClass: "left-0",
|
6753
|
+
handleColorChange: function handleColorChange(color) {
|
6754
|
+
displayPallet.callback(displayPallet.property, color);
|
6755
|
+
setDisplayPallet({
|
6756
|
+
visible: false,
|
6757
|
+
property: '',
|
6758
|
+
color: '',
|
6759
|
+
callback: null
|
6760
|
+
});
|
6761
|
+
},
|
6762
|
+
style: position ? {
|
6763
|
+
position: 'fixed',
|
6764
|
+
left: position.x - 450,
|
6765
|
+
top: position.y - 5,
|
6766
|
+
width: '450px'
|
6767
|
+
} : {
|
6768
|
+
display: 'none'
|
6769
|
+
}
|
6770
|
+
}));
|
6750
6771
|
};
|
6751
6772
|
|
6752
6773
|
var UploadLogo = function UploadLogo() {
|
@@ -7996,6 +8017,17 @@ var Rightmenu = function Rightmenu() {
|
|
7996
8017
|
var _useState6 = useState(false),
|
7997
8018
|
isNextClicked = _useState6[0],
|
7998
8019
|
setIsNextClicked = _useState6[1];
|
8020
|
+
var _useState7 = useState({
|
8021
|
+
visible: false,
|
8022
|
+
property: '',
|
8023
|
+
color: '',
|
8024
|
+
callback: null
|
8025
|
+
}),
|
8026
|
+
displayPallet = _useState7[0],
|
8027
|
+
setDisplayPallet = _useState7[1];
|
8028
|
+
var _useState8 = useState(null),
|
8029
|
+
position = _useState8[0],
|
8030
|
+
setPosition = _useState8[1];
|
7999
8031
|
var tabs = [{
|
8000
8032
|
id: 1,
|
8001
8033
|
label: 'Properties'
|
@@ -8552,6 +8584,13 @@ var Rightmenu = function Rightmenu() {
|
|
8552
8584
|
// textSelected.set('text', use3dddPlus.getState().textInfo);
|
8553
8585
|
use3dddPlus.getState().forIconCapture();
|
8554
8586
|
textSelected.icon = use3dddPlus.getState().iconImage;
|
8587
|
+
var dublicateText = textSelected;
|
8588
|
+
var brNewD = textSelected.getBoundingRect();
|
8589
|
+
if (brNewD.width + brNewD.left + 45 >= dublicateText.canvas.width || brNewD.height + brNewD.top + 10 >= dublicateText.canvas.height || brNewD.left < 0 || brNewD.top < 0) {
|
8590
|
+
var newFontSize = canvasWidth / (brNew.width + brNew.left) * textSelected.fontSize;
|
8591
|
+
textSelected.set('fontSize', textSelected.fontSize - 3);
|
8592
|
+
}
|
8593
|
+
textSelected.setCoords();
|
8555
8594
|
canvas.renderAll();
|
8556
8595
|
use3dddPlus.getState().updateModifaction(true);
|
8557
8596
|
};
|
@@ -8580,7 +8619,7 @@ var Rightmenu = function Rightmenu() {
|
|
8580
8619
|
// brNew = dublicateText.getBoundingRect();
|
8581
8620
|
// }
|
8582
8621
|
var brNew = dublicateText.getBoundingRect();
|
8583
|
-
if (brNew.width + brNew.left >= textSelected.canvas.width || brNew.height + brNew.top >= textSelected.canvas.height || brNew.left <
|
8622
|
+
if (brNew.width + brNew.left + 45 >= textSelected.canvas.width || brNew.height + brNew.top + 10 >= textSelected.canvas.height || brNew.left < 45 || brNew.top < 10) {
|
8584
8623
|
if (currentSelection === 'path') {
|
8585
8624
|
textSelected.set('fontSize', event.target.value - (Math.sign(toReduceSize) >= 0 ? toReduceSize : 1));
|
8586
8625
|
textShapeChange(textSelected.shapeType, true);
|
@@ -8684,16 +8723,40 @@ var Rightmenu = function Rightmenu() {
|
|
8684
8723
|
};
|
8685
8724
|
var textSpacingHandler = function textSpacingHandler(e) {
|
8686
8725
|
// setSpacinglineVal(e.target.valueAsNumber);
|
8687
|
-
|
8688
|
-
|
8689
|
-
|
8690
|
-
|
8691
|
-
|
8692
|
-
|
8693
|
-
|
8694
|
-
|
8695
|
-
|
8696
|
-
|
8726
|
+
var dublicateText = textSelected;
|
8727
|
+
var oldCharSpacing = dublicateText.charSpacing;
|
8728
|
+
dublicateText.charSpacing = e.target.valueAsNumber;
|
8729
|
+
var brNew = dublicateText.getBoundingRect();
|
8730
|
+
if (brNew.width + brNew.left + 45 >= dublicateText.canvas.width || brNew.height + brNew.top >= dublicateText.canvas.height || brNew.left < 0 || brNew.top < 0) {
|
8731
|
+
if (textSelected.charSpacing > e.target.valueAsNumber) {
|
8732
|
+
textSelected.charSpacing = e.target.valueAsNumber;
|
8733
|
+
if (currentSelection === 'path') {
|
8734
|
+
textShapeChange(textSelected.shapeType, true);
|
8735
|
+
}
|
8736
|
+
use3dddPlus.getState().updateModifaction(true);
|
8737
|
+
use3dddPlus.getState().forIconCapture();
|
8738
|
+
textSelected.icon = use3dddPlus.getState().iconImage;
|
8739
|
+
canvas.renderAll();
|
8740
|
+
if (textSelected.aCoords.tr.x > 480) {
|
8741
|
+
return;
|
8742
|
+
}
|
8743
|
+
}
|
8744
|
+
} else {
|
8745
|
+
textSelected.charSpacing = e.target.valueAsNumber;
|
8746
|
+
if (currentSelection === 'path') {
|
8747
|
+
textShapeChange(textSelected.shapeType, true);
|
8748
|
+
}
|
8749
|
+
use3dddPlus.getState().updateModifaction(true);
|
8750
|
+
use3dddPlus.getState().forIconCapture();
|
8751
|
+
textSelected.icon = use3dddPlus.getState().iconImage;
|
8752
|
+
var _brNew = textSelected.getBoundingRect();
|
8753
|
+
if (_brNew.width + _brNew.left + 45 >= dublicateText.canvas.width || _brNew.height + _brNew.top >= dublicateText.canvas.height || _brNew.left < 0 || _brNew.top < 0) {
|
8754
|
+
textSelected.charSpacing = oldCharSpacing;
|
8755
|
+
}
|
8756
|
+
canvas.renderAll();
|
8757
|
+
if (textSelected.aCoords.tr.x > 480) {
|
8758
|
+
return;
|
8759
|
+
}
|
8697
8760
|
}
|
8698
8761
|
};
|
8699
8762
|
var textStyle = function textStyle(e, key, value) {
|
@@ -8757,6 +8820,17 @@ var Rightmenu = function Rightmenu() {
|
|
8757
8820
|
});
|
8758
8821
|
}
|
8759
8822
|
// canvas.renderAll();
|
8823
|
+
} else if (data.type === 'path') {
|
8824
|
+
var _C2 = data.fill;
|
8825
|
+
if (_C2 === previousColor) {
|
8826
|
+
data.set({
|
8827
|
+
fill: color,
|
8828
|
+
colorFill: {
|
8829
|
+
layer0: color
|
8830
|
+
}
|
8831
|
+
});
|
8832
|
+
}
|
8833
|
+
// canvas.renderAll();
|
8760
8834
|
} else if (data.type === 'group') {
|
8761
8835
|
// console.log(data);
|
8762
8836
|
var objImage = data._objects;
|
@@ -8893,10 +8967,12 @@ var Rightmenu = function Rightmenu() {
|
|
8893
8967
|
}
|
8894
8968
|
};
|
8895
8969
|
var removeColorPalatte = function removeColorPalatte() {
|
8896
|
-
|
8897
|
-
|
8898
|
-
|
8899
|
-
|
8970
|
+
setDisplayPallet({
|
8971
|
+
visible: false,
|
8972
|
+
property: '',
|
8973
|
+
color: '',
|
8974
|
+
callback: null
|
8975
|
+
});
|
8900
8976
|
};
|
8901
8977
|
useEffect(function () {
|
8902
8978
|
window.addEventListener('click', removeColorPalatte);
|
@@ -8992,7 +9068,8 @@ var Rightmenu = function Rightmenu() {
|
|
8992
9068
|
className: textSelected.fontWeight === 'bold' ? SELECT_BG_COLOR + " text-[#fff] text-base cursor-pointer border font-bold border-[#EBEBEB] py-[7px] px-[25px] " : 'bg-[#fff] font-bold text-base cursor-pointer border border-[#EBEBEB] py-[7px] px-[25px]',
|
8993
9069
|
style: textSelected && textSelected.shapeType && textSelected.shapeType !== 'none' ? {
|
8994
9070
|
color: '#cccccc',
|
8995
|
-
cursor: 'default'
|
9071
|
+
cursor: 'default',
|
9072
|
+
backgroundColor: '#ffffff'
|
8996
9073
|
} : {},
|
8997
9074
|
onClick: function onClick(e) {
|
8998
9075
|
return textStyle(e, 'fontWeight', 'bold');
|
@@ -9003,7 +9080,8 @@ var Rightmenu = function Rightmenu() {
|
|
9003
9080
|
className: textSelected.fontStyle && textSelected.fontStyle === 'italic' ? SELECT_BG_COLOR + " text-[#fff] text-base cursor-pointer border italic border-[#EBEBEB] py-[7px] px-[25px] " : 'bg-[#fff] italic text-base cursor-pointer border border-[#EBEBEB] py-[7px] px-[25px]',
|
9004
9081
|
style: textSelected && textSelected.shapeType && textSelected.shapeType !== 'none' ? {
|
9005
9082
|
color: '#cccccc',
|
9006
|
-
cursor: 'default'
|
9083
|
+
cursor: 'default',
|
9084
|
+
backgroundColor: '#ffffff'
|
9007
9085
|
} : {},
|
9008
9086
|
onClick: function onClick(e) {
|
9009
9087
|
return textStyle(e, 'fontStyle', 'italic');
|
@@ -9014,7 +9092,8 @@ var Rightmenu = function Rightmenu() {
|
|
9014
9092
|
className: textSelected.underline && textSelected.underline === true ? SELECT_BG_COLOR + " text-[#fff] text-base cursor-pointer border underline border-[#EBEBEB] py-[7px] px-[25px] " : 'bg-[#fff] underline text-base cursor-pointer border border-[#EBEBEB] py-[7px] px-[25px]',
|
9015
9093
|
style: textSelected && textSelected.shapeType && textSelected.shapeType !== 'none' ? {
|
9016
9094
|
color: '#cccccc',
|
9017
|
-
cursor: 'default'
|
9095
|
+
cursor: 'default',
|
9096
|
+
backgroundColor: '#ffffff'
|
9018
9097
|
} : {},
|
9019
9098
|
onClick: function onClick(e) {
|
9020
9099
|
return textStyle(e, 'underline', !fontStyle.underline);
|
@@ -9059,7 +9138,10 @@ var Rightmenu = function Rightmenu() {
|
|
9059
9138
|
handleChange: textColorChange,
|
9060
9139
|
property: 'backgroundColor',
|
9061
9140
|
name: 'backgroundColor',
|
9062
|
-
color: activeSelection.fill
|
9141
|
+
color: activeSelection.fill,
|
9142
|
+
setDisplayPallet: setDisplayPallet,
|
9143
|
+
setPosition: setPosition,
|
9144
|
+
callback: textColorChange
|
9063
9145
|
})), React.createElement("div", {
|
9064
9146
|
className: "flex gap-2 mt-4"
|
9065
9147
|
}, React.createElement("div", null, React.createElement("div", {
|
@@ -9081,7 +9163,10 @@ var Rightmenu = function Rightmenu() {
|
|
9081
9163
|
handleChange: strokeColorChange,
|
9082
9164
|
property: 'backgroundColor',
|
9083
9165
|
name: 'backgroundColor',
|
9084
|
-
color: activeSelection.stroke
|
9166
|
+
color: activeSelection.stroke,
|
9167
|
+
setDisplayPallet: setDisplayPallet,
|
9168
|
+
setPosition: setPosition,
|
9169
|
+
callback: strokeColorChange
|
9085
9170
|
})))), React.createElement("div", {
|
9086
9171
|
className: "flex gap-2"
|
9087
9172
|
}, React.createElement("div", null, React.createElement("div", {
|
@@ -9127,7 +9212,10 @@ var Rightmenu = function Rightmenu() {
|
|
9127
9212
|
key: 'color-' + i,
|
9128
9213
|
handleChange: changeSVGColor,
|
9129
9214
|
property: item,
|
9130
|
-
color: activeSelection.colorFill[item]
|
9215
|
+
color: activeSelection.colorFill[item],
|
9216
|
+
setDisplayPallet: setDisplayPallet,
|
9217
|
+
setPosition: setPosition,
|
9218
|
+
callback: changeSVGColor
|
9131
9219
|
});
|
9132
9220
|
}))), React.createElement(React.Fragment, null, React.createElement("div", {
|
9133
9221
|
className: "my-[24.5px]"
|
@@ -9163,13 +9251,25 @@ var Rightmenu = function Rightmenu() {
|
|
9163
9251
|
}, "Color in Canvas"), React.createElement("div", {
|
9164
9252
|
className: "flex flex-wrap gap-x-[1rem] mt-[12px] mb-[12px]"
|
9165
9253
|
}, allColor == null ? void 0 : allColor.map(function (item, i) {
|
9166
|
-
return
|
9167
|
-
|
9168
|
-
|
9169
|
-
|
9170
|
-
|
9171
|
-
|
9172
|
-
|
9254
|
+
return (
|
9255
|
+
// <ColorImpl
|
9256
|
+
// mClass={'mb-[10px]'}
|
9257
|
+
// key={'color-' + i}
|
9258
|
+
// handleChange={changeSVGTextColor}
|
9259
|
+
// property={item}
|
9260
|
+
// color={item}
|
9261
|
+
// />
|
9262
|
+
React.createElement(ColorImpl, {
|
9263
|
+
mClass: 'mb-[10px]',
|
9264
|
+
key: 'color-' + i,
|
9265
|
+
handleChange: changeSVGTextColor,
|
9266
|
+
property: item,
|
9267
|
+
color: item,
|
9268
|
+
setDisplayPallet: setDisplayPallet,
|
9269
|
+
setPosition: setPosition,
|
9270
|
+
callback: changeSVGTextColor
|
9271
|
+
})
|
9272
|
+
);
|
9173
9273
|
})), (allColor && allColor.includes('transparent') ? allColor.length - 1 : allColor.length) > 8 && React.createElement(errorPopup, {
|
9174
9274
|
allColor: allColor
|
9175
9275
|
})), currentSelection === 'none' && React.createElement(React.Fragment, null, React.createElement("div", {
|
@@ -9177,13 +9277,25 @@ var Rightmenu = function Rightmenu() {
|
|
9177
9277
|
}, "Color in Canvas"), React.createElement("div", {
|
9178
9278
|
className: "flex flex-wrap gap-x-[1rem] mt-[12px]"
|
9179
9279
|
}, allColor == null ? void 0 : allColor.map(function (item, i) {
|
9180
|
-
return
|
9181
|
-
|
9182
|
-
|
9183
|
-
|
9184
|
-
|
9185
|
-
|
9186
|
-
|
9280
|
+
return (
|
9281
|
+
// <ColorImpl
|
9282
|
+
// mClass={'mb-[10px]'}
|
9283
|
+
// key={'color-' + i}
|
9284
|
+
// handleChange={changeSVGTextColor}
|
9285
|
+
// property={item}
|
9286
|
+
// color={item}
|
9287
|
+
// />
|
9288
|
+
React.createElement(ColorImpl, {
|
9289
|
+
mClass: 'mb-[10px]',
|
9290
|
+
key: 'color-' + i,
|
9291
|
+
handleChange: changeSVGTextColor,
|
9292
|
+
property: item,
|
9293
|
+
color: item,
|
9294
|
+
setDisplayPallet: setDisplayPallet,
|
9295
|
+
setPosition: setPosition,
|
9296
|
+
callback: changeSVGTextColor
|
9297
|
+
})
|
9298
|
+
);
|
9187
9299
|
})), (allColor && allColor.includes('transparent') ? allColor.length - 1 : allColor.length) > 8 && React.createElement(errorPopup, {
|
9188
9300
|
allColor: allColor
|
9189
9301
|
}))), isNextClicked && conflictColors && conflictColors.length > 0 && React.createElement("div", {
|
@@ -9354,7 +9466,26 @@ var Rightmenu = function Rightmenu() {
|
|
9354
9466
|
}), React.createElement("path", {
|
9355
9467
|
d: "M121.752,335.085L256,200.837l134.248,134.248c8.331,8.331,21.839,8.331,30.17,0c8.331-8.331,8.331-21.839,0-30.17 L271.085,155.582c-8.331-8.331-21.839-8.331-30.17,0L91.582,304.915c-8.331,8.331-8.331,21.839,0,30.17 S113.42,343.416,121.752,335.085z"
|
9356
9468
|
})))))))))));
|
9357
|
-
}))))))
|
9469
|
+
})))))), displayPallet && displayPallet.visible && React.createElement(ColorPalette, {
|
9470
|
+
mainClass: "left-0",
|
9471
|
+
handleColorChange: function handleColorChange(color) {
|
9472
|
+
displayPallet.callback(displayPallet.property, color);
|
9473
|
+
setDisplayPallet({
|
9474
|
+
visible: false,
|
9475
|
+
property: '',
|
9476
|
+
color: '',
|
9477
|
+
callback: null
|
9478
|
+
});
|
9479
|
+
},
|
9480
|
+
style: position ? {
|
9481
|
+
position: 'fixed',
|
9482
|
+
left: position.x - 450,
|
9483
|
+
top: position.y - 5,
|
9484
|
+
width: '450px'
|
9485
|
+
} : {
|
9486
|
+
display: 'none'
|
9487
|
+
}
|
9488
|
+
}));
|
9358
9489
|
};
|
9359
9490
|
|
9360
9491
|
var css_248z$5 = "#ls{//top:8rem;background-color:#fff;background:radial-gradient(#eee,#ccc);height:100%;left:0;opacity:1;position:relative;transition:opacity 1s;width:100%;z-index:100}#ls.fade-out{opacity:0}#l{animation:spin 2s linear infinite;border:3px solid transparent;border-radius:50%;border-top-color:#b16b6b;display:block;height:100px;left:50%;margin:-50px 0 0 -50px;position:relative;top:50%;width:100px}#l:before{animation:spin 3s linear infinite;border:3px solid transparent;border-radius:50%;border-top-color:#c10909;bottom:5px;left:5px;right:5px;top:5px}#l:after,#l:before{content:\"\";position:absolute}#l:after{animation:spin 1.5s linear infinite;border:3px solid transparent;border-radius:50%;border-top-color:#bb4646;bottom:15px;left:15px;right:15px;top:15px}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}";
|