feat(selection): add context menu handler closes #478
This commit is contained in:
@@ -101,6 +101,7 @@ const BasicFlow = () => <ReactFlow elements={elements} />;
|
|||||||
- `onSelectionDragStart(evt: MouseEvent, nodes: Node[])`: called when user starts to drag a selection
|
- `onSelectionDragStart(evt: MouseEvent, nodes: Node[])`: called when user starts to drag a selection
|
||||||
- `onSelectionDrag(evt: MouseEvent, nodes: Node[])`: called when user drags 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
|
- `onSelectionDragStop(evt: MouseEvent, nodes: Node[])`: called when user stops to drag a selection
|
||||||
|
- `onSelectionContextMenu(event: MouseEvent, nodes: Node[])`: called when user does a right-click on 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
|
||||||
- `onPaneScroll(event: WheelEvent)`: called when user scrolls pane (only works when `zoomOnScroll` is set to `false)
|
- `onPaneScroll(event: WheelEvent)`: called when user scrolls pane (only works when `zoomOnScroll` is set to `false)
|
||||||
|
|||||||
@@ -7,6 +7,10 @@ const onNodeDragStop = (event, node) => console.log('drag stop', node);
|
|||||||
const onSelectionDrag = (event, nodes) => console.log('selection drag', nodes);
|
const onSelectionDrag = (event, nodes) => console.log('selection drag', nodes);
|
||||||
const onSelectionDragStart = (event, nodes) => console.log('selection drag start', nodes);
|
const onSelectionDragStart = (event, nodes) => console.log('selection drag start', nodes);
|
||||||
const onSelectionDragStop = (event, nodes) => console.log('selection drag stop', nodes);
|
const onSelectionDragStop = (event, nodes) => console.log('selection drag stop', nodes);
|
||||||
|
const onSelectionContextMenu = (event, nodes) => {
|
||||||
|
event.preventDefault();
|
||||||
|
console.log('selection context menu', 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) => {
|
||||||
@@ -126,6 +130,7 @@ const OverviewFlow = () => {
|
|||||||
onSelectionDragStart={onSelectionDragStart}
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
onSelectionDrag={onSelectionDrag}
|
onSelectionDrag={onSelectionDrag}
|
||||||
onSelectionDragStop={onSelectionDragStop}
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
|
onSelectionContextMenu={onSelectionContextMenu}
|
||||||
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, { MouseEvent } from 'react';
|
import React, { useMemo, useCallback, MouseEvent } from 'react';
|
||||||
import ReactDraggable, { DraggableData } from 'react-draggable';
|
import ReactDraggable, { DraggableData } from 'react-draggable';
|
||||||
|
|
||||||
import { useStoreState, useStoreActions } from '../../store/hooks';
|
import { useStoreState, useStoreActions } from '../../store/hooks';
|
||||||
@@ -14,9 +14,15 @@ export interface NodesSelectionProps {
|
|||||||
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionContextMenu?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ({ onSelectionDragStart, onSelectionDrag, onSelectionDragStop }: NodesSelectionProps) => {
|
export default ({
|
||||||
|
onSelectionDragStart,
|
||||||
|
onSelectionDrag,
|
||||||
|
onSelectionDragStop,
|
||||||
|
onSelectionContextMenu,
|
||||||
|
}: NodesSelectionProps) => {
|
||||||
const [tX, tY, tScale] = useStoreState((state) => state.transform);
|
const [tX, tY, tScale] = useStoreState((state) => state.transform);
|
||||||
const selectedNodesBbox = useStoreState((state) => state.selectedNodesBbox);
|
const selectedNodesBbox = useStoreState((state) => state.selectedNodesBbox);
|
||||||
const selectedElements = useStoreState((state) => state.selectedElements);
|
const selectedElements = useStoreState((state) => state.selectedElements);
|
||||||
@@ -32,31 +38,30 @@ export default ({ onSelectionDragStart, onSelectionDrag, onSelectionDragStop }:
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const onStart = (event: MouseEvent) => {
|
const selectedNodes = useMemo(
|
||||||
const selectedNodes = selectedElements
|
() =>
|
||||||
? selectedElements
|
selectedElements
|
||||||
.filter(isNode)
|
? selectedElements
|
||||||
.map((selectedNode) => nodes.find((node) => node.id === selectedNode.id)! as Node)
|
.filter(isNode)
|
||||||
: [];
|
.map((selectedNode) => nodes.find((node) => node.id === selectedNode.id)! as Node)
|
||||||
|
: [],
|
||||||
|
[selectedElements]
|
||||||
|
);
|
||||||
|
|
||||||
if (onSelectionDragStart) {
|
const onStart = useCallback(
|
||||||
onSelectionDragStart(event, selectedNodes);
|
(event: MouseEvent) => {
|
||||||
}
|
onSelectionDragStart?.(event, selectedNodes);
|
||||||
};
|
},
|
||||||
|
[onSelectionDragStart, selectedNodes]
|
||||||
const onDrag = (event: MouseEvent, data: DraggableData) => {
|
);
|
||||||
if (selectedElements) {
|
|
||||||
const selectedNodes = selectedElements ? selectedElements.filter(isNode) : [];
|
|
||||||
|
|
||||||
|
const onDrag = useCallback(
|
||||||
|
(event: MouseEvent, data: DraggableData) => {
|
||||||
if (onSelectionDrag) {
|
if (onSelectionDrag) {
|
||||||
const selectionNodes = selectedNodes.map(
|
onSelectionDrag(event, selectedNodes);
|
||||||
(selectedNode) => nodes.find((node) => node.id === selectedNode.id)! as Node
|
|
||||||
);
|
|
||||||
|
|
||||||
onSelectionDrag(event, selectionNodes);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
selectedNodes.forEach((node) => {
|
selectedNodes?.forEach((node) => {
|
||||||
updateNodePosDiff({
|
updateNodePosDiff({
|
||||||
id: node.id,
|
id: node.id,
|
||||||
diff: {
|
diff: {
|
||||||
@@ -65,26 +70,47 @@ export default ({ onSelectionDragStart, onSelectionDrag, onSelectionDragStop }:
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
};
|
[onSelectionDrag, selectedNodes, updateNodePosDiff]
|
||||||
|
);
|
||||||
|
|
||||||
const onStop = (event: MouseEvent) => {
|
const onStop = useCallback(
|
||||||
if (selectedElements && onSelectionDragStop) {
|
(event: MouseEvent) => {
|
||||||
|
onSelectionDragStop?.(event, selectedNodes);
|
||||||
|
},
|
||||||
|
[selectedNodes, onSelectionDragStop]
|
||||||
|
);
|
||||||
|
|
||||||
|
const onContextMenu = useCallback(
|
||||||
|
(event: MouseEvent) => {
|
||||||
const selectedNodes = selectedElements
|
const selectedNodes = selectedElements
|
||||||
? selectedElements.filter(isNode).map((selectedNode) => nodes.find((node) => node.id === selectedNode.id)!)
|
? selectedElements.filter(isNode).map((selectedNode) => nodes.find((node) => node.id === selectedNode.id)!)
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
onSelectionDragStop(event, selectedNodes);
|
onSelectionContextMenu?.(event, selectedNodes);
|
||||||
}
|
},
|
||||||
};
|
[onSelectionContextMenu]
|
||||||
|
);
|
||||||
|
|
||||||
|
const style = useMemo(
|
||||||
|
() => ({
|
||||||
|
transform: `translate(${tX}px,${tY}px) scale(${tScale})`,
|
||||||
|
}),
|
||||||
|
[tX, tY, tScale]
|
||||||
|
);
|
||||||
|
|
||||||
|
const innerStyle = useMemo(
|
||||||
|
() => ({
|
||||||
|
width: selectedNodesBbox.width,
|
||||||
|
height: selectedNodesBbox.height,
|
||||||
|
top: selectedNodesBbox.y,
|
||||||
|
left: selectedNodesBbox.x,
|
||||||
|
}),
|
||||||
|
[selectedNodesBbox]
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div className="react-flow__nodesselection" style={style}>
|
||||||
className="react-flow__nodesselection"
|
|
||||||
style={{
|
|
||||||
transform: `translate(${tX}px,${tY}px) scale(${tScale})`,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<ReactDraggable
|
<ReactDraggable
|
||||||
scale={tScale}
|
scale={tScale}
|
||||||
grid={grid}
|
grid={grid}
|
||||||
@@ -92,15 +118,7 @@ export default ({ onSelectionDragStart, onSelectionDrag, onSelectionDragStop }:
|
|||||||
onDrag={(event, data) => onDrag(event as MouseEvent, data)}
|
onDrag={(event, data) => onDrag(event as MouseEvent, data)}
|
||||||
onStop={(event) => onStop(event as MouseEvent)}
|
onStop={(event) => onStop(event as MouseEvent)}
|
||||||
>
|
>
|
||||||
<div
|
<div className="react-flow__nodesselection-rect" onContextMenu={onContextMenu} style={innerStyle} />
|
||||||
className="react-flow__nodesselection-rect"
|
|
||||||
style={{
|
|
||||||
width: selectedNodesBbox.width,
|
|
||||||
height: selectedNodesBbox.height,
|
|
||||||
top: selectedNodesBbox.y,
|
|
||||||
left: selectedNodesBbox.x,
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</ReactDraggable>
|
</ReactDraggable>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ export interface GraphViewProps {
|
|||||||
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionContextMenu?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
selectionKeyCode: number;
|
selectionKeyCode: number;
|
||||||
nodeTypes: NodeTypesType;
|
nodeTypes: NodeTypesType;
|
||||||
edgeTypes: EdgeTypesType;
|
edgeTypes: EdgeTypesType;
|
||||||
@@ -93,6 +94,7 @@ const GraphView = ({
|
|||||||
onSelectionDragStart,
|
onSelectionDragStart,
|
||||||
onSelectionDrag,
|
onSelectionDrag,
|
||||||
onSelectionDragStop,
|
onSelectionDragStop,
|
||||||
|
onSelectionContextMenu,
|
||||||
connectionLineType,
|
connectionLineType,
|
||||||
connectionLineStyle,
|
connectionLineStyle,
|
||||||
selectionKeyCode,
|
selectionKeyCode,
|
||||||
@@ -292,6 +294,7 @@ const GraphView = ({
|
|||||||
onSelectionDragStart={onSelectionDragStart}
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
onSelectionDrag={onSelectionDrag}
|
onSelectionDrag={onSelectionDrag}
|
||||||
onSelectionDragStop={onSelectionDragStop}
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
|
onSelectionContextMenu={onSelectionContextMenu}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'on
|
|||||||
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStart?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDrag?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
onSelectionDragStop?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
|
onSelectionContextMenu?: (event: MouseEvent, nodes: Node[]) => void;
|
||||||
onPaneScroll?: (event?: WheelEvent) => void;
|
onPaneScroll?: (event?: WheelEvent) => void;
|
||||||
onPaneClick?: (event: MouseEvent) => void;
|
onPaneClick?: (event: MouseEvent) => void;
|
||||||
onPaneContextMenu?: (event: MouseEvent) => void;
|
onPaneContextMenu?: (event: MouseEvent) => void;
|
||||||
@@ -112,6 +113,7 @@ const ReactFlow = ({
|
|||||||
onSelectionDragStart,
|
onSelectionDragStart,
|
||||||
onSelectionDrag,
|
onSelectionDrag,
|
||||||
onSelectionDragStop,
|
onSelectionDragStop,
|
||||||
|
onSelectionContextMenu,
|
||||||
connectionLineType,
|
connectionLineType,
|
||||||
connectionLineStyle,
|
connectionLineStyle,
|
||||||
deleteKeyCode,
|
deleteKeyCode,
|
||||||
@@ -191,6 +193,7 @@ const ReactFlow = ({
|
|||||||
onSelectionDragStart={onSelectionDragStart}
|
onSelectionDragStart={onSelectionDragStart}
|
||||||
onSelectionDrag={onSelectionDrag}
|
onSelectionDrag={onSelectionDrag}
|
||||||
onSelectionDragStop={onSelectionDragStop}
|
onSelectionDragStop={onSelectionDragStop}
|
||||||
|
onSelectionContextMenu={onSelectionContextMenu}
|
||||||
/>
|
/>
|
||||||
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
|
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
Reference in New Issue
Block a user