feat(selection): add drag handlers closes #444
This commit is contained in:
@@ -97,6 +97,9 @@ const BasicFlow = () => <ReactFlow elements={elements} />;
|
|||||||
- `onMoveStart()`: called when user starts panning or zooming
|
- `onMoveStart()`: called when user starts panning or zooming
|
||||||
- `onMoveEnd()`: called when user ends panning or zooming
|
- `onMoveEnd()`: called when user ends panning or zooming
|
||||||
- `onSelectionChange(elements: Elements)`: called when user selects one or multiple elements
|
- `onSelectionChange(elements: Elements)`: called when user selects one or multiple elements
|
||||||
|
- `onSelectionDragStart(evt: MouseEvent, nodes: Node[])`: called when user starts to drag a selection
|
||||||
|
- `onSelectionDrag(evt: MouseEvent, nodes: Node[])`: called when user drags a selection
|
||||||
|
- `onSelectionDragStop(evt: MouseEvent, nodes: Node[])`: called when user stops to drag a selection
|
||||||
- `onPaneClick(event: MouseEvent)`: called when user clicks directly on the canvas
|
- `onPaneClick(event: MouseEvent)`: called when user clicks directly on the canvas
|
||||||
- `onPaneContextMenu(event: MouseEvent)`: called when user does a right-click on the canvas
|
- `onPaneContextMenu(event: MouseEvent)`: called when user does a right-click on the canvas
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import ReactFlow, { removeElements, addEdge, MiniMap, Controls, Background, isNo
|
|||||||
|
|
||||||
const onNodeDragStart = (event, node) => console.log('drag start', node);
|
const onNodeDragStart = (event, node) => console.log('drag start', node);
|
||||||
const onNodeDragStop = (event, node) => console.log('drag stop', node);
|
const onNodeDragStop = (event, node) => console.log('drag stop', node);
|
||||||
|
const onSelectionDrag = (event, nodes) => console.log('selection drag', nodes);
|
||||||
|
const onSelectionDragStart = (event, nodes) => console.log('selection drag start', nodes);
|
||||||
|
const onSelectionDragStop = (event, nodes) => console.log('selection drag stop', nodes);
|
||||||
const onElementClick = (event, element) => console.log(`${isNode(element) ? 'node' : 'edge'} click:`, element);
|
const onElementClick = (event, element) => console.log(`${isNode(element) ? 'node' : 'edge'} click:`, element);
|
||||||
const onSelectionChange = (elements) => console.log('selection change', elements);
|
const onSelectionChange = (elements) => console.log('selection change', elements);
|
||||||
const onLoad = (reactFlowInstance) => {
|
const onLoad = (reactFlowInstance) => {
|
||||||
@@ -120,6 +123,9 @@ const OverviewFlow = () => {
|
|||||||
onConnect={onConnect}
|
onConnect={onConnect}
|
||||||
onNodeDragStart={onNodeDragStart}
|
onNodeDragStart={onNodeDragStart}
|
||||||
onNodeDragStop={onNodeDragStop}
|
onNodeDragStop={onNodeDragStop}
|
||||||
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
|
onSelectionDrag={onSelectionDrag}
|
||||||
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
onSelectionChange={onSelectionChange}
|
onSelectionChange={onSelectionChange}
|
||||||
onMoveEnd={onMoveEnd}
|
onMoveEnd={onMoveEnd}
|
||||||
onLoad={onLoad}
|
onLoad={onLoad}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* made a selectio with on or several nodes
|
* made a selectio with on or several nodes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, { useState } from 'react';
|
import React, { useState, MouseEvent } from 'react';
|
||||||
import ReactDraggable from 'react-draggable';
|
import ReactDraggable from 'react-draggable';
|
||||||
|
|
||||||
import { useStoreState, useStoreActions } from '../../store/hooks';
|
import { useStoreState, useStoreActions } from '../../store/hooks';
|
||||||
@@ -27,7 +27,13 @@ function getStartPositions(nodes: Node[]): StartPositions {
|
|||||||
}, startPositions);
|
}, startPositions);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default () => {
|
export interface NodesSelectionProps {
|
||||||
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ({ onSelectionDragStart, onSelectionDrag, onSelectionDragStop }: NodesSelectionProps) => {
|
||||||
const [offset, setOffset] = useState<XYPosition>({ x: 0, y: 0 });
|
const [offset, setOffset] = useState<XYPosition>({ x: 0, y: 0 });
|
||||||
const [startPositions, setStartPositions] = useState<StartPositions>({});
|
const [startPositions, setStartPositions] = useState<StartPositions>({});
|
||||||
|
|
||||||
@@ -61,6 +67,10 @@ export default () => {
|
|||||||
|
|
||||||
const nextStartPositions = getStartPositions(selectedNodes);
|
const nextStartPositions = getStartPositions(selectedNodes);
|
||||||
|
|
||||||
|
if (onSelectionDragStart) {
|
||||||
|
onSelectionDragStart(event, selectedNodes);
|
||||||
|
}
|
||||||
|
|
||||||
if (nextStartPositions) {
|
if (nextStartPositions) {
|
||||||
setOffset({ x: offsetX, y: offsetY });
|
setOffset({ x: offsetX, y: offsetY });
|
||||||
setStartPositions(nextStartPositions);
|
setStartPositions(nextStartPositions);
|
||||||
@@ -74,7 +84,17 @@ export default () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (selectedElements) {
|
if (selectedElements) {
|
||||||
selectedElements.filter(isNode).forEach((node) => {
|
const selectedNodes = selectedElements ? selectedElements.filter(isNode) : [];
|
||||||
|
|
||||||
|
if (onSelectionDrag) {
|
||||||
|
const selectionNodes = selectedNodes.map(
|
||||||
|
(selectedNode) => nodes.find((node) => node.id === selectedNode.id)! as Node
|
||||||
|
);
|
||||||
|
|
||||||
|
onSelectionDrag(event, selectionNodes);
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedNodes.forEach((node) => {
|
||||||
const pos: XYPosition = {
|
const pos: XYPosition = {
|
||||||
x: startPositions[node.id].x + scaledClient.x - selectedNodesBbox.x - offset.x - tX,
|
x: startPositions[node.id].x + scaledClient.x - selectedNodesBbox.x - offset.x - tX,
|
||||||
y: startPositions[node.id].y + scaledClient.y - selectedNodesBbox.y - offset.y - tY,
|
y: startPositions[node.id].y + scaledClient.y - selectedNodesBbox.y - offset.y - tY,
|
||||||
@@ -85,6 +105,16 @@ export default () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onStop = (event: MouseEvent) => {
|
||||||
|
if (selectedElements && onSelectionDragStop) {
|
||||||
|
const selectedNodes = selectedElements
|
||||||
|
? selectedElements.filter(isNode).map((selectedNode) => nodes.find((node) => node.id === selectedNode.id)!)
|
||||||
|
: [];
|
||||||
|
|
||||||
|
onSelectionDragStop(event, selectedNodes);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="react-flow__nodesselection"
|
className="react-flow__nodesselection"
|
||||||
@@ -97,6 +127,7 @@ export default () => {
|
|||||||
grid={grid}
|
grid={grid}
|
||||||
onStart={(event) => onStart(event as MouseEvent)}
|
onStart={(event) => onStart(event as MouseEvent)}
|
||||||
onDrag={(event) => onDrag(event as MouseEvent)}
|
onDrag={(event) => onDrag(event as MouseEvent)}
|
||||||
|
onStop={(event) => onStop(event as MouseEvent)}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="react-flow__nodesselection-rect"
|
className="react-flow__nodesselection-rect"
|
||||||
|
|||||||
@@ -46,6 +46,9 @@ export interface GraphViewProps {
|
|||||||
onMoveEnd?: (flowTransform?: FlowTransform) => void;
|
onMoveEnd?: (flowTransform?: FlowTransform) => void;
|
||||||
onPaneClick?: (event: MouseEvent) => void;
|
onPaneClick?: (event: MouseEvent) => void;
|
||||||
onPaneContextMenu?: (event: MouseEvent) => void;
|
onPaneContextMenu?: (event: MouseEvent) => void;
|
||||||
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
selectionKeyCode: number;
|
selectionKeyCode: number;
|
||||||
nodeTypes: NodeTypesType;
|
nodeTypes: NodeTypesType;
|
||||||
edgeTypes: EdgeTypesType;
|
edgeTypes: EdgeTypesType;
|
||||||
@@ -84,6 +87,9 @@ const GraphView = ({
|
|||||||
onNodeContextMenu,
|
onNodeContextMenu,
|
||||||
onNodeDragStart,
|
onNodeDragStart,
|
||||||
onNodeDragStop,
|
onNodeDragStop,
|
||||||
|
onSelectionDragStart,
|
||||||
|
onSelectionDrag,
|
||||||
|
onSelectionDragStop,
|
||||||
connectionLineType,
|
connectionLineType,
|
||||||
connectionLineStyle,
|
connectionLineStyle,
|
||||||
selectionKeyCode,
|
selectionKeyCode,
|
||||||
@@ -262,7 +268,13 @@ const GraphView = ({
|
|||||||
markerEndId={markerEndId}
|
markerEndId={markerEndId}
|
||||||
/>
|
/>
|
||||||
<UserSelection selectionKeyPressed={selectionKeyPressed} />
|
<UserSelection selectionKeyPressed={selectionKeyPressed} />
|
||||||
{nodesSelectionActive && <NodesSelection />}
|
{nodesSelectionActive && (
|
||||||
|
<NodesSelection
|
||||||
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
|
onSelectionDrag={onSelectionDrag}
|
||||||
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<div
|
<div
|
||||||
className="react-flow__zoompane"
|
className="react-flow__zoompane"
|
||||||
onClick={onZoomPaneClick}
|
onClick={onZoomPaneClick}
|
||||||
|
|||||||
@@ -53,6 +53,9 @@ export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'on
|
|||||||
onMoveStart?: (flowTransform?: FlowTransform) => void;
|
onMoveStart?: (flowTransform?: FlowTransform) => void;
|
||||||
onMoveEnd?: (flowTransform?: FlowTransform) => void;
|
onMoveEnd?: (flowTransform?: FlowTransform) => void;
|
||||||
onSelectionChange?: (elements: Elements | null) => void;
|
onSelectionChange?: (elements: Elements | null) => void;
|
||||||
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onPaneClick?: (event: MouseEvent) => void;
|
onPaneClick?: (event: MouseEvent) => void;
|
||||||
onPaneContextMenu?: (event: MouseEvent) => void;
|
onPaneContextMenu?: (event: MouseEvent) => void;
|
||||||
nodeTypes: NodeTypesType;
|
nodeTypes: NodeTypesType;
|
||||||
@@ -103,6 +106,9 @@ const ReactFlow = ({
|
|||||||
onNodeDragStart,
|
onNodeDragStart,
|
||||||
onNodeDragStop,
|
onNodeDragStop,
|
||||||
onSelectionChange,
|
onSelectionChange,
|
||||||
|
onSelectionDragStart,
|
||||||
|
onSelectionDrag,
|
||||||
|
onSelectionDragStop,
|
||||||
connectionLineType,
|
connectionLineType,
|
||||||
connectionLineStyle,
|
connectionLineStyle,
|
||||||
deleteKeyCode,
|
deleteKeyCode,
|
||||||
@@ -175,6 +181,9 @@ const ReactFlow = ({
|
|||||||
paneMoveable={paneMoveable}
|
paneMoveable={paneMoveable}
|
||||||
onPaneClick={onPaneClick}
|
onPaneClick={onPaneClick}
|
||||||
onPaneContextMenu={onPaneContextMenu}
|
onPaneContextMenu={onPaneContextMenu}
|
||||||
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
|
onSelectionDrag={onSelectionDrag}
|
||||||
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
/>
|
/>
|
||||||
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
|
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
Reference in New Issue
Block a user