Fix node dragging while zooming on a flow that does not occupy whole browser window.
This commit is contained in:
@@ -5,14 +5,18 @@ export type GetPointerPositionParams = {
|
|||||||
transform: Transform;
|
transform: Transform;
|
||||||
snapGrid?: SnapGrid;
|
snapGrid?: SnapGrid;
|
||||||
snapToGrid?: boolean;
|
snapToGrid?: boolean;
|
||||||
|
containerBounds: DOMRect | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function getPointerPosition(
|
export function getPointerPosition(
|
||||||
event: MouseEvent | TouchEvent,
|
event: MouseEvent | TouchEvent,
|
||||||
{ snapGrid = [0, 0], snapToGrid = false, transform }: GetPointerPositionParams
|
{ snapGrid = [0, 0], snapToGrid = false, transform, containerBounds }: GetPointerPositionParams
|
||||||
): XYPosition & { xSnapped: number; ySnapped: number } {
|
): XYPosition & { xSnapped: number; ySnapped: number } {
|
||||||
const { x, y } = getEventPosition(event);
|
const { x, y } = getEventPosition(event);
|
||||||
const pointerPos = pointToRendererPoint({ x, y }, transform);
|
const pointerPos = pointToRendererPoint(
|
||||||
|
{ x: x - (containerBounds?.left ?? 0), y: y - (containerBounds?.top ?? 0) },
|
||||||
|
transform
|
||||||
|
);
|
||||||
const { x: xSnapped, y: ySnapped } = snapToGrid ? snapPosition(pointerPos, snapGrid) : pointerPos;
|
const { x: xSnapped, y: ySnapped } = snapToGrid ? snapPosition(pointerPos, snapGrid) : pointerPos;
|
||||||
|
|
||||||
// we need the snapped position in order to be able to skip unnecessary drag events
|
// we need the snapped position in order to be able to skip unnecessary drag events
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ export function XYDrag<OnNodeDrag extends (e: any, nodes: any, node: any) => voi
|
|||||||
onNodeMouseDown?.(nodeId);
|
onNodeMouseDown?.(nodeId);
|
||||||
}
|
}
|
||||||
|
|
||||||
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid });
|
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid, containerBounds });
|
||||||
lastPos = pointerPos;
|
lastPos = pointerPos;
|
||||||
dragItems = getDragItems(nodeLookup, nodesDraggable, pointerPos, nodeId);
|
dragItems = getDragItems(nodeLookup, nodesDraggable, pointerPos, nodeId);
|
||||||
|
|
||||||
@@ -281,6 +281,7 @@ export function XYDrag<OnNodeDrag extends (e: any, nodes: any, node: any) => voi
|
|||||||
.clickDistance(nodeClickDistance)
|
.clickDistance(nodeClickDistance)
|
||||||
.on('start', (event: UseDragEvent) => {
|
.on('start', (event: UseDragEvent) => {
|
||||||
const { domNode, nodeDragThreshold, transform, snapGrid, snapToGrid } = getStoreItems();
|
const { domNode, nodeDragThreshold, transform, snapGrid, snapToGrid } = getStoreItems();
|
||||||
|
containerBounds = domNode?.getBoundingClientRect() || null;
|
||||||
|
|
||||||
abortDrag = false;
|
abortDrag = false;
|
||||||
|
|
||||||
@@ -288,14 +289,13 @@ export function XYDrag<OnNodeDrag extends (e: any, nodes: any, node: any) => voi
|
|||||||
startDrag(event);
|
startDrag(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid });
|
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid, containerBounds });
|
||||||
lastPos = pointerPos;
|
lastPos = pointerPos;
|
||||||
containerBounds = domNode?.getBoundingClientRect() || null;
|
|
||||||
mousePosition = getEventPosition(event.sourceEvent, containerBounds!);
|
mousePosition = getEventPosition(event.sourceEvent, containerBounds!);
|
||||||
})
|
})
|
||||||
.on('drag', (event: UseDragEvent) => {
|
.on('drag', (event: UseDragEvent) => {
|
||||||
const { autoPanOnNodeDrag, transform, snapGrid, snapToGrid, nodeDragThreshold, nodeLookup } = getStoreItems();
|
const { autoPanOnNodeDrag, transform, snapGrid, snapToGrid, nodeDragThreshold, nodeLookup } = getStoreItems();
|
||||||
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid });
|
const pointerPos = getPointerPosition(event.sourceEvent, { transform, snapGrid, snapToGrid, containerBounds });
|
||||||
|
|
||||||
if (
|
if (
|
||||||
(event.sourceEvent.type === 'touchmove' && event.sourceEvent.touches.length > 1) ||
|
(event.sourceEvent.type === 'touchmove' && event.sourceEvent.touches.length > 1) ||
|
||||||
|
|||||||
Reference in New Issue
Block a user