Atlas48/grungnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix map scroll when modal open

Browse Source
This commit is contained in:
Mitchell McCaffrey 2020-05-28 11:52:18 +10:00
parent 5b269fe7d1
commit 8432176014
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/map/MapInteraction.js
View File

@ -75,11 +75,15 @@ function MapInteraction({ map, children, controls, selectedToolId }) {
const pinchPreviousDistanceRef = useRef(); const pinchPreviousDistanceRef = useRef();
const pinchPreviousOriginRef = useRef(); const pinchPreviousOriginRef = useRef();
const isDraggingCanvas = useRef(false); const isInteractingCanvas = useRef(false);
const bind = useGesture({ const bind = useGesture({
onWheelStart: ({ event }) => {
isInteractingCanvas.current =
event.target === mapLayerRef.current.getCanvas()._canvas;
},
onWheel: ({ delta }) => { onWheel: ({ delta }) => {
if (preventMapInteraction) { if (preventMapInteraction || !isInteractingCanvas.current) {
return; return;
} }
const newScale = Math.min( const newScale = Math.min(
@ -122,11 +126,11 @@ function MapInteraction({ map, children, controls, selectedToolId }) {
pinchPreviousOriginRef.current = { x: originX, y: originY }; pinchPreviousOriginRef.current = { x: originX, y: originY };
}, },
onDragStart: ({ event }) => { onDragStart: ({ event }) => {
isDraggingCanvas.current = isInteractingCanvas.current =
event.target === mapLayerRef.current.getCanvas()._canvas; event.target === mapLayerRef.current.getCanvas()._canvas;
}, },
onDrag: ({ delta, xy, first, last, pinching }) => { onDrag: ({ delta, xy, first, last, pinching }) => {
if (preventMapInteraction || pinching || !isDraggingCanvas.current) { if (preventMapInteraction || pinching || !isInteractingCanvas.current) {
return; return;
} }