mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-14 05:14:54 +00:00
fix: drag mind map root node should layout in real time (#9252)
Fixes [BS-2062](https://linear.app/affine-design/issue/BS-2062/拖拽整个-mind-map-还是希望和之前一样,整个思维导图跟手)
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||
import type {
|
||||
SurfaceBlockComponent,
|
||||
SurfaceBlockModel,
|
||||
@@ -129,6 +128,10 @@ export class EdgelessRootBlockComponent extends BlockComponent<
|
||||
return this.std.event;
|
||||
}
|
||||
|
||||
get fontLoader() {
|
||||
return this.std.get(FontLoaderService);
|
||||
}
|
||||
|
||||
get gfx() {
|
||||
return this.std.get(GfxControllerIdentifier);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||
import {
|
||||
MindmapUtils,
|
||||
NODE_HORIZONTAL_SPACING,
|
||||
@@ -30,7 +29,11 @@ import type { MindMapIndicatorOverlay } from './indicator-overlay.js';
|
||||
type DragMindMapCtx = {
|
||||
mindmap: MindmapElementModel;
|
||||
node: MindmapNode;
|
||||
clear?: () => void;
|
||||
clear: () => void;
|
||||
/**
|
||||
* Whether the dragged node is the root node of the mind map
|
||||
*/
|
||||
isRoot: boolean;
|
||||
originalMindMapBound: Bound;
|
||||
startPoint: PointerEventState;
|
||||
};
|
||||
@@ -94,75 +97,73 @@ export class MindMapExt extends DefaultToolExt {
|
||||
node: hoveredNode,
|
||||
};
|
||||
|
||||
// 1. not hovered on any mind map or
|
||||
// 2. hovered on the other mind map but not on any node
|
||||
// then consider user is trying to detach the node
|
||||
// hovered on the currently dragged mind map but
|
||||
// 1. not hovered on any node or
|
||||
// 2. hovered on the node that is itself or its children (which is not allowed)
|
||||
// then consider user is trying to drop the node to its original position
|
||||
if (
|
||||
!hoveredMindMap ||
|
||||
(hoveredMindMap !== dragMindMapCtx.mindmap && !hoveredNode)
|
||||
) {
|
||||
hoveredCtx.detach = true;
|
||||
|
||||
const reset = (hoveredCtx.abort = MindmapUtils.hideNodeConnector(
|
||||
dragMindMapCtx.mindmap,
|
||||
hoveredNode &&
|
||||
hoveredMindMap &&
|
||||
!MindmapUtils.containsNode(
|
||||
hoveredMindMap,
|
||||
hoveredNode,
|
||||
dragMindMapCtx.node
|
||||
));
|
||||
)
|
||||
) {
|
||||
const operation = MindmapUtils.tryMoveNode(
|
||||
hoveredMindMap,
|
||||
hoveredNode,
|
||||
dragMindMapCtx.mindmap,
|
||||
dragMindMapCtx.node,
|
||||
[x, y],
|
||||
options => this._drawIndicator(options)
|
||||
);
|
||||
|
||||
hoveredCtx.abort = () => {
|
||||
reset?.();
|
||||
if (operation) {
|
||||
hoveredCtx.abort = operation.abort;
|
||||
hoveredCtx.merge = operation.merge;
|
||||
}
|
||||
} else if (dragMindMapCtx.isRoot) {
|
||||
dragMindMapCtx.mindmap.layout();
|
||||
hoveredCtx.merge = () => {
|
||||
dragMindMapCtx.mindmap.layout();
|
||||
};
|
||||
} else {
|
||||
// hovered on the currently dragging mind map but
|
||||
// 1. not hovered on any node or
|
||||
// 2. hovered on the node that is itself or its children (which is not allowed)
|
||||
// then consider user is trying to drop the node to its original position
|
||||
if (
|
||||
!hoveredNode ||
|
||||
MindmapUtils.containsNode(
|
||||
hoveredMindMap,
|
||||
hoveredNode,
|
||||
dragMindMapCtx.node
|
||||
)
|
||||
) {
|
||||
const { mindmap, node } = dragMindMapCtx;
|
||||
|
||||
// if the node is the root node, then do nothing
|
||||
if (node === mindmap.tree) {
|
||||
return;
|
||||
}
|
||||
|
||||
const nodeBound = node.element.elementBound;
|
||||
// if `hoveredMindMap` is not null
|
||||
// either the node is hovered on the dragged node's children
|
||||
// or the there is no hovered node at all
|
||||
// then consider user is trying to place the node to its original position
|
||||
if (hoveredMindMap) {
|
||||
const { node: draggedNode, mindmap } = dragMindMapCtx;
|
||||
const nodeBound = draggedNode.element.elementBound;
|
||||
|
||||
hoveredCtx.abort = this._drawIndicator({
|
||||
targetMindMap: mindmap,
|
||||
target: node,
|
||||
target: draggedNode,
|
||||
sourceMindMap: mindmap,
|
||||
source: node,
|
||||
newParent: node.parent!,
|
||||
source: draggedNode,
|
||||
newParent: draggedNode.parent!,
|
||||
insertPosition: {
|
||||
type: 'sibling',
|
||||
layoutDir: mindmap.getLayoutDir(node) as Exclude<
|
||||
layoutDir: mindmap.getLayoutDir(draggedNode) as Exclude<
|
||||
LayoutType,
|
||||
LayoutType.BALANCE
|
||||
>,
|
||||
position: y > nodeBound.y + nodeBound.h / 2 ? 'next' : 'prev',
|
||||
},
|
||||
path: mindmap.getPath(node),
|
||||
path: mindmap.getPath(draggedNode),
|
||||
});
|
||||
} else {
|
||||
const operation = MindmapUtils.tryMoveNode(
|
||||
hoveredMindMap,
|
||||
hoveredNode,
|
||||
dragMindMapCtx.mindmap,
|
||||
dragMindMapCtx.node,
|
||||
[x, y],
|
||||
options => this._drawIndicator(options)
|
||||
);
|
||||
hoveredCtx.detach = true;
|
||||
|
||||
if (operation) {
|
||||
hoveredCtx.abort = operation.abort;
|
||||
hoveredCtx.merge = operation.merge;
|
||||
}
|
||||
const reset = (hoveredCtx.abort = MindmapUtils.hideNodeConnector(
|
||||
dragMindMapCtx.mindmap,
|
||||
dragMindMapCtx.node
|
||||
));
|
||||
|
||||
hoveredCtx.abort = () => {
|
||||
reset?.();
|
||||
};
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -204,7 +205,7 @@ export class MindMapExt extends DefaultToolExt {
|
||||
}
|
||||
|
||||
hoveredCtx = null;
|
||||
dragMindMapCtx.clear?.();
|
||||
dragMindMapCtx.clear();
|
||||
this._responseAreaUpdated.clear();
|
||||
},
|
||||
};
|
||||
@@ -394,8 +395,7 @@ export class MindMapExt extends DefaultToolExt {
|
||||
const mindmap = dragState.movedElements[0].group as MindmapElementModel;
|
||||
const mindmapNode = mindmap.getNode(dragState.movedElements[0].id)!;
|
||||
const mindmapBound = mindmap.elementBound;
|
||||
|
||||
dragState.movedElements.splice(0, 1);
|
||||
const isRoot = mindmapNode === mindmap.tree;
|
||||
|
||||
mindmapBound.x -= NODE_HORIZONTAL_SPACING;
|
||||
mindmapBound.y -= NODE_VERTICAL_SPACING * 2;
|
||||
@@ -404,19 +404,25 @@ export class MindMapExt extends DefaultToolExt {
|
||||
|
||||
this._calcDragResponseArea(mindmap);
|
||||
|
||||
const clearDragImage = this._setupDragNodeImage(
|
||||
mindmapNode,
|
||||
dragState.event
|
||||
);
|
||||
const clearDragStatus = isRoot
|
||||
? mindmap.stashTree(mindmapNode)
|
||||
: this._setupDragNodeImage(mindmapNode, dragState.event);
|
||||
const clearOpacity = this._updateNodeOpacity(mindmap, mindmapNode);
|
||||
|
||||
if (!isRoot) {
|
||||
dragState.movedElements.splice(0, 1);
|
||||
}
|
||||
|
||||
const mindMapDragCtx: DragMindMapCtx = {
|
||||
mindmap,
|
||||
node: mindmapNode,
|
||||
isRoot,
|
||||
clear: () => {
|
||||
clearOpacity();
|
||||
clearDragImage?.();
|
||||
dragState.movedElements.push(mindmapNode.element);
|
||||
clearDragStatus?.();
|
||||
if (!isRoot) {
|
||||
dragState.movedElements.push(mindmapNode.element);
|
||||
}
|
||||
},
|
||||
originalMindMapBound: mindmapBound,
|
||||
startPoint: dragState.event,
|
||||
|
||||
Reference in New Issue
Block a user