@sequent-org/moodboard 1.4.48 → 1.4.51

package/src/services/FrameService.js

@@ -71,6 +71,24 @@ export class FrameService {
 		};
 		this.eventBus.on(Events.Object.Created, this._onObjectCreated);
 
+		this._onStateChanged = (data) => {
+			if (!data || !data.updates || !data.updates.properties) return;
+			if (data.updates.properties.hidden !== undefined) {
+				const obj = this.state.state.objects.find(o => o.id === data.objectId);
+				if (obj && obj.type === 'frame') {
+					const isHidden = data.updates.properties.hidden;
+					const children = this._getFrameChildren(obj.id);
+					for (const childId of children) {
+						const pixi = this.pixi.objects.get(childId);
+						if (pixi) {
+							pixi.visible = !isHidden;
+						}
+					}
+				}
+			}
+		};
+		this.eventBus.on(Events.Object.StateChanged, this._onStateChanged);
+
 		this._onDragStart = (data) => {
 			const moved = this.state.state.objects.find(o => o.id === data.object);
 			if (moved && moved.type === 'frame') {
@@ -256,6 +274,20 @@ export class FrameService {
 			this._forceFramesBelow();
 			this.eventBus.emit(Events.Object.Reordered, { reason: 'recompute_frame_attachment' });
 		}
+		
+		// Обновляем видимость в зависимости от скрытости фрейма
+		const pixi = this.pixi.objects.get(objectId);
+		if (pixi) {
+			let isHidden = false;
+			const targetFrameId = obj.properties?.frameId;
+			if (targetFrameId) {
+				const frameObj = this.state.state.objects.find(o => o.id === targetFrameId);
+				if (frameObj && frameObj.properties?.hidden) {
+					isHidden = true;
+				}
+			}
+			pixi.visible = !isHidden;
+		}
 	}
 }
 

package/src/tools/manager/ToolManagerLifecycle.js

@@ -29,6 +29,10 @@ export class ToolManagerLifecycle {
         manager._onContextMenu = (e) => {
             e.preventDefault();
             if (!manager.activeTool) return;
+            if (manager.activeTool.name === 'draw') {
+                manager.activateDefaultTool();
+                return;
+            }
             const rect = manager.container.getBoundingClientRect();
             const toolEvent = {
                 x: e.clientX - rect.left,

package/src/tools/object-tools/DrawingTool.js

@@ -98,6 +98,7 @@ export class DrawingTool extends BaseTool {
     }
 
     onMouseDown(event) {
+        if (event.button === 2) return;
         super.onMouseDown(event);
         if (!this.world) this.world = this._getWorldLayer();
         if (!this.world) return;

package/src/tools/object-tools/selection/TransformInteractionController.js

@@ -25,6 +25,12 @@ export function handleObjectSelect(objectId, event) {
 }
 
 export function startDrag(objectId, event) {
+    const req = { objectId, pixiObject: null };
+    this.emit('tool:get:object:pixi', req);
+    if (req.pixiObject?._mb?.properties?.locked) {
+        return;
+    }
+
     this.isDragging = true;
     this.dragTarget = objectId;
     // Сообщаем HtmlHandlesLayer о начале перетаскивания одиночного объекта
@@ -91,6 +97,23 @@ export function endDrag() {
 }
 
 export function startResize(handle, objectId) {
+    const isLocked = (() => {
+        if (objectId === this.groupId) {
+            return this.selection.toArray().some(id => {
+                const req = { objectId: id, pixiObject: null };
+                this.emit('tool:get:object:pixi', req);
+                return !!req.pixiObject?._mb?.properties?.locked;
+            });
+        }
+        const req = { objectId, pixiObject: null };
+        this.emit('tool:get:object:pixi', req);
+        return !!req.pixiObject?._mb?.properties?.locked;
+    })();
+
+    if (isLocked) {
+        return;
+    }
+
     // Групповой resize
     if (objectId === this.groupId && this.selection.size() > 1) {
         this.isGroupResizing = true;
@@ -169,6 +192,23 @@ export function endResize() {
 }
 
 export function startRotate(objectId) {
+    const isLocked = (() => {
+        if (objectId === this.groupId) {
+            return this.selection.toArray().some(id => {
+                const req = { objectId: id, pixiObject: null };
+                this.emit('tool:get:object:pixi', req);
+                return !!req.pixiObject?._mb?.properties?.locked;
+            });
+        }
+        const req = { objectId, pixiObject: null };
+        this.emit('tool:get:object:pixi', req);
+        return !!req.pixiObject?._mb?.properties?.locked;
+    })();
+
+    if (isLocked) {
+        return;
+    }
+
     // Групповой поворот
     if (objectId === this.groupId && this.selection.size() > 1) {
         this.isGroupRotating = true;
@@ -276,6 +316,16 @@ export function endBoxSelect() {
 }
 
 export function startGroupDrag(event) {
+    const isLocked = this.selection.toArray().some(id => {
+        const req = { objectId: id, pixiObject: null };
+        this.emit('tool:get:object:pixi', req);
+        return !!req.pixiObject?._mb?.properties?.locked;
+    });
+
+    if (isLocked) {
+        return;
+    }
+
     const gb = this.computeGroupBounds();
     this.groupStartBounds = gb;
     this.isGroupDragging = true;