feat(interaction): add zoomOnDoublickClick and fix behaviour closes #338

This commit is contained in:
moklick
2020-07-17 11:04:32 +02:00
parent a40f5adc03
commit 42f6336171
5 changed files with 47 additions and 16 deletions
+20 -11
View File
@@ -7,10 +7,11 @@ interface UseD3ZoomParams {
zoomPane: MutableRefObject<Element | null>;
selectionKeyPressed: boolean;
zoomOnScroll: boolean;
zoomOnDoubleClick: boolean;
onMove?: () => void;
}
export default ({ zoomPane, onMove, zoomOnScroll, selectionKeyPressed }: UseD3ZoomParams): void => {
export default ({ zoomPane, onMove, zoomOnScroll, zoomOnDoubleClick, selectionKeyPressed }: UseD3ZoomParams): void => {
const d3Zoom = useStoreState((s) => s.d3Zoom);
const initD3 = useStoreActions((actions) => actions.initD3);
@@ -27,15 +28,7 @@ export default ({ zoomPane, onMove, zoomOnScroll, selectionKeyPressed }: UseD3Zo
if (selectionKeyPressed) {
d3Zoom.on('zoom', null);
} else {
d3Zoom.on('zoom', function () {
if (!event.sourceEvent || (event.sourceEvent && event.sourceEvent.target !== zoomPane.current)) {
return;
}
if (!zoomOnScroll && event.sourceEvent.type === 'wheel') {
return;
}
d3Zoom.on('zoom', () => {
updateTransform(event.transform);
if (onMove) {
@@ -44,5 +37,21 @@ export default ({ zoomPane, onMove, zoomOnScroll, selectionKeyPressed }: UseD3Zo
});
}
}
}, [selectionKeyPressed, zoomOnScroll, d3Zoom]);
}, [selectionKeyPressed, d3Zoom]);
useEffect(() => {
if (d3Zoom) {
d3Zoom.filter(() => {
if (!zoomOnScroll && event.type === 'wheel') {
return false;
}
if (!zoomOnDoubleClick && event.type === 'dblclick') {
return false;
}
return !event.ctrlKey && !event.button;
});
}
}, [d3Zoom, zoomOnScroll, zoomOnDoubleClick]);
};