feat(elements): multiselect
This commit is contained in:
@@ -33,7 +33,7 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
|
|||||||
markerEndId,
|
markerEndId,
|
||||||
isHidden,
|
isHidden,
|
||||||
}: WrapEdgeProps) => {
|
}: WrapEdgeProps) => {
|
||||||
const setSelectedElements = useStoreActions((actions) => actions.setSelectedElements);
|
const addSelectedElements = useStoreActions((actions) => actions.addSelectedElements);
|
||||||
|
|
||||||
const inactive = !elementsSelectable && !onClick;
|
const inactive = !elementsSelectable && !onClick;
|
||||||
const edgeClasses = cc([
|
const edgeClasses = cc([
|
||||||
@@ -46,7 +46,7 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
|
|||||||
const onEdgeClick = useCallback(
|
const onEdgeClick = useCallback(
|
||||||
(event: React.MouseEvent<SVGGElement, MouseEvent>): void => {
|
(event: React.MouseEvent<SVGGElement, MouseEvent>): void => {
|
||||||
if (elementsSelectable) {
|
if (elementsSelectable) {
|
||||||
setSelectedElements({ id, source, target });
|
addSelectedElements({ id, source, target });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (onClick) {
|
if (onClick) {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
|
|||||||
isDragging,
|
isDragging,
|
||||||
}: WrapNodeProps) => {
|
}: WrapNodeProps) => {
|
||||||
const updateNodeDimensions = useStoreActions((actions) => actions.updateNodeDimensions);
|
const updateNodeDimensions = useStoreActions((actions) => actions.updateNodeDimensions);
|
||||||
const setSelectedElements = useStoreActions((actions) => actions.setSelectedElements);
|
const addSelectedElements = useStoreActions((actions) => actions.addSelectedElements);
|
||||||
const updateNodePosDiff = useStoreActions((actions) => actions.updateNodePosDiff);
|
const updateNodePosDiff = useStoreActions((actions) => actions.updateNodePosDiff);
|
||||||
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
||||||
|
|
||||||
@@ -94,7 +94,7 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
|
|||||||
if (!isDraggable) {
|
if (!isDraggable) {
|
||||||
if (isSelectable) {
|
if (isSelectable) {
|
||||||
unsetNodesSelection();
|
unsetNodesSelection();
|
||||||
setSelectedElements({ id: node.id, type: node.type } as Node);
|
addSelectedElements({ id: node.id, type: node.type } as Node);
|
||||||
}
|
}
|
||||||
|
|
||||||
onClick?.(event, node);
|
onClick?.(event, node);
|
||||||
@@ -109,7 +109,7 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
|
|||||||
|
|
||||||
if (selectNodesOnDrag && isSelectable) {
|
if (selectNodesOnDrag && isSelectable) {
|
||||||
unsetNodesSelection();
|
unsetNodesSelection();
|
||||||
setSelectedElements({ id: node.id, type: node.type } as Node);
|
addSelectedElements({ id: node.id, type: node.type } as Node);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[node, selectNodesOnDrag, isSelectable, onNodeDragStart]
|
[node, selectNodesOnDrag, isSelectable, onNodeDragStart]
|
||||||
@@ -134,7 +134,7 @@ export default (NodeComponent: ComponentType<NodeComponentProps>) => {
|
|||||||
// Because of that we set dragging to true inside the onDrag handler and handle the click here
|
// Because of that we set dragging to true inside the onDrag handler and handle the click here
|
||||||
if (!isDragging) {
|
if (!isDragging) {
|
||||||
if (isSelectable && !selectNodesOnDrag) {
|
if (isSelectable && !selectNodesOnDrag) {
|
||||||
setSelectedElements({ id: node.id, type: node.type } as Node);
|
addSelectedElements({ id: node.id, type: node.type } as Node);
|
||||||
}
|
}
|
||||||
|
|
||||||
onClick?.(event as MouseEvent, node);
|
onClick?.(event as MouseEvent, node);
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ const FlowRenderer = ({
|
|||||||
onMoveStart,
|
onMoveStart,
|
||||||
onMoveEnd,
|
onMoveEnd,
|
||||||
selectionKeyCode,
|
selectionKeyCode,
|
||||||
|
multiSelectionKeyCode,
|
||||||
zoomOnScroll,
|
zoomOnScroll,
|
||||||
zoomOnDoubleClick,
|
zoomOnDoubleClick,
|
||||||
paneMoveable,
|
paneMoveable,
|
||||||
@@ -48,12 +49,15 @@ const FlowRenderer = ({
|
|||||||
onSelectionContextMenu,
|
onSelectionContextMenu,
|
||||||
}: FlowRendererProps) => {
|
}: FlowRendererProps) => {
|
||||||
const zoomPane = useRef<HTMLDivElement>(null);
|
const zoomPane = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
||||||
|
const resetSelectedElements = useStoreActions((actions) => actions.resetSelectedElements);
|
||||||
const nodesSelectionActive = useStoreState((state) => state.nodesSelectionActive);
|
const nodesSelectionActive = useStoreState((state) => state.nodesSelectionActive);
|
||||||
|
|
||||||
const selectionKeyPressed = useKeyPress(selectionKeyCode);
|
const selectionKeyPressed = useKeyPress(selectionKeyCode);
|
||||||
|
|
||||||
useResizeHandler(zoomPane);
|
useResizeHandler(zoomPane);
|
||||||
useGlobalKeyHandler({ onElementsRemove, deleteKeyCode });
|
useGlobalKeyHandler({ onElementsRemove, deleteKeyCode, multiSelectionKeyCode });
|
||||||
|
|
||||||
useD3Zoom({
|
useD3Zoom({
|
||||||
zoomPane,
|
zoomPane,
|
||||||
@@ -73,6 +77,7 @@ const FlowRenderer = ({
|
|||||||
(event: MouseEvent) => {
|
(event: MouseEvent) => {
|
||||||
onPaneClick?.(event);
|
onPaneClick?.(event);
|
||||||
unsetNodesSelection();
|
unsetNodesSelection();
|
||||||
|
resetSelectedElements();
|
||||||
},
|
},
|
||||||
[onPaneClick]
|
[onPaneClick]
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ export interface GraphViewProps {
|
|||||||
connectionLineStyle?: CSSProperties;
|
connectionLineStyle?: CSSProperties;
|
||||||
connectionLineComponent?: ConnectionLineComponent;
|
connectionLineComponent?: ConnectionLineComponent;
|
||||||
deleteKeyCode: number;
|
deleteKeyCode: number;
|
||||||
|
multiSelectionKeyCode: number;
|
||||||
snapToGrid: boolean;
|
snapToGrid: boolean;
|
||||||
snapGrid: [number, number];
|
snapGrid: [number, number];
|
||||||
onlyRenderVisibleNodes: boolean;
|
onlyRenderVisibleNodes: boolean;
|
||||||
@@ -96,6 +97,7 @@ const GraphView = ({
|
|||||||
connectionLineStyle,
|
connectionLineStyle,
|
||||||
connectionLineComponent,
|
connectionLineComponent,
|
||||||
selectionKeyCode,
|
selectionKeyCode,
|
||||||
|
multiSelectionKeyCode,
|
||||||
onElementsRemove,
|
onElementsRemove,
|
||||||
deleteKeyCode,
|
deleteKeyCode,
|
||||||
elements,
|
elements,
|
||||||
@@ -245,6 +247,7 @@ const GraphView = ({
|
|||||||
onElementsRemove={onElementsRemove}
|
onElementsRemove={onElementsRemove}
|
||||||
deleteKeyCode={deleteKeyCode}
|
deleteKeyCode={deleteKeyCode}
|
||||||
selectionKeyCode={selectionKeyCode}
|
selectionKeyCode={selectionKeyCode}
|
||||||
|
multiSelectionKeyCode={multiSelectionKeyCode}
|
||||||
onMove={onMove}
|
onMove={onMove}
|
||||||
onMoveStart={onMoveStart}
|
onMoveStart={onMoveStart}
|
||||||
onMoveEnd={onMoveEnd}
|
onMoveEnd={onMoveEnd}
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'on
|
|||||||
connectionLineComponent?: ConnectionLineComponent;
|
connectionLineComponent?: ConnectionLineComponent;
|
||||||
deleteKeyCode?: number;
|
deleteKeyCode?: number;
|
||||||
selectionKeyCode?: number;
|
selectionKeyCode?: number;
|
||||||
|
multiSelectionKeyCode?: number;
|
||||||
snapToGrid?: boolean;
|
snapToGrid?: boolean;
|
||||||
snapGrid?: [number, number];
|
snapGrid?: [number, number];
|
||||||
onlyRenderVisibleNodes?: boolean;
|
onlyRenderVisibleNodes?: boolean;
|
||||||
@@ -132,6 +133,7 @@ const ReactFlow = ({
|
|||||||
connectionLineComponent,
|
connectionLineComponent,
|
||||||
deleteKeyCode = 8,
|
deleteKeyCode = 8,
|
||||||
selectionKeyCode = 16,
|
selectionKeyCode = 16,
|
||||||
|
multiSelectionKeyCode = 91,
|
||||||
snapToGrid = false,
|
snapToGrid = false,
|
||||||
snapGrid = [15, 15],
|
snapGrid = [15, 15],
|
||||||
onlyRenderVisibleNodes = true,
|
onlyRenderVisibleNodes = true,
|
||||||
@@ -182,6 +184,7 @@ const ReactFlow = ({
|
|||||||
selectionKeyCode={selectionKeyCode}
|
selectionKeyCode={selectionKeyCode}
|
||||||
onElementsRemove={onElementsRemove}
|
onElementsRemove={onElementsRemove}
|
||||||
deleteKeyCode={deleteKeyCode}
|
deleteKeyCode={deleteKeyCode}
|
||||||
|
multiSelectionKeyCode={multiSelectionKeyCode}
|
||||||
elements={elements}
|
elements={elements}
|
||||||
onConnect={onConnect}
|
onConnect={onConnect}
|
||||||
onConnectStart={onConnectStart}
|
onConnectStart={onConnectStart}
|
||||||
|
|||||||
@@ -7,15 +7,20 @@ import { Elements } from '../types';
|
|||||||
|
|
||||||
interface HookParams {
|
interface HookParams {
|
||||||
deleteKeyCode: number;
|
deleteKeyCode: number;
|
||||||
|
multiSelectionKeyCode: number;
|
||||||
onElementsRemove?: (elements: Elements) => void;
|
onElementsRemove?: (elements: Elements) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ({ deleteKeyCode, onElementsRemove }: HookParams): void => {
|
export default ({ deleteKeyCode, multiSelectionKeyCode, onElementsRemove }: HookParams): void => {
|
||||||
const selectedElements = useStoreState((state) => state.selectedElements);
|
const selectedElements = useStoreState((state) => state.selectedElements);
|
||||||
const edges = useStoreState((state) => state.edges);
|
const edges = useStoreState((state) => state.edges);
|
||||||
|
|
||||||
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
const unsetNodesSelection = useStoreActions((actions) => actions.unsetNodesSelection);
|
||||||
|
const setMultiSelectionActive = useStoreActions((actions) => actions.setMultiSelectionActive);
|
||||||
|
const resetSelectedElements = useStoreActions((actions) => actions.resetSelectedElements);
|
||||||
|
|
||||||
const deleteKeyPressed = useKeyPress(deleteKeyCode);
|
const deleteKeyPressed = useKeyPress(deleteKeyCode);
|
||||||
|
const multiSelectionKeyPressed = useKeyPress(multiSelectionKeyCode);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (onElementsRemove && deleteKeyPressed && selectedElements) {
|
if (onElementsRemove && deleteKeyPressed && selectedElements) {
|
||||||
@@ -30,6 +35,11 @@ export default ({ deleteKeyCode, onElementsRemove }: HookParams): void => {
|
|||||||
|
|
||||||
onElementsRemove(elementsToRemove);
|
onElementsRemove(elementsToRemove);
|
||||||
unsetNodesSelection();
|
unsetNodesSelection();
|
||||||
|
resetSelectedElements();
|
||||||
}
|
}
|
||||||
}, [deleteKeyPressed]);
|
}, [deleteKeyPressed]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setMultiSelectionActive(multiSelectionKeyPressed);
|
||||||
|
}, [multiSelectionKeyPressed])
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -82,6 +82,8 @@ export interface StoreModel {
|
|||||||
nodesConnectable: boolean;
|
nodesConnectable: boolean;
|
||||||
elementsSelectable: boolean;
|
elementsSelectable: boolean;
|
||||||
|
|
||||||
|
multiSelectionActive: boolean;
|
||||||
|
|
||||||
reactFlowVersion: string;
|
reactFlowVersion: string;
|
||||||
|
|
||||||
onConnect?: OnConnectFunc;
|
onConnect?: OnConnectFunc;
|
||||||
@@ -104,8 +106,10 @@ export interface StoreModel {
|
|||||||
setSelection: Action<StoreModel, boolean>;
|
setSelection: Action<StoreModel, boolean>;
|
||||||
|
|
||||||
unsetNodesSelection: Action<StoreModel>;
|
unsetNodesSelection: Action<StoreModel>;
|
||||||
|
resetSelectedElements: Action<StoreModel>;
|
||||||
|
|
||||||
setSelectedElements: Action<StoreModel, Elements | Node | Edge>;
|
setSelectedElements: Action<StoreModel, Elements | Node | Edge>;
|
||||||
|
addSelectedElements: Thunk<StoreModel, Elements | Node | Edge>;
|
||||||
|
|
||||||
updateTransform: Action<StoreModel, TransformXYK>;
|
updateTransform: Action<StoreModel, TransformXYK>;
|
||||||
|
|
||||||
@@ -141,6 +145,8 @@ export interface StoreModel {
|
|||||||
zoom: Thunk<StoreModel, number, any, StoreModel>;
|
zoom: Thunk<StoreModel, number, any, StoreModel>;
|
||||||
zoomIn: Thunk<StoreModel>;
|
zoomIn: Thunk<StoreModel>;
|
||||||
zoomOut: Thunk<StoreModel>;
|
zoomOut: Thunk<StoreModel>;
|
||||||
|
|
||||||
|
setMultiSelectionActive: Action<StoreModel, boolean>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const storeModel: StoreModel = {
|
export const storeModel: StoreModel = {
|
||||||
@@ -187,6 +193,8 @@ export const storeModel: StoreModel = {
|
|||||||
nodesConnectable: true,
|
nodesConnectable: true,
|
||||||
elementsSelectable: true,
|
elementsSelectable: true,
|
||||||
|
|
||||||
|
multiSelectionActive: false,
|
||||||
|
|
||||||
reactFlowVersion: typeof __REACT_FLOW_VERSION__ !== 'undefined' ? __REACT_FLOW_VERSION__ : '-',
|
reactFlowVersion: typeof __REACT_FLOW_VERSION__ !== 'undefined' ? __REACT_FLOW_VERSION__ : '-',
|
||||||
|
|
||||||
setOnConnect: action((state, onConnect) => {
|
setOnConnect: action((state, onConnect) => {
|
||||||
@@ -332,6 +340,9 @@ export const storeModel: StoreModel = {
|
|||||||
|
|
||||||
unsetNodesSelection: action((state) => {
|
unsetNodesSelection: action((state) => {
|
||||||
state.nodesSelectionActive = false;
|
state.nodesSelectionActive = false;
|
||||||
|
}),
|
||||||
|
|
||||||
|
resetSelectedElements: action((state) => {
|
||||||
state.selectedElements = null;
|
state.selectedElements = null;
|
||||||
}),
|
}),
|
||||||
|
|
||||||
@@ -343,6 +354,20 @@ export const storeModel: StoreModel = {
|
|||||||
state.selectedElements = selectedElements;
|
state.selectedElements = selectedElements;
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
addSelectedElements: thunk((actions, elements, helpers) => {
|
||||||
|
const { multiSelectionActive, selectedElements } = helpers.getState();
|
||||||
|
const selectedElementsArr = Array.isArray(elements) ? elements : [elements];
|
||||||
|
|
||||||
|
if (multiSelectionActive) {
|
||||||
|
const nextElements = selectedElements ? [...selectedElements, ...selectedElementsArr] : selectedElementsArr;
|
||||||
|
actions.setSelectedElements(nextElements);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
actions.setSelectedElements(elements);
|
||||||
|
}),
|
||||||
|
|
||||||
updateTransform: action((state, transform) => {
|
updateTransform: action((state, transform) => {
|
||||||
state.transform[0] = transform.x;
|
state.transform[0] = transform.x;
|
||||||
state.transform[1] = transform.y;
|
state.transform[1] = transform.y;
|
||||||
@@ -509,6 +534,10 @@ export const storeModel: StoreModel = {
|
|||||||
zoomOut: thunk((actions) => {
|
zoomOut: thunk((actions) => {
|
||||||
actions.zoom(-0.2);
|
actions.zoom(-0.2);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
setMultiSelectionActive: action((state, isActive) => {
|
||||||
|
state.multiSelectionActive = isActive;
|
||||||
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
const nodeEnv: string = process.env.NODE_ENV as string;
|
const nodeEnv: string = process.env.NODE_ENV as string;
|
||||||
|
|||||||
Reference in New Issue
Block a user