Skip to content
Snippets Groups Projects
Commit ef5a0e47 authored by Miłosz Grocholewski's avatar Miłosz Grocholewski
Browse files

bugfix(mouse-click): deactivated default mouse clickwhen user edits map

parent 5305037b
No related branches found
No related tags found
7 merge requests!392Resolve MIN-136 "Feat/ appearance of layer editing",!391fix(layer-text): correct color model in ColorTilePicker,!390feat(layer-image): correct z index on bring to front/back,!389feat(websocket): update information from websocket connection,!388fix(overview-images): add directory to path in useOverviewImageUrl,!387feat(pathway): separation pathway from compartment,!386bugfix(mouse-click): deactivated default mouse clickwhen user edits map
Pipeline #101034 passed
......@@ -19,6 +19,7 @@ import { useHandlePinIconClick } from '@/components/Map/MapViewer/utils/listener
import { onMapPositionChange } from '@/components/Map/MapViewer/utils/listeners/onMapPositionChange';
import { onPointerMove } from '@/components/Map/MapViewer/utils/listeners/onPointerMove';
import { View } from 'ol';
import { isMapEditToolsActiveSelector } from '@/redux/mapEditTools/mapEditTools.selectors';
interface UseOlMapListenersInput {
view: View;
......@@ -31,6 +32,7 @@ export const useOlMapListeners = ({ view, mapInstance }: UseOlMapListenersInput)
const isResultDrawerOpen = useSelector(resultDrawerOpen);
const modelElementsForCurrentModel = useSelector(modelElementsForCurrentModelSelector);
const newReactionsForCurrentModel = useSelector(newReactionsForCurrentModelSelector);
const isMapEditToolsActive = useSelector(isMapEditToolsActiveSelector);
const dispatch = useAppDispatch();
const coordinate = useRef<Coordinate>([]);
const pixel = useRef<Pixel>([]);
......@@ -90,7 +92,7 @@ export const useOlMapListeners = ({ view, mapInstance }: UseOlMapListenersInput)
}, [mapInstance]);
useEffect(() => {
if (!mapInstance) {
if (!mapInstance || isMapEditToolsActive) {
return;
}
......@@ -100,10 +102,10 @@ export const useOlMapListeners = ({ view, mapInstance }: UseOlMapListenersInput)
// eslint-disable-next-line consistent-return
return () => unByKey(key);
}, [mapInstance, handleMapLeftClick]);
}, [mapInstance, handleMapLeftClick, isMapEditToolsActive]);
useEffect(() => {
if (!mapInstance) {
if (!mapInstance || isMapEditToolsActive) {
return;
}
......@@ -123,5 +125,5 @@ export const useOlMapListeners = ({ view, mapInstance }: UseOlMapListenersInput)
// eslint-disable-next-line consistent-return
return () => mapInstance.getViewport().removeEventListener('contextmenu', rightClickEvent);
}, [mapInstance, handleRightClick]);
}, [mapInstance, handleRightClick, isMapEditToolsActive]);
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment