From 8fd53ab64abb29465d24100449df4c0cf713fe16 Mon Sep 17 00:00:00 2001 From: Mateusz Bolewski <mateusz.bolewski@appunite.com> Date: Tue, 2 Jan 2024 10:44:15 +0100 Subject: [PATCH] feat(map): code review fixes --- .../Map/MapViewer/utils/listeners/useOlMapListeners.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/Map/MapViewer/utils/listeners/useOlMapListeners.ts b/src/components/Map/MapViewer/utils/listeners/useOlMapListeners.ts index d45b2ecc..5be3fd4c 100644 --- a/src/components/Map/MapViewer/utils/listeners/useOlMapListeners.ts +++ b/src/components/Map/MapViewer/utils/listeners/useOlMapListeners.ts @@ -68,13 +68,18 @@ export const useOlMapListeners = ({ view, mapInstance }: UseOlMapListenersInput) return; } - mapInstance.getViewport().addEventListener('contextmenu', e => { + const rightClickEvent = (e: MouseEvent): Promise<void> | undefined => { e.preventDefault(); coordinate.current = mapInstance.getEventCoordinate(e); pixel.current = mapInstance.getEventPixel(e); return handleRightClick(coordinate.current, pixel.current); - }); + }; + + mapInstance.getViewport().addEventListener('contextmenu', rightClickEvent); + + // eslint-disable-next-line consistent-return + return () => mapInstance.getViewport().removeEventListener('contextmenu', rightClickEvent); }, [mapInstance, handleRightClick]); }; -- GitLab