feat(general): add defaultNodes, defaultEdges and defaultEdgeOptions

This commit is contained in:
moklick
2022-01-18 13:05:41 +01:00
parent 660ec00be5
commit 634b592b3a
14 changed files with 364 additions and 60 deletions
+98
View File
@@ -0,0 +1,98 @@
import { useState } from 'react';
import ReactFlow, {
Background,
BackgroundVariant,
Node,
Edge,
ReactFlowInstance,
ReactFlowProvider,
useUpdateNodes,
useUpdateEdges,
} from 'react-flow-renderer';
const defaultNodes: Node[] = [
{ id: '1', type: 'input', data: { label: 'Node 1' }, position: { x: 250, y: 5 }, className: 'light' },
{ id: '2', data: { label: 'Node 2' }, position: { x: 100, y: 100 }, className: 'light' },
{ id: '3', data: { label: 'Node 3' }, position: { x: 400, y: 100 }, className: 'light' },
{ id: '4', data: { label: 'Node 4' }, position: { x: 400, y: 200 }, className: 'light' },
];
const defaultEdges: Edge[] = [
{ id: 'e1-2', source: '1', target: '2' },
{ id: 'e1-3', source: '1', target: '3' },
];
const defaultEdgeOptions = {
animated: true,
};
const DefaultNodes = () => {
const [rfInstance, setRfInstance] = useState<ReactFlowInstance | null>(null);
const updateNodes = useUpdateNodes();
const updateEdges = useUpdateEdges();
const logToObject = () => console.log(rfInstance?.toObject());
const resetTransform = () => rfInstance?.setTransform({ x: 0, y: 0, zoom: 1 });
const updateNodePositions = () => {
updateNodes((nodes, setNodes) => {
setNodes(
nodes.map((node) => {
node.position = {
x: Math.random() * 400,
y: Math.random() * 400,
};
return node;
})
);
});
};
const updateEdgeColors = () => {
updateEdges((edges, setEdges) => {
setEdges(
edges.map((edge) => {
edge.style = {
stroke: '#ff5050',
};
return edge;
})
);
});
};
return (
<ReactFlow
defaultNodes={defaultNodes}
defaultEdges={defaultEdges}
defaultEdgeOptions={defaultEdgeOptions}
onPaneReady={setRfInstance}
fitViewOnInit
>
<Background variant={BackgroundVariant.Lines} />
<div style={{ position: 'absolute', right: 10, top: 10, zIndex: 4 }}>
<button onClick={resetTransform} style={{ marginRight: 5 }}>
reset transform
</button>
<button onClick={updateNodePositions} style={{ marginRight: 5 }}>
change pos
</button>
<button onClick={updateEdgeColors} style={{ marginRight: 5 }}>
red edges
</button>
<button onClick={logToObject}>toObject</button>
</div>
</ReactFlow>
);
};
export default function App() {
return (
<ReactFlowProvider>
<DefaultNodes />
</ReactFlowProvider>
);
}
+5
View File
@@ -31,6 +31,7 @@ import NodeTypesObjectChange from './NodeTypesObjectChange';
import SaveRestore from './SaveRestore'; import SaveRestore from './SaveRestore';
import SwitchFlow from './Switch'; import SwitchFlow from './Switch';
import Validation from './Validation'; import Validation from './Validation';
import DefaultNodes from './DefaultNodes';
import './index.css'; import './index.css';
@@ -43,6 +44,10 @@ const routes = [
path: '/basic', path: '/basic',
component: Basic, component: Basic,
}, },
{
path: '/default-nodes',
component: DefaultNodes,
},
{ {
path: '/custom-connectionline', path: '/custom-connectionline',
component: CustomConnectionLine, component: CustomConnectionLine,
+17 -3
View File
@@ -7,6 +7,7 @@ import NodeIdContext from '../../contexts/NodeIdContext';
import { HandleProps, Connection, ReactFlowState, Position } from '../../types'; import { HandleProps, Connection, ReactFlowState, Position } from '../../types';
import { checkElementBelowIsValid, onMouseDown } from './handler'; import { checkElementBelowIsValid, onMouseDown } from './handler';
import { getHostForElement } from '../../utils'; import { getHostForElement } from '../../utils';
import { addEdge } from '../../utils/graph';
const alwaysValid = () => true; const alwaysValid = () => true;
@@ -20,6 +21,7 @@ const selector = (s: ReactFlowState) => ({
connectionMode: s.connectionMode, connectionMode: s.connectionMode,
connectionStartHandle: s.connectionStartHandle, connectionStartHandle: s.connectionStartHandle,
connectOnClick: s.connectOnClick, connectOnClick: s.connectOnClick,
isControlled: s.isControlled,
}); });
const Handle = forwardRef<HTMLDivElement, HandleComponentProps>( const Handle = forwardRef<HTMLDivElement, HandleComponentProps>(
@@ -47,6 +49,7 @@ const Handle = forwardRef<HTMLDivElement, HandleComponentProps>(
connectionMode, connectionMode,
connectionStartHandle, connectionStartHandle,
connectOnClick, connectOnClick,
isControlled,
} = useStore(selector, shallow); } = useStore(selector, shallow);
const handleId = id || null; const handleId = id || null;
@@ -54,10 +57,21 @@ const Handle = forwardRef<HTMLDivElement, HandleComponentProps>(
const onConnectExtended = useCallback( const onConnectExtended = useCallback(
(params: Connection) => { (params: Connection) => {
onConnectAction?.(params); const { defaultEdgeOptions } = store.getState();
onConnect?.(params);
const edgeParams = {
...defaultEdgeOptions,
...params,
};
if (isControlled) {
const { edges } = store.getState();
store.setState({ edges: addEdge(edgeParams, edges) });
} else {
onConnectAction?.(edgeParams);
}
onConnect?.(edgeParams);
}, },
[onConnectAction, onConnect] [isControlled, onConnectAction, onConnect]
); );
const onMouseDownHandler = useCallback( const onMouseDownHandler = useCallback(
+34 -13
View File
@@ -16,11 +16,14 @@ import {
OnEdgesChange, OnEdgesChange,
ConnectionMode, ConnectionMode,
SnapGrid, SnapGrid,
DefaultEdgeOptions,
} from '../../types'; } from '../../types';
interface StoreUpdaterProps { interface StoreUpdaterProps {
nodes: Node[]; nodes?: Node[];
edges: Edge[]; edges?: Edge[];
defaultNodes?: Node[];
defaultEdges?: Edge[];
onConnect?: OnConnect; onConnect?: OnConnect;
onConnectStart?: OnConnectStart; onConnectStart?: OnConnectStart;
onConnectStop?: OnConnectStop; onConnectStop?: OnConnectStop;
@@ -39,11 +42,13 @@ interface StoreUpdaterProps {
translateExtent?: CoordinateExtent; translateExtent?: CoordinateExtent;
fitViewOnInit: boolean; fitViewOnInit: boolean;
connectOnClick: boolean; connectOnClick: boolean;
defaultEdgeOptions?: DefaultEdgeOptions;
} }
const selector = (s: ReactFlowState) => ({ const selector = (s: ReactFlowState) => ({
setNodes: s.setNodes, setNodes: s.setNodes,
setEdges: s.setEdges, setEdges: s.setEdges,
setDefaultNodesAndEdges: s.setDefaultNodesAndEdges,
setMinZoom: s.setMinZoom, setMinZoom: s.setMinZoom,
setMaxZoom: s.setMaxZoom, setMaxZoom: s.setMaxZoom,
setTranslateExtent: s.setTranslateExtent, setTranslateExtent: s.setTranslateExtent,
@@ -71,6 +76,8 @@ function useDirectStoreUpdater(key: keyof ReactFlowState, value: any, setState:
const StoreUpdater = ({ const StoreUpdater = ({
nodes, nodes,
edges, edges,
defaultNodes,
defaultEdges,
onConnect, onConnect,
onConnectStart, onConnectStart,
onConnectStop, onConnectStop,
@@ -89,26 +96,31 @@ const StoreUpdater = ({
translateExtent, translateExtent,
fitViewOnInit, fitViewOnInit,
connectOnClick, connectOnClick,
defaultEdgeOptions,
}: StoreUpdaterProps) => { }: StoreUpdaterProps) => {
const { setNodes, setEdges, setMinZoom, setMaxZoom, setTranslateExtent, setNodeExtent, reset } = useStore( const {
selector, setNodes,
shallow setEdges,
); setDefaultNodesAndEdges,
setMinZoom,
setMaxZoom,
setTranslateExtent,
setNodeExtent,
reset,
} = useStore(selector, shallow);
const store = useStoreApi(); const store = useStoreApi();
useEffect(() => { useEffect(() => {
if (defaultNodes) {
setDefaultNodesAndEdges(defaultNodes, defaultEdges);
}
return () => { return () => {
reset(); reset();
}; };
}, []); }, []);
useStoreUpdater<Node[]>(nodes, setNodes); useDirectStoreUpdater('defaultEdgeOptions', defaultEdgeOptions, store.setState);
useStoreUpdater<Edge[]>(edges, setEdges);
useStoreUpdater<number>(minZoom, setMinZoom);
useStoreUpdater<number>(maxZoom, setMaxZoom);
useStoreUpdater<CoordinateExtent>(translateExtent, setTranslateExtent);
useStoreUpdater<CoordinateExtent>(nodeExtent, setNodeExtent);
useDirectStoreUpdater('connectionMode', connectionMode, store.setState); useDirectStoreUpdater('connectionMode', connectionMode, store.setState);
useDirectStoreUpdater('onConnect', onConnect, store.setState); useDirectStoreUpdater('onConnect', onConnect, store.setState);
useDirectStoreUpdater('onConnectStart', onConnectStart, store.setState); useDirectStoreUpdater('onConnectStart', onConnectStart, store.setState);
@@ -124,6 +136,15 @@ const StoreUpdater = ({
useDirectStoreUpdater('onEdgesChange', onEdgesChange, store.setState); useDirectStoreUpdater('onEdgesChange', onEdgesChange, store.setState);
useDirectStoreUpdater('connectOnClick', connectOnClick, store.setState); useDirectStoreUpdater('connectOnClick', connectOnClick, store.setState);
useStoreUpdater<Node[]>(nodes, setNodes);
useStoreUpdater<Edge[]>(edges, setEdges);
useStoreUpdater<Node[]>(defaultNodes, setNodes);
useStoreUpdater<Edge[]>(defaultEdges, setEdges);
useStoreUpdater<number>(minZoom, setMinZoom);
useStoreUpdater<number>(maxZoom, setMaxZoom);
useStoreUpdater<CoordinateExtent>(translateExtent, setTranslateExtent);
useStoreUpdater<CoordinateExtent>(nodeExtent, setNodeExtent);
return null; return null;
}; };
+14 -4
View File
@@ -43,6 +43,7 @@ import {
OnPaneReady, OnPaneReady,
ProOptions, ProOptions,
AttributionPosition, AttributionPosition,
DefaultEdgeOptions,
} from '../../types'; } from '../../types';
import '../../style.css'; import '../../style.css';
@@ -62,8 +63,11 @@ const defaultEdgeTypes = {
}; };
export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'onPaneReady'> { export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'onPaneReady'> {
nodes: Node[]; nodes?: Node[];
edges: Edge[]; edges?: Edge[];
defaultNodes?: Node[];
defaultEdges?: Edge[];
defaultEdgeOptions?: DefaultEdgeOptions;
onNodesChange?: (nodeChanges: NodeChange[]) => void; onNodesChange?: (nodeChanges: NodeChange[]) => void;
onEdgesChange?: (edgeChanges: EdgeChange[]) => void; onEdgesChange?: (edgeChanges: EdgeChange[]) => void;
onNodeClick?: (event: React.MouseEvent, node: Node) => void; onNodeClick?: (event: React.MouseEvent, node: Node) => void;
@@ -150,8 +154,10 @@ const initDefaultPosition: [number, number] = [0, 0];
const ReactFlow: FunctionComponent<ReactFlowProps> = forwardRef<ReactFlowRefType, ReactFlowProps>( const ReactFlow: FunctionComponent<ReactFlowProps> = forwardRef<ReactFlowRefType, ReactFlowProps>(
( (
{ {
nodes = [], nodes,
edges = [], edges,
defaultNodes,
defaultEdges,
className, className,
nodeTypes = defaultNodeTypes, nodeTypes = defaultNodeTypes,
edgeTypes = defaultEdgeTypes, edgeTypes = defaultEdgeTypes,
@@ -230,6 +236,7 @@ const ReactFlow: FunctionComponent<ReactFlowProps> = forwardRef<ReactFlowRefType
connectOnClick = true, connectOnClick = true,
attributionPosition, attributionPosition,
pro, pro,
defaultEdgeOptions,
...rest ...rest
}, },
ref ref
@@ -301,6 +308,8 @@ const ReactFlow: FunctionComponent<ReactFlowProps> = forwardRef<ReactFlowRefType
<StoreUpdater <StoreUpdater
nodes={nodes} nodes={nodes}
edges={edges} edges={edges}
defaultNodes={defaultNodes}
defaultEdges={defaultEdges}
onConnect={onConnect} onConnect={onConnect}
onConnectStart={onConnectStart} onConnectStart={onConnectStart}
onConnectStop={onConnectStop} onConnectStop={onConnectStop}
@@ -319,6 +328,7 @@ const ReactFlow: FunctionComponent<ReactFlowProps> = forwardRef<ReactFlowRefType
translateExtent={translateExtent} translateExtent={translateExtent}
fitViewOnInit={fitViewOnInit} fitViewOnInit={fitViewOnInit}
connectOnClick={connectOnClick} connectOnClick={connectOnClick}
defaultEdgeOptions={defaultEdgeOptions}
/> />
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />} {onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
{children} {children}
+20 -8
View File
@@ -25,7 +25,7 @@ export default ({ deleteKeyCode, multiSelectionKeyCode }: HookParams): void => {
const multiSelectionKeyPressed = useKeyPress(multiSelectionKeyCode); const multiSelectionKeyPressed = useKeyPress(multiSelectionKeyCode);
useEffect(() => { useEffect(() => {
const { nodeInternals, edges } = store.getState(); const { nodeInternals, edges, isControlled } = store.getState();
// @TODO: work with nodeInternals instead of converting it to an array // @TODO: work with nodeInternals instead of converting it to an array
const nodes = Array.from(nodeInternals).map(([_, node]) => node); const nodes = Array.from(nodeInternals).map(([_, node]) => node);
const selectedNodes = nodes.filter((n) => n.selected); const selectedNodes = nodes.filter((n) => n.selected);
@@ -33,15 +33,27 @@ export default ({ deleteKeyCode, multiSelectionKeyCode }: HookParams): void => {
if (deleteKeyPressed && (selectedNodes || selectedEdges)) { if (deleteKeyPressed && (selectedNodes || selectedEdges)) {
const connectedEdges = getConnectedEdges(selectedNodes, edges); const connectedEdges = getConnectedEdges(selectedNodes, edges);
const edgeIdsToRemove = [...selectedEdges, ...connectedEdges].map((e) => e.id);
const nodeChanges: NodeChange[] = selectedNodes.map((n) => ({ id: n.id, type: 'remove' })); if (isControlled) {
const edgeChanges: EdgeChange[] = [...selectedEdges, ...connectedEdges].map((e) => ({ selectedNodes.forEach((node) => {
id: e.id, nodeInternals.delete(node.id);
type: 'remove', });
}));
onNodesChange?.(nodeChanges); store.setState({
onEdgesChange?.(edgeChanges); nodeInternals: new Map(nodeInternals),
edges: edges.filter((e) => !edgeIdsToRemove.includes(e.id)),
});
} else {
const nodeChanges: NodeChange[] = selectedNodes.map((n) => ({ id: n.id, type: 'remove' }));
const edgeChanges: EdgeChange[] = edgeIdsToRemove.map((id) => ({
id,
type: 'remove',
}));
onNodesChange?.(nodeChanges);
onEdgesChange?.(edgeChanges);
}
store.setState({ nodesSelectionActive: false }); store.setState({ nodesSelectionActive: false });
+23
View File
@@ -0,0 +1,23 @@
import { useMemo } from 'react';
import { useStoreApi } from '../store';
import { Edge } from '../types';
type FunctionParams<T> = (nodes: Edge<T>[], setEdges: (nodes: Edge<T>[]) => void) => void;
function useUpdateEdges<T>() {
const store = useStoreApi();
const update = useMemo(() => {
return (action: FunctionParams<T>): void => {
const { edges, setEdges } = store.getState();
if (typeof action === 'function') {
action(edges, setEdges);
}
};
}, []);
return update;
}
export default useUpdateEdges;
+24
View File
@@ -0,0 +1,24 @@
import { useMemo } from 'react';
import { useStoreApi } from '../store';
import { Node } from '../types';
type FunctionParams<T> = (nodes: Node<T>[], setNodes: (nodes: Node<T>[]) => void) => void;
function useUpdateNodes<T>() {
const store = useStoreApi();
const update = useMemo(() => {
return (action: FunctionParams<T>): void => {
const { nodeInternals, setNodes } = store.getState();
const nodes = Array.from(nodeInternals.values()) as Node<T>[];
if (typeof action === 'function') {
action(nodes, setNodes);
}
};
}, []);
return update;
}
export default useUpdateNodes;
+2
View File
@@ -26,6 +26,8 @@ export { applyNodeChanges, applyEdgeChanges } from './utils/changes';
export { default as useZoomPanHelper } from './hooks/useZoomPanHelper'; export { default as useZoomPanHelper } from './hooks/useZoomPanHelper';
export { default as useUpdateNodeInternals } from './hooks/useUpdateNodeInternals'; export { default as useUpdateNodeInternals } from './hooks/useUpdateNodeInternals';
export { default as useNodeBounds } from './hooks/useNodeBounds'; export { default as useNodeBounds } from './hooks/useNodeBounds';
export { default as useUpdateNodes } from './hooks/useUpdateNodes';
export { default as useUpdateEdges } from './hooks/useUpdateEdges';
export * from './hooks/useNodesEdgesState'; export * from './hooks/useNodesEdgesState';
export * from './additional-components'; export * from './additional-components';
+90 -32
View File
@@ -2,6 +2,7 @@ import create from 'zustand';
import createContext from 'zustand/context'; import createContext from 'zustand/context';
import { clampPosition, getDimensions } from '../utils'; import { clampPosition, getDimensions } from '../utils';
import { applyNodeChanges } from '../utils/changes';
import { import {
ReactFlowState, ReactFlowState,
Node, Node,
@@ -9,13 +10,20 @@ import {
NodeDimensionUpdate, NodeDimensionUpdate,
NodeDiffUpdate, NodeDiffUpdate,
CoordinateExtent, CoordinateExtent,
NodeChange,
EdgeChange,
NodeDimensionChange, NodeDimensionChange,
EdgeSelectionChange,
NodeSelectionChange,
} from '../types'; } from '../types';
import { getHandleBounds } from '../components/Nodes/utils'; import { getHandleBounds } from '../components/Nodes/utils';
import { createSelectionChange, getSelectionChanges } from '../utils/changes'; import { createSelectionChange, getSelectionChanges } from '../utils/changes';
import { createNodeInternals, createPositionChange, fitView, isParentSelected } from './utils'; import {
createNodeInternals,
createPositionChange,
fitView,
handleControlledEdgeSelectionChange,
handleControlledNodeSelectionChange,
isParentSelected,
} from './utils';
import initialState from './initialState'; import initialState from './initialState';
const { Provider, useStore, useStoreApi } = createContext<ReactFlowState>(); const { Provider, useStore, useStoreApi } = createContext<ReactFlowState>();
@@ -24,17 +32,25 @@ const createStore = () =>
create<ReactFlowState>((set, get) => ({ create<ReactFlowState>((set, get) => ({
...initialState, ...initialState,
setNodes: (nodes: Node[]) => { setNodes: (nodes: Node[]) => {
const nodeInternals = createNodeInternals(nodes, get().nodeInternals); set({ nodeInternals: createNodeInternals(nodes, get().nodeInternals) });
set({ nodeInternals });
}, },
setEdges: (edges: Edge[]) => { setEdges: (edges: Edge[]) => {
set({ edges }); const { defaultEdgeOptions } = get();
if (defaultEdgeOptions) {
set({ edges: edges.map((e) => ({ ...defaultEdgeOptions, ...e })) });
} else {
set({ edges });
}
},
setDefaultNodesAndEdges: (nodes: Node[], edges: Edge[] = []) => {
const nodeInternals = createNodeInternals(nodes, get().nodeInternals);
set({ nodeInternals, edges, isControlled: true });
}, },
updateNodeDimensions: (updates: NodeDimensionUpdate[]) => { updateNodeDimensions: (updates: NodeDimensionUpdate[]) => {
const { onNodesChange, transform, nodeInternals, fitViewOnInit } = get(); const { onNodesChange, transform, nodeInternals, fitViewOnInit } = get();
const changes: NodeChange[] = updates.reduce<NodeChange[]>((res, update) => { const changes: NodeDimensionChange[] = updates.reduce<NodeDimensionChange[]>((res, update) => {
const node = nodeInternals.get(update.id); const node = nodeInternals.get(update.id);
if (node) { if (node) {
@@ -57,7 +73,7 @@ const createStore = () =>
id: node.id, id: node.id,
type: 'dimensions', type: 'dimensions',
dimensions, dimensions,
} as NodeChange); });
} }
} }
@@ -65,7 +81,6 @@ const createStore = () =>
}, []); }, []);
const fitViewOnInitDone = fitViewOnInit && fitView(get); const fitViewOnInitDone = fitViewOnInit && fitView(get);
set({ nodeInternals: new Map(nodeInternals), fitViewOnInitDone }); set({ nodeInternals: new Map(nodeInternals), fitViewOnInitDone });
if (changes?.length > 0) { if (changes?.length > 0) {
@@ -73,9 +88,9 @@ const createStore = () =>
} }
}, },
updateNodePosition: ({ id, diff, dragging }: NodeDiffUpdate) => { updateNodePosition: ({ id, diff, dragging }: NodeDiffUpdate) => {
const { onNodesChange, nodeExtent, nodeInternals } = get(); const { onNodesChange, nodeExtent, nodeInternals, isControlled } = get();
if (onNodesChange) { if (isControlled || onNodesChange) {
const changes: NodeDimensionChange[] = []; const changes: NodeDimensionChange[] = [];
nodeInternals.forEach((node) => { nodeInternals.forEach((node) => {
@@ -89,57 +104,83 @@ const createStore = () =>
}); });
if (changes?.length) { if (changes?.length) {
onNodesChange(changes); if (isControlled) {
const nodes = applyNodeChanges(changes, Array.from(nodeInternals.values()));
const nextNodeInternals = createNodeInternals(nodes, nodeInternals);
set({ nodeInternals: nextNodeInternals });
} else {
onNodesChange?.(changes);
}
} }
} }
}, },
addSelectedNodes: (selectedNodeIds: string[]) => { addSelectedNodes: (selectedNodeIds: string[]) => {
const { multiSelectionActive, onNodesChange, nodeInternals } = get(); const { multiSelectionActive, onNodesChange, nodeInternals, isControlled } = get();
// @TODO: work with nodeInternals instead of converting it to an array // @TODO: work with nodeInternals instead of converting it to an array
const nodes = Array.from(nodeInternals).map(([_, node]) => node); const nodes = Array.from(nodeInternals).map(([_, node]) => node);
let changedNodes; let changedNodes: NodeSelectionChange[];
if (multiSelectionActive) { if (multiSelectionActive) {
changedNodes = selectedNodeIds.map((nodeId) => createSelectionChange(nodeId, true)); changedNodes = selectedNodeIds.map((nodeId) => createSelectionChange(nodeId, true)) as NodeSelectionChange[];
} else { } else {
changedNodes = getSelectionChanges(nodes, selectedNodeIds); changedNodes = getSelectionChanges(nodes, selectedNodeIds);
} }
if (changedNodes.length) { if (changedNodes.length) {
onNodesChange?.(changedNodes as NodeChange[]); if (isControlled) {
set({ nodeInternals: handleControlledNodeSelectionChange(changedNodes, nodeInternals) });
} else if (onNodesChange) {
onNodesChange(changedNodes);
}
} }
}, },
addSelectedEdges: (selectedEdgeIds: string[]) => { addSelectedEdges: (selectedEdgeIds: string[]) => {
const { multiSelectionActive, onEdgesChange, edges } = get(); const { multiSelectionActive, onEdgesChange, edges, isControlled } = get();
let changedEdges; let changedEdges: EdgeSelectionChange[];
if (multiSelectionActive) { if (multiSelectionActive) {
changedEdges = selectedEdgeIds.map((edgeId) => createSelectionChange(edgeId, true)); changedEdges = selectedEdgeIds.map((edgeId) => createSelectionChange(edgeId, true)) as EdgeSelectionChange[];
} else { } else {
changedEdges = getSelectionChanges(edges, selectedEdgeIds); changedEdges = getSelectionChanges(edges, selectedEdgeIds);
} }
if (changedEdges.length) { if (changedEdges.length) {
onEdgesChange?.(changedEdges as EdgeChange[]); if (isControlled) {
set({
edges: handleControlledEdgeSelectionChange(changedEdges, edges),
});
} else if (onEdgesChange) {
onEdgesChange(changedEdges);
}
} }
}, },
unselectNodesAndEdges: () => { unselectNodesAndEdges: () => {
const { nodeInternals, edges, onNodesChange, onEdgesChange } = get(); const { nodeInternals, edges, onNodesChange, onEdgesChange, isControlled } = get();
// @TODO: work with nodeInternals instead of converting it to an array // @TODO: work with nodeInternals instead of converting it to an array
const nodes = Array.from(nodeInternals).map(([_, node]) => node); const nodes = Array.from(nodeInternals).map(([_, node]) => node);
const nodesToUnselect = nodes.map((n) => { const nodesToUnselect = nodes.map((n) => {
n.selected = false; n.selected = false;
return createSelectionChange(n.id, false); return createSelectionChange(n.id, false);
}) as NodeChange[]; }) as NodeSelectionChange[];
const edgesToUnselect = edges.map((edge) => createSelectionChange(edge.id, false)) as EdgeChange[]; const edgesToUnselect = edges.map((edge) => createSelectionChange(edge.id, false)) as EdgeSelectionChange[];
if (nodesToUnselect.length) { if (nodesToUnselect.length) {
onNodesChange?.(nodesToUnselect); if (isControlled) {
set({ nodeInternals: handleControlledNodeSelectionChange(nodesToUnselect, nodeInternals) });
} else if (onNodesChange) {
onNodesChange(nodesToUnselect);
}
} }
if (edgesToUnselect.length) { if (edgesToUnselect.length) {
onEdgesChange?.(edgesToUnselect); if (isControlled) {
set({
edges: handleControlledEdgeSelectionChange(edgesToUnselect, edges),
});
} else if (onEdgesChange) {
onEdgesChange(edgesToUnselect);
}
} }
}, },
setMinZoom: (minZoom: number) => { setMinZoom: (minZoom: number) => {
@@ -161,17 +202,34 @@ const createStore = () =>
set({ translateExtent }); set({ translateExtent });
}, },
resetSelectedElements: () => { resetSelectedElements: () => {
const { nodeInternals, edges, onNodesChange, onEdgesChange } = get(); const { nodeInternals, edges, onNodesChange, onEdgesChange, isControlled } = get();
// @TODO: work with nodeInternals instead of converting it to an array // @TODO: work with nodeInternals instead of converting it to an array
const nodes = Array.from(nodeInternals).map(([_, node]) => node); const nodes = Array.from(nodeInternals.values());
const nodesToUnselect = nodes.filter((e) => e.selected).map((n) => createSelectionChange(n.id, false));
const edgesToUnselect = edges.filter((e) => e.selected).map((e) => createSelectionChange(e.id, false)); const nodesToUnselect = nodes
.filter((e) => e.selected)
.map((n) => createSelectionChange(n.id, false)) as NodeSelectionChange[];
const edgesToUnselect = edges
.filter((e) => e.selected)
.map((e) => createSelectionChange(e.id, false)) as EdgeSelectionChange[];
if (nodesToUnselect.length) { if (nodesToUnselect.length) {
onNodesChange?.(nodesToUnselect as NodeChange[]); if (isControlled) {
set({
nodeInternals: handleControlledNodeSelectionChange(nodesToUnselect, nodeInternals),
});
} else if (onNodesChange) {
onNodesChange(nodesToUnselect);
}
} }
if (edgesToUnselect.length) { if (edgesToUnselect.length) {
onEdgesChange?.(edgesToUnselect as EdgeChange[]); if (isControlled) {
set({
edges: handleControlledEdgeSelectionChange(edgesToUnselect, edges),
});
} else if (onEdgesChange) {
onEdgesChange(edgesToUnselect);
}
} }
}, },
setNodeExtent: (nodeExtent: CoordinateExtent) => { setNodeExtent: (nodeExtent: CoordinateExtent) => {
+1
View File
@@ -13,6 +13,7 @@ const initialState: ReactFlowStore = {
edges: [], edges: [],
onNodesChange: null, onNodesChange: null,
onEdgesChange: null, onEdgesChange: null,
isControlled: false,
selectedNodesBbox: { x: 0, y: 0, width: 0, height: 0 }, selectedNodesBbox: { x: 0, y: 0, width: 0, height: 0 },
d3Zoom: null, d3Zoom: null,
d3Selection: null, d3Selection: null,
+27
View File
@@ -2,10 +2,13 @@ import { zoomIdentity } from 'd3-zoom';
import { GetState } from 'zustand'; import { GetState } from 'zustand';
import { import {
CoordinateExtent, CoordinateExtent,
Edge,
EdgeSelectionChange,
Node, Node,
NodeDimensionChange, NodeDimensionChange,
NodeInternals, NodeInternals,
NodeInternalsItem, NodeInternalsItem,
NodeSelectionChange,
ReactFlowState, ReactFlowState,
XYPosition, XYPosition,
XYZPosition, XYZPosition,
@@ -163,3 +166,27 @@ export function fitView(get: GetState<ReactFlowState>) {
return fitViewOnInitDone; return fitViewOnInitDone;
} }
export function handleControlledNodeSelectionChange(nodeChanges: NodeSelectionChange[], nodeInternals: NodeInternals) {
nodeChanges.forEach((change) => {
const node = nodeInternals.get(change.id);
if (node) {
nodeInternals.set(node.id, {
...node,
selected: change.selected,
});
}
});
return new Map(nodeInternals);
}
export function handleControlledEdgeSelectionChange(edgeChanges: EdgeSelectionChange[], edges: Edge[]) {
return edges.map((e) => {
const change = edgeChanges.find((change) => change.id === e.id);
if (change) {
e.selected = change.selected;
}
return e;
});
}
+5
View File
@@ -32,6 +32,11 @@ export interface Edge<T = any> {
zIndex?: number; zIndex?: number;
} }
export type DefaultEdgeOptions = Omit<
Edge,
'id' | 'source' | 'target' | 'sourceHandle' | 'targetHandle' | 'sourceNode' | 'targetNode'
>;
// props that get passed to a custom edge // props that get passed to a custom edge
export interface EdgeProps<T = any> { export interface EdgeProps<T = any> {
id: string; id: string;
+4
View File
@@ -6,6 +6,7 @@ import { NodeChange, EdgeChange } from './changes';
import { Node, NodeInternals, NodeDimensionUpdate, NodeDiffUpdate } from './nodes'; import { Node, NodeInternals, NodeDimensionUpdate, NodeDiffUpdate } from './nodes';
import { Edge } from './edges'; import { Edge } from './edges';
import { HandleType, StartHandle } from './handles'; import { HandleType, StartHandle } from './handles';
import { DefaultEdgeOptions } from '.';
export type NodeTypesType = { [key: string]: ReactNode }; export type NodeTypesType = { [key: string]: ReactNode };
export type EdgeTypesType = NodeTypesType; export type EdgeTypesType = NodeTypesType;
@@ -142,6 +143,7 @@ export type ReactFlowStore = {
selectedNodesBbox: Rect; selectedNodesBbox: Rect;
onNodesChange: OnNodesChange | null; onNodesChange: OnNodesChange | null;
onEdgesChange: OnEdgesChange | null; onEdgesChange: OnEdgesChange | null;
isControlled: boolean;
d3Zoom: ZoomBehavior<Element, unknown> | null; d3Zoom: ZoomBehavior<Element, unknown> | null;
d3Selection: D3Selection<Element, unknown, null, undefined> | null; d3Selection: D3Selection<Element, unknown, null, undefined> | null;
@@ -182,11 +184,13 @@ export type ReactFlowStore = {
onConnectEnd?: OnConnectEnd; onConnectEnd?: OnConnectEnd;
connectOnClick: boolean; connectOnClick: boolean;
defaultEdgeOptions?: DefaultEdgeOptions;
}; };
export type ReactFlowActions = { export type ReactFlowActions = {
setNodes: (nodes: Node[]) => void; setNodes: (nodes: Node[]) => void;
setEdges: (edges: Edge[]) => void; setEdges: (edges: Edge[]) => void;
setDefaultNodesAndEdges: (nodes: Node[], edges?: Edge[]) => void;
updateNodeDimensions: (updates: NodeDimensionUpdate[]) => void; updateNodeDimensions: (updates: NodeDimensionUpdate[]) => void;
updateNodePosition: (update: NodeDiffUpdate) => void; updateNodePosition: (update: NodeDiffUpdate) => void;
resetSelectedElements: () => void; resetSelectedElements: () => void;