feat(interaction): add zoomOnScroll property closes #331

This commit is contained in:
moklick
2020-07-14 13:28:59 +02:00
parent 0593db289a
commit 65764fbefb
5 changed files with 29 additions and 3 deletions
+1
View File
@@ -91,6 +91,7 @@ const BasicFlow = () => <ReactFlow elements={elements} />;
- `nodesDraggable`: default: `true` - `nodesDraggable`: default: `true`
- `nodesConnectable`: default: `true` - `nodesConnectable`: default: `true`
- `elementsSelectable`: default: `true` - `elementsSelectable`: default: `true`
- `zoomOnScroll`: default: `true`
- `selectNodesOnDrag`: default: `true` - `selectNodesOnDrag`: default: `true`
- `minZoom`: default: `0.5` - `minZoom`: default: `0.5`
- `maxZoom`: default: `2` - `maxZoom`: default: `2`
+14
View File
@@ -18,6 +18,7 @@ const InteractionFlow = () => {
const [isSelectable, setIsSelectable] = useState(false); const [isSelectable, setIsSelectable] = useState(false);
const [isDraggable, setIsDraggable] = useState(false); const [isDraggable, setIsDraggable] = useState(false);
const [isConnectable, setIsConnectable] = useState(false); const [isConnectable, setIsConnectable] = useState(false);
const [zoomOnScroll, setZoomOnScroll] = useState(true);
return ( return (
<ReactFlow <ReactFlow
@@ -25,6 +26,7 @@ const InteractionFlow = () => {
elementsSelectable={isSelectable} elementsSelectable={isSelectable}
nodesConnectable={isConnectable} nodesConnectable={isConnectable}
nodesDraggable={isDraggable} nodesDraggable={isDraggable}
zoomOnScroll={zoomOnScroll}
onConnect={onConnect} onConnect={onConnect}
> >
<MiniMap /> <MiniMap />
@@ -67,6 +69,18 @@ const InteractionFlow = () => {
/> />
</label> </label>
</div> </div>
<div>
<label htmlFor="zoomonscroll">
zoom on scroll
<input
id="zoomonscroll"
type="checkbox"
checked={zoomOnScroll}
onChange={(evt) => setZoomOnScroll(evt.target.checked)}
className="react-flow__zoomonscroll"
/>
</label>
</div>
</div> </div>
</ReactFlow> </ReactFlow>
); );
+3 -1
View File
@@ -54,6 +54,7 @@ export interface GraphViewProps {
defaultZoom: number; defaultZoom: number;
arrowHeadColor: string; arrowHeadColor: string;
markerEndId?: string; markerEndId?: string;
zoomOnScroll: boolean;
} }
const GraphView = memo( const GraphView = memo(
@@ -88,6 +89,7 @@ const GraphView = memo(
defaultZoom, defaultZoom,
arrowHeadColor, arrowHeadColor,
markerEndId, markerEndId,
zoomOnScroll,
}: GraphViewProps) => { }: GraphViewProps) => {
const zoomPane = useRef<HTMLDivElement>(null); const zoomPane = useRef<HTMLDivElement>(null);
const rendererNode = useRef<HTMLDivElement>(null); const rendererNode = useRef<HTMLDivElement>(null);
@@ -158,7 +160,7 @@ const GraphView = memo(
}; };
}, []); }, []);
useD3Zoom({ zoomPane, onMove, selectionKeyPressed }); useD3Zoom({ zoomPane, onMove, selectionKeyPressed, zoomOnScroll });
useEffect(() => { useEffect(() => {
if (d3Initialised && onLoad) { if (d3Initialised && onLoad) {
+4
View File
@@ -62,6 +62,7 @@ export interface ReactFlowProps extends Omit<HTMLAttributes<HTMLDivElement>, 'on
defaultZoom: number; defaultZoom: number;
arrowHeadColor: string; arrowHeadColor: string;
markerEndId?: string; markerEndId?: string;
zoomOnScroll: boolean
} }
const ReactFlow = ({ const ReactFlow = ({
@@ -99,6 +100,7 @@ const ReactFlow = ({
defaultZoom, defaultZoom,
arrowHeadColor, arrowHeadColor,
markerEndId, markerEndId,
zoomOnScroll
}: ReactFlowProps) => { }: ReactFlowProps) => {
const nodeTypesParsed = useMemo(() => createNodeTypes(nodeTypes), []); const nodeTypesParsed = useMemo(() => createNodeTypes(nodeTypes), []);
const edgeTypesParsed = useMemo(() => createEdgeTypes(edgeTypes), []); const edgeTypesParsed = useMemo(() => createEdgeTypes(edgeTypes), []);
@@ -138,6 +140,7 @@ const ReactFlow = ({
defaultZoom={defaultZoom} defaultZoom={defaultZoom}
arrowHeadColor={arrowHeadColor} arrowHeadColor={arrowHeadColor}
markerEndId={markerEndId} markerEndId={markerEndId}
zoomOnScroll={zoomOnScroll}
/> />
{onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />} {onSelectionChange && <SelectionListener onSelectionChange={onSelectionChange} />}
{children} {children}
@@ -174,6 +177,7 @@ ReactFlow.defaultProps = {
maxZoom: 2, maxZoom: 2,
defaultZoom: 1, defaultZoom: 1,
arrowHeadColor: '#bbb', arrowHeadColor: '#bbb',
zoomOnScroll: true
}; };
export default ReactFlow; export default ReactFlow;
+7 -2
View File
@@ -6,10 +6,11 @@ import { useStoreState, useStoreActions } from '../store/hooks';
interface UseD3ZoomParams { interface UseD3ZoomParams {
zoomPane: MutableRefObject<Element | null>; zoomPane: MutableRefObject<Element | null>;
selectionKeyPressed: boolean; selectionKeyPressed: boolean;
zoomOnScroll: boolean;
onMove?: () => void; onMove?: () => void;
} }
export default ({ zoomPane, onMove, selectionKeyPressed }: UseD3ZoomParams): void => { export default ({ zoomPane, onMove, zoomOnScroll, selectionKeyPressed }: UseD3ZoomParams): void => {
const d3Zoom = useStoreState((s) => s.d3Zoom); const d3Zoom = useStoreState((s) => s.d3Zoom);
const initD3 = useStoreActions((actions) => actions.initD3); const initD3 = useStoreActions((actions) => actions.initD3);
@@ -31,6 +32,10 @@ export default ({ zoomPane, onMove, selectionKeyPressed }: UseD3ZoomParams): voi
return; return;
} }
if (!zoomOnScroll && event.sourceEvent.type === 'wheel') {
return;
}
updateTransform(event.transform); updateTransform(event.transform);
if (onMove) { if (onMove) {
@@ -39,5 +44,5 @@ export default ({ zoomPane, onMove, selectionKeyPressed }: UseD3ZoomParams): voi
}); });
} }
} }
}, [selectionKeyPressed, d3Zoom]); }, [selectionKeyPressed, zoomOnScroll, d3Zoom]);
}; };