adt-js-components 1.10.2 → 1.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adt-js-components",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "JavaScript components for Nette framework",
   "main": "index.js",
   "scripts": {

package/src/Map/index.js

@@ -21,6 +21,7 @@ const markerClusters = new WeakMap();
 const onSelectionChangeMap = new WeakMap();
 const onBeforeRouteCalculationMap = new WeakMap();
 const onAfterRouteCalculationMap = new WeakMap();
+const disableClickZoomMap = new WeakMap();
 
 const DEPOT_TYPE = {
 	START: 'depot-start',
@@ -53,6 +54,7 @@ async function run(options) {
 			markerInfoCallback = null,
 			onBeforeRouteCalculation = null,
 			onAfterRouteCalculation = null,
+			disableClickZoom = false
 		} = JSON.parse(el.dataset.adtMap);
 
 		const routeSettings = {
@@ -78,6 +80,7 @@ async function run(options) {
 		onSelectionChangeMap.set(map, onSelectionChange);
 		onBeforeRouteCalculationMap.set(map, onBeforeRouteCalculation);
 		onAfterRouteCalculationMap.set(map, onAfterRouteCalculation);
+		disableClickZoomMap.set(map, disableClickZoom);
 
 		if (mapProvider === MAP_PROVIDER.HERE) {
 			L.tileLayer(
@@ -229,7 +232,7 @@ function enableRectangleSelection(map, onSelectionChange, showSelectionOrder) {
 	let rectangle = null;
 
 	map.on('mousedown', (e) => {
-		if (e.originalEvent.ctrlKey && e.originalEvent.shiftKey) {
+		if (e.originalEvent.ctrlKey && !e.originalEvent.shiftKey) {
 			isDrawing = true;
 			startPoint = e.latlng;
 			rectangle = L.rectangle([startPoint, startPoint], { color: '#3388ff', weight: 2, fillOpacity: 0.1 }).addTo(map);
@@ -392,33 +395,45 @@ function createMarker(marker, options, selectedOptions, cluster = null, selectab
 
 	if (selectable && map) {
 		mapMarker.on('click', function (e) {
-			if (e.originalEvent.shiftKey && !e.originalEvent.ctrlKey && markerInfoCallback && window[markerInfoCallback]) {
-				window[markerInfoCallback](marker);
+			if (e.originalEvent.ctrlKey) {
 				L.DomEvent.stopPropagation(e);
 				L.DomEvent.preventDefault(e);
-				return;
-			}
 
-			const selected = selectedMarkers.get(map);
-			if (selected.has(marker.id)) {
-				deselectMarker(mapMarker, map, showSelectionOrder);
-			} else {
-				selectMarker(mapMarker, map, showSelectionOrder);
-			}
+				const selected = selectedMarkers.get(map);
+				if (selected.has(marker.id)) {
+					deselectMarker(mapMarker, map, showSelectionOrder);
+				} else {
+					selectMarker(mapMarker, map, showSelectionOrder);
+				}
 
-			if (onSelectionChange && window[onSelectionChange]) {
-				const order = selectionOrder.get(map);
-				const orderedIds = Array.from(order.entries()).sort((a, b) => a[1] - b[1]).map(e => e[0]);
-				window[onSelectionChange](orderedIds);
+				if (onSelectionChange && window[onSelectionChange]) {
+					const order = selectionOrder.get(map);
+					const orderedIds = Array.from(order.entries()).sort((a, b) => a[1] - b[1]).map(e => e[0]);
+					window[onSelectionChange](orderedIds);
+				}
+
+				const settings = routeSettingsMap.get(map);
+				if (settings && settings.enabled) {
+					calculateRoute(map);
+				}
+
+				if (originalCallback && window[originalCallback]) {
+					window[originalCallback](e);
+				}
+				return;
 			}
 
-			const settings = routeSettingsMap.get(map);
-			if (settings && settings.enabled) {
-				calculateRoute(map);
+			if (markerInfoCallback && window[markerInfoCallback]) {
+				L.DomEvent.stopPropagation(e);
+				L.DomEvent.preventDefault(e);
+				window[markerInfoCallback](marker);
+				return;
 			}
+
 			if (originalCallback && window[originalCallback]) {
 				window[originalCallback](e);
 			}
+
 			L.DomEvent.stopPropagation(e);
 		});
 	} else if (originalCallback) {
@@ -625,7 +640,10 @@ async function calculateRoute(map) {
 			opacity: routeSettings.opacity
 		}).addTo(map);
 		routePolylines.set(map, polyline);
-		map.fitBounds(polyline.getBounds(), { padding: [32, 32] });
+
+		if (!disableClickZoomMap.get(map)) {
+			map.fitBounds(polyline.getBounds(), {padding: [32, 32]});
+		}
 	}
 
 	const totalDuration = allParts.reduce((s, p) => s + (p.duration || 0), 0);
@@ -929,6 +947,7 @@ function addMarkerAndSelect(mapElement, markerData, recalculate = true) {
 		});
 	};
 }
+
 export default {
 	run,
 	getSelectedMarkers,