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

Fix map interaction

Browse Source
This commit is contained in:
Mitchell McCaffrey 2020-10-02 13:44:15 +10:00
parent f783a9bb70
commit 54a60d6c76
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ function MapInteraction({
stageScale, stageScale,
setStageScale, setStageScale,
stageTranslateRef, stageTranslateRef,
selectedToolId,
preventMapInteraction, preventMapInteraction,
{ {
onPinchStart: () => { onPinchStart: () => {

19
src/helpers/useStageInteraction.js
View File

@ -12,6 +12,7 @@ function useStageInteraction(
stageScale, stageScale,
onStageScaleChange, onStageScaleChange,
stageTranslateRef, stageTranslateRef,
tool = "pan",
preventInteraction = false, preventInteraction = false,
gesture = {} gesture = {}
) { ) {
@ -89,14 +90,16 @@ function useStageInteraction(
const [dx, dy] = delta; const [dx, dy] = delta;
const stageTranslate = stageTranslateRef.current; const stageTranslate = stageTranslateRef.current;
const newTranslate = { if (tool === "pan") {
x: stageTranslate.x + dx / stageScale, const newTranslate = {
y: stageTranslate.y + dy / stageScale, x: stageTranslate.x + dx / stageScale,
}; y: stageTranslate.y + dy / stageScale,
layer.x(newTranslate.x); };
layer.y(newTranslate.y); layer.x(newTranslate.x);
layer.draw(); layer.y(newTranslate.y);
stageTranslateRef.current = newTranslate; layer.draw();
stageTranslateRef.current = newTranslate;
}
gesture.onDrag && gesture.onDrag(props); gesture.onDrag && gesture.onDrag(props);
}, },
}); });