@syncfusion/ej2-maps 21.2.3 → 21.2.5

package/dist/es6/ej2-maps.es2015.js

@@ -993,10 +993,10 @@ function clusterTemplate(currentLayer, markerTemplate, maps, layerIndex, markerC
                         const ele = drawSymbols(shapeCustom['shape'], shapeCustom['imageUrl'], { x: 0, y: 0 }, clusterID, shapeCustom, markerCollection, maps);
                         ele.setAttribute('transform', 'translate( ' + tempX + ' ' + tempY + ' )');
                         if (eventArg.shape === 'Balloon') {
-                            ele.children[0].innerText = indexCollection.toString();
+                            ele.children[0].textContent = indexCollection.toString();
                         }
                         else {
-                            ele.innerText = indexCollection.toString();
+                            ele.textContent = indexCollection.toString();
                         }
                         options = new TextOption(labelID, (0), postionY, 'middle', (colloideBounds.length + 1).toString(), '', '');
                         textElement = renderTextElement(options, style, style.color, markerCollection);
@@ -1095,7 +1095,7 @@ function mergeSeparateCluster(sameMarkerData, maps, markerElement) {
     let markerEle;
     const markerDataLength = sameMarkerData[0].data.length;
     for (let i = 0; i < markerDataLength; i++) {
-        markerEle = marker.shape === 'Balloon' ? getElement(markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index'] + '_Group') : getElement(markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index']);
+        markerEle = marker.shape === 'Balloon' && isNullOrUndefined(marker.template) ? getElement(markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index'] + '_Group') : getElement(markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index']);
         markerEle['style']['visibility'] = 'hidden';
     }
     removeElement(maps.element.id + '_LayerIndex_' + layerIndex + '_MarkerIndex_' + markerIndex + '_markerClusterConnectorLine');
@@ -1124,7 +1124,7 @@ function clusterSeparate(sameMarkerData, maps, markerElement, isDom) {
     const clusterEleLabel = getElementFunction(getQueryConnect + '' + clusterId + '_datalabel_' + clusterIndex);
     clusterEle.setAttribute('visibility', 'hidden');
     clusterEleLabel.setAttribute('visibility', 'hidden');
-    let markerEle = marker.shape === 'Balloon' ? getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + dataIndex + '_Group') : getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + dataIndex);
+    let markerEle = marker.shape === 'Balloon' && isNullOrUndefined(marker.template) ? getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + dataIndex + '_Group') : getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + dataIndex);
     const height = markerEle.parentElement.id.indexOf('Template_Group') > -1 ? markerEle.getBoundingClientRect().height : marker.height;
     const width = markerEle.parentElement.id.indexOf('Template_Group') > -1 ? markerEle.getBoundingClientRect().width : marker.width;
     const centerX = +clusterEle.getAttribute('transform').split('translate(')[1].trim().split(' ')[0];
@@ -1160,7 +1160,7 @@ function clusterSeparate(sameMarkerData, maps, markerElement, isDom) {
         const x1 = centerX + radius * Math.sin((Math.PI * 2 * newAngle) / 360);
         const y1 = centerY + radius * Math.cos((Math.PI * 2 * newAngle) / 360);
         path += start + 'L ' + (x1) + ' ' + y1 + ' ';
-        markerEle = marker.shape === 'Balloon' ? getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index'] + '_Group') : getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index']);
+        markerEle = marker.shape === 'Balloon' && isNullOrUndefined(marker.template) ? getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index'] + '_Group') : getElementFunction(getQueryConnect + '' + markerId + '_dataIndex_' + sameMarkerData[0].data[i]['index']);
         if (markerEle.parentElement.id.indexOf('Template_Group') > -1) {
             markerEle['style']['transform'] = '';
             markerEle['style']['left'] = maps.isTileMap ? x1 - (width / 2) + 'px' : (x1 - (width / 2) - 10) + 'px';
@@ -5264,7 +5264,7 @@ class Marker {
                 if ((target.indexOf('_cluster_') > -1)) {
                     let isClusterSame = false;
                     const clusterElement = document.getElementById(target.indexOf('_datalabel_') > -1 ? layer.markerClusterSettings.shape === 'Balloon' ? target.split('_datalabel_')[0] + '_Group' : target.split('_datalabel_')[0] : layer.markerClusterSettings.shape === 'Balloon' ? target + '_Group' : target);
-                    const indexes = layer.markerClusterSettings.shape === 'Balloon' ? clusterElement.children[0].innerText.split(',').map(Number) : clusterElement.innerText.split(',').map(Number);
+                    const indexes = layer.markerClusterSettings.shape === 'Balloon' ? clusterElement.children[0].textContent.split(',').map(Number) : clusterElement.textContent.split(',').map(Number);
                     collection = [];
                     for (const i of indexes) {
                         collection.push({ data: marker$$1.dataSource[i], index: i });
@@ -13815,7 +13815,7 @@ class MapsTooltip {
                     }
                 }
                 else {
-                    this.clearTooltip();
+                    this.clearTooltip(e.target);
                 }
             });
             if (this.svgTooltip) {
@@ -13830,7 +13830,7 @@ class MapsTooltip {
                 });
             }
             else {
-                this.clearTooltip();
+                this.clearTooltip(e.target);
             }
         }
         else {
@@ -13840,7 +13840,7 @@ class MapsTooltip {
                 this.maps.notify(click, this);
             }
             else {
-                this.clearTooltip();
+                this.clearTooltip(e.target);
             }
         }
     }
@@ -13897,11 +13897,14 @@ class MapsTooltip {
         }
         return isTooltipRemoved;
     }
-    clearTooltip() {
-        const isTooltipRemoved = this.removeTooltip();
-        if (isTooltipRemoved) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            this.maps.clearTemplate();
+    clearTooltip(element) {
+        let tooltipElement = element.closest('#' + this.maps.element.id + '_mapsTooltipparent_template');
+        if (isNullOrUndefined(tooltipElement)) {
+            const isTooltipRemoved = this.removeTooltip();
+            if (isTooltipRemoved) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                this.maps.clearTemplate();
+            }
         }
     }
     // eslint-disable-next-line valid-jsdoc