feat(node-toolbar): allow multiple nodeIds as property to enable multi selection

This commit is contained in:
Christopher Möller
2022-11-24 12:51:17 +01:00
parent 6bbc004315
commit d4b00452a0
4 changed files with 40 additions and 10 deletions
@@ -0,0 +1,13 @@
import { NodeToolbar, useNodes } from 'reactflow';
export default function SelectedNodesToolbar() {
const nodes = useNodes();
const selectedNodeIds = nodes.filter((node) => node.selected).map((node) => node.id);
const isVisible = selectedNodeIds.length > 1;
return (
<NodeToolbar nodeId={selectedNodeIds} isVisible={isVisible}>
<button>Group selected nodes</button>
</NodeToolbar>
);
}
@@ -11,6 +11,7 @@ import ReactFlow, {
} from 'reactflow'; } from 'reactflow';
import CustomNode from './CustomNode'; import CustomNode from './CustomNode';
import SelectedNodesToolbar from './SelectedNodesToolbar';
const nodeTypes: NodeTypes = { const nodeTypes: NodeTypes = {
custom: CustomNode, custom: CustomNode,
@@ -79,6 +80,7 @@ export default function NodeToolbarExample() {
<Background variant={BackgroundVariant.Dots} /> <Background variant={BackgroundVariant.Dots} />
<MiniMap /> <MiniMap />
<Controls /> <Controls />
<SelectedNodesToolbar />
</ReactFlow> </ReactFlow>
); );
} }
+24 -9
View File
@@ -15,9 +15,7 @@ import shallow from 'zustand/shallow';
import NodeToolbarPortal from './NodeToolbarPortal'; import NodeToolbarPortal from './NodeToolbarPortal';
import { NodeToolbarProps } from './types'; import { NodeToolbarProps } from './types';
type SelectedNode = Node | undefined; const nodeEqualityFn = (a: Node | undefined, b: Node | undefined) =>
const nodeEqualityFn = (a: SelectedNode, b: SelectedNode) =>
a?.positionAbsolute?.x === b?.positionAbsolute?.x && a?.positionAbsolute?.x === b?.positionAbsolute?.x &&
a?.positionAbsolute?.y === b?.positionAbsolute?.y && a?.positionAbsolute?.y === b?.positionAbsolute?.y &&
a?.width === b?.width && a?.width === b?.width &&
@@ -25,6 +23,10 @@ const nodeEqualityFn = (a: SelectedNode, b: SelectedNode) =>
a?.selected === b?.selected && a?.selected === b?.selected &&
a?.[internalsSymbol]?.z === b?.[internalsSymbol]?.z; a?.[internalsSymbol]?.z === b?.[internalsSymbol]?.z;
const nodesEqualityFn = (a: Node[], b: Node[]) => {
return a.length === b.length && a.every((node, i) => nodeEqualityFn(node, b[i]));
};
const storeSelector = (state: ReactFlowState) => ({ const storeSelector = (state: ReactFlowState) => ({
transform: state.transform, transform: state.transform,
nodeOrigin: state.nodeOrigin, nodeOrigin: state.nodeOrigin,
@@ -70,21 +72,34 @@ function NodeToolbar({
offset = 10, offset = 10,
...rest ...rest
}: NodeToolbarProps) { }: NodeToolbarProps) {
const nodeSelector = useCallback((state: ReactFlowState): SelectedNode => state.nodeInternals.get(nodeId), [nodeId]); const nodeIds: string[] = typeof nodeId === 'string' ? [nodeId] : nodeId;
const node = useStore(nodeSelector, nodeEqualityFn); const nodesSelector = useCallback(
(state: ReactFlowState): Node[] =>
nodeIds.reduce<Node[]>((acc, id) => {
const node = state.nodeInternals.get(id);
if (node) {
acc.push(node);
}
return acc;
}, [] as Node[]),
[nodeIds]
);
const nodes = useStore(nodesSelector, nodesEqualityFn);
const { transform, nodeOrigin, selectedNodesCount } = useStore(storeSelector, shallow); const { transform, nodeOrigin, selectedNodesCount } = useStore(storeSelector, shallow);
const isActive = typeof isVisible === 'boolean' ? isVisible : node?.selected && selectedNodesCount === 1; const isActive =
typeof isVisible === 'boolean' ? isVisible : nodes.length === 1 && nodes[0].selected && selectedNodesCount === 1;
if (!isActive || !node) { if (!isActive || !nodes.length) {
return null; return null;
} }
const nodeRect: Rect = getRectOfNodes([node], nodeOrigin); const nodeRect: Rect = getRectOfNodes(nodes, nodeOrigin);
const zIndex: number = Math.max(...nodes.map((node) => (node[internalsSymbol]?.z || 1) + 1));
const wrapperStyle: CSSProperties = { const wrapperStyle: CSSProperties = {
position: 'absolute', position: 'absolute',
transform: getTransform(nodeRect, transform, position, offset), transform: getTransform(nodeRect, transform, position, offset),
zIndex: (node[internalsSymbol]?.z || 1) + 1, zIndex,
...style, ...style,
}; };
+1 -1
View File
@@ -2,7 +2,7 @@ import { Position } from '@reactflow/core';
import type { HTMLAttributes } from 'react'; import type { HTMLAttributes } from 'react';
export type NodeToolbarProps = HTMLAttributes<HTMLDivElement> & { export type NodeToolbarProps = HTMLAttributes<HTMLDivElement> & {
nodeId: string; nodeId: string | string[];
isVisible?: boolean; isVisible?: boolean;
position?: Position; position?: Position;
offset?: number; offset?: number;