highcharts 9.2.0 → 9.3.1

package/es-modules/Extensions/GeoJSON.js

@@ -145,6 +145,11 @@ var error = U.error, extend = U.extend, merge = U.merge, wrap = U.wrap;
 * @name Highcharts.MapLatLonObject#lon
 * @type {number}
 */
+/**
+ * An array of longitude, latitude.
+ *
+ * @typedef {Array<number>} Highcharts.LonLatArray
+ */
 ''; // detach doclets above
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
@@ -198,9 +203,7 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
      * @product    highmaps
      * @apioption  chart.proj4
      */
-    var proj4 = (this.userOptions.chart &&
-        this.userOptions.chart.proj4 ||
-        win.proj4);
+    var proj4 = this.options.chart.proj4 || win.proj4;
     if (!proj4) {
         error(21, false, this);
         return {
@@ -208,6 +211,7 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
             y: null
         };
     }
+    var _a = transform.jsonmarginX, jsonmarginX = _a === void 0 ? 0 : _a, _b = transform.jsonmarginY, jsonmarginY = _b === void 0 ? 0 : _b, _c = transform.jsonres, jsonres = _c === void 0 ? 1 : _c, _d = transform.scale, scale = _d === void 0 ? 1 : _d, _e = transform.xoffset, xoffset = _e === void 0 ? 0 : _e, _f = transform.xpan, xpan = _f === void 0 ? 0 : _f, _g = transform.yoffset, yoffset = _g === void 0 ? 0 : _g, _h = transform.ypan, ypan = _h === void 0 ? 0 : _h;
     var projected = proj4(transform.crs, [latLon.lon, latLon.lat]), cosAngle = transform.cosAngle ||
         (transform.rotation && Math.cos(transform.rotation)), sinAngle = transform.sinAngle ||
         (transform.rotation && Math.sin(transform.rotation)), rotated = transform.rotation ? [
@@ -215,12 +219,8 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
         -projected[0] * sinAngle + projected[1] * cosAngle
     ] : projected;
     return {
-        x: ((rotated[0] - (transform.xoffset || 0)) * (transform.scale || 1) +
-            (transform.xpan || 0)) * (transform.jsonres || 1) +
-            (transform.jsonmarginX || 0),
-        y: (((transform.yoffset || 0) - rotated[1]) * (transform.scale || 1) +
-            (transform.ypan || 0)) * (transform.jsonres || 1) -
-            (transform.jsonmarginY || 0)
+        x: ((rotated[0] - xoffset) * scale + xpan) * jsonres + jsonmarginX,
+        y: -(((yoffset - rotated[1]) * scale + ypan) * jsonres - jsonmarginY)
     };
 };
 /**
@@ -246,18 +246,18 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
  *         An object with `lat` and `lon` properties.
  */
 Chart.prototype.transformToLatLon = function (point, transform) {
-    if (typeof win.proj4 === 'undefined') {
+    var proj4 = this.options.chart.proj4 || win.proj4;
+    if (!proj4) {
         error(21, false, this);
         return;
     }
+    if (point.y === null) {
+        return;
+    }
+    var _a = transform.jsonmarginX, jsonmarginX = _a === void 0 ? 0 : _a, _b = transform.jsonmarginY, jsonmarginY = _b === void 0 ? 0 : _b, _c = transform.jsonres, jsonres = _c === void 0 ? 1 : _c, _d = transform.scale, scale = _d === void 0 ? 1 : _d, _e = transform.xoffset, xoffset = _e === void 0 ? 0 : _e, _f = transform.xpan, xpan = _f === void 0 ? 0 : _f, _g = transform.yoffset, yoffset = _g === void 0 ? 0 : _g, _h = transform.ypan, ypan = _h === void 0 ? 0 : _h;
     var normalized = {
-        x: ((point.x -
-            (transform.jsonmarginX || 0)) / (transform.jsonres || 1) -
-            (transform.xpan || 0)) / (transform.scale || 1) +
-            (transform.xoffset || 0),
-        y: ((-point.y - (transform.jsonmarginY || 0)) / (transform.jsonres || 1) +
-            (transform.ypan || 0)) / (transform.scale || 1) +
-            (transform.yoffset || 0)
+        x: ((point.x - jsonmarginX) / jsonres - xpan) / scale + xoffset,
+        y: ((point.y - jsonmarginY) / jsonres + ypan) / scale + yoffset
     }, cosAngle = transform.cosAngle ||
         (transform.rotation && Math.cos(transform.rotation)), sinAngle = transform.sinAngle ||
         (transform.rotation && Math.sin(transform.rotation)), 
@@ -287,15 +287,15 @@ Chart.prototype.transformToLatLon = function (point, transform) {
  *         An object with `lat` and `lon` properties.
  */
 Chart.prototype.fromPointToLatLon = function (point) {
-    var transforms = this.mapTransforms, transform;
+    var transforms = this.mapTransforms;
     if (!transforms) {
         error(22, false, this);
         return;
     }
-    for (transform in transforms) {
+    for (var transform in transforms) {
         if (Object.hasOwnProperty.call(transforms, transform) &&
             transforms[transform].hitZone &&
-            pointInPolygon({ x: point.x, y: -point.y }, transforms[transform].hitZone.coordinates[0])) {
+            pointInPolygon(point, transforms[transform].hitZone.coordinates[0])) {
             return this.transformToLatLon(point, transforms[transform]);
         }
     }
@@ -332,7 +332,7 @@ Chart.prototype.fromLatLonToPoint = function (latLon) {
         if (Object.hasOwnProperty.call(transforms, transform) &&
             transforms[transform].hitZone) {
             coords = this.transformFromLatLon(latLon, transforms[transform]);
-            if (pointInPolygon({ x: coords.x, y: -coords.y }, transforms[transform].hitZone.coordinates[0])) {
+            if (pointInPolygon(coords, transforms[transform].hitZone.coordinates[0])) {
                 return coords;
             }
         }
@@ -371,56 +371,32 @@ Chart.prototype.fromLatLonToPoint = function (latLon) {
  *         An object ready for the `mapData` option.
  */
 H.geojson = function (geojson, hType, series) {
-    var mapData = [], path = [], polygonToPath = function (polygon) {
-        polygon.forEach(function (point, i) {
-            if (i === 0) {
-                path.push(['M', point[0], -point[1]]);
-            }
-            else {
-                path.push(['L', point[0], -point[1]]);
-            }
-        });
-    };
-    hType = hType || 'map';
+    if (hType === void 0) { hType = 'map'; }
+    var mapData = [];
+    var path = [];
     geojson.features.forEach(function (feature) {
-        var geometry = feature.geometry, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties, point;
+        var geometry = feature.geometry || {}, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties, pointOptions;
         path = [];
-        if (hType === 'map' || hType === 'mapbubble') {
-            if (type === 'Polygon') {
-                coordinates.forEach(polygonToPath);
-                path.push(['Z']);
-            }
-            else if (type === 'MultiPolygon') {
-                coordinates.forEach(function (items) {
-                    items.forEach(polygonToPath);
-                });
-                path.push(['Z']);
-            }
-            if (path.length) {
-                point = { path: path };
+        if ((hType === 'map' || hType === 'mapbubble') &&
+            (type === 'Polygon' || type === 'MultiPolygon')) {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        else if (hType === 'mapline') {
-            if (type === 'LineString') {
-                polygonToPath(coordinates);
-            }
-            else if (type === 'MultiLineString') {
-                coordinates.forEach(polygonToPath);
-            }
-            if (path.length) {
-                point = { path: path };
+        else if (hType === 'mapline' &&
+            (type === 'LineString' ||
+                type === 'MultiLineString')) {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        else if (hType === 'mappoint') {
-            if (type === 'Point') {
-                point = {
-                    x: coordinates[0],
-                    y: -coordinates[1]
-                };
+        else if (hType === 'mappoint' && type === 'Point') {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        if (point) {
-            mapData.push(extend(point, {
+        if (pointOptions) {
+            mapData.push(extend(pointOptions, {
                 name: properties.name || properties.NAME,
                 /**
                  * In Highmaps, when data is loaded from GeoJSON, the GeoJSON

package/es-modules/Extensions/MarkerClusters.js

@@ -17,7 +17,6 @@ var animObject = A.animObject;
 import Chart from '../Core/Chart/Chart.js';
 import D from '../Core/DefaultOptions.js';
 var defaultOptions = D.defaultOptions;
-import palette from '../Core/Color/Palette.js';
 import Point from '../Core/Series/Point.js';
 import Series from '../Core/Series/Series.js';
 import SeriesRegistry from '../Core/Series/SeriesRegistry.js';
@@ -40,10 +39,10 @@ var addEvent = U.addEvent, defined = U.defined, error = U.error, isArray = U.isA
 ''; // detach doclets from following code
 /* eslint-disable no-invalid-this */
 import Axis from '../Core/Axis/Axis.js';
-var Scatter = seriesTypes.scatter, baseGeneratePoints = Series.prototype.generatePoints, stateIdCounter = 0, 
+var Scatter = seriesTypes.scatter, baseGeneratePoints = Series.prototype.generatePoints;
 // Points that ids are included in the oldPointsStateId array
 // are hidden before animation. Other ones are destroyed.
-oldPointsStateId = [];
+var oldPointsStateId = [], stateIdCounter = 0;
 /**
  * Options for marker clusters, the concept of sampling the data
  * values into larger blocks in order to ease readability and
@@ -240,7 +239,7 @@ var clusterDefaultOptions = {
         /** @internal */
         lineWidth: 0,
         /** @internal */
-        lineColor: palette.backgroundColor
+        lineColor: "#ffffff" /* backgroundColor */
     },
     /**
      * Fires when the cluster point is clicked and `drillToCluster` is enabled.
@@ -354,6 +353,26 @@ var clusterDefaultOptions = {
     }
 });
 // Utils.
+var pixelsToValues = function (series, pos) {
+    var chart = series.chart, xAxis = series.xAxis, yAxis = series.yAxis;
+    if (chart.mapView) {
+        return chart.mapView.pixelsToProjectedUnits(pos);
+    }
+    return {
+        x: xAxis ? xAxis.toValue(pos.x) : 0,
+        y: yAxis ? yAxis.toValue(pos.y) : 0
+    };
+};
+var valuesToPixels = function (series, pos) {
+    var chart = series.chart, xAxis = series.xAxis, yAxis = series.yAxis;
+    if (chart.mapView) {
+        return chart.mapView.projectedUnitsToPixels(pos);
+    }
+    return {
+        x: xAxis ? xAxis.toPixels(pos.x) : 0,
+        y: yAxis ? yAxis.toPixels(pos.y) : 0
+    };
+};
 /* eslint-disable require-jsdoc */
 function getClusterPosition(points) {
     var pointsLen = points.length, sumX = 0, sumY = 0, i;
@@ -455,11 +474,13 @@ symbols.cluster = function (x, y, width, height) {
     return outer2.concat(outer1, inner);
 };
 Scatter.prototype.animateClusterPoint = function (clusterObj) {
-    var series = this, xAxis = series.xAxis, yAxis = series.yAxis, chart = series.chart, clusterOptions = series.options.cluster, animation = animObject((clusterOptions || {}).animation), animDuration = animation.duration || 500, pointsState = (series.markerClusterInfo || {}).pointsState, newState = (pointsState || {}).newState, oldState = (pointsState || {}).oldState, parentId, oldPointObj, newPointObj, oldPoints = [], newPointBBox, offset = 0, newX = 0, newY = 0, isOldPointGrahic = false, isCbHandled = false;
+    var series = this, chart = series.chart, mapView = chart.mapView, clusterOptions = series.options.cluster, animation = animObject((clusterOptions || {}).animation), animDuration = animation.duration || 500, pointsState = (series.markerClusterInfo || {}).pointsState, newState = (pointsState || {}).newState, oldState = (pointsState || {}).oldState, oldPoints = [];
+    var parentId, oldPointObj, newPointObj, newPointBBox, offset = 0, newX = 0, newY = 0, isOldPointGrahic = false, isCbHandled = false;
     if (oldState && newState) {
         newPointObj = newState[clusterObj.stateId];
-        newX = xAxis.toPixels(newPointObj.x) - chart.plotLeft;
-        newY = yAxis.toPixels(newPointObj.y) - chart.plotTop;
+        var newPos = valuesToPixels(series, newPointObj);
+        newX = newPos.x - (mapView ? 0 : chart.plotLeft);
+        newY = newPos.y - (mapView ? 0 : chart.plotTop);
         // Point has one ancestor.
         if (newPointObj.parentsId.length === 1) {
             parentId = (newState || {})[clusterObj.stateId].parentsId[0];
@@ -567,14 +588,14 @@ Scatter.prototype.animateClusterPoint = function (clusterObj) {
 };
 Scatter.prototype.getGridOffset = function () {
     var series = this, chart = series.chart, xAxis = series.xAxis, yAxis = series.yAxis, plotLeft = 0, plotTop = 0;
-    if (series.dataMinX && series.dataMaxX) {
+    if (xAxis && series.dataMinX && series.dataMaxX) {
         plotLeft = xAxis.reversed ?
             xAxis.toPixels(series.dataMaxX) : xAxis.toPixels(series.dataMinX);
     }
     else {
         plotLeft = chart.plotLeft;
     }
-    if (series.dataMinY && series.dataMaxY) {
+    if (yAxis && series.dataMinY && series.dataMaxY) {
         plotTop = yAxis.reversed ?
             yAxis.toPixels(series.dataMinY) : yAxis.toPixels(series.dataMaxY);
     }
@@ -584,16 +605,24 @@ Scatter.prototype.getGridOffset = function () {
     return { plotLeft: plotLeft, plotTop: plotTop };
 };
 Scatter.prototype.getScaledGridSize = function (options) {
-    var series = this, xAxis = series.xAxis, search = true, k = 1, divider = 1, processedGridSize = options.processedGridSize ||
-        clusterDefaultOptions.layoutAlgorithm.gridSize, gridSize, scale, level;
+    var series = this, xAxis = series.xAxis, mapView = this.chart.mapView, processedGridSize = options.processedGridSize ||
+        clusterDefaultOptions.layoutAlgorithm.gridSize;
+    var search = true, k = 1, divider = 1;
     if (!series.gridValueSize) {
-        series.gridValueSize = Math.abs(xAxis.toValue(processedGridSize) - xAxis.toValue(0));
+        if (mapView) {
+            series.gridValueSize = processedGridSize / mapView.getScale();
+        }
+        else {
+            series.gridValueSize = Math.abs(xAxis.toValue(processedGridSize) - xAxis.toValue(0));
+        }
     }
-    gridSize = xAxis.toPixels(series.gridValueSize) - xAxis.toPixels(0);
-    scale = +(processedGridSize / gridSize).toFixed(14);
+    var gridSize = mapView ?
+        series.gridValueSize * mapView.getScale() :
+        xAxis.toPixels(series.gridValueSize) - xAxis.toPixels(0);
+    var scale = +(processedGridSize / gridSize).toFixed(14);
     // Find the level and its divider.
     while (search && scale !== 1) {
-        level = Math.pow(2, k);
+        var level = Math.pow(2, k);
         if (scale > 0.75 && scale < 1.25) {
             search = false;
         }
@@ -610,77 +639,62 @@ Scatter.prototype.getScaledGridSize = function (options) {
     return (processedGridSize / divider) / scale;
 };
 Scatter.prototype.getRealExtremes = function () {
-    var _a, _b;
-    var series = this, chart = series.chart, xAxis = series.xAxis, yAxis = series.yAxis, realMinX = xAxis ? xAxis.toValue(chart.plotLeft) : 0, realMaxX = xAxis ?
-        xAxis.toValue(chart.plotLeft + chart.plotWidth) : 0, realMinY = yAxis ? yAxis.toValue(chart.plotTop) : 0, realMaxY = yAxis ?
-        yAxis.toValue(chart.plotTop + chart.plotHeight) : 0;
-    if (realMinX > realMaxX) {
-        _a = [realMinX, realMaxX], realMaxX = _a[0], realMinX = _a[1];
-    }
-    if (realMinY > realMaxY) {
-        _b = [realMinY, realMaxY], realMaxY = _b[0], realMinY = _b[1];
-    }
+    var chart = this.chart, x = chart.mapView ? 0 : chart.plotLeft, y = chart.mapView ? 0 : chart.plotTop, p1 = pixelsToValues(this, {
+        x: x,
+        y: y
+    }), p2 = pixelsToValues(this, {
+        x: x + chart.plotWidth,
+        y: x + chart.plotHeight
+    }), realMinX = p1.x, realMaxX = p2.x, realMinY = p1.y, realMaxY = p2.y;
     return {
-        minX: realMinX,
-        maxX: realMaxX,
-        minY: realMinY,
-        maxY: realMaxY
+        minX: Math.min(realMinX, realMaxX),
+        maxX: Math.max(realMinX, realMaxX),
+        minY: Math.min(realMinY, realMaxY),
+        maxY: Math.max(realMinY, realMaxY)
     };
 };
 Scatter.prototype.onDrillToCluster = function (event) {
     var point = event.point || event.target;
     point.firePointEvent('drillToCluster', event, function (e) {
-        var _a, _b;
-        var point = e.point || e.target, series = point.series, xAxis = point.series.xAxis, yAxis = point.series.yAxis, chart = point.series.chart, clusterOptions = series.options.cluster, drillToCluster = (clusterOptions || {}).drillToCluster, offsetX, offsetY, sortedDataX, sortedDataY, minX, minY, maxX, maxY;
+        var point = e.point || e.target, series = point.series, xAxis = point.series.xAxis, yAxis = point.series.yAxis, chart = point.series.chart, mapView = chart.mapView, clusterOptions = series.options.cluster, drillToCluster = (clusterOptions || {}).drillToCluster;
         if (drillToCluster && point.clusteredData) {
-            sortedDataX = point.clusteredData.map(function (data) {
-                return data.x;
-            }).sort(function (a, b) { return a - b; });
-            sortedDataY = point.clusteredData.map(function (data) {
-                return data.y;
-            }).sort(function (a, b) { return a - b; });
-            minX = sortedDataX[0];
-            maxX = sortedDataX[sortedDataX.length - 1];
-            minY = sortedDataY[0];
-            maxY = sortedDataY[sortedDataY.length - 1];
-            offsetX = Math.abs((maxX - minX) * 0.1);
-            offsetY = Math.abs((maxY - minY) * 0.1);
-            chart.pointer.zoomX = true;
-            chart.pointer.zoomY = true;
-            // Swap when minus values.
-            if (minX > maxX) {
-                _a = [maxX, minX], minX = _a[0], maxX = _a[1];
+            var sortedDataX = point.clusteredData
+                .map(function (data) { return data.x; })
+                .sort(function (a, b) { return a - b; }), sortedDataY = point.clusteredData
+                .map(function (data) { return data.y; })
+                .sort(function (a, b) { return a - b; }), minX = sortedDataX[0], maxX = sortedDataX[sortedDataX.length - 1], minY = sortedDataY[0], maxY = sortedDataY[sortedDataY.length - 1], offsetX = Math.abs((maxX - minX) * 0.1), offsetY = Math.abs((maxY - minY) * 0.1), x1 = Math.min(minX, maxX) - offsetX, x2 = Math.max(minX, maxX) + offsetX, y1 = Math.min(minY, maxY) - offsetY, y2 = Math.max(minY, maxY) + offsetY;
+            if (mapView) {
+                mapView.fitToBounds({ x1: x1, x2: x2, y1: y1, y2: y2 });
             }
-            if (minY > maxY) {
-                _b = [maxY, minY], minY = _b[0], maxY = _b[1];
+            else if (xAxis && yAxis) {
+                chart.pointer.zoomX = true;
+                chart.pointer.zoomY = true;
+                chart.zoom({
+                    originalEvent: e,
+                    xAxis: [{
+                            axis: xAxis,
+                            min: x1,
+                            max: x2
+                        }],
+                    yAxis: [{
+                            axis: yAxis,
+                            min: y1,
+                            max: y2
+                        }]
+                });
             }
-            chart.zoom({
-                originalEvent: e,
-                xAxis: [{
-                        axis: xAxis,
-                        min: minX - offsetX,
-                        max: maxX + offsetX
-                    }],
-                yAxis: [{
-                        axis: yAxis,
-                        min: minY - offsetY,
-                        max: maxY + offsetY
-                    }]
-            });
         }
     });
 };
 Scatter.prototype.getClusterDistancesFromPoint = function (clusters, pointX, pointY) {
-    var series = this, xAxis = series.xAxis, yAxis = series.yAxis, pointClusterDistance = [], j, distance;
-    for (j = 0; j < clusters.length; j++) {
-        distance = Math.sqrt(Math.pow(xAxis.toPixels(pointX) -
-            xAxis.toPixels(clusters[j].posX), 2) +
-            Math.pow(yAxis.toPixels(pointY) -
-                yAxis.toPixels(clusters[j].posY), 2));
-        pointClusterDistance.push({
-            clusterIndex: j,
-            distance: distance
-        });
+    var pointClusterDistance = [];
+    for (var clusterIndex = 0; clusterIndex < clusters.length; clusterIndex++) {
+        var p1 = valuesToPixels(this, { x: pointX, y: pointY }), p2 = valuesToPixels(this, {
+            x: clusters[clusterIndex].posX,
+            y: clusters[clusterIndex].posY
+        }), distance = Math.sqrt(Math.pow(p1.x - p2.x, 2) +
+            Math.pow(p1.y - p2.y, 2));
+        pointClusterDistance.push({ clusterIndex: clusterIndex, distance: distance });
     }
     return pointClusterDistance.sort(function (a, b) { return a.distance - b.distance; });
 };
@@ -730,12 +744,14 @@ Scatter.prototype.getPointsState = function (clusteredData, oldMarkerClusterInfo
 };
 Scatter.prototype.markerClusterAlgorithms = {
     grid: function (dataX, dataY, dataIndexes, options) {
-        var series = this, xAxis = series.xAxis, yAxis = series.yAxis, grid = {}, gridOffset = series.getGridOffset(), scaledGridSize, x, y, gridX, gridY, key, i;
+        var grid = {}, gridOffset = this.getGridOffset();
+        var x, y, gridX, gridY, key, i;
         // drawGridLines(series, options);
-        scaledGridSize = series.getScaledGridSize(options);
+        var scaledGridSize = this.getScaledGridSize(options);
         for (i = 0; i < dataX.length; i++) {
-            x = xAxis.toPixels(dataX[i]) - gridOffset.plotLeft;
-            y = yAxis.toPixels(dataY[i]) - gridOffset.plotTop;
+            var p = valuesToPixels(this, { x: dataX[i], y: dataY[i] });
+            x = p.x - gridOffset.plotLeft;
+            y = p.y - gridOffset.plotTop;
             gridX = Math.floor(x / scaledGridSize);
             gridY = Math.floor(y / scaledGridSize);
             key = gridY + '-' + gridX;
@@ -875,10 +891,9 @@ Scatter.prototype.markerClusterAlgorithms = {
                 cluster.pointsOutside = [];
                 cluster.pointsInside = [];
                 cluster.data.forEach(function (dataPoint) {
-                    distance = Math.sqrt(Math.pow(xAxis.toPixels(dataPoint.x) -
-                        xAxis.toPixels(cluster.x), 2) +
-                        Math.pow(yAxis.toPixels(dataPoint.y) -
-                            yAxis.toPixels(cluster.y), 2));
+                    var dataPointPx = valuesToPixels(series, dataPoint), clusterPx = valuesToPixels(series, cluster);
+                    distance = Math.sqrt(Math.pow(dataPointPx.x - clusterPx.x, 2) +
+                        Math.pow(dataPointPx.y - clusterPx.y, 2));
                     if (cluster.clusterZone &&
                         cluster.clusterZone.marker &&
                         cluster.clusterZone.marker.radius) {
@@ -916,7 +931,7 @@ Scatter.prototype.markerClusterAlgorithms = {
     }
 };
 Scatter.prototype.preventClusterCollisions = function (props) {
-    var series = this, xAxis = series.xAxis, yAxis = series.yAxis, _a = props.key.split('-').map(parseFloat), gridY = _a[0], gridX = _a[1], gridSize = props.gridSize, groupedData = props.groupedData, defaultRadius = props.defaultRadius, clusterRadius = props.clusterRadius, gridXPx = gridX * gridSize, gridYPx = gridY * gridSize, xPixel = xAxis.toPixels(props.x), yPixel = yAxis.toPixels(props.y), gridsToCheckCollision = [], pointsLen = 0, radius = 0, clusterMarkerOptions = (series.options.cluster || {}).marker, zoneOptions = (series.options.cluster || {}).zones, gridOffset = series.getGridOffset(), nextXPixel, nextYPixel, signX, signY, cornerGridX, cornerGridY, i, j, itemX, itemY, nextClusterPos, maxDist, keys, x, y;
+    var series = this, _a = props.key.split('-').map(parseFloat), gridY = _a[0], gridX = _a[1], gridSize = props.gridSize, groupedData = props.groupedData, defaultRadius = props.defaultRadius, clusterRadius = props.clusterRadius, gridXPx = gridX * gridSize, gridYPx = gridY * gridSize, propsPx = valuesToPixels(series, props), xPixel = propsPx.x, yPixel = propsPx.y, gridsToCheckCollision = [], pointsLen = 0, radius = 0, clusterMarkerOptions = (series.options.cluster || {}).marker, zoneOptions = (series.options.cluster || {}).zones, gridOffset = series.getGridOffset(), nextXPixel, nextYPixel, signX, signY, cornerGridX, cornerGridY, i, j, itemX, itemY, nextClusterPos, maxDist, keys;
     // Distance to the grid start.
     xPixel -= gridOffset.plotLeft;
     yPixel -= gridOffset.plotTop;
@@ -946,10 +961,12 @@ Scatter.prototype.preventClusterCollisions = function (props) {
                 groupedData[item].posX = nextClusterPos.x;
                 groupedData[item].posY = nextClusterPos.y;
             }
-            nextXPixel = xAxis.toPixels(groupedData[item].posX || 0) -
-                gridOffset.plotLeft;
-            nextYPixel = yAxis.toPixels(groupedData[item].posY || 0) -
-                gridOffset.plotTop;
+            var pos_1 = valuesToPixels(series, {
+                x: groupedData[item].posX || 0,
+                y: groupedData[item].posY || 0
+            });
+            nextXPixel = pos_1.x - gridOffset.plotLeft;
+            nextYPixel = pos_1.y - gridOffset.plotTop;
             _a = item.split('-').map(parseFloat), itemY = _a[0], itemX = _a[1];
             if (zoneOptions) {
                 pointsLen = groupedData[item].length;
@@ -992,11 +1009,13 @@ Scatter.prototype.preventClusterCollisions = function (props) {
             }
         }
     });
-    x = xAxis.toValue(xPixel + gridOffset.plotLeft);
-    y = yAxis.toValue(yPixel + gridOffset.plotTop);
-    groupedData[props.key].posX = x;
-    groupedData[props.key].posY = y;
-    return { x: x, y: y };
+    var pos = pixelsToValues(series, {
+        x: xPixel + gridOffset.plotLeft,
+        y: yPixel + gridOffset.plotTop
+    });
+    groupedData[props.key].posX = pos.x;
+    groupedData[props.key].posY = pos.y;
+    return pos;
 };
 // Check if user algorithm result is valid groupedDataObject.
 Scatter.prototype.isValidGroupedDataObject = function (groupedData) {
@@ -1188,7 +1207,7 @@ Scatter.prototype.hideClusteredData = function () {
 };
 // Override the generatePoints method by adding a reference to grouped data.
 Scatter.prototype.generatePoints = function () {
-    var series = this, chart = series.chart, xAxis = series.xAxis, yAxis = series.yAxis, clusterOptions = series.options.cluster, realExtremes = series.getRealExtremes(), visibleXData = [], visibleYData = [], visibleDataIndexes = [], oldPointsState, oldDataLen, oldMarkerClusterInfo, kmeansThreshold, cropDataOffsetX, cropDataOffsetY, seriesMinX, seriesMaxX, seriesMinY, seriesMaxY, type, algorithm, clusteredData, groupedData, layoutAlgOptions, point, i;
+    var series = this, chart = series.chart, mapView = chart.mapView, xAxis = series.xAxis, yAxis = series.yAxis, clusterOptions = series.options.cluster, realExtremes = series.getRealExtremes(), visibleXData = [], visibleYData = [], visibleDataIndexes = [], oldPointsState, oldDataLen, oldMarkerClusterInfo, kmeansThreshold, cropDataOffsetX, cropDataOffsetY, seriesMinX, seriesMaxX, seriesMinY, seriesMaxY, type, algorithm, clusteredData, groupedData, layoutAlgOptions, point, i;
     if (clusterOptions &&
         clusterOptions.enabled &&
         series.xData &&
@@ -1206,10 +1225,9 @@ Scatter.prototype.generatePoints = function () {
         kmeansThreshold = layoutAlgOptions.kmeansThreshold ||
             clusterDefaultOptions.layoutAlgorithm.kmeansThreshold;
         // Offset to prevent cluster size changes.
-        cropDataOffsetX = Math.abs(xAxis.toValue(layoutAlgOptions.processedGridSize / 2) -
-            xAxis.toValue(0));
-        cropDataOffsetY = Math.abs(yAxis.toValue(layoutAlgOptions.processedGridSize / 2) -
-            yAxis.toValue(0));
+        var halfGrid = layoutAlgOptions.processedGridSize / 2, p1 = pixelsToValues(series, { x: 0, y: 0 }), p2 = pixelsToValues(series, { x: halfGrid, y: halfGrid });
+        cropDataOffsetX = Math.abs(p1.x - p2.x);
+        cropDataOffsetY = Math.abs(p1.y - p2.y);
         // Get only visible data.
         for (i = 0; i < series.xData.length; i++) {
             if (!series.dataMaxX) {
@@ -1341,7 +1359,7 @@ addEvent(Chart, 'render', function () {
             if ((options || {}).animation &&
                 series.markerClusterInfo &&
                 series.chart.pointer.pinchDown.length === 0 &&
-                (series.xAxis.eventArgs || {}).trigger !== 'pan' &&
+                ((series.xAxis || {}).eventArgs || {}).trigger !== 'pan' &&
                 oldState &&
                 Object.keys(oldState).length) {
                 series.markerClusterInfo.clusters.forEach(function (cluster) {

package/es-modules/Extensions/NoDataToDisplay.js

@@ -15,7 +15,6 @@ import AST from '../Core/Renderer/HTML/AST.js';
 import Chart from '../Core/Chart/Chart.js';
 import D from '../Core/DefaultOptions.js';
 var getOptions = D.getOptions;
-import palette from '../Core/Color/Palette.js';
 import U from '../Core/Utilities.js';
 var addEvent = U.addEvent, extend = U.extend;
 var chartPrototype = Chart.prototype, defaultOptions = getOptions();
@@ -118,7 +117,7 @@ defaultOptions.noData = {
         /** @ignore */
         fontSize: '12px',
         /** @ignore */
-        color: palette.neutralColor60
+        color: "#666666" /* neutralColor60 */
     }
 };
 /**

package/es-modules/Extensions/OfflineExporting/OfflineExporting.js

@@ -333,7 +333,7 @@ var OfflineExporting;
         // renderer for inline styles that we want to pass through. There
         // are so many styles by default in IE that we don't want to
         // blacklist them all.
-        if (H.isMS && chart.styledMode) {
+        if (H.isMS && chart.styledMode && !Exporting.inlineWhitelist.length) {
             Exporting.inlineWhitelist.push(/^blockSize/, /^border/, /^caretColor/, /^color/, /^columnRule/, /^columnRuleColor/, /^cssFloat/, /^cursor/, /^fill$/, /^fillOpacity/, /^font/, /^inlineSize/, /^length/, /^lineHeight/, /^opacity/, /^outline/, /^parentRule/, /^rx$/, /^ry$/, /^stroke/, /^textAlign/, /^textAnchor/, /^textDecoration/, /^transform/, /^vectorEffect/, /^visibility/, /^x$/, /^y$/);
         }
         // Always fall back on:
@@ -389,7 +389,7 @@ var OfflineExporting;
         sanitize = function (svg) { return chart.sanitizeSVG(svg, chartCopyOptions); }, 
         // When done with last image we have our SVG
         checkDone = function () {
-            if (images && imagesEmbedded === images.length) {
+            if (images && imagesEmbedded === imagesLength) {
                 successCallback(sanitize(chartCopyContainer.innerHTML));
             }
         }, 
@@ -400,13 +400,14 @@ var OfflineExporting;
             callbackArgs.imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'href', imageURL);
             checkDone();
         };
-        var el, i, l, chartCopyContainer, chartCopyOptions, href = null, images, imagesEmbedded = 0;
+        var el, chartCopyContainer, chartCopyOptions, href = null, images, imagesLength = 0, imagesEmbedded = 0;
         // Hook into getSVG to get a copy of the chart copy's
         // container (#8273)
         chart.unbindGetSVG = addEvent(chart, 'getSVG', function (e) {
             chartCopyOptions = e.chartCopy.options;
             chartCopyContainer = e.chartCopy.container.cloneNode(true);
             images = chartCopyContainer && chartCopyContainer.getElementsByTagName('image') || [];
+            imagesLength = images.length;
         });
         // Trigger hook to get chart copy
         chart.getSVGForExport(options, chartOptions);
@@ -418,7 +419,7 @@ var OfflineExporting;
                 return;
             }
             // Go through the images we want to embed
-            for (i = 0, l = images.length; i < l; ++i) {
+            for (var i = 0; i < images.length; i++) {
                 el = images[i];
                 href = el.getAttributeNS('http://www.w3.org/1999/xlink', 'href');
                 if (href) {
@@ -432,8 +433,9 @@ var OfflineExporting;
                     // Hidden, boosted series have blank href (#10243)
                 }
                 else {
-                    ++imagesEmbedded;
+                    imagesEmbedded++;
                     el.parentNode.removeChild(el);
+                    i--;
                     checkDone();
                 }
             }
@@ -552,10 +554,9 @@ var OfflineExporting;
             userAgent.indexOf('Chrome') < 0);
         try {
             // Safari requires data URI since it doesn't allow navigation to
-            // blob URLs. Firefox has an issue with Blobs and internal
-            // references, leading to gradients not working using Blobs (#4550).
-            // foreignObjects also dont work well in Blobs in Chrome (#14780).
-            if (!webKit && !H.isFirefox && svg.indexOf('<foreignObject') === -1) {
+            // blob URLs. ForeignObjects also dont work well in Blobs in Chrome
+            // (#14780).
+            if (!webKit && svg.indexOf('<foreignObject') === -1) {
                 return OfflineExporting.domurl.createObjectURL(new win.Blob([svg], {
                     type: 'image/svg+xml;charset-utf-16'
                 }));

package/es-modules/Extensions/OfflineExporting/OfflineExportingDefaults.js

@@ -14,7 +14,7 @@
  *
  * */
 var OfflineExportingDefaults = {
-    libURL: 'https://code.highcharts.com/9.2.0/lib/',
+    libURL: 'https://code.highcharts.com/9.3.1/lib/',
     // When offline-exporting is loaded, redefine the menu item definitions
     // related to download.
     menuItemDefinitions: {