@syncfusion/ej2-maps 20.4.40 → 20.4.44

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

@@ -8000,7 +8000,8 @@ let Maps = class Maps extends Component {
         EventHandler.add(this.element, 'keydown', this.keyDownHandler, this);
         EventHandler.add(this.element, 'keyup', this.keyUpHandler, this);
         //  EventHandler.add(this.element, cancelEvent, this.mouseLeaveOnMap, this);
-        window.addEventListener((Browser.isTouch && ('orientation' in window && 'onorientationchange' in window)) ? 'orientationchange' : 'resize', this.mapsOnResize.bind(this));
+        this.resizeEvent = this.mapsOnResize.bind(this);
+        window.addEventListener((Browser.isTouch && ('orientation' in window && 'onorientationchange' in window)) ? 'orientationchange' : 'resize', this.resizeEvent);
     }
     /**
      * To unbind event handlers from maps.
@@ -8019,7 +8020,7 @@ let Maps = class Maps extends Component {
         EventHandler.remove(this.element, 'keydown', this.keyDownHandler);
         EventHandler.remove(this.element, 'keyup', this.keyUpHandler);
         //EventHandler.remove(this.element, cancelEvent, this.mouseLeaveOnMap);
-        window.removeEventListener((Browser.isTouch && ('orientation' in window && 'onorientationchange' in window)) ? 'orientationchange' : 'resize', this.mapsOnResize);
+        window.removeEventListener((Browser.isTouch && ('orientation' in window && 'onorientationchange' in window)) ? 'orientationchange' : 'resize', this.resizeEvent);
     }
     /**
      * This method is used to perform operations when mouse pointer leave from maps.
@@ -8861,6 +8862,9 @@ let Maps = class Maps extends Component {
      */
     destroy() {
         this.unWireEVents();
+        if (!isNullOrUndefined(this.mapsTooltipModule)) {
+            this.mapsTooltipModule.removeEventListener();
+        }
         super.destroy();
         this.shapeSelectionItem = [];
         this.toggledShapeElementId = [];
@@ -10936,14 +10940,14 @@ class Legend {
                             ' L ' + (rightPageX - width) + ' ' + (locY + height) + ' z ';
                         const leftPath = ' M ' + leftPageX + ' ' + locY + ' L ' + (leftPageX + width) + ' ' + (locY - height) +
                             ' L ' + (leftPageX + width) + ' ' + (locY + height) + ' z ';
-                        const leftPageOptions = new PathOption(map.element.id + '_Left_Page', '#a6a6a6', 0, '#a6a6a6', ((page + 1) === 1 ? 0.5 : 1), 1, '', leftPath);
+                        const leftPageOptions = new PathOption(map.element.id + '_Left_Page', this.maps.themeStyle.legendTextColor, 0, this.maps.themeStyle.legendTextColor, ((page + 1) === 1 ? 0.5 : 1), 1, '', leftPath);
                         leftPageElement.appendChild(render.drawPath(leftPageOptions));
                         const leftRectPageOptions = new RectOption(map.element.id + '_Left_Page_Rect', 'transparent', {}, 1, new Rect(leftPageX - (width / 2), (locY - (height * 2)), width * 2, spacing * 2), null, null, '', '');
                         let pathEle = render.drawRectangle(leftRectPageOptions);
                         pathEle.tabIndex = (page + 1) === 1 ? -1 : (map.tabIndex + 1);
                         leftPageElement.appendChild(pathEle);
                         this.wireEvents(leftPageElement);
-                        const rightPageOptions = new PathOption(map.element.id + '_Right_Page', '#a6a6a6', 0, '#a6a6a6', ((page + 1) === this.totalPages.length ? 0.5 : 1), 1, '', rightPath);
+                        const rightPageOptions = new PathOption(map.element.id + '_Right_Page', this.maps.themeStyle.legendTextColor, 0, this.maps.themeStyle.legendTextColor, ((page + 1) === this.totalPages.length ? 0.5 : 1), 1, '', rightPath);
                         rightPageElement.appendChild(render.drawPath(rightPageOptions));
                         const rightRectPageOptions = new RectOption(map.element.id + '_Right_Page_Rect', 'transparent', {}, 1, new Rect(rightPageX - spacing - (width / 2), (locY - (height * 2)), width * 2, spacing * 2), null, null, '', '');
                         pathEle = render.drawRectangle(rightRectPageOptions);
@@ -10957,7 +10961,7 @@ class Legend {
                             'id': map.element.id + '_Paging_Text',
                             'x': pageTextX,
                             'y': locY + (pagingTextSize.height / 4),
-                            'fill': '#a6a6a6',
+                            'fill': this.maps.themeStyle.legendTextColor,
                             'font-size': '14px',
                             'font-style': pagingFont.fontStyle,
                             'font-family': pagingFont.fontFamily,
@@ -12192,22 +12196,10 @@ class Legend {
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Shape_Index_' + legendIndex, this.maps.element.id);
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
                                     if (!this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
-                                        legendShapeId.setAttribute('fill', legendToggleFill);
-                                        legendShapeId.setAttribute('fill-opacity', (legendToggleOpacity).toString());
-                                        legendShapeId.setAttribute('stroke', legendToggleBorderColor);
-                                        legendShapeId.setAttribute('stroke-width', (legendToggleBorderWidth).toString());
-                                        legendShapeId.setAttribute('stroke-opacity', (legendToggleBorderOpacity).toString());
-                                        legendTextId.setAttribute('fill', legendToggleFill);
+                                        this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        legendTextId.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                        legendShapeId.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                        legendShapeId.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color);
-                                        legendShapeId.setAttribute('fill-opacity', (this.maps.layers[k].shapeSettings.opacity).toString());
-                                        legendShapeId.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width).toString());
-                                        legendShapeId.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
-                                            this.maps.layers[k].shapeSettings.opacity :
-                                            this.maps.layers[k].shapeSettings.border.opacity).toString());
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[k].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ? this.maps.layers[k].shapeSettings.opacity : this.maps.layers[k].shapeSettings.border.opacity, this.maps.layers[k].shapeSettings.fill);
                                     }
                                 }
                             }
