@sequent-org/moodboard 1.4.48 → 1.4.51

package/src/ui/comments/CommentThreadPopover.js

@@ -125,6 +125,7 @@ export class CommentThreadPopover {
         this._onThreadOpened = this._onThreadOpened.bind(this);
         this._onRemote = () => this._refreshIfOpen();
         this._onOpenDraftAt = this._onOpenDraftAt.bind(this);
+        this._onOpenImageDraft = this._onOpenImageDraft.bind(this);
         this._onThreadDeleted = this._onThreadDeleted.bind(this);
     }
 
@@ -143,6 +144,7 @@ export class CommentThreadPopover {
         this.eventBus.on(Events.Comment.RemoteUpdated, this._onRemote);
         this.eventBus.on(Events.Comment.MessageAdded, this._onRemote);
         this.eventBus.on(Events.Comment.OpenDraftAt, this._onOpenDraftAt);
+        this.eventBus.on(Events.Comment.OpenImageDraft, this._onOpenImageDraft);
         this.eventBus.on(Events.Comment.ThreadDeleted, this._onThreadDeleted);
         this.eventBus.on(Events.Viewport.Changed, () => this.reposition());
         this.eventBus.on(Events.Tool.PanUpdate, () => this.reposition());
@@ -155,6 +157,7 @@ export class CommentThreadPopover {
         this.eventBus.off(Events.Comment.RemoteUpdated, this._onRemote);
         this.eventBus.off(Events.Comment.MessageAdded, this._onRemote);
         this.eventBus.off(Events.Comment.OpenDraftAt, this._onOpenDraftAt);
+        this.eventBus.off(Events.Comment.OpenImageDraft, this._onOpenImageDraft);
         this.eventBus.off(Events.Comment.ThreadDeleted, this._onThreadDeleted);
         if (this.layer) this.layer.remove();
         this.layer = null;
@@ -178,6 +181,70 @@ export class CommentThreadPopover {
         this.openDraftAt({ x: local.x, y: local.y });
     }
 
+    /**
+     * Открывает черновик комментария, привязанный к центру объекта.
+     * Если на объекте уже есть комментарии, смещает точку от занятых позиций.
+     */
+    _onOpenImageDraft({ objectId }) {
+        if (!objectId) return;
+
+        const posData = { objectId, position: null };
+        const sizeData = { objectId, size: null };
+        this.eventBus.emit(Events.Tool.GetObjectPosition, posData);
+        this.eventBus.emit(Events.Tool.GetObjectSize, sizeData);
+
+        if (!posData.position || !sizeData.size) return;
+
+        const { x: left, y: top } = posData.position;
+        const { width, height } = sizeData.size;
+
+        const anchored = this.commentService.getAllThreads().filter(
+            (t) => t.anchor_object_id === objectId
+        );
+
+        // anchor_dx/anchor_dy хранятся как смещение от top-left объекта,
+        // поэтому центр = (width/2, height/2) в этом пространстве
+        const { dx, dy } = this._findFreeCommentOffset(anchored, width / 2, height / 2);
+
+        this.openDraftAt(
+            { x: left + dx, y: top + dy },
+            { anchor_object_id: objectId, anchor_dx: dx, anchor_dy: dy }
+        );
+    }
+
+    /**
+     * Ищет свободный anchor-offset от top-left объекта.
+     * Начинает с центра (centerDx, centerDy), затем пробует 8 направлений шагами по 10px.
+     * «Свободным» считается offset, удалённый от всех занятых не менее чем на 12px.
+     */
+    _findFreeCommentOffset(anchoredThreads, centerDx, centerDy) {
+        const STEP = 10;
+        const MIN_DIST = 12;
+
+        const isFree = (dx, dy) => anchoredThreads.every((t) => {
+            const ex = t.anchor_dx || 0;
+            const ey = t.anchor_dy || 0;
+            return Math.sqrt((dx - ex) ** 2 + (dy - ey) ** 2) >= MIN_DIST;
+        });
+
+        if (isFree(centerDx, centerDy)) return { dx: centerDx, dy: centerDy };
+
+        const directions = [
+            [1, 0], [0, 1], [-1, 0], [0, -1],
+            [1, 1], [-1, 1], [1, -1], [-1, -1],
+        ];
+
+        for (let radius = 1; radius <= 20; radius++) {
+            for (const [dirX, dirY] of directions) {
+                const dx = centerDx + dirX * STEP * radius;
+                const dy = centerDy + dirY * STEP * radius;
+                if (isFree(dx, dy)) return { dx, dy };
+            }
+        }
+
+        return { dx: centerDx + STEP, dy: centerDy };
+    }
+
     _onThreadOpened({ threadId, pinEl }) {
         if (threadId == null && this._draftWorld) return;
         this._draftWorld = null;
@@ -203,6 +270,7 @@ export class CommentThreadPopover {
         this._closePalette();
         this._disarmOutsideClose();
         if (wasDraft) this.eventBus.emit(Events.Comment.DraftClosed, {});
+        this.eventBus.emit(Events.Comment.PopoverClosed, {});
     }
 
     reposition() {

package/src/ui/connectors/ConnectionAnchorsLayer.js

@@ -18,6 +18,7 @@ export class ConnectionAnchorsLayer {
         this.hoveredObjectId = null;
         this._dragController = null;
         this._onAnchorPointerDown = null;
+        this._commentPopoverOpen = false;
     }
 
     attach() {
@@ -94,7 +95,12 @@ export class ConnectionAnchorsLayer {
             [Events.Viewport.Changed, () => this.update()],
             [Events.UI.ZoomPercent, () => this.update()],
             [Events.History.Changed, () => this.update()],
-            [Events.Board.Loaded, () => this.update()]
+            [Events.Board.Loaded, () => this.update()],
+            [Events.Comment.ThreadOpened, () => { this._commentPopoverOpen = true; this.layer.innerHTML = ''; }],
+            [Events.Comment.DraftOpened,  () => { this._commentPopoverOpen = true; this.layer.innerHTML = ''; }],
+            [Events.Comment.DraftClosed,  () => { this._commentPopoverOpen = false; this.update(); }],
+            [Events.Comment.ThreadDeleted, () => { this._commentPopoverOpen = false; this.update(); }],
+            [Events.Comment.PopoverClosed, () => { this._commentPopoverOpen = false; this.update(); }],
         ];
         
         bindings.forEach(([event, handler]) => {
@@ -137,6 +143,11 @@ export class ConnectionAnchorsLayer {
 
     update() {
         if (!this.layer) return;
+        if (this._commentPopoverOpen) return;
+        if (typeof window !== 'undefined' && window.moodboardHtmlHandlesLayer?._cropMode) {
+            this.layer.innerHTML = '';
+            return;
+        }
         this.layer.innerHTML = '';
         
         const selection = Array.from(this.core?.selectTool?.selectedObjects || []);

package/src/ui/handles/HandlesDomRenderer.js

@@ -1157,6 +1157,7 @@ export class HandlesDomRenderer {
         let isFrameTarget = false;
         let isMindmapTarget = false;
         let isMindmapOnlyGroupTarget = false;
+        let isLockedTarget = false;
         let isRevitScreenshotTarget = false;
         let revitViewPayload = null;
         let isModel3dScreenshotTarget = false;
@@ -1167,11 +1168,12 @@ export class HandlesDomRenderer {
         const hiddenIncomingSide = { value: null };
         if (id !== '__group__') {
             const req = { objectId: id, pixiObject: null };
-            this.host.eventBus.emit(Events.Tool.GetObjectPixi, req);
+            this.host.eventBus.emit('tool:get:object:pixi', req);
             const mbType = req.pixiObject && req.pixiObject._mb && req.pixiObject._mb.type;
             isFileTarget = mbType === 'file';
             isFrameTarget = mbType === 'frame';
             isMindmapTarget = mbType === 'mindmap';
+            isLockedTarget = !!req.pixiObject?._mb?.properties?.locked;
             isRevitScreenshotTarget = mbType === 'revit-screenshot-img';
             revitViewPayload = req.pixiObject?._mb?.properties?.view || null;
             isModel3dScreenshotTarget = mbType === 'model3d-screenshot-img';
@@ -1199,9 +1201,14 @@ export class HandlesDomRenderer {
             if (selectionIds.length > 0) {
                 const byId = new Map((this.host.core?.state?.state?.objects || []).map((obj) => [obj?.id, obj]));
                 isMindmapOnlyGroupTarget = selectionIds.every((selectedId) => byId.get(selectedId)?.type === 'mindmap');
+                isLockedTarget = selectionIds.some(selId => {
+                    const req = { objectId: selId, pixiObject: null };
+                    this.host.eventBus.emit('tool:get:object:pixi', req);
+                    return !!req.pixiObject?._mb?.properties?.locked;
+                });
             }
         }
-        const isNonResizableTarget = isFileTarget || isMindmapTarget || isMindmapOnlyGroupTarget;
+        const isNonResizableTarget = isFileTarget || isMindmapTarget || isMindmapOnlyGroupTarget || isLockedTarget;
 
         const left = Math.round(cssRect.left);
         const top = Math.round(cssRect.top);

package/src/ui/handles/HandlesEventBridge.js

@@ -114,6 +114,7 @@ export class HandlesEventBridge {
             [Events.UI.ZoomPercent, () => this.host.update()],
             [Events.Tool.PanUpdate, () => this.host.update()],
             [Events.Viewport.Changed, () => this.host.update()],
+            [Events.Object.TransformUpdated, () => this.host.update()],
             [Events.History.Changed, (data) => {
                 if (data?.lastUndone || data?.lastRedone) {
                     this.host._endGroupRotationPreview();