highcharts 10.2.1 → 10.3.1

package/modules/map.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highmaps JS v10.2.1 (2022-08-29)
+ * @license Highmaps JS v10.3.1 (2022-10-31)
  *
  * Highmaps as a plugin for Highcharts or Highcharts Stock.
  *
@@ -199,7 +199,7 @@
              */
             function onLegendAfterColorizeItem(e) {
                 if (e.visible && e.item.legendColor) {
-                    e.item.legendSymbol.attr({
+                    e.item.legendItem.symbol.attr({
                         fill: e.item.legendColor
                     });
                 }
@@ -281,7 +281,9 @@
                                 point.color || series.color);
                     if (color && point.color !== color) {
                         point.color = color;
-                        if (series.options.legendType === 'point' && point.legendItem) {
+                        if (series.options.legendType === 'point' &&
+                            point.legendItem &&
+                            point.legendItem.label) {
                             series.chart.legend.colorizeItem(point, point.visible);
                         }
                     }
@@ -850,8 +852,6 @@
                 _this.chart = void 0;
                 _this.coll = 'colorAxis';
                 _this.dataClasses = void 0;
-                _this.legendItem = void 0;
-                _this.legendItems = void 0;
                 _this.name = ''; // Prevents 'undefined' in legend in IE8
                 _this.options = void 0;
                 _this.stops = void 0;
@@ -921,13 +921,14 @@
             ColorAxis.prototype.initDataClasses = function (userOptions) {
                 var axis = this,
                     chart = axis.chart,
-                    options = axis.options,
-                    len = userOptions.dataClasses.length;
+                    legendItem = axis.legendItem = axis.legendItem || {},
+                    len = userOptions.dataClasses.length,
+                    options = axis.options;
                 var dataClasses,
                     colorCounter = 0,
                     colorCount = chart.options.chart.colorCount;
                 axis.dataClasses = dataClasses = [];
-                axis.legendItems = [];
+                legendItem.labels = [];
                 (userOptions.dataClasses || []).forEach(function (dataClass, i) {
                     var colors;
                     dataClass = merge(dataClass);
@@ -1001,7 +1002,7 @@
              */
             ColorAxis.prototype.setAxisSize = function () {
                 var axis = this;
-                var symbol = axis.legendSymbol;
+                var symbol = axis.legendItem && axis.legendItem.symbol;
                 var chart = axis.chart;
                 var legendOptions = chart.options.legend || {};
                 var x,
@@ -1091,7 +1092,7 @@
              */
             ColorAxis.prototype.getOffset = function () {
                 var axis = this;
-                var group = axis.legendGroup;
+                var group = axis.legendItem && axis.legendItem.group;
                 var sideOffset = axis.chart.axisOffset[axis.side];
                 if (group) {
                     // Hook for the getOffset method to add groups to this parent
@@ -1148,34 +1149,35 @@
              * @private
              */
             ColorAxis.prototype.drawLegendSymbol = function (legend, item) {
-                var axis = this;
-                var padding = legend.padding;
-                var legendOptions = legend.options;
-                var horiz = axis.horiz;
-                var width = pick(legendOptions.symbolWidth,
-                    horiz ? ColorAxis.defaultLegendLength : 12);
-                var height = pick(legendOptions.symbolHeight,
-                    horiz ? 12 : ColorAxis.defaultLegendLength);
-                var labelPadding = pick(
+                var axis = this,
+                    legendItem = item.legendItem || {},
+                    padding = legend.padding,
+                    legendOptions = legend.options,
+                    itemDistance = pick(legendOptions.itemDistance, 10),
+                    horiz = axis.horiz,
+                    width = pick(legendOptions.symbolWidth,
+                    horiz ? ColorAxis.defaultLegendLength : 12),
+                    height = pick(legendOptions.symbolHeight,
+                    horiz ? 12 : ColorAxis.defaultLegendLength),
+                    labelPadding = pick(
                     // @todo: This option is not documented, nor implemented when
                     // vertical
                     legendOptions.labelPadding,
                     horiz ? 16 : 30);
-                var itemDistance = pick(legendOptions.itemDistance, 10);
                 this.setLegendColor();
                 // Create the gradient
-                if (!item.legendSymbol) {
-                    item.legendSymbol = this.chart.renderer.rect(0, legend.baseline - 11, width, height).attr({
+                if (!legendItem.symbol) {
+                    legendItem.symbol = this.chart.renderer.rect(0, legend.baseline - 11, width, height).attr({
                         zIndex: 1
-                    }).add(item.legendGroup);
+                    }).add(legendItem.group);
                 }
                 // Set how much space this legend item takes up
-                axis.legendItemWidth = (width +
+                legendItem.labelWidth = (width +
                     padding +
                     (horiz ?
                         itemDistance :
                         this.options.labels.x + this.maxLabelLength));
-                axis.legendItemHeight = height + padding + (horiz ? labelPadding : 0);
+                legendItem.labelHeight = height + padding + (horiz ? labelPadding : 0);
             };
             /**
              * Fool the legend.
@@ -1270,11 +1272,12 @@
              * @emits Highcharts.ColorAxis#event:drawCrosshair
              */
             ColorAxis.prototype.drawCrosshair = function (e, point) {
-                var axis = this;
-                var plotX = point && point.plotX;
-                var plotY = point && point.plotY;
-                var axisPos = axis.pos;
-                var axisLen = axis.len;
+                var axis = this,
+                    legendItem = axis.legendItem || {},
+                    plotX = point && point.plotX,
+                    plotY = point && point.plotY,
+                    axisPos = axis.pos,
+                    axisLen = axis.len;
                 var crossPos;
                 if (point) {
                     crossPos = axis.toPixels(point.getNestedProperty(point.series.colorKey));
@@ -1291,10 +1294,10 @@
                     point.plotY = plotY;
                     if (axis.cross &&
                         !axis.cross.addedToColorAxis &&
-                        axis.legendGroup) {
+                        legendItem.group) {
                         axis.cross
                             .addClass('highcharts-coloraxis-marker')
-                            .add(axis.legendGroup);
+                            .add(legendItem.group);
                         axis.cross.addedToColorAxis = true;
                         if (!axis.chart.styledMode &&
                             typeof axis.crosshair === 'object') {
@@ -1358,7 +1361,7 @@
                     axis.destroyItems();
                 }
                 _super.prototype.update.call(this, newOptions, redraw);
-                if (axis.legendItem) {
+                if (axis.legendItem && axis.legendItem.label) {
                     axis.setLegendColor();
                     legend.colorizeItem(this, true);
                 }
@@ -1368,15 +1371,17 @@
              * @private
              */
             ColorAxis.prototype.destroyItems = function () {
-                var axis = this;
-                var chart = axis.chart;
-                if (axis.legendItem) {
+                var axis = this,
+                    chart = axis.chart,
+                    legendItem = axis.legendItem || {};
+                if (legendItem.label) {
                     chart.legend.destroyItem(axis);
                 }
-                else if (axis.legendItems) {
-                    axis.legendItems.forEach(function (item) {
+                else if (legendItem.labels) {
+                    for (var _i = 0, _a = legendItem.labels; _i < _a.length; _i++) {
+                        var item = _a[_i];
                         chart.legend.destroyItem(item);
-                    });
+                    }
                 }
                 chart.isDirtyLegend = true;
             };
@@ -1403,12 +1408,24 @@
              * @private
              */
             ColorAxis.prototype.getDataClassLegendSymbols = function () {
-                var axis = this;
-                var chart = axis.chart;
-                var legendItems = axis.legendItems;
-                var legendOptions = chart.options.legend;
-                var valueDecimals = legendOptions.valueDecimals;
-                var valueSuffix = legendOptions.valueSuffix || '';
+                var axis = this,
+                    chart = axis.chart,
+                    legendItems = (axis.legendItem &&
+                        axis.legendItem.labels ||
+                        []),
+                    legendOptions = chart.options.legend,
+                    valueDecimals = pick(legendOptions.valueDecimals, -1),
+                    valueSuffix = pick(legendOptions.valueSuffix, '');
+                var getPointsInDataClass = function (i) {
+                        return axis.series.reduce(function (points,
+                    s) {
+                            points.push.apply(points,
+                    s.points.filter(function (point) {
+                                return point.dataClass === i;
+                        }));
+                        return points;
+                    }, []);
+                };
                 var name;
                 if (!legendItems.length) {
                     axis.dataClasses.forEach(function (dataClass, i) {
@@ -1441,17 +1458,23 @@
                             options: {},
                             drawLegendSymbol: LegendSymbol.drawRectangle,
                             visible: true,
-                            setState: noop,
                             isDataClass: true,
+                            // Override setState to set either normal or inactive
+                            // state to all points in this data class
+                            setState: function (state) {
+                                for (var _i = 0, _a = getPointsInDataClass(i); _i < _a.length; _i++) {
+                                    var point = _a[_i];
+                                    point.setState(state);
+                                }
+                            },
+                            // Override setState to show or hide all points in this
+                            // data class
                             setVisible: function () {
                                 this.visible = vis = axis.visible = !vis;
-                                axis.series.forEach(function (series) {
-                                    series.points.forEach(function (point) {
-                                        if (point.dataClass === i) {
-                                            point.setVisible(vis);
-                                        }
-                                    });
-                                });
+                                for (var _i = 0, _a = getPointsInDataClass(i); _i < _a.length; _i++) {
+                                    var point = _a[_i];
+                                    point.setVisible(vis);
+                                }
                                 chart.legend.colorizeItem(this, vis);
                             }
                         }, dataClass));
@@ -1470,11 +1493,7 @@
              * @private
              */
             ColorAxis.keepProps = [
-                'legendGroup',
-                'legendItemHeight',
-                'legendItemWidth',
-                'legendItem',
-                'legendSymbol'
+                'legendItem'
             ];
             return ColorAxis;
         }(Axis));
@@ -1504,7 +1523,7 @@
 
         return ColorAxis;
     });
-    _registerModule(_modules, 'Maps/MapNavigationOptionsDefault.js', [_modules['Core/DefaultOptions.js'], _modules['Core/Utilities.js']], function (D, U) {
+    _registerModule(_modules, 'Maps/MapNavigationDefaults.js', [_modules['Core/Defaults.js'], _modules['Core/Utilities.js']], function (D, U) {
         /* *
          *
          *  (c) 2010-2021 Torstein Honsi
@@ -1527,7 +1546,7 @@
          * @product      highmaps
          * @optionparent mapNavigation
          */
-        var defaultOptions = {
+        var MapNavigationDefaults = {
                 /**
                  * General options for the map navigation buttons. Individual options
                  * can be given from the [mapNavigation.buttons](#mapNavigation.buttons)
@@ -1759,14 +1778,14 @@
             zoomOut: 'Zoom out'
         });
         // Set the default map navigation options
-        D.defaultOptions.mapNavigation = defaultOptions;
+        D.defaultOptions.mapNavigation = MapNavigationDefaults;
         /* *
          *
          *  Default Export
          *
          * */
 
-        return defaultOptions;
+        return MapNavigationDefaults;
     });
     _registerModule(_modules, 'Maps/MapNavigation.js', [_modules['Core/Chart/Chart.js'], _modules['Core/Globals.js'], _modules['Core/Utilities.js']], function (Chart, H, U) {
         /* *
@@ -2393,7 +2412,7 @@
 
         return symbols;
     });
-    _registerModule(_modules, 'Core/Chart/MapChart.js', [_modules['Core/Chart/Chart.js'], _modules['Core/DefaultOptions.js'], _modules['Core/Renderer/SVG/SVGRenderer.js'], _modules['Core/Utilities.js']], function (Chart, D, SVGRenderer, U) {
+    _registerModule(_modules, 'Core/Chart/MapChart.js', [_modules['Core/Chart/Chart.js'], _modules['Core/Defaults.js'], _modules['Core/Renderer/SVG/SVGRenderer.js'], _modules['Core/Utilities.js']], function (Chart, D, SVGRenderer, U) {
         /* *
          *
          *  (c) 2010-2021 Torstein Honsi
@@ -2770,7 +2789,11 @@
              */
             MapPoint.prototype.onMouseOver = function (e) {
                 U.clearTimeout(this.colorInterval);
-                if (!this.isNull || this.series.options.nullInteraction) {
+                if (
+                // Valid...
+                (!this.isNull && this.visible) ||
+                    // ... or interact anyway
+                    this.series.options.nullInteraction) {
                     _super.prototype.onMouseOver.call(this, e);
                 }
                 else {
@@ -2778,6 +2801,20 @@
                     this.series.onMouseOut(e);
                 }
             };
+            MapPoint.prototype.setVisible = function (vis) {
+                var method = vis ? 'show' : 'hide';
+                this.visible = this.options.visible = !!vis;
+                // Show and hide associated elements
+                if (this.dataLabel) {
+                    this.dataLabel[method]();
+                }
+                // For invisible map points, render them as null points rather than
+                // fully removing them. Makes more sense for color axes with data
+                // classes.
+                if (this.graphic) {
+                    this.graphic.attr(this.series.pointAttribs(this));
+                }
+            };
             /**
              * Highmaps only. Zoom in on the point using the global animation.
              *
@@ -2876,7 +2913,7 @@
                  *
                  * @type   {Object}
                  *
-                 * @sample maps/mapview/projection-explorer
+                 * @sample maps/demo/projection-explorer
                  *         Projection explorer
                  * @sample maps/demo/topojson-projection
                  *         Orthographic projection
@@ -2893,7 +2930,7 @@
             `Orthographic` and `WebMercator`.
                      *
                      * @type   {string}
-                     * @sample maps/mapview/projection-explorer
+                     * @sample maps/demo/projection-explorer
                      *         Projection explorer
                      * @sample maps/mapview/projection-custom-proj4js
                      *         Custom UTM projection definition
@@ -2912,7 +2949,7 @@
                      *
                      * @sample maps/mapview/projection-parallels
                      *         LCC projection with parallels
-                     * @sample maps/mapview/projection-explorer
+                     * @sample maps/demo/projection-explorer
                      *         Projection explorer
                      * @type {Array<number>}
                      */
@@ -2928,7 +2965,7 @@
                      * * `phi` shifts the latitudes by the given value. Can be omitted.
                      * * `gamma` applies a _roll_. Can be omitted.
                      *
-                     * @sample maps/mapview/projection-explorer
+                     * @sample maps/demo/projection-explorer
                      *         Projection explorer
                      * @sample maps/mapview/projection-america-centric
                      *         America-centric world map
@@ -3571,8 +3608,12 @@
                     }
                 }
                 if (pointOptions) {
-                    var name_1 = properties && (properties.name || properties.NAME);
+                    var name_1 = properties && (properties.name || properties.NAME),
+                        lon = properties && properties.lon,
+                        lat = properties && properties.lat;
                     mapData.push(extend(pointOptions, {
+                        lat: typeof lat === 'number' ? lat : void 0,
+                        lon: typeof lon === 'number' ? lon : void 0,
                         name: typeof name_1 === 'string' ? name_1 : void 0,
                         /**
                          * In Highcharts Maps, when data is loaded from GeoJSON, the
@@ -6168,6 +6209,13 @@
                     isNumber(seriesStrokeWidth)) {
                     pointStrokeWidth = seriesStrokeWidth / mapView.getScale();
                 }
+                // Invisible map points means that the data value is removed from the
+                // map, but not the map area shape itself. Instead it is rendered like a
+                // null point. To fully remove a map area, it should be removed from the
+                // mapData.
+                if (!point.visible) {
+                    attr.fill = this.options.nullColor;
+                }
                 attr['stroke-width'] = pick(pointStrokeWidth, 
                 // By default set the stroke-width on the group element and let all
                 // point graphics inherit. That way we don't have to iterate over
@@ -6669,9 +6717,6 @@
                          * @apioption plotOptions.series.states.select.color
                          */
                         color: "#cccccc" /* Palette.neutralColor20 */
-                    },
-                    inactive: {
-                        opacity: 1
                     }
                 }
             });
@@ -7182,11 +7227,6 @@
         var MapPointPoint = /** @class */ (function (_super) {
                 __extends(MapPointPoint, _super);
             function MapPointPoint() {
-                /* *
-                 *
-                 *  Properties
-                 *
-                 * */
                 var _this = _super !== null && _super.apply(this,
                     arguments) || this;
                 _this.options = void 0;
@@ -7242,7 +7282,9 @@
             };
         })();
         var noop = H.noop;
-        var ScatterSeries = SeriesRegistry.seriesTypes.scatter;
+        var _a = SeriesRegistry.seriesTypes,
+            MapSeries = _a.map,
+            ScatterSeries = _a.scatter;
         var extend = U.extend,
             fireEvent = U.fireEvent,
             isNumber = U.isNumber,
@@ -7278,6 +7320,7 @@
                 _this.data = void 0;
                 _this.options = void 0;
                 _this.points = void 0;
+                _this.clearBounds = MapSeries.prototype.clearBounds;
                 return _this;
                 /* eslint-enable valid-jsdoc */
             }
@@ -7332,13 +7375,19 @@
                 }
                 // Create map based translation
                 if (mapView) {
-                    var hasCoordinates_1 = mapView.projection.hasCoordinates;
+                    var mainSvgTransform_1 = mapView.getSVGTransform(),
+                        hasCoordinates_1 = mapView.projection.hasCoordinates;
                     this.points.forEach(function (p) {
                         var _a = p.x,
                             x = _a === void 0 ? void 0 : _a,
                             _b = p.y,
                             y = _b === void 0 ? void 0 : _b;
-                        var xy = _this.projectPoint(p.options);
+                        var svgTransform = (isNumber(p.insetIndex) &&
+                                mapView.insets[p.insetIndex].getSVGTransform()) || mainSvgTransform_1;
+                        var xy = (_this.projectPoint(p.options) ||
+                                (p.properties &&
+                                    _this.projectPoint(p.properties)));
+                        var didBounds;
                         if (xy) {
                             x = xy.x;
                             y = xy.y;
@@ -7347,15 +7396,24 @@
                         else if (p.bounds) {
                             x = p.bounds.midX;
                             y = p.bounds.midY;
+                            if (svgTransform && isNumber(x) && isNumber(y)) {
+                                p.plotX = x * svgTransform.scaleX +
+                                    svgTransform.translateX;
+                                p.plotY = y * svgTransform.scaleY +
+                                    svgTransform.translateY;
+                                didBounds = true;
+                            }
                         }
                         if (isNumber(x) && isNumber(y)) {
                             // Establish plotX and plotY
-                            var plotCoords = mapView.projectedUnitsToPixels({ x: x,
-                                y: y });
-                            p.plotX = plotCoords.x;
-                            p.plotY = hasCoordinates_1 ?
-                                plotCoords.y :
-                                _this.chart.plotHeight - plotCoords.y;
+                            if (!didBounds) {
+                                var plotCoords = mapView.projectedUnitsToPixels({ x: x,
+                                    y: y });
+                                p.plotX = plotCoords.x;
+                                p.plotY = hasCoordinates_1 ?
+                                    plotCoords.y :
+                                    _this.chart.plotHeight - plotCoords.y;
+                            }
                         }
                         else {
                             p.y = p.plotX = p.plotY = void 0;
@@ -7899,11 +7957,6 @@
                     this.chart = void 0;
                 this.fontMetrics = void 0;
                 this.legend = void 0;
-                this.legendGroup = void 0;
-                this.legendItem = void 0;
-                this.legendItemHeight = void 0;
-                this.legendItemWidth = void 0;
-                this.legendSymbol = void 0;
                 this.maxLabel = void 0;
                 this.movementX = void 0;
                 this.ranges = void 0;
@@ -7952,8 +8005,9 @@
              */
             BubbleLegendItem.prototype.drawLegendSymbol = function (legend) {
                 var chart = this.chart,
-                    options = this.options,
                     itemDistance = pick(legend.options.itemDistance, 20),
+                    legendItem = this.legendItem || {},
+                    options = this.options,
                     ranges = options.ranges,
                     connectorDistance = options.connectorDistance;
                 var connectorSpace;
@@ -7983,8 +8037,8 @@
                 this.maxLabel = maxLabel;
                 this.movementX = options.labels.align === 'left' ?
                     connectorSpace : 0;
-                this.legendItemWidth = size + connectorSpace + itemDistance;
-                this.legendItemHeight = size + this.fontMetrics.h / 2;
+                legendItem.labelWidth = size + connectorSpace + itemDistance;
+                legendItem.labelHeight = size + this.fontMetrics.h / 2;
             };
             /**
              * Set style options for each bubbleLegend range.
@@ -8058,11 +8112,12 @@
                 return bubbleSeries.getRadius.call(this, zMin, zMax, minSize, maxSize, value);
             };
             /**
-             * Render the legendSymbol group.
+             * Render the legendItem group.
              * @private
              */
             BubbleLegendItem.prototype.render = function () {
-                var renderer = this.chart.renderer,
+                var legendItem = this.legendItem || {},
+                    renderer = this.chart.renderer,
                     zThreshold = this.options.zThreshold;
                 if (!this.symbols) {
                     this.symbols = {
@@ -8072,19 +8127,20 @@
                     };
                 }
                 // Nesting SVG groups to enable handleOverflow
-                this.legendSymbol = renderer.g('bubble-legend');
-                this.legendItem = renderer.g('bubble-legend-item');
+                legendItem.symbol = renderer.g('bubble-legend');
+                legendItem.label = renderer.g('bubble-legend-item');
                 // To enable default 'hideOverlappingLabels' method
-                this.legendSymbol.translateX = 0;
-                this.legendSymbol.translateY = 0;
-                this.ranges.forEach(function (range) {
+                legendItem.symbol.translateX = 0;
+                legendItem.symbol.translateY = 0;
+                for (var _i = 0, _a = this.ranges; _i < _a.length; _i++) {
+                    var range = _a[_i];
                     if (range.value >= zThreshold) {
                         this.renderRange(range);
                     }
-                }, this);
+                }
                 // To use handleOverflow method
-                this.legendSymbol.add(this.legendItem);
-                this.legendItem.add(this.legendGroup);
+                legendItem.symbol.add(legendItem.label);
+                legendItem.label.add(legendItem.group);
                 this.hideOverlappingLabels();
             };
             /**
@@ -8140,7 +8196,7 @@
                         bubbleSeries.colorIndex + ' ' :
                     '') +
                     'highcharts-bubble-legend-symbol ' +
-                    (options.className || '')).add(this.legendSymbol));
+                    (options.className || '')).add(this.legendItem.symbol));
                 // Render connector
                 symbols.connectors.push(renderer
                     .path(renderer.crispLine([
@@ -8152,7 +8208,7 @@
                     'highcharts-color-' +
                         this.options.seriesIndex + ' ' : '') +
                     'highcharts-bubble-legend-connectors ' +
-                    (options.connectorClassName || '')).add(this.legendSymbol));
+                    (options.connectorClassName || '')).add(this.legendItem.symbol));
                 // Render label
                 var label = renderer
                         .text(this.formatLabel(range),
@@ -8161,7 +8217,7 @@
                         .attr((styledMode ? {} : range.labelAttribs))
                         .css(styledMode ? {} : labelsOptions.style)
                         .addClass('highcharts-bubble-legend-labels ' +
-                        (options.labels.className || '')).add(this.legendSymbol);
+                        (options.labels.className || '')).add(this.legendItem.symbol);
                 labels.push(label);
                 // To enable default 'hideOverlappingLabels' method
                 label.placed = true;
@@ -8387,7 +8443,7 @@
 
         return BubbleLegendItem;
     });
-    _registerModule(_modules, 'Series/Bubble/BubbleLegendComposition.js', [_modules['Series/Bubble/BubbleLegendDefaults.js'], _modules['Series/Bubble/BubbleLegendItem.js'], _modules['Core/DefaultOptions.js'], _modules['Core/Utilities.js']], function (BubbleLegendDefaults, BubbleLegendItem, D, U) {
+    _registerModule(_modules, 'Series/Bubble/BubbleLegendComposition.js', [_modules['Series/Bubble/BubbleLegendDefaults.js'], _modules['Series/Bubble/BubbleLegendItem.js'], _modules['Core/Defaults.js'], _modules['Core/Utilities.js']], function (BubbleLegendDefaults, BubbleLegendItem, D, U) {
         /* *
          *
          *  (c) 2010-2021 Highsoft AS
@@ -8423,7 +8479,8 @@
                 legend = chart.legend,
                 bubbleSeries = getVisibleBubbleSeriesIndex(chart) >= 0;
             var bubbleLegendOptions,
-                bubbleSizes;
+                bubbleSizes,
+                legendItem;
             if (legend && legend.options.enabled && legend.bubbleLegend &&
                 legend.options.bubbleLegend.autoRanges && bubbleSeries) {
                 bubbleLegendOptions = legend.bubbleLegend.options;
@@ -8433,7 +8490,10 @@
                 if (!bubbleLegendOptions.placed) {
                     legend.group.placed = false;
                     legend.allItems.forEach(function (item) {
-                        item.legendGroup.translateY = null;
+                        legendItem = item.legendItem || {};
+                        if (legendItem.group) {
+                            legendItem.group.translateY = null;
+                        }
                     });
                 }
                 // Create legend with bubbleLegend
@@ -8546,18 +8606,20 @@
                 lines = [],
                 length = items.length;
             var lastLine,
+                legendItem,
+                legendItem2,
                 i = 0,
                 j = 0;
             for (i = 0; i < length; i++) {
-                if (items[i].legendItemHeight) {
+                legendItem = items[i].legendItem || {};
+                legendItem2 = (items[i + 1] || {}).legendItem || {};
+                if (legendItem.labelHeight) {
                     // for bubbleLegend
-                    items[i].itemHeight = items[i].legendItemHeight;
+                    items[i].itemHeight = legendItem.labelHeight;
                 }
                 if ( // Line break
                 items[i] === items[length - 1] ||
-                    items[i + 1] &&
-                        items[i]._legendItemPos[1] !==
-                            items[i + 1]._legendItemPos[1]) {
+                    legendItem.y !== legendItem2.y) {
                     lines.push({ height: 0 });
                     lastLine = lines[lines.length - 1];
                     // Find the highest item in line
@@ -8644,25 +8706,29 @@
             var orgTranslateX,
                 orgTranslateY,
                 movementX,
+                legendItem,
                 actualLine = 0;
             items.forEach(function (item, index) {
-                orgTranslateX = item.legendGroup.translateX;
-                orgTranslateY = item._legendItemPos[1];
+                legendItem = item.legendItem || {};
+                if (!legendItem.group) {
+                    return;
+                }
+                orgTranslateX = legendItem.group.translateX || 0;
+                orgTranslateY = legendItem.y || 0;
                 movementX = item.movementX;
                 if (movementX || (rtl && item.ranges)) {
                     movementX = rtl ?
                         orgTranslateX - item.options.maxSize / 2 :
                         orgTranslateX + movementX;
-                    item.legendGroup.attr({ translateX: movementX });
+                    legendItem.group.attr({ translateX: movementX });
                 }
                 if (index > lines[actualLine].step) {
                     actualLine++;
                 }
-                item.legendGroup.attr({
+                legendItem.group.attr({
                     translateY: Math.round(orgTranslateY + lines[actualLine].height / 2)
                 });
-                item._legendItemPos[1] = orgTranslateY +
-                    lines[actualLine].height / 2;
+                legendItem.y = orgTranslateY + lines[actualLine].height / 2;
             });
         }
         /* *
@@ -9628,6 +9694,7 @@
                 _this.data = void 0;
                 _this.options = void 0;
                 _this.points = void 0;
+                _this.clearBounds = mapProto.clearBounds;
                 return _this;
             }
             MapBubbleSeries.prototype.searchPoint = function (e, compareX) {
@@ -9811,6 +9878,9 @@
                  * @default 500
                  */
                 animationLimit: 500,
+                /**
+                 * @type {string|Array<string>}
+                 */
                 joinBy: 'hc-key',
                 tooltip: {
                     pointFormat: '{point.name}: {point.z}'
@@ -10504,6 +10574,9 @@
                     inside: true,
                     verticalAlign: 'middle',
                     crop: false,
+                    /**
+                     * @ignore-option
+                     */
                     overflow: false,
                     padding: 0 // #3837
                 },