@@ -12220,16 +12212,11 @@ class Legend {
                                 }
                                 if (targetEle !== null) {
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Shape_Index_' + legendIndex, this.maps.element.id);
-                                    legendShapeId.setAttribute('fill', this.legendCollection[legendIndex]['fill']);
-                                    legendShapeId.setAttribute('fill-opacity', this.legendCollection[legendIndex]['opacity']);
-                                    legendShapeId.setAttribute('stroke', this.legendCollection[legendIndex]['shapeBorder']['color']);
-                                    legendShapeId.setAttribute('stroke-width', this.legendCollection[legendIndex]['shapeBorder']['width']);
-                                    legendShapeId.setAttribute('stroke-opacity', this.legendCollection[legendIndex]['shapeBorder']['opacity']);
+                                    legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
+                                    this.setToggleAttributes(legendTextId, legendShapeId, this.legendCollection[legendIndex]['fill'], this.legendCollection[legendIndex]['opacity'], this.legendCollection[legendIndex]['shapeBorder']['color'], this.legendCollection[legendIndex]['shapeBorder']['width'], this.legendCollection[legendIndex]['shapeBorder']['opacity'], '#757575');
                                     if (this.maps.legendSettings.shape === 'HorizontalLine' || this.maps.legendSettings.shape === 'VerticalLine' || this.maps.legendSettings.shape === 'Cross') {
                                         legendShapeId.setAttribute('stroke', this.legendCollection[legendIndex]['fill']);
                                     }
-                                    legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
-                                    legendTextId.setAttribute('fill', '#757575');
                                 }
                             }
                         }
