@sequent-org/moodboard 1.4.19 → 1.4.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequent-org/moodboard",
-  "version": "1.4.19",
+  "version": "1.4.21",
   "type": "module",
   "description": "Interactive moodboard",
   "main": "./src/index.js",

package/src/moodboard/integration/MoodBoardEventBindings.js

@@ -9,11 +9,38 @@ function getSelectTool(board) {
         || null;
 }
 
-function hasOpenTextEditorInDom(board) {
-    const doc = board?.workspaceElement?.ownerDocument
-        || (typeof document !== 'undefined' ? document : null);
-    if (!doc || typeof doc.querySelector !== 'function') return false;
-    return Boolean(doc.querySelector('.moodboard-text-input'));
+function shouldOpenEditorForObject(objectType) {
+    return objectType === 'mindmap'
+        || objectType === 'text'
+        || objectType === 'simple-text'
+        || objectType === 'note'
+        || objectType === 'file';
+}
+
+function focusCreatedObject(board, createdObject) {
+    if (!board?.coreMoodboard?.eventBus || !createdObject?.id) return;
+    const objectType = createdObject?.type || null;
+    const objectPayload = {
+        id: createdObject.id,
+        type: objectType,
+        position: createdObject.position || null,
+        properties: createdObject.properties || {},
+    };
+
+    // Run after object is mounted so selection/HTML overlays can sync first.
+    setTimeout(() => {
+        board.coreMoodboard.eventBus.emit(Events.Keyboard.ToolSelect, { tool: 'select' });
+        const selectTool = getSelectTool(board);
+        if (typeof selectTool?.setSelection === 'function') {
+            selectTool.setSelection([createdObject.id]);
+        }
+        if (shouldOpenEditorForObject(objectType)) {
+            board.coreMoodboard.eventBus.emit(Events.Tool.ObjectEdit, {
+                object: objectPayload,
+                create: true,
+            });
+        }
+    }, 0);
 }
 
 export function bindToolbarEvents(board) {
@@ -26,63 +53,8 @@ export function bindToolbarEvents(board) {
             });
         }
         const createdObject = board.actionHandler.handleToolbarAction(action);
-        if (action?.type === 'mindmap' && createdObject?.id) {
-            const content = String(createdObject?.properties?.content || '');
-            const createdMeta = createdObject?.properties?.mindmap || {};
-            const isRootMindmap = createdMeta?.role === 'root';
-            const mindmapObjects = (board?.coreMoodboard?.state?.state?.objects || [])
-                .filter((obj) => obj?.type === 'mindmap');
-            const rootCount = mindmapObjects.filter((obj) => (obj?.properties?.mindmap?.role || null) === 'root').length;
-            const shouldAutoOpenForRoot = !isRootMindmap || rootCount <= 1;
-            const selectTool = getSelectTool(board);
-            const hasActiveEditor = Boolean(selectTool?.textEditor?.active);
-            const hasEditorDom = hasOpenTextEditorInDom(board);
-            const shouldBlockAutoOpen = hasActiveEditor && hasEditorDom;
-            if (content.trim().length === 0 && !shouldBlockAutoOpen && shouldAutoOpenForRoot) {
-                const doc = board?.workspaceElement?.ownerDocument
-                    || (typeof document !== 'undefined' ? document : null);
-                const closeSeqAtSchedule = Number(selectTool?._mindmapEditorCloseSeq || 0);
-                let cancelledByPointer = false;
-                const cancelOnPointerDown = () => {
-                    cancelledByPointer = true;
-                };
-                const cancelOnEscape = (event) => {
-                    if (event?.key === 'Escape') {
-                        cancelledByPointer = true;
-                    }
-                };
-                if (doc && typeof doc.addEventListener === 'function') {
-                    doc.addEventListener('pointerdown', cancelOnPointerDown, true);
-                    doc.addEventListener('keydown', cancelOnEscape, true);
-                }
-                setTimeout(() => {
-                    if (doc && typeof doc.removeEventListener === 'function') {
-                        doc.removeEventListener('pointerdown', cancelOnPointerDown, true);
-                        doc.removeEventListener('keydown', cancelOnEscape, true);
-                    }
-                    if (cancelledByPointer) return;
-                    const latestSelectTool = getSelectTool(board);
-                    const latestCloseSeq = Number(latestSelectTool?._mindmapEditorCloseSeq || 0);
-                    if (latestCloseSeq !== closeSeqAtSchedule) return;
-
-                    const nextSelectTool = getSelectTool(board);
-                    const nextHasActiveEditor = Boolean(nextSelectTool?.textEditor?.active);
-                    const nextHasEditorDom = hasOpenTextEditorInDom(board);
-                    if (nextHasActiveEditor || nextHasEditorDom) {
-                        return;
-                    }
-                    board.coreMoodboard.eventBus.emit(Events.Keyboard.ToolSelect, { tool: 'select' });
-                    board.coreMoodboard.eventBus.emit(Events.Tool.ObjectEdit, {
-                        object: {
-                            id: createdObject.id,
-                            type: 'mindmap',
-                            position: createdObject.position || null,
-                            properties: createdObject.properties || {},
-                        },
-                        create: true,
-                    });
-                }, 0);
-            }
+        if (createdObject?.id) {
+            focusCreatedObject(board, createdObject);
         }
     });
 

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

