feat(connecting): move pane when mouse is close to edge of canvas #2753
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
import type { MouseEvent as ReactMouseEvent } from 'react';
|
import type { MouseEvent as ReactMouseEvent } from 'react';
|
||||||
import { StoreApi } from 'zustand';
|
import { StoreApi } from 'zustand';
|
||||||
|
|
||||||
import { getHostForElement } from '../../utils';
|
import { clamp, getHostForElement } from '../../utils';
|
||||||
import { ConnectionMode } from '../../types';
|
import { ConnectionMode } from '../../types';
|
||||||
import type { OnConnect, Connection, HandleType, ReactFlowState } from '../../types';
|
import type { OnConnect, Connection, HandleType, ReactFlowState, XYPosition } from '../../types';
|
||||||
|
|
||||||
type ValidConnectionFunc = (connection: Connection) => boolean;
|
type ValidConnectionFunc = (connection: Connection) => boolean;
|
||||||
|
|
||||||
@@ -75,6 +75,18 @@ function resetRecentHandle(hoveredHandle: Element): void {
|
|||||||
hoveredHandle?.classList.remove('react-flow__handle-connecting');
|
hoveredHandle?.classList.remove('react-flow__handle-connecting');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// returns a number between 0 and 1 that represents the velocity of the movement
|
||||||
|
// when the mouse is close to the edge of the canvas
|
||||||
|
function getVelocity(value: number, min: number, max: number): number {
|
||||||
|
if (value < min) {
|
||||||
|
return clamp(Math.abs(value - min), 1, 100) / 100;
|
||||||
|
} else if (value > max) {
|
||||||
|
return -clamp(Math.abs(value - max), 1, 100) / 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
export function handleMouseDown({
|
export function handleMouseDown({
|
||||||
event,
|
event,
|
||||||
handleId,
|
handleId,
|
||||||
@@ -98,11 +110,26 @@ export function handleMouseDown({
|
|||||||
elementEdgeUpdaterType?: HandleType;
|
elementEdgeUpdaterType?: HandleType;
|
||||||
onEdgeUpdateEnd?: (evt: MouseEvent) => void;
|
onEdgeUpdateEnd?: (evt: MouseEvent) => void;
|
||||||
}): void {
|
}): void {
|
||||||
const reactFlowNode = (event.target as Element).closest('.react-flow');
|
|
||||||
// when react-flow is used inside a shadow root we can't use document
|
// when react-flow is used inside a shadow root we can't use document
|
||||||
const doc = getHostForElement(event.target as HTMLElement);
|
const doc = getHostForElement(event.target as HTMLElement);
|
||||||
|
const { onConnectStart, connectionMode, domNode } = getState();
|
||||||
|
let connectionPosition: XYPosition | null = null;
|
||||||
|
let requestAnimationFrameId = 0;
|
||||||
|
|
||||||
if (!doc) {
|
// when the user is moving the mouse close to the edge of the canvas while connecting we move the canvas
|
||||||
|
const updateViewport = (): void => {
|
||||||
|
if (!connectionPosition || !containerBounds) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const xMovement = getVelocity(connectionPosition.x, 35, containerBounds.width - 35) * 20;
|
||||||
|
const yMovement = getVelocity(connectionPosition.y, 35, containerBounds.height - 35) * 20;
|
||||||
|
|
||||||
|
getState().movePane({ x: xMovement, y: yMovement });
|
||||||
|
requestAnimationFrameId = requestAnimationFrame(updateViewport);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!doc || !domNode) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,33 +137,36 @@ export function handleMouseDown({
|
|||||||
const elementBelowIsTarget = elementBelow?.classList.contains('target');
|
const elementBelowIsTarget = elementBelow?.classList.contains('target');
|
||||||
const elementBelowIsSource = elementBelow?.classList.contains('source');
|
const elementBelowIsSource = elementBelow?.classList.contains('source');
|
||||||
|
|
||||||
if (!reactFlowNode || (!elementBelowIsTarget && !elementBelowIsSource && !elementEdgeUpdaterType)) {
|
if (!elementBelowIsTarget && !elementBelowIsSource && !elementEdgeUpdaterType) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { onConnectStart, connectionMode } = getState();
|
|
||||||
const handleType = elementEdgeUpdaterType ? elementEdgeUpdaterType : elementBelowIsTarget ? 'target' : 'source';
|
const handleType = elementEdgeUpdaterType ? elementEdgeUpdaterType : elementBelowIsTarget ? 'target' : 'source';
|
||||||
const containerBounds = reactFlowNode.getBoundingClientRect();
|
const containerBounds = domNode.getBoundingClientRect();
|
||||||
let recentHoveredHandle: Element;
|
let recentHoveredHandle: Element;
|
||||||
|
connectionPosition = {
|
||||||
|
x: event.clientX - containerBounds.left,
|
||||||
|
y: event.clientY - containerBounds.top,
|
||||||
|
};
|
||||||
|
|
||||||
|
updateViewport();
|
||||||
|
|
||||||
setState({
|
setState({
|
||||||
connectionPosition: {
|
connectionPosition,
|
||||||
x: event.clientX - containerBounds.left,
|
|
||||||
y: event.clientY - containerBounds.top,
|
|
||||||
},
|
|
||||||
connectionNodeId: nodeId,
|
connectionNodeId: nodeId,
|
||||||
connectionHandleId: handleId,
|
connectionHandleId: handleId,
|
||||||
connectionHandleType: handleType,
|
connectionHandleType: handleType,
|
||||||
});
|
});
|
||||||
|
|
||||||
onConnectStart?.(event, { nodeId, handleId, handleType });
|
onConnectStart?.(event, { nodeId, handleId, handleType });
|
||||||
|
|
||||||
function onMouseMove(event: MouseEvent) {
|
function onMouseMove(event: MouseEvent) {
|
||||||
|
connectionPosition = {
|
||||||
|
x: event.clientX - containerBounds.left,
|
||||||
|
y: event.clientY - containerBounds.top,
|
||||||
|
};
|
||||||
|
|
||||||
setState({
|
setState({
|
||||||
connectionPosition: {
|
connectionPosition,
|
||||||
x: event.clientX - containerBounds.left,
|
|
||||||
y: event.clientY - containerBounds.top,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const { connection, elementBelow, isValid, isHoveringHandle } = checkElementBelowIsValid(
|
const { connection, elementBelow, isValid, isHoveringHandle } = checkElementBelowIsValid(
|
||||||
@@ -162,6 +192,8 @@ export function handleMouseDown({
|
|||||||
}
|
}
|
||||||
|
|
||||||
function onMouseUp(event: MouseEvent) {
|
function onMouseUp(event: MouseEvent) {
|
||||||
|
cancelAnimationFrame(requestAnimationFrameId);
|
||||||
|
|
||||||
const { connection, isValid } = checkElementBelowIsValid(
|
const { connection, isValid } = checkElementBelowIsValid(
|
||||||
event,
|
event,
|
||||||
connectionMode,
|
connectionMode,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { createStore } from 'zustand';
|
import { createStore } from 'zustand';
|
||||||
|
import { zoomIdentity } from 'd3-zoom';
|
||||||
|
|
||||||
import { clampPosition, getDimensions, internalsSymbol } from '../utils';
|
import { clampPosition, getDimensions, internalsSymbol } from '../utils';
|
||||||
import { applyNodeChanges, createSelectionChange, getSelectionChanges } from '../utils/changes';
|
import { applyNodeChanges, createSelectionChange, getSelectionChanges } from '../utils/changes';
|
||||||
@@ -19,6 +20,7 @@ import type {
|
|||||||
UnselectNodesAndEdgesParams,
|
UnselectNodesAndEdgesParams,
|
||||||
NodeChange,
|
NodeChange,
|
||||||
} from '../types';
|
} from '../types';
|
||||||
|
import { XYPosition } from 'react-flow-renderer';
|
||||||
|
|
||||||
const createRFStore = () =>
|
const createRFStore = () =>
|
||||||
createStore<ReactFlowState>((set, get) => ({
|
createStore<ReactFlowState>((set, get) => ({
|
||||||
@@ -250,6 +252,23 @@ const createRFStore = () =>
|
|||||||
nodeInternals: new Map(nodeInternals),
|
nodeInternals: new Map(nodeInternals),
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
movePane: (delta: XYPosition) => {
|
||||||
|
const { transform, width, height, d3Zoom, d3Selection, translateExtent } = get();
|
||||||
|
|
||||||
|
if (!d3Zoom || !d3Selection || (!delta.x && !delta.y)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextTransform = zoomIdentity.translate(transform[0] + delta.x, transform[1] + delta.y).scale(transform[2]);
|
||||||
|
|
||||||
|
const extent: CoordinateExtent = [
|
||||||
|
[0, 0],
|
||||||
|
[width, height],
|
||||||
|
];
|
||||||
|
|
||||||
|
const constrainedTransform = d3Zoom?.constrain()(nextTransform, extent, translateExtent);
|
||||||
|
d3Zoom.transform(d3Selection, constrainedTransform);
|
||||||
|
},
|
||||||
cancelConnection: () =>
|
cancelConnection: () =>
|
||||||
set({
|
set({
|
||||||
connectionNodeId: initialState.connectionNodeId,
|
connectionNodeId: initialState.connectionNodeId,
|
||||||
|
|||||||
@@ -230,6 +230,7 @@ export type ReactFlowActions = {
|
|||||||
cancelConnection: () => void;
|
cancelConnection: () => void;
|
||||||
reset: () => void;
|
reset: () => void;
|
||||||
triggerNodeChanges: (changes: NodeChange[]) => void;
|
triggerNodeChanges: (changes: NodeChange[]) => void;
|
||||||
|
movePane: (delta: XYPosition) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ReactFlowState = ReactFlowStore & ReactFlowActions;
|
export type ReactFlowState = ReactFlowStore & ReactFlowActions;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
|
import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
|
||||||
|
|
||||||
import type { Dimensions, Node, XYPosition, CoordinateExtent, Box, Rect } from '../types';
|
import type { Dimensions, Node, XYPosition, CoordinateExtent, Box, Rect } from '../types';
|
||||||
|
|
||||||
export const getDimensions = (node: HTMLDivElement): Dimensions => ({
|
export const getDimensions = (node: HTMLDivElement): Dimensions => ({
|
||||||
|
|||||||
Reference in New Issue
Block a user