@@ -12276,9 +12263,13 @@ class Legend {
                                 }
                                 if (targetEle !== null) {
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
-                                    legendTextId.setAttribute('fill', '#E5E5E5');
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Shape_Index_' + legendIndex, this.maps.element.id);
-                                    legendShapeId.setAttribute('fill', '#E5E5E5');
+                                    if (!this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
+                                        this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
+                                    }
+                                    else {
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[j].shapeSettings.fill, this.maps.layers[j].shapeSettings.opacity, this.maps.layers[j].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[j].shapeSettings.border.width) ? 0 : this.maps.layers[j].shapeSettings.border.width, isNullOrUndefined(this.maps.layers[j].shapeSettings.border.opacity) ? this.maps.layers[j].shapeSettings.opacity : this.maps.layers[j].shapeSettings.border.opacity, this.maps.layers[j].shapeSettings.fill);
+                                    }
                                 }
                             }
                             else {
@@ -12297,9 +12288,8 @@ class Legend {
                                 layerElement.setAttribute('stroke', this.maps.layers[j].shapeSettings.border.color);
                                 if (targetEle !== null) {
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Text_Index_' + legendIndex, this.maps.element.id);
-                                    legendTextId.setAttribute('fill', '#757575');
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Shape_Index_' + legendIndex, this.maps.element.id);
-                                    legendShapeId.setAttribute('fill', this.legendCollection[legendIndex]['fill']);
+                                    this.setToggleAttributes(legendTextId, legendShapeId, this.legendCollection[legendIndex]['fill'], this.legendCollection[legendIndex]['opacity'], this.legendCollection[legendIndex]['shapeBorder']['color'], this.legendCollection[legendIndex]['shapeBorder']['width'], this.legendCollection[legendIndex]['shapeBorder']['opacity'], '#757575');
                                 }
                             }
                         }
@@ -12353,22 +12343,10 @@ class Legend {
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex + '_Text', this.maps.element.id);
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex, this.maps.element.id);
                                     if (!this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
-                                        legendTextId.setAttribute('fill', legendToggleFill);
-                                        legendShapeId.setAttribute('fill', legendToggleFill);
-                                        legendShapeId.setAttribute('fill-opacity', (legendToggleOpacity).toString());
-                                        legendShapeId.setAttribute('stroke', legendToggleBorderColor);
-                                        legendShapeId.setAttribute('stroke-width', (legendToggleBorderWidth).toString());
-                                        legendShapeId.setAttribute('stroke-opacity', (legendToggleBorderOpacity).toString());
+                                        this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
                                     }
                                     else {
-                                        legendTextId.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                        legendShapeId.setAttribute('fill', this.maps.layers[k].shapeSettings.fill);
-                                        legendShapeId.setAttribute('stroke', this.maps.layers[k].shapeSettings.border.color);
-                                        legendShapeId.setAttribute('stroke-width', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width).toString());
-                                        legendShapeId.setAttribute('stroke-opacity', (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ?
-                                            this.maps.layers[k].shapeSettings.opacity :
-                                            this.maps.layers[k].shapeSettings.border.opacity).toString());
-                                        legendShapeId.setAttribute('fill-opacity', (this.maps.layers[k].shapeSettings.opacity).toString());
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[k].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[k].shapeSettings.border.color, (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width), (isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ? this.maps.layers[k].shapeSettings.opacity : this.maps.layers[k].shapeSettings.border.opacity), this.maps.layers[k].shapeSettings.fill);
                                     }
                                 }
                             }
