diff --git a/src/additional-components/Background/index.tsx b/src/additional-components/Background/index.tsx index c655b544..2007702a 100644 --- a/src/additional-components/Background/index.tsx +++ b/src/additional-components/Background/index.tsx @@ -19,38 +19,43 @@ const defaultColors = { [BackgroundVariant.Lines]: '#eee', }; -const Background = memo( - ({ variant = BackgroundVariant.Dots, gap = 24, size = 0.5, color, style, className }: BackgroundProps) => { - const [x, y, scale] = useStoreState((s) => s.transform); +const Background = ({ + variant = BackgroundVariant.Dots, + gap = 24, + size = 0.5, + color, + style, + className, +}: BackgroundProps) => { + const [x, y, scale] = useStoreState((s) => s.transform); - const bgClasses = cc(['react-flow__background', className]); - const scaledGap = gap * scale; - const xOffset = x % scaledGap; - const yOffset = y % scaledGap; + const bgClasses = cc(['react-flow__background', className]); + const scaledGap = gap * scale; + const xOffset = x % scaledGap; + const yOffset = y % scaledGap; - const bgSvgTile = useMemo(() => { - const isLines = variant === BackgroundVariant.Lines; - const bgColor = color ? color : defaultColors[variant]; - const path = isLines ? createGridLinesPath(scaledGap, size, bgColor) : createGridDotsPath(size, bgColor); + const bgSvgTile = useMemo(() => { + const isLines = variant === BackgroundVariant.Lines; + const bgColor = color ? color : defaultColors[variant]; + const path = isLines ? createGridLinesPath(scaledGap, size, bgColor) : createGridDotsPath(size, bgColor); - return encodeURIComponent( - `${path}` - ); - }, [variant, scaledGap, size, color]); - - return ( -
+ return encodeURIComponent( + `${path}` ); - } -); + }, [variant, scaledGap, size, color]); + + return ( +
+ ); +}; Background.displayName = 'Background'; -export default Background; +export default memo(Background); diff --git a/src/additional-components/Controls/index.tsx b/src/additional-components/Controls/index.tsx index f2d14162..0f6caa07 100644 --- a/src/additional-components/Controls/index.tsx +++ b/src/additional-components/Controls/index.tsx @@ -17,49 +17,47 @@ interface ControlProps extends React.HTMLAttributes { showInteractive?: boolean; } -const Controls = memo( - ({ style, showZoom = true, showFitView = true, showInteractive = true, className }: ControlProps) => { - const setInteractive = useStoreActions((actions) => actions.setInteractive); - const fitView = useStoreActions((actions) => actions.fitView); - const zoomIn = useStoreActions((actions) => actions.zoomIn); - const zoomOut = useStoreActions((actions) => actions.zoomOut); +const Controls = ({ style, showZoom = true, showFitView = true, showInteractive = true, className }: ControlProps) => { + const setInteractive = useStoreActions((actions) => actions.setInteractive); + const fitView = useStoreActions((actions) => actions.fitView); + const zoomIn = useStoreActions((actions) => actions.zoomIn); + const zoomOut = useStoreActions((actions) => actions.zoomOut); - const isInteractive = useStoreState((s) => s.nodesDraggable && s.nodesConnectable && s.elementsSelectable); - const mapClasses = cc(['react-flow__controls', className]); + const isInteractive = useStoreState((s) => s.nodesDraggable && s.nodesConnectable && s.elementsSelectable); + const mapClasses = cc(['react-flow__controls', className]); - return ( -
- {showZoom && ( - <> -
zoomIn()}> - -
-
zoomOut()}> - -
- - )} - {showFitView && ( -
fitView({ padding: 0.1 })} - > - + return ( +
+ {showZoom && ( + <> +
zoomIn()}> +
- )} - {showInteractive && ( -
setInteractive(!isInteractive)} - > - {isInteractive ? : } +
zoomOut()}> +
- )} -
- ); - } -); + + )} + {showFitView && ( +
fitView({ padding: 0.1 })} + > + +
+ )} + {showInteractive && ( +
setInteractive(!isInteractive)} + > + {isInteractive ? : } +
+ )} +
+ ); +}; Controls.displayName = 'Controls'; -export default Controls; +export default memo(Controls); diff --git a/src/additional-components/MiniMap/MiniMapNode.tsx b/src/additional-components/MiniMap/MiniMapNode.tsx index a1986e92..f6b5b4ab 100644 --- a/src/additional-components/MiniMap/MiniMapNode.tsx +++ b/src/additional-components/MiniMap/MiniMapNode.tsx @@ -10,7 +10,7 @@ interface MiniMapNodeProps { style?: CSSProperties; } -const MiniMapNode = memo(({ x, y, width, height, style, color, borderRadius }: MiniMapNodeProps) => { +const MiniMapNode = ({ x, y, width, height, style, color, borderRadius }: MiniMapNodeProps) => { const { background, backgroundColor } = style || {}; const fill = (color || background || backgroundColor) as string; @@ -26,8 +26,8 @@ const MiniMapNode = memo(({ x, y, width, height, style, color, borderRadius }: M fill={fill} /> ); -}); +}; MiniMapNode.displayName = 'MiniMapNode'; -export default MiniMapNode; +export default memo(MiniMapNode); diff --git a/src/additional-components/MiniMap/index.tsx b/src/additional-components/MiniMap/index.tsx index ea4a3cb5..5e25ab4f 100644 --- a/src/additional-components/MiniMap/index.tsx +++ b/src/additional-components/MiniMap/index.tsx @@ -19,77 +19,75 @@ interface MiniMapProps extends React.HTMLAttributes { const defaultWidth = 200; const defaultHeight = 150; -const MiniMap = memo( - ({ - style = { backgroundColor: '#f8f8f8' }, - className, - nodeColor = '#ddd', - nodeBorderRadius = 5, - maskColor = 'rgba(10, 10, 10, .25)', - }: MiniMapProps) => { - const containerWidth = useStoreState((s) => s.width); - const containerHeight = useStoreState((s) => s.height); - const [tX, tY, tScale] = useStoreState((s) => s.transform); - const nodes = useStoreState((s) => s.nodes); +const MiniMap = ({ + style = { backgroundColor: '#f8f8f8' }, + className, + nodeColor = '#ddd', + nodeBorderRadius = 5, + maskColor = 'rgba(10, 10, 10, .25)', +}: MiniMapProps) => { + const containerWidth = useStoreState((s) => s.width); + const containerHeight = useStoreState((s) => s.height); + const [tX, tY, tScale] = useStoreState((s) => s.transform); + const nodes = useStoreState((s) => s.nodes); - const mapClasses = cc(['react-flow__minimap', className]); - const elementWidth = (style.width || defaultWidth)! as number; - const elementHeight = (style.height || defaultHeight)! as number; - const nodeColorFunc = (nodeColor instanceof Function ? nodeColor : () => nodeColor) as StringFunc; - const hasNodes = nodes && nodes.length; - const bb = getRectOfNodes(nodes); - const viewBB: Rect = { - x: -tX / tScale, - y: -tY / tScale, - width: containerWidth / tScale, - height: containerHeight / tScale, - }; - const boundingRect = hasNodes ? getBoundsofRects(bb, viewBB) : viewBB; - const scaledWidth = boundingRect.width / elementWidth; - const scaledHeight = boundingRect.height / elementHeight; - const viewScale = Math.max(scaledWidth, scaledHeight); - const viewWidth = viewScale * elementWidth; - const viewHeight = viewScale * elementHeight; - const offset = 5 * viewScale; - const x = boundingRect.x - (viewWidth - boundingRect.width) / 2 - offset; - const y = boundingRect.y - (viewHeight - boundingRect.height) / 2 - offset; - const width = viewWidth + offset * 2; - const height = viewHeight + offset * 2; + const mapClasses = cc(['react-flow__minimap', className]); + const elementWidth = (style.width || defaultWidth)! as number; + const elementHeight = (style.height || defaultHeight)! as number; + const nodeColorFunc = (nodeColor instanceof Function ? nodeColor : () => nodeColor) as StringFunc; + const hasNodes = nodes && nodes.length; + const bb = getRectOfNodes(nodes); + const viewBB: Rect = { + x: -tX / tScale, + y: -tY / tScale, + width: containerWidth / tScale, + height: containerHeight / tScale, + }; + const boundingRect = hasNodes ? getBoundsofRects(bb, viewBB) : viewBB; + const scaledWidth = boundingRect.width / elementWidth; + const scaledHeight = boundingRect.height / elementHeight; + const viewScale = Math.max(scaledWidth, scaledHeight); + const viewWidth = viewScale * elementWidth; + const viewHeight = viewScale * elementHeight; + const offset = 5 * viewScale; + const x = boundingRect.x - (viewWidth - boundingRect.width) / 2 - offset; + const y = boundingRect.y - (viewHeight - boundingRect.height) / 2 - offset; + const width = viewWidth + offset * 2; + const height = viewHeight + offset * 2; - return ( - - {nodes - .filter((node) => !node.isHidden) - .map((node) => ( - - ))} - + {nodes + .filter((node) => !node.isHidden) + .map((node) => ( + + ))} + - - ); - } -); + fill={maskColor} + fillRule="evenodd" + /> + + ); +}; MiniMap.displayName = 'MiniMap'; -export default MiniMap; +export default memo(MiniMap); diff --git a/src/components/Edges/wrapEdge.tsx b/src/components/Edges/wrapEdge.tsx index d3ea8e46..176d29d1 100644 --- a/src/components/Edges/wrapEdge.tsx +++ b/src/components/Edges/wrapEdge.tsx @@ -23,70 +23,68 @@ interface EdgeWrapperProps { } export default (EdgeComponent: ComponentType) => { - const EdgeWrapper = memo( - ({ - id, - source, - target, - type, - animated, - selected, - onClick, - elementsSelectable, - label, - labelStyle, - labelShowBg, - labelBgStyle, - className, - isHidden, - data, - ...rest - }: EdgeWrapperProps) => { - const setSelectedElements = useStoreActions((a) => a.setSelectedElements); + const EdgeWrapper = ({ + id, + source, + target, + type, + animated, + selected, + onClick, + elementsSelectable, + label, + labelStyle, + labelShowBg, + labelBgStyle, + className, + isHidden, + data, + ...rest + }: EdgeWrapperProps) => { + const setSelectedElements = useStoreActions((a) => a.setSelectedElements); - if (isHidden) { - return null; + if (isHidden) { + return null; + } + + const edgeClasses = cc(['react-flow__edge', `react-flow__edge-${type}`, className, { selected, animated }]); + const edgeGroupStyle: CSSProperties = { + pointerEvents: elementsSelectable ? 'all' : 'none', + }; + const onEdgeClick = (): void => { + if (!elementsSelectable) { + return; } - const edgeClasses = cc(['react-flow__edge', `react-flow__edge-${type}`, className, { selected, animated }]); - const edgeGroupStyle: CSSProperties = { - pointerEvents: elementsSelectable ? 'all' : 'none', - }; - const onEdgeClick = (): void => { - if (!elementsSelectable) { - return; - } + setSelectedElements({ id, source, target }); - setSelectedElements({ id, source, target }); + if (onClick) { + onClick({ id, source, target, type }); + } + }; - if (onClick) { - onClick({ id, source, target, type }); - } - }; - - return ( - - - - ); - } - ); + return ( + + + + ); + }; EdgeWrapper.displayName = 'EdgeWrapper'; - return EdgeWrapper; + return memo(EdgeWrapper); }; diff --git a/src/components/Handle/BaseHandle.tsx b/src/components/Handle/BaseHandle.tsx index 7a16a001..706aca81 100644 --- a/src/components/Handle/BaseHandle.tsx +++ b/src/components/Handle/BaseHandle.tsx @@ -130,47 +130,45 @@ function onMouseDown( document.addEventListener('mouseup', onMouseUp); } -const BaseHandle = memo( - ({ - type, - nodeId, - onConnect, - position, - setConnectionNodeId, - setPosition, +const BaseHandle = ({ + type, + nodeId, + onConnect, + position, + setConnectionNodeId, + setPosition, + className, + id = false, + isValidConnection, + ...rest +}: BaseHandleProps) => { + const isTarget = type === 'target'; + const handleClasses = cc([ + 'react-flow__handle', + `react-flow__handle-${position}`, + 'nodrag', className, - id = false, - isValidConnection, - ...rest - }: BaseHandleProps) => { - const isTarget = type === 'target'; - const handleClasses = cc([ - 'react-flow__handle', - `react-flow__handle-${position}`, - 'nodrag', - className, - { - source: !isTarget, - target: isTarget, - }, - ]); + { + source: !isTarget, + target: isTarget, + }, + ]); - const nodeIdWithHandleId = id ? `${nodeId}__${id}` : nodeId; + const nodeIdWithHandleId = id ? `${nodeId}__${id}` : nodeId; - return ( -
- onMouseDown(evt, nodeIdWithHandleId, setConnectionNodeId, setPosition, onConnect, isTarget, isValidConnection) - } - {...rest} - /> - ); - } -); + return ( +
+ onMouseDown(evt, nodeIdWithHandleId, setConnectionNodeId, setPosition, onConnect, isTarget, isValidConnection) + } + {...rest} + /> + ); +}; BaseHandle.displayName = 'BaseHandle'; -export default BaseHandle; +export default memo(BaseHandle); diff --git a/src/components/Handle/index.tsx b/src/components/Handle/index.tsx index adfdacd2..f181183e 100644 --- a/src/components/Handle/index.tsx +++ b/src/components/Handle/index.tsx @@ -7,44 +7,42 @@ import NodeIdContext from '../../contexts/NodeIdContext'; import { HandleProps, ElementId, Position, Connection } from '../../types'; -const Handle = memo( - ({ - type = 'source', - position = Position.Top, - onConnect = () => {}, - isValidConnection = () => true, - isConnectable = true, - style, - className, - id, - }: HandleProps) => { - const nodeId = useContext(NodeIdContext) as ElementId; - const setPosition = useStoreActions((a) => a.setConnectionPosition); - const setConnectionNodeId = useStoreActions((a) => a.setConnectionNodeId); - const onConnectAction = useStoreState((s) => s.onConnect); - const onConnectExtended = (params: Connection) => { - onConnectAction(params); - onConnect(params); - }; - const handleClasses = cc([className, { connectable: isConnectable }]); +const Handle = ({ + type = 'source', + position = Position.Top, + onConnect = () => {}, + isValidConnection = () => true, + isConnectable = true, + style, + className, + id, +}: HandleProps) => { + const nodeId = useContext(NodeIdContext) as ElementId; + const setPosition = useStoreActions((a) => a.setConnectionPosition); + const setConnectionNodeId = useStoreActions((a) => a.setConnectionNodeId); + const onConnectAction = useStoreState((s) => s.onConnect); + const onConnectExtended = (params: Connection) => { + onConnectAction(params); + onConnect(params); + }; + const handleClasses = cc([className, { connectable: isConnectable }]); - return ( - - ); - } -); + return ( + + ); +}; Handle.displayName = 'Handle'; -export default Handle; +export default memo(Handle); diff --git a/src/components/Nodes/DefaultNode.tsx b/src/components/Nodes/DefaultNode.tsx index 23913c76..11d9af2f 100644 --- a/src/components/Nodes/DefaultNode.tsx +++ b/src/components/Nodes/DefaultNode.tsx @@ -3,16 +3,19 @@ import React, { memo } from 'react'; import Handle from '../../components/Handle'; import { NodeProps, Position } from '../../types'; -const DefaultNode = memo( - ({ data, isConnectable, targetPosition = Position.Top, sourcePosition = Position.Bottom }: NodeProps) => ( - <> - - {data.label} - - - ) +const DefaultNode = ({ + data, + isConnectable, + targetPosition = Position.Top, + sourcePosition = Position.Bottom, +}: NodeProps) => ( + <> + + {data.label} + + ); DefaultNode.displayName = 'DefaultNode'; -export default DefaultNode; +export default memo(DefaultNode); diff --git a/src/components/Nodes/InputNode.tsx b/src/components/Nodes/InputNode.tsx index 5e9123dc..73ac0cdf 100644 --- a/src/components/Nodes/InputNode.tsx +++ b/src/components/Nodes/InputNode.tsx @@ -3,13 +3,13 @@ import React, { memo } from 'react'; import Handle from '../../components/Handle'; import { NodeProps, Position } from '../../types'; -const InputNode = memo(({ data, isConnectable, sourcePosition = Position.Bottom }: NodeProps) => ( +const InputNode = ({ data, isConnectable, sourcePosition = Position.Bottom }: NodeProps) => ( <> {data.label} -)); +); InputNode.displayName = 'InputNode'; -export default InputNode; +export default memo(InputNode); diff --git a/src/components/Nodes/OutputNode.tsx b/src/components/Nodes/OutputNode.tsx index f77458f3..b6358414 100644 --- a/src/components/Nodes/OutputNode.tsx +++ b/src/components/Nodes/OutputNode.tsx @@ -3,13 +3,13 @@ import React, { memo } from 'react'; import Handle from '../../components/Handle'; import { NodeProps, Position } from '../../types'; -const OutputNode = memo(({ data, isConnectable, targetPosition = Position.Top }: NodeProps) => ( +const OutputNode = ({ data, isConnectable, targetPosition = Position.Top }: NodeProps) => ( <> {data.label} -)); +); OutputNode.displayName = 'OutputNode'; -export default OutputNode; +export default memo(OutputNode); diff --git a/src/components/Nodes/wrapNode.tsx b/src/components/Nodes/wrapNode.tsx index 3115c4f7..98d0d465 100644 --- a/src/components/Nodes/wrapNode.tsx +++ b/src/components/Nodes/wrapNode.tsx @@ -160,192 +160,190 @@ const onStop = ({ }; export default (NodeComponent: ComponentType) => { - const NodeWrapper = memo( - ({ - id, - type, - data, - transform, - xPos, - yPos, - selected, - onClick, - onMouseEnter, - onMouseMove, - onMouseLeave, - onContextMenu, - onNodeDragStart, - onNodeDragStop, - style, + const NodeWrapper = ({ + id, + type, + data, + transform, + xPos, + yPos, + selected, + onClick, + onMouseEnter, + onMouseMove, + onMouseLeave, + onContextMenu, + onNodeDragStart, + onNodeDragStop, + style, + className, + isDraggable, + isSelectable, + isConnectable, + selectNodesOnDrag, + sourcePosition, + targetPosition, + isHidden, + }: WrapNodeProps) => { + const updateNodeDimensions = useStoreActions((a) => a.updateNodeDimensions); + const setSelectedElements = useStoreActions((a) => a.setSelectedElements); + const updateNodePos = useStoreActions((a) => a.updateNodePos); + + const nodeElement = useRef(null); + const [offset, setOffset] = useState({ x: 0, y: 0 }); + const [isDragging, setDragging] = useState(false); + const position = { x: xPos, y: yPos }; + const nodeClasses = cc([ + 'react-flow__node', + `react-flow__node-${type}`, className, - isDraggable, - isSelectable, - isConnectable, - selectNodesOnDrag, - sourcePosition, - targetPosition, - isHidden, - }: WrapNodeProps) => { - const updateNodeDimensions = useStoreActions((a) => a.updateNodeDimensions); - const setSelectedElements = useStoreActions((a) => a.setSelectedElements); - const updateNodePos = useStoreActions((a) => a.updateNodePos); - - const nodeElement = useRef(null); - const [offset, setOffset] = useState({ x: 0, y: 0 }); - const [isDragging, setDragging] = useState(false); - const position = { x: xPos, y: yPos }; - const nodeClasses = cc([ - 'react-flow__node', - `react-flow__node-${type}`, - className, - { - selected, - selectable: isSelectable, - }, - ]); - const node = { id, type, position, data }; - const onMouseEnterHandler = useMemo(() => { - if (!onMouseEnter || isDragging) { - return noop; - } - - return (evt: MouseEvent) => onMouseEnter(evt, node); - }, [onMouseEnter, isDragging]); - - const onMouseMoveHandler = useMemo(() => { - if (!onMouseMove || isDragging) { - return noop; - } - - return (evt: MouseEvent) => onMouseMove(evt, node); - }, [onMouseMove, isDragging]); - - const onMouseLeaveHandler = useMemo(() => { - if (!onMouseLeave || isDragging) { - return noop; - } - - return (evt: MouseEvent) => onMouseLeave(evt, node); - }, [onMouseLeave, isDragging]); - - const onContextMenuHandler = useMemo(() => { - if (!onContextMenu) { - return noop; - } - - return (evt: MouseEvent) => onContextMenu(evt, node); - }, [onContextMenu]); - - const onSelectNodeHandler = useCallback(() => { - if (!isDraggable && isSelectable) { - setSelectedElements({ id: node.id, type: node.type } as Node); - - if (onClick) { - onClick(node); - } - } - + { + selected, + selectable: isSelectable, + }, + ]); + const node = { id, type, position, data }; + const onMouseEnterHandler = useMemo(() => { + if (!onMouseEnter || isDragging) { return noop; - }, [isSelectable, isDraggable, node]); - - useEffect(() => { - if (nodeElement.current) { - updateNodeDimensions({ id, nodeElement: nodeElement.current }); - - const resizeObserver = new ResizeObserver((entries) => { - for (let _ of entries) { - updateNodeDimensions({ id, nodeElement: nodeElement.current! }); - } - }); - - resizeObserver.observe(nodeElement.current); - - return () => { - if (resizeObserver && nodeElement.current) { - resizeObserver.unobserve(nodeElement.current); - } - }; - } - - return; - }, [id]); - - if (isHidden) { - return null; } - const nodeStyle: CSSProperties = { - zIndex: selected ? 10 : 3, - transform: `translate(${xPos}px,${yPos}px)`, - pointerEvents: isSelectable || isDraggable ? 'all' : 'none', - ...style, - }; + return (evt: MouseEvent) => onMouseEnter(evt, node); + }, [onMouseEnter, isDragging]); - return ( - - onStart({ - evt: evt as MouseEvent, - selectNodesOnDrag, - isSelectable, - onNodeDragStart, - id, - type, - data, - setOffset, - transform, - position, - setSelectedElements, - }) + const onMouseMoveHandler = useMemo(() => { + if (!onMouseMove || isDragging) { + return noop; + } + + return (evt: MouseEvent) => onMouseMove(evt, node); + }, [onMouseMove, isDragging]); + + const onMouseLeaveHandler = useMemo(() => { + if (!onMouseLeave || isDragging) { + return noop; + } + + return (evt: MouseEvent) => onMouseLeave(evt, node); + }, [onMouseLeave, isDragging]); + + const onContextMenuHandler = useMemo(() => { + if (!onContextMenu) { + return noop; + } + + return (evt: MouseEvent) => onContextMenu(evt, node); + }, [onContextMenu]); + + const onSelectNodeHandler = useCallback(() => { + if (!isDraggable && isSelectable) { + setSelectedElements({ id: node.id, type: node.type } as Node); + + if (onClick) { + onClick(node); + } + } + + return noop; + }, [isSelectable, isDraggable, node]); + + useEffect(() => { + if (nodeElement.current) { + updateNodeDimensions({ id, nodeElement: nodeElement.current }); + + const resizeObserver = new ResizeObserver((entries) => { + for (let _ of entries) { + updateNodeDimensions({ id, nodeElement: nodeElement.current! }); } - onDrag={(evt) => onDrag({ evt: evt as MouseEvent, setDragging, id, offset, transform, updateNodePos })} - onStop={() => - onStop({ - onNodeDragStop, - selectNodesOnDrag, - isSelectable, - onClick, - isDragging, - setDragging, - id, - type, - position, - data, - setSelectedElements, - }) + }); + + resizeObserver.observe(nodeElement.current); + + return () => { + if (resizeObserver && nodeElement.current) { + resizeObserver.unobserve(nodeElement.current); } - scale={transform[2]} - disabled={!isDraggable} - cancel=".nodrag" - > -
- - - -
-
- ); + }; + } + + return; + }, [id]); + + if (isHidden) { + return null; } - ); + + const nodeStyle: CSSProperties = { + zIndex: selected ? 10 : 3, + transform: `translate(${xPos}px,${yPos}px)`, + pointerEvents: isSelectable || isDraggable ? 'all' : 'none', + ...style, + }; + + return ( + + onStart({ + evt: evt as MouseEvent, + selectNodesOnDrag, + isSelectable, + onNodeDragStart, + id, + type, + data, + setOffset, + transform, + position, + setSelectedElements, + }) + } + onDrag={(evt) => onDrag({ evt: evt as MouseEvent, setDragging, id, offset, transform, updateNodePos })} + onStop={() => + onStop({ + onNodeDragStop, + selectNodesOnDrag, + isSelectable, + onClick, + isDragging, + setDragging, + id, + type, + position, + data, + setSelectedElements, + }) + } + scale={transform[2]} + disabled={!isDraggable} + cancel=".nodrag" + > +
+ + + +
+
+ ); + }; NodeWrapper.displayName = 'NodeWrapper'; - return NodeWrapper; + return memo(NodeWrapper); }; diff --git a/src/components/NodesSelection/index.tsx b/src/components/NodesSelection/index.tsx index c23eb40f..ff5aa7f3 100644 --- a/src/components/NodesSelection/index.tsx +++ b/src/components/NodesSelection/index.tsx @@ -3,7 +3,7 @@ * made a selectio with on or several nodes */ -import React, { useState, memo } from 'react'; +import React, { useState } from 'react'; import ReactDraggable from 'react-draggable'; import { useStoreState, useStoreActions } from '../../store/hooks'; @@ -27,7 +27,7 @@ function getStartPositions(nodes: Node[]): StartPositions { }, startPositions); } -export default memo(() => { +export default () => { const [offset, setOffset] = useState({ x: 0, y: 0 }); const [startPositions, setStartPositions] = useState({}); const [tX, tY, tScale] = useStoreState((s) => s.transform); @@ -110,4 +110,4 @@ export default memo(() => {
); -}); +}; diff --git a/src/container/EdgeRenderer/index.tsx b/src/container/EdgeRenderer/index.tsx index ae4ce4ea..4565eec9 100644 --- a/src/container/EdgeRenderer/index.tsx +++ b/src/container/EdgeRenderer/index.tsx @@ -193,7 +193,7 @@ function renderEdge( ); } -const EdgeRenderer = memo((props: EdgeRendererProps) => { +const EdgeRenderer = (props: EdgeRendererProps) => { const [tX, tY, tScale] = useStoreState((s) => s.transform); const edges = useStoreState((s) => s.edges); const nodes = useStoreState((s) => s.nodes); @@ -234,8 +234,8 @@ const EdgeRenderer = memo((props: EdgeRendererProps) => { ); -}); +}; EdgeRenderer.displayName = 'EdgeRenderer'; -export default EdgeRenderer; +export default memo(EdgeRenderer); diff --git a/src/container/GraphView/index.tsx b/src/container/GraphView/index.tsx index b8503fc7..f58985c0 100644 --- a/src/container/GraphView/index.tsx +++ b/src/container/GraphView/index.tsx @@ -62,200 +62,198 @@ export interface GraphViewProps { zoomOnDoubleClick: boolean; } -const GraphView = memo( - ({ - nodeTypes, - edgeTypes, +const GraphView = ({ + nodeTypes, + edgeTypes, + onMove, + onMoveStart, + onMoveEnd, + onLoad, + onElementClick, + onNodeMouseEnter, + onNodeMouseMove, + onNodeMouseLeave, + onNodeContextMenu, + onNodeDragStart, + onNodeDragStop, + connectionLineType, + connectionLineStyle, + selectionKeyCode, + onElementsRemove, + deleteKeyCode, + elements, + onConnect, + snapToGrid, + snapGrid, + onlyRenderVisibleNodes, + nodesDraggable, + nodesConnectable, + elementsSelectable, + selectNodesOnDrag, + minZoom, + maxZoom, + defaultZoom, + defaultPosition, + arrowHeadColor, + markerEndId, + zoomOnScroll, + zoomOnDoubleClick, +}: GraphViewProps) => { + const zoomPane = useRef(null); + const rendererNode = useRef(null); + const width = useStoreState((s) => s.width); + const height = useStoreState((s) => s.height); + const d3Initialised = useStoreState((s) => s.d3Initialised); + const nodesSelectionActive = useStoreState((s) => s.nodesSelectionActive); + const updateSize = useStoreActions((actions) => actions.updateSize); + const setNodesSelection = useStoreActions((actions) => actions.setNodesSelection); + const setOnConnect = useStoreActions((a) => a.setOnConnect); + const setSnapGrid = useStoreActions((actions) => actions.setSnapGrid); + const setNodesDraggable = useStoreActions((actions) => actions.setNodesDraggable); + const setNodesConnectable = useStoreActions((actions) => actions.setNodesConnectable); + const setElementsSelectable = useStoreActions((actions) => actions.setElementsSelectable); + const setInitTransform = useStoreActions((actions) => actions.setInitTransform); + const setMinMaxZoom = useStoreActions((actions) => actions.setMinMaxZoom); + const fitView = useStoreActions((actions) => actions.fitView); + const zoom = useStoreActions((actions) => actions.zoom); + + const selectionKeyPressed = useKeyPress(selectionKeyCode); + + const onZoomPaneClick = () => setNodesSelection({ isActive: false }); + + const updateDimensions = () => { + if (!rendererNode.current) { + return; + } + + const size = getDimensions(rendererNode.current); + + if (size.height === 0 || size.width === 0) { + throw new Error('The React Flow parent container needs a width and a height to render the graph.'); + } + + updateSize(size); + }; + + useEffect(() => { + let resizeObserver: ResizeObserver; + + updateDimensions(); + window.onresize = updateDimensions; + + if (onConnect) { + setOnConnect(onConnect); + } + + if (rendererNode.current) { + resizeObserver = new ResizeObserver((entries) => { + for (let _ of entries) { + updateDimensions(); + } + }); + + resizeObserver.observe(rendererNode.current); + } + + return () => { + window.onresize = null; + + if (resizeObserver && rendererNode.current) { + resizeObserver.unobserve(rendererNode.current!); + } + }; + }, []); + + useD3Zoom({ + zoomPane, onMove, onMoveStart, onMoveEnd, - onLoad, - onElementClick, - onNodeMouseEnter, - onNodeMouseMove, - onNodeMouseLeave, - onNodeContextMenu, - onNodeDragStart, - onNodeDragStop, - connectionLineType, - connectionLineStyle, - selectionKeyCode, - onElementsRemove, - deleteKeyCode, - elements, - onConnect, - snapToGrid, - snapGrid, - onlyRenderVisibleNodes, - nodesDraggable, - nodesConnectable, - elementsSelectable, - selectNodesOnDrag, - minZoom, - maxZoom, - defaultZoom, - defaultPosition, - arrowHeadColor, - markerEndId, + selectionKeyPressed, zoomOnScroll, zoomOnDoubleClick, - }: GraphViewProps) => { - const zoomPane = useRef(null); - const rendererNode = useRef(null); - const width = useStoreState((s) => s.width); - const height = useStoreState((s) => s.height); - const d3Initialised = useStoreState((s) => s.d3Initialised); - const nodesSelectionActive = useStoreState((s) => s.nodesSelectionActive); - const updateSize = useStoreActions((actions) => actions.updateSize); - const setNodesSelection = useStoreActions((actions) => actions.setNodesSelection); - const setOnConnect = useStoreActions((a) => a.setOnConnect); - const setSnapGrid = useStoreActions((actions) => actions.setSnapGrid); - const setNodesDraggable = useStoreActions((actions) => actions.setNodesDraggable); - const setNodesConnectable = useStoreActions((actions) => actions.setNodesConnectable); - const setElementsSelectable = useStoreActions((actions) => actions.setElementsSelectable); - const setInitTransform = useStoreActions((actions) => actions.setInitTransform); - const setMinMaxZoom = useStoreActions((actions) => actions.setMinMaxZoom); - const fitView = useStoreActions((actions) => actions.fitView); - const zoom = useStoreActions((actions) => actions.zoom); + }); - const selectionKeyPressed = useKeyPress(selectionKeyCode); + useEffect(() => { + if (d3Initialised && onLoad) { + onLoad({ + fitView: (params = { padding: 0.1 }) => fitView(params), + zoomIn: () => zoom(0.2), + zoomOut: () => zoom(-0.2), + project, + getElements, + setTransform: (transform: FlowTransform) => + setInitTransform({ x: transform.x, y: transform.y, k: transform.zoom }), + }); + } - const onZoomPaneClick = () => setNodesSelection({ isActive: false }); - - const updateDimensions = () => { - if (!rendererNode.current) { - return; - } - - const size = getDimensions(rendererNode.current); - - if (size.height === 0 || size.width === 0) { - throw new Error('The React Flow parent container needs a width and a height to render the graph.'); - } - - updateSize(size); - }; - - useEffect(() => { - let resizeObserver: ResizeObserver; - - updateDimensions(); - window.onresize = updateDimensions; - - if (onConnect) { - setOnConnect(onConnect); - } - - if (rendererNode.current) { - resizeObserver = new ResizeObserver((entries) => { - for (let _ of entries) { - updateDimensions(); - } - }); - - resizeObserver.observe(rendererNode.current); - } - - return () => { - window.onresize = null; - - if (resizeObserver && rendererNode.current) { - resizeObserver.unobserve(rendererNode.current!); - } + if (d3Initialised) { + const initialTransform = { + x: defaultPosition[0], + y: defaultPosition[1], + k: defaultZoom, }; - }, []); - useD3Zoom({ - zoomPane, - onMove, - onMoveStart, - onMoveEnd, - selectionKeyPressed, - zoomOnScroll, - zoomOnDoubleClick, - }); - - useEffect(() => { - if (d3Initialised && onLoad) { - onLoad({ - fitView: (params = { padding: 0.1 }) => fitView(params), - zoomIn: () => zoom(0.2), - zoomOut: () => zoom(-0.2), - project, - getElements, - setTransform: (transform: FlowTransform) => - setInitTransform({ x: transform.x, y: transform.y, k: transform.zoom }), - }); + if (initialTransform.x !== 0 || initialTransform.y !== 0 || initialTransform.k !== 1) { + setInitTransform(initialTransform); } + } + }, [d3Initialised, onLoad]); - if (d3Initialised) { - const initialTransform = { - x: defaultPosition[0], - y: defaultPosition[1], - k: defaultZoom, - }; + useEffect(() => { + setSnapGrid({ snapToGrid, snapGrid }); + }, [snapToGrid]); - if (initialTransform.x !== 0 || initialTransform.y !== 0 || initialTransform.k !== 1) { - setInitTransform(initialTransform); - } - } - }, [d3Initialised, onLoad]); + useEffect(() => { + setNodesDraggable(nodesDraggable); + }, [nodesDraggable]); - useEffect(() => { - setSnapGrid({ snapToGrid, snapGrid }); - }, [snapToGrid]); + useEffect(() => { + setNodesConnectable(nodesConnectable); + }, [nodesConnectable]); - useEffect(() => { - setNodesDraggable(nodesDraggable); - }, [nodesDraggable]); + useEffect(() => { + setElementsSelectable(elementsSelectable); + }, [elementsSelectable]); - useEffect(() => { - setNodesConnectable(nodesConnectable); - }, [nodesConnectable]); + useEffect(() => { + setMinMaxZoom({ minZoom, maxZoom }); + }, [minZoom, maxZoom]); - useEffect(() => { - setElementsSelectable(elementsSelectable); - }, [elementsSelectable]); + useGlobalKeyHandler({ onElementsRemove, deleteKeyCode }); + useElementUpdater(elements); - useEffect(() => { - setMinMaxZoom({ minZoom, maxZoom }); - }, [minZoom, maxZoom]); - - useGlobalKeyHandler({ onElementsRemove, deleteKeyCode }); - useElementUpdater(elements); - - return ( -
- - - - {nodesSelectionActive && } -
-
- ); - } -); + return ( +
+ + + + {nodesSelectionActive && } +
+
+ ); +}; GraphView.displayName = 'GraphView'; -export default GraphView; +export default memo(GraphView); diff --git a/src/container/NodeRenderer/index.tsx b/src/container/NodeRenderer/index.tsx index 4f6504aa..e369dfe3 100644 --- a/src/container/NodeRenderer/index.tsx +++ b/src/container/NodeRenderer/index.tsx @@ -68,7 +68,7 @@ function renderNode( ); } -const NodeRenderer = memo(({ onlyRenderVisibleNodes = true, ...props }: NodeRendererProps) => { +const NodeRenderer = ({ onlyRenderVisibleNodes = true, ...props }: NodeRendererProps) => { const nodes = useStoreState((s) => s.nodes); const transform = useStoreState((s) => s.transform); const selectedElements = useStoreState((s) => s.selectedElements); @@ -94,8 +94,8 @@ const NodeRenderer = memo(({ onlyRenderVisibleNodes = true, ...props }: NodeRend )}
); -}); +}; NodeRenderer.displayName = 'NodeRenderer'; -export default NodeRenderer; +export default memo(NodeRenderer);