refactor(interactive-minimap): drag mask instead of pane
This commit is contained in:
@@ -17,35 +17,70 @@ const onNodeClick = (_: MouseEvent, node: Node) => console.log('click', node);
|
|||||||
const initialNodes: Node[] = [
|
const initialNodes: Node[] = [
|
||||||
{
|
{
|
||||||
id: '1',
|
id: '1',
|
||||||
type: 'input',
|
|
||||||
data: { label: 'Node 1' },
|
data: { label: 'Node 1' },
|
||||||
position: { x: 0, y: 0 },
|
position: { x: 0, y: 0 },
|
||||||
className: 'light',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '2',
|
id: '2',
|
||||||
data: { label: 'Node 2' },
|
data: { label: 'Node 2' },
|
||||||
position: { x: 0, y: 200 },
|
position: { x: 0, y: 200 },
|
||||||
className: 'light',
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: '3',
|
id: '3',
|
||||||
data: { label: 'Node 3' },
|
data: { label: 'Node 3' },
|
||||||
position: { x: 200, y: 200 },
|
position: { x: 200, y: 0 },
|
||||||
className: 'light',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
id: '4',
|
id: '4',
|
||||||
data: { label: 'Node 4' },
|
data: { label: 'Node 4' },
|
||||||
position: { x: 200, y: 400 },
|
position: { x: 1000, y: 0 },
|
||||||
className: 'light',
|
},
|
||||||
|
{
|
||||||
|
id: '5',
|
||||||
|
data: { label: 'Node 5' },
|
||||||
|
position: { x: 1000, y: 200 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '6',
|
||||||
|
data: { label: 'Node 6' },
|
||||||
|
position: { x: 800, y: 0 },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
id: '7',
|
||||||
|
data: { label: 'Node 4' },
|
||||||
|
position: { x: 0, y: 1000 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '8',
|
||||||
|
data: { label: 'Node 5' },
|
||||||
|
position: { x: 0, y: 800 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '9',
|
||||||
|
data: { label: 'Node 6' },
|
||||||
|
position: { x: 200, y: 1000 },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
id: '10',
|
||||||
|
data: { label: 'Node 4' },
|
||||||
|
position: { x: 1000, y: 1000 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '11',
|
||||||
|
data: { label: 'Node 5' },
|
||||||
|
position: { x: 800, y: 1000 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '12',
|
||||||
|
data: { label: 'Node 6' },
|
||||||
|
position: { x: 1000, y: 800 },
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const initialEdges: Edge[] = [
|
const initialEdges: Edge[] = [];
|
||||||
{ id: 'e1-2', source: '1', target: '2', animated: true },
|
|
||||||
{ id: 'e1-3', source: '1', target: '3' },
|
|
||||||
];
|
|
||||||
|
|
||||||
const defaultEdgeOptions = { zIndex: 0 };
|
const defaultEdgeOptions = { zIndex: 0 };
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
import { memo, useEffect, useRef } from 'react';
|
import { memo, MouseEvent, useEffect, useRef } from 'react';
|
||||||
import cc from 'classcat';
|
import cc from 'classcat';
|
||||||
import shallow from 'zustand/shallow';
|
import shallow from 'zustand/shallow';
|
||||||
import { zoom, D3ZoomEvent, zoomIdentity } from 'd3-zoom';
|
import { zoom, D3ZoomEvent, zoomIdentity } from 'd3-zoom';
|
||||||
import { select } from 'd3-selection';
|
import { select, pointer } from 'd3-selection';
|
||||||
import {
|
import {
|
||||||
useStore,
|
useStore,
|
||||||
getRectOfNodes,
|
getRectOfNodes,
|
||||||
@@ -13,7 +13,6 @@ import {
|
|||||||
getBoundsOfRects,
|
getBoundsOfRects,
|
||||||
useStoreApi,
|
useStoreApi,
|
||||||
useReactFlow,
|
useReactFlow,
|
||||||
XYPosition,
|
|
||||||
} from '@reactflow/core';
|
} from '@reactflow/core';
|
||||||
|
|
||||||
import MiniMapNode from './MiniMapNode';
|
import MiniMapNode from './MiniMapNode';
|
||||||
@@ -38,6 +37,8 @@ const selector = (s: ReactFlowState) => {
|
|||||||
viewBB,
|
viewBB,
|
||||||
boundingRect: nodes.length > 0 ? getBoundsOfRects(getRectOfNodes(nodes), viewBB) : viewBB,
|
boundingRect: nodes.length > 0 ? getBoundsOfRects(getRectOfNodes(nodes), viewBB) : viewBB,
|
||||||
rfId: s.rfId,
|
rfId: s.rfId,
|
||||||
|
width: s.width,
|
||||||
|
height: s.height,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -49,17 +50,16 @@ function MiniMap({
|
|||||||
style,
|
style,
|
||||||
className,
|
className,
|
||||||
nodeStrokeColor = '#555',
|
nodeStrokeColor = '#555',
|
||||||
nodeColor = '#fff',
|
nodeColor = '#999',
|
||||||
nodeClassName = '',
|
nodeClassName = '',
|
||||||
nodeBorderRadius = 5,
|
nodeBorderRadius = 5,
|
||||||
nodeStrokeWidth = 2,
|
nodeStrokeWidth = 2,
|
||||||
maskColor = 'rgb(240, 242, 243, 0.7)',
|
maskColor = 'rgb(200, 200, 200, 0.9)',
|
||||||
position = 'bottom-right',
|
position = 'bottom-right',
|
||||||
}: MiniMapProps) {
|
}: MiniMapProps) {
|
||||||
const store = useStoreApi();
|
const store = useStoreApi();
|
||||||
const svg = useRef<SVGSVGElement>(null);
|
const svg = useRef<SVGSVGElement>(null);
|
||||||
const initialized = useRef(false);
|
const { boundingRect, viewBB, nodes, rfId, width: w, height: h } = useStore(selector, shallow);
|
||||||
const { boundingRect, viewBB, nodes, rfId } = useStore(selector, shallow);
|
|
||||||
const elementWidth = (style?.width as number) ?? defaultWidth;
|
const elementWidth = (style?.width as number) ?? defaultWidth;
|
||||||
const elementHeight = (style?.height as number) ?? defaultHeight;
|
const elementHeight = (style?.height as number) ?? defaultHeight;
|
||||||
const nodeColorFunc = getAttrFunction(nodeColor);
|
const nodeColorFunc = getAttrFunction(nodeColor);
|
||||||
@@ -77,33 +77,27 @@ function MiniMap({
|
|||||||
const height = viewHeight + offset * 2;
|
const height = viewHeight + offset * 2;
|
||||||
const shapeRendering = typeof window === 'undefined' || !!window.chrome ? 'crispEdges' : 'geometricPrecision';
|
const shapeRendering = typeof window === 'undefined' || !!window.chrome ? 'crispEdges' : 'geometricPrecision';
|
||||||
const labelledBy = `${ARIA_LABEL_KEY}-${rfId}`;
|
const labelledBy = `${ARIA_LABEL_KEY}-${rfId}`;
|
||||||
const { setCenter } = useReactFlow();
|
const { setCenter, setViewport, project } = useReactFlow();
|
||||||
const startTransform = useRef<XYPosition>({ x: 0, y: 0 });
|
const startTransform = useRef<[number, number]>([0, 0]);
|
||||||
const viewScaleRef = useRef(0);
|
const viewScaleRef = useRef(0);
|
||||||
const viewScaleWRef = useRef(0);
|
|
||||||
const viewScaleHRef = useRef(0);
|
|
||||||
|
|
||||||
viewScaleRef.current = viewScale;
|
viewScaleRef.current = Math.max(w / elementWidth, h / elementHeight);
|
||||||
viewScaleWRef.current = scaledWidth;
|
|
||||||
viewScaleHRef.current = scaledHeight;
|
const onClick = (event: MouseEvent) => {
|
||||||
|
const rfCoord = pointer(event);
|
||||||
|
|
||||||
|
console.log(rfCoord);
|
||||||
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!initialized.current && svg.current) {
|
if (svg.current) {
|
||||||
const bounds = svg.current.getBoundingClientRect() || { left: 0, top: 0 };
|
|
||||||
|
|
||||||
const selection = select(svg.current as Element);
|
const selection = select(svg.current as Element);
|
||||||
|
|
||||||
const zoomHandler = zoom()
|
const zoomHandler = zoom()
|
||||||
.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
const { transform } = store.getState();
|
const rfCoord = pointer(event);
|
||||||
|
|
||||||
const px = (event.sourceEvent.clientX - bounds.left) * viewScaleRef.current;
|
startTransform.current = rfCoord;
|
||||||
const py = (event.sourceEvent.clientY - bounds.top) * viewScaleRef.current;
|
|
||||||
|
|
||||||
startTransform.current = {
|
|
||||||
x: px - transform[0] / transform[2],
|
|
||||||
y: py - transform[1] / transform[2],
|
|
||||||
};
|
|
||||||
})
|
})
|
||||||
.on('zoom.wheel', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
.on('zoom.wheel', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
const { transform, d3Selection, d3Zoom } = store.getState();
|
const { transform, d3Selection, d3Zoom } = store.getState();
|
||||||
@@ -117,29 +111,26 @@ function MiniMap({
|
|||||||
(event.sourceEvent.deltaMode === 1 ? 0.05 : event.sourceEvent.deltaMode ? 1 : 0.002) *
|
(event.sourceEvent.deltaMode === 1 ? 0.05 : event.sourceEvent.deltaMode ? 1 : 0.002) *
|
||||||
10;
|
10;
|
||||||
const zoom = transform[2] * Math.pow(2, pinchDelta);
|
const zoom = transform[2] * Math.pow(2, pinchDelta);
|
||||||
d3Zoom.scaleTo(d3Selection, zoom, [startTransform.current.x, startTransform.current.y]);
|
|
||||||
|
d3Zoom.scaleTo(d3Selection, zoom, startTransform.current);
|
||||||
})
|
})
|
||||||
.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
if (event.sourceEvent.type !== 'mousemove') {
|
const { transform, d3Selection, d3Zoom } = store.getState();
|
||||||
|
if (event.sourceEvent.type !== 'mousemove' || !d3Selection || !d3Zoom) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { transform, d3Selection, d3Zoom } = store.getState();
|
|
||||||
const px = (event.sourceEvent.clientX - bounds.left) * viewScaleRef.current;
|
|
||||||
const py = (event.sourceEvent.clientY - bounds.top) * viewScaleRef.current;
|
|
||||||
|
|
||||||
const position = {
|
const position = {
|
||||||
x: (px - startTransform.current.x) * transform[2],
|
x: transform[0] - event.sourceEvent.movementX * viewScaleRef.current * transform[2],
|
||||||
y: (py - startTransform.current.y) * transform[2],
|
y: transform[1] - event.sourceEvent.movementY * viewScaleRef.current * transform[2],
|
||||||
};
|
};
|
||||||
|
|
||||||
const nextTransform = zoomIdentity.translate(position.x, position.y).scale(transform[2]);
|
const nextTransform = zoomIdentity.translate(position.x, position.y).scale(transform[2]);
|
||||||
d3Zoom!.transform(d3Selection!, nextTransform);
|
d3Zoom.transform(d3Selection, nextTransform);
|
||||||
});
|
});
|
||||||
selection.call(zoomHandler);
|
selection.call(zoomHandler);
|
||||||
initialized.current = true;
|
|
||||||
}
|
}
|
||||||
}, [setCenter]);
|
}, [setCenter, setViewport, project]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Panel position={position} style={style} className={cc(['react-flow__minimap', className])}>
|
<Panel position={position} style={style} className={cc(['react-flow__minimap', className])}>
|
||||||
@@ -150,6 +141,7 @@ function MiniMap({
|
|||||||
role="img"
|
role="img"
|
||||||
aria-labelledby={labelledBy}
|
aria-labelledby={labelledBy}
|
||||||
ref={svg}
|
ref={svg}
|
||||||
|
onClick={onClick}
|
||||||
>
|
>
|
||||||
<title id={labelledBy}>React Flow mini map</title>
|
<title id={labelledBy}>React Flow mini map</title>
|
||||||
{nodes.map((node) => {
|
{nodes.map((node) => {
|
||||||
|
|||||||
@@ -0,0 +1,187 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||||
|
import { memo, useEffect, useRef } from 'react';
|
||||||
|
import cc from 'classcat';
|
||||||
|
import shallow from 'zustand/shallow';
|
||||||
|
import { zoom, D3ZoomEvent, zoomIdentity } from 'd3-zoom';
|
||||||
|
import { select } from 'd3-selection';
|
||||||
|
import {
|
||||||
|
useStore,
|
||||||
|
getRectOfNodes,
|
||||||
|
ReactFlowState,
|
||||||
|
Rect,
|
||||||
|
Panel,
|
||||||
|
getBoundsOfRects,
|
||||||
|
useStoreApi,
|
||||||
|
useReactFlow,
|
||||||
|
XYPosition,
|
||||||
|
} from '@reactflow/core';
|
||||||
|
|
||||||
|
import MiniMapNode from './MiniMapNode';
|
||||||
|
import { MiniMapProps, GetMiniMapNodeAttribute } from './types';
|
||||||
|
|
||||||
|
declare const window: any;
|
||||||
|
|
||||||
|
const defaultWidth = 200;
|
||||||
|
const defaultHeight = 150;
|
||||||
|
|
||||||
|
const selector = (s: ReactFlowState) => {
|
||||||
|
const nodes = Array.from(s.nodeInternals.values());
|
||||||
|
const viewBB: Rect = {
|
||||||
|
x: -s.transform[0] / s.transform[2],
|
||||||
|
y: -s.transform[1] / s.transform[2],
|
||||||
|
width: s.width / s.transform[2],
|
||||||
|
height: s.height / s.transform[2],
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
nodes: nodes.filter((node) => !node.hidden && node.width && node.height),
|
||||||
|
viewBB,
|
||||||
|
boundingRect: nodes.length > 0 ? getBoundsOfRects(getRectOfNodes(nodes), viewBB) : viewBB,
|
||||||
|
rfId: s.rfId,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const getAttrFunction = (func: any): GetMiniMapNodeAttribute => (func instanceof Function ? func : () => func);
|
||||||
|
|
||||||
|
const ARIA_LABEL_KEY = 'react-flow__minimap-desc';
|
||||||
|
|
||||||
|
function MiniMap({
|
||||||
|
style,
|
||||||
|
className,
|
||||||
|
nodeStrokeColor = '#555',
|
||||||
|
nodeColor = '#fff',
|
||||||
|
nodeClassName = '',
|
||||||
|
nodeBorderRadius = 5,
|
||||||
|
nodeStrokeWidth = 2,
|
||||||
|
maskColor = 'rgb(240, 242, 243, 0.7)',
|
||||||
|
position = 'bottom-right',
|
||||||
|
}: MiniMapProps) {
|
||||||
|
const store = useStoreApi();
|
||||||
|
const svg = useRef<SVGSVGElement>(null);
|
||||||
|
const initialized = useRef(false);
|
||||||
|
const { boundingRect, viewBB, nodes, rfId } = useStore(selector, shallow);
|
||||||
|
const elementWidth = (style?.width as number) ?? defaultWidth;
|
||||||
|
const elementHeight = (style?.height as number) ?? defaultHeight;
|
||||||
|
const nodeColorFunc = getAttrFunction(nodeColor);
|
||||||
|
const nodeStrokeColorFunc = getAttrFunction(nodeStrokeColor);
|
||||||
|
const nodeClassNameFunc = getAttrFunction(nodeClassName);
|
||||||
|
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 shapeRendering = typeof window === 'undefined' || !!window.chrome ? 'crispEdges' : 'geometricPrecision';
|
||||||
|
const labelledBy = `${ARIA_LABEL_KEY}-${rfId}`;
|
||||||
|
const { setCenter } = useReactFlow();
|
||||||
|
const startTransform = useRef<XYPosition>({ x: 0, y: 0 });
|
||||||
|
const viewScaleRef = useRef(0);
|
||||||
|
const viewScaleWRef = useRef(0);
|
||||||
|
const viewScaleHRef = useRef(0);
|
||||||
|
|
||||||
|
viewScaleRef.current = viewScale;
|
||||||
|
viewScaleWRef.current = scaledWidth;
|
||||||
|
viewScaleHRef.current = scaledHeight;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!initialized.current && svg.current) {
|
||||||
|
const bounds = svg.current.getBoundingClientRect() || { left: 0, top: 0 };
|
||||||
|
|
||||||
|
const selection = select(svg.current as Element);
|
||||||
|
|
||||||
|
const zoomHandler = zoom()
|
||||||
|
.on('start', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
|
const { transform } = store.getState();
|
||||||
|
|
||||||
|
const px = (event.sourceEvent.clientX - bounds.left) * viewScaleRef.current;
|
||||||
|
const py = (event.sourceEvent.clientY - bounds.top) * viewScaleRef.current;
|
||||||
|
|
||||||
|
startTransform.current = {
|
||||||
|
x: px - transform[0] / transform[2],
|
||||||
|
y: py - transform[1] / transform[2],
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.on('zoom.wheel', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
|
const { transform, d3Selection, d3Zoom } = store.getState();
|
||||||
|
|
||||||
|
if (event.sourceEvent.type !== 'wheel' || !d3Selection || !d3Zoom) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pinchDelta =
|
||||||
|
-event.sourceEvent.deltaY *
|
||||||
|
(event.sourceEvent.deltaMode === 1 ? 0.05 : event.sourceEvent.deltaMode ? 1 : 0.002) *
|
||||||
|
10;
|
||||||
|
const zoom = transform[2] * Math.pow(2, pinchDelta);
|
||||||
|
d3Zoom.scaleTo(d3Selection, zoom, [startTransform.current.x, startTransform.current.y]);
|
||||||
|
})
|
||||||
|
.on('zoom', (event: D3ZoomEvent<HTMLDivElement, any>) => {
|
||||||
|
if (event.sourceEvent.type !== 'mousemove') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { transform, d3Selection, d3Zoom } = store.getState();
|
||||||
|
const px = (event.sourceEvent.clientX - bounds.left) * viewScaleRef.current;
|
||||||
|
const py = (event.sourceEvent.clientY - bounds.top) * viewScaleRef.current;
|
||||||
|
|
||||||
|
const position = {
|
||||||
|
x: (px - startTransform.current.x) * transform[2],
|
||||||
|
y: (py - startTransform.current.y) * transform[2],
|
||||||
|
};
|
||||||
|
|
||||||
|
const nextTransform = zoomIdentity.translate(position.x, position.y).scale(transform[2]);
|
||||||
|
d3Zoom!.transform(d3Selection!, nextTransform);
|
||||||
|
});
|
||||||
|
selection.call(zoomHandler);
|
||||||
|
initialized.current = true;
|
||||||
|
}
|
||||||
|
}, [setCenter]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Panel position={position} style={style} className={cc(['react-flow__minimap', className])}>
|
||||||
|
<svg
|
||||||
|
width={elementWidth}
|
||||||
|
height={elementHeight}
|
||||||
|
viewBox={`${x} ${y} ${width} ${height}`}
|
||||||
|
role="img"
|
||||||
|
aria-labelledby={labelledBy}
|
||||||
|
ref={svg}
|
||||||
|
>
|
||||||
|
<title id={labelledBy}>React Flow mini map</title>
|
||||||
|
{nodes.map((node) => {
|
||||||
|
return (
|
||||||
|
<MiniMapNode
|
||||||
|
key={node.id}
|
||||||
|
x={node.positionAbsolute?.x ?? 0}
|
||||||
|
y={node.positionAbsolute?.y ?? 0}
|
||||||
|
width={node.width!}
|
||||||
|
height={node.height!}
|
||||||
|
style={node.style}
|
||||||
|
className={nodeClassNameFunc(node)}
|
||||||
|
color={nodeColorFunc(node)}
|
||||||
|
borderRadius={nodeBorderRadius}
|
||||||
|
strokeColor={nodeStrokeColorFunc(node)}
|
||||||
|
strokeWidth={nodeStrokeWidth}
|
||||||
|
shapeRendering={shapeRendering}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
<path
|
||||||
|
className="react-flow__minimap-mask"
|
||||||
|
d={`M${x - offset},${y - offset}h${width + offset * 2}v${height + offset * 2}h${-width - offset * 2}z
|
||||||
|
M${viewBB.x},${viewBB.y}h${viewBB.width}v${viewBB.height}h${-viewBB.width}z`}
|
||||||
|
fill={maskColor}
|
||||||
|
fillRule="evenodd"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</Panel>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
MiniMap.displayName = 'MiniMap';
|
||||||
|
|
||||||
|
export default memo(MiniMap);
|
||||||
Reference in New Issue
Block a user