@@ -510,7 +510,9 @@ export function openMindmapEditor(object, create = false) {
         const sideButton = (typeof target.closest === 'function')
             ? target.closest('.mb-mindmap-side-btn')
             : null;
-        if (sideButton?.dataset?.side === 'bottom') return;
+        // Allow all mindmap "+" buttons to complete their click flow
+        // without collapsing current selection in capture phase.
+        if (sideButton) return;
         finalize(true);
         if (typeof this.clearSelection === 'function') {
             this.clearSelection();

package/src/ui/handles/HandlesDomRenderer.js

@@ -209,7 +209,10 @@ function relayoutMindmapBranchLevel({ core, eventBus, parentId, side }) {
         if (!(targetX === currentX && targetY === currentY)) {
             core.updateObjectPositionDirect(node.id, { x: targetX, y: targetY }, { snap: false });
             eventBus.emit(Events.Object.TransformUpdated, { objectId: node.id });
-            eventBus.emit(Events.Tool.DragUpdate, { object: node.id });
+            eventBus.emit(Events.Tool.DragUpdate, {
+                object: node.id,
+                position: { x: targetX, y: targetY },
+            });
             movedPositions.set(node.id, { x: targetX, y: targetY });
 
             const dx = Math.round(targetX - currentX);
@@ -233,7 +236,10 @@ function relayoutMindmapBranchLevel({ core, eventBus, parentId, side }) {
                     };
                     core.updateObjectPositionDirect(descId, nextPos, { snap: false });
                     eventBus.emit(Events.Object.TransformUpdated, { objectId: descId });
-                    eventBus.emit(Events.Tool.DragUpdate, { object: descId });
+                    eventBus.emit(Events.Tool.DragUpdate, {
+                        object: descId,
+                        position: nextPos,
+                    });
                     movedPositions.set(descId, nextPos);
                 });
             }
@@ -965,7 +971,10 @@ export class HandlesDomRenderer {
                     const nextPos = { x: Math.round(Number(snap.x) + dx), y: Math.round(Number(snap.y) + dy) };
                     core.updateObjectPositionDirect(nodeId, nextPos, { snap: false });
                     eventBus.emit(Events.Object.TransformUpdated, { objectId: nodeId });
-                    eventBus.emit(Events.Tool.DragUpdate, { object: nodeId });
+                    eventBus.emit(Events.Tool.DragUpdate, {
+                        object: nodeId,
+                        position: nextPos,
+                    });
                 });
                 translatedScopeByCompound.set(compoundId, moveScopeIds);
                 logMindmapCompoundDebug('layout:drag-end-translate-scope', {
@@ -994,7 +1003,10 @@ export class HandlesDomRenderer {
                 const nextPos = { x: Math.round(snap.x), y: Math.round(snap.y) };
                 core.updateObjectPositionDirect(nodeId, nextPos, { snap: false });
                 eventBus.emit(Events.Object.TransformUpdated, { objectId: nodeId });
-                eventBus.emit(Events.Tool.DragUpdate, { object: nodeId });
+                eventBus.emit(Events.Tool.DragUpdate, {
+                    object: nodeId,
+                    position: nextPos,
+                });
             });
             logMindmapCompoundDebug('layout:drag-end-restore-compound', {
                 compoundId,