lock resize in group with a object mask

This commit is contained in:
hamid zarghami
2026-01-06 15:54:24 +03:30
parent 0b8d9ebddd
commit ff6912449e
2 changed files with 48 additions and 40 deletions
+43 -20
View File
@@ -655,11 +655,39 @@ const EditorCanvas = () => {
const isGroup = selectedObject?.type === "group";
// بررسی امکان group/ungroup با mask
const hasMask = selectedObject?.maskId;
const maskObject = hasMask ? objects.find(m => m.id === selectedObject.maskId) : null;
const isGrouped = selectedObject?.groupId && maskObject?.groupId === selectedObject.groupId;
const canGroup = hasMask && !isGrouped && maskObject && !selectedObject?.isMask;
const canUngroup = isGrouped && selectedObject?.groupId;
let isGroupedWithMask = false;
let hasMask = false;
let maskObject = null;
if (isGroup) {
// اگر این یک group است، بررسی کن که آیا از یک object با mask تشکیل شده
const groupMembers = objects.filter(o => o.groupId === selectedObject.id);
const objectWithMask = groupMembers.find(m => m.maskId);
if (objectWithMask) {
maskObject = groupMembers.find(m => m.id === objectWithMask.maskId);
isGroupedWithMask = !!maskObject;
}
} else {
// اگر یک object معمولی است
hasMask = !!selectedObject?.maskId;
maskObject = hasMask ? objects.find(m => m.id === selectedObject.maskId) : null;
isGroupedWithMask = selectedObject?.groupId && maskObject?.groupId === selectedObject.groupId;
}
const canGroup = hasMask && !isGroupedWithMask && maskObject && !selectedObject?.isMask;
const canUngroup = isGroupedWithMask && isGroup;
// اگر با mask گروه شده، امکان ریسایز نباشد
const enabledAnchors = isGroupedWithMask ? [] : [
"top-left",
"top-right",
"bottom-left",
"bottom-right",
"top-center",
"bottom-center",
"middle-left",
"middle-right",
];
return (
<>
@@ -669,6 +697,10 @@ const EditorCanvas = () => {
if (Math.abs(newBox.width) < 5 || Math.abs(newBox.height) < 5) {
return oldBox;
}
// اگر با mask گروه شده، هیچ تغییر سایزی مجاز نیست
if (isGroupedWithMask) {
return oldBox;
}
return newBox;
}}
ignoreStroke={isText}
@@ -678,17 +710,8 @@ const EditorCanvas = () => {
borderStroke="#3b82f6"
borderStrokeWidth={2}
anchorSize={8}
rotateEnabled={!isGroup}
enabledAnchors={[
"top-left",
"top-right",
"bottom-left",
"bottom-right",
"top-center",
"bottom-center",
"middle-left",
"middle-right",
]}
rotateEnabled={!isGroup && !isGroupedWithMask}
enabledAnchors={enabledAnchors}
/>
{/* دکمه گروه‌بندی */}
@@ -739,8 +762,8 @@ const EditorCanvas = () => {
shadowColor="black"
shadowBlur={10}
shadowOpacity={0.2}
onClick={() => handleUngroupFromMask(selectedObject.groupId!)}
onTap={() => handleUngroupFromMask(selectedObject.groupId!)}
onClick={() => handleUngroupFromMask(selectedObject.id)}
onTap={() => handleUngroupFromMask(selectedObject.id)}
listening={true}
/>
<Text
@@ -754,8 +777,8 @@ const EditorCanvas = () => {
fill="white"
align="center"
verticalAlign="middle"
onClick={() => handleUngroupFromMask(selectedObject.groupId!)}
onTap={() => handleUngroupFromMask(selectedObject.groupId!)}
onClick={() => handleUngroupFromMask(selectedObject.id)}
onTap={() => handleUngroupFromMask(selectedObject.id)}
listening={true}
/>
</Group>