@@ -12434,9 +12412,13 @@ class Legend {
                                 }
                                 if (targetEle !== null) {
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex, this.maps.element.id);
-                                    legendShapeId.setAttribute('fill', '#E5E5E5');
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex + '_Text', this.maps.element.id);
-                                    legendTextId.setAttribute('fill', '#E5E5E5');
+                                    if (!this.maps.legendSettings.toggleLegendSettings.applyShapeSettings) {
+                                        this.setToggleAttributes(legendTextId, legendShapeId, legendToggleFill, legendToggleOpacity, legendToggleBorderColor, legendToggleBorderWidth, legendToggleBorderOpacity, legendToggleFill);
+                                    }
+                                    else {
+                                        this.setToggleAttributes(legendTextId, legendShapeId, this.maps.layers[0].shapeSettings.fill, this.maps.layers[k].shapeSettings.opacity, this.maps.layers[0].shapeSettings.border.color, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.width) ? 0 : this.maps.layers[k].shapeSettings.border.width, isNullOrUndefined(this.maps.layers[k].shapeSettings.border.opacity) ? this.maps.layers[k].shapeSettings.opacity : this.maps.layers[k].shapeSettings.border.opacity, this.maps.layers[0].shapeSettings.fill);
+                                    }
                                 }
                             }
                             else {
@@ -12456,9 +12438,8 @@ class Legend {
                                 mapLegendElement.setAttribute('fill', this.legendCollection[legendIndex]['fill']);
                                 if (targetEle !== null) {
                                     legendTextId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex + '_Text', this.maps.element.id);
-                                    legendTextId.setAttribute('fill', '#757575');
                                     legendShapeId = querySelector(this.maps.element.id + '_Legend_Index_' + legendIndex, this.maps.element.id);
-                                    legendShapeId.setAttribute('fill', this.legendCollection[legendIndex]['fill']);
+                                    this.setToggleAttributes(legendTextId, legendShapeId, this.legendCollection[legendIndex]['fill'], this.legendCollection[legendIndex]['opacity'], this.legendCollection[legendIndex]['shapeBorder']['color'], this.legendCollection[legendIndex]['shapeBorder']['width'], this.legendCollection[legendIndex]['shapeBorder']['opacity'], '#757575');
                                 }
                             }
                         }
@@ -12535,6 +12516,16 @@ class Legend {
         }
         return legendData;
     }
+    setToggleAttributes(textElement, shapeElement, fillColor, fillOpacity, borderColor, borderWidth, borderOpacity, textColor) {
+        textElement.setAttribute('fill', textColor);
+        shapeElement.setAttribute('fill', fillColor);
+        shapeElement.setAttribute('fill-opacity', (fillOpacity).toString());
+        shapeElement.setAttribute('stroke', borderColor);
+        shapeElement.setAttribute('stroke-width', (borderWidth).toString());
+        if (!isNullOrUndefined(borderOpacity)) {
+            shapeElement.setAttribute('stroke-opacity', (borderOpacity).toString());
+        }
+    }
     legendGradientColor(colorMap, legendIndex) {
         let legendFillColor;
         const xmlns = 'http://www.w3.org/2000/svg';
@@ -13496,23 +13487,26 @@ class MapsTooltip {
         else {
             this.maps.on(Browser.touchMoveEvent, this.renderTooltip, this);
         }
-        this.maps.element.addEventListener('contextmenu', this.removeTooltip);
         this.maps.on(Browser.touchCancelEvent, this.removeTooltip, this);
+        this.maps.element.addEventListener('contextmenu', this.removeTooltip);
     }
     removeEventListener() {
-        if (this.maps.isDestroyed) {
-            return;
-        }
-        if (this.maps.tooltipDisplayMode === 'DoubleClick') {
-            this.maps.off('dblclick', this.removeTooltip);
-        }
-        else if (this.maps.tooltipDisplayMode === 'Click') {
-            this.maps.off(Browser.touchEndEvent, this.mouseUpHandler);
-        }
-        else {
-            this.maps.off(Browser.touchMoveEvent, this.renderTooltip);
+        if (this.maps) {
+            if (this.maps.isDestroyed) {
+                return;
+            }
+            if (this.maps.tooltipDisplayMode === 'DoubleClick') {
+                this.maps.off('dblclick', this.removeTooltip);
+            }
+            else if (this.maps.tooltipDisplayMode === 'Click') {
+                this.maps.off(Browser.touchEndEvent, this.mouseUpHandler);
+            }
+            else {
+                this.maps.off(Browser.touchMoveEvent, this.renderTooltip);
+            }
+            this.maps.off(Browser.touchCancelEvent, this.removeTooltip);
+            this.maps.element.removeEventListener('contextmenu', this.removeTooltip);
         }
-        this.maps.off(Browser.touchCancelEvent, this.removeTooltip);
     }
     /**
      * Get module name.
@@ -13533,7 +13527,6 @@ class MapsTooltip {
             this.svgTooltip.destroy();
         }
         this.svgTooltip = null;
-        this.removeEventListener();
         //TODO: Calling the below code throws spec issue.
         //this.maps = null;
     }