From cb07aa9fb08cfb615464078e4eadebd55e956701 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Thu, 9 Jan 2020 17:17:01 +0700 Subject: [PATCH] fixed marker hiding --- src/containers/map/Route/index.tsx | 16 +++++++++++----- src/utils/osrm.ts | 3 --- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/containers/map/Route/index.tsx b/src/containers/map/Route/index.tsx index 601db62..8b60d84 100644 --- a/src/containers/map/Route/index.tsx +++ b/src/containers/map/Route/index.tsx @@ -20,12 +20,19 @@ const mapStateToProps = state => ({ const mapDispatchToProps = { mapSetRoute: MAP_ACTIONS.mapSetRoute, editorSetDistance: EDITOR_ACTIONS.editorSetDistance, + editorSetMarkersShown: EDITOR_ACTIONS.editorSetMarkersShown, }; type Props = ReturnType & typeof mapDispatchToProps & {}; const RouteUnconnected: FC = memo( - ({ map: { route }, editor: { editing, mode }, mapSetRoute, editorSetDistance }) => { + ({ + map: { route }, + editor: { editing, mode }, + mapSetRoute, + editorSetDistance, + editorSetMarkersShown, + }) => { const [layer, setLayer] = useState(null); const onDistanceChange = useCallback(({ distance }) => editorSetDistance(distance), [ @@ -46,9 +53,9 @@ const RouteUnconnected: FC = memo( .on('vertexdragstart', MainMap.disableClicks) .on('vertexdragend', MainMap.enableClicks) .on('vertexaddstart', MainMap.disableClicks) - .on('vertexaddend', MainMap.enableClicks); - // .on("allvertexhide", console.log) - // .on("allvertexshow", console.log) + .on('vertexaddend', MainMap.enableClicks) + .on('allvertexhide', () => editorSetMarkersShown(false)) + .on('allvertexshow', () => editorSetMarkersShown(true)); setLayer(interactive); @@ -59,7 +66,6 @@ const RouteUnconnected: FC = memo( const onRouteChanged = useCallback( ({ latlngs }) => { - // console.log('THIS!'); mapSetRoute(latlngs); }, [mapSetRoute] diff --git a/src/utils/osrm.ts b/src/utils/osrm.ts index 7028e24..9f12dc8 100644 --- a/src/utils/osrm.ts +++ b/src/utils/osrm.ts @@ -7,9 +7,6 @@ import { MainMap } from '~/constants/map'; const createWaypointMarker = (): DomMarker => { const element = document.createElement('div'); - element.addEventListener('mousedown', event => event.stopPropagation()); - element.addEventListener('mouseup', event => event.stopPropagation()); - return new DomMarker({ element, className: 'router-waypoint',