highcharts 9.2.2 → 9.3.3

package/modules/marker-clusters.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v9.2.2 (2021-08-24)
+ * @license Highcharts JS v9.3.3 (2022-02-01)
  *
  * Marker clusters module for Highcharts
  *
@@ -28,7 +28,7 @@
             obj[path] = fn.apply(null, args);
         }
     }
-    _registerModule(_modules, 'Extensions/MarkerClusters.js', [_modules['Core/Animation/AnimationUtilities.js'], _modules['Core/Chart/Chart.js'], _modules['Core/DefaultOptions.js'], _modules['Core/Color/Palette.js'], _modules['Core/Series/Point.js'], _modules['Core/Series/Series.js'], _modules['Core/Series/SeriesRegistry.js'], _modules['Core/Renderer/SVG/SVGRenderer.js'], _modules['Core/Utilities.js'], _modules['Core/Axis/Axis.js']], function (A, Chart, D, palette, Point, Series, SeriesRegistry, SVGRenderer, U, Axis) {
+    _registerModule(_modules, 'Extensions/MarkerClusters.js', [_modules['Core/Animation/AnimationUtilities.js'], _modules['Core/Chart/Chart.js'], _modules['Core/DefaultOptions.js'], _modules['Core/Series/Point.js'], _modules['Core/Series/Series.js'], _modules['Core/Series/SeriesRegistry.js'], _modules['Core/Renderer/SVG/SVGRenderer.js'], _modules['Core/Utilities.js'], _modules['Core/Axis/Axis.js']], function (A, Chart, D, Point, Series, SeriesRegistry, SVGRenderer, U, Axis) {
         /* *
          *
          *  Marker clusters module.
@@ -71,11 +71,11 @@
         ''; // detach doclets from following code
         /* eslint-disable no-invalid-this */
         var Scatter = seriesTypes.scatter,
-            baseGeneratePoints = Series.prototype.generatePoints,
-            stateIdCounter = 0, 
-            // Points that ids are included in the oldPointsStateId array
-            // are hidden before animation. Other ones are destroyed.
-            oldPointsStateId = [];
+            baseGeneratePoints = Series.prototype.generatePoints;
+        // Points that ids are included in the oldPointsStateId array
+        // are hidden before animation. Other ones are destroyed.
+        var oldPointsStateId = [],
+            stateIdCounter = 0;
         /**
          * Options for marker clusters, the concept of sampling the data
          * values into larger blocks in order to ease readability and
@@ -282,7 +282,7 @@
                     /** @internal */
                     lineWidth: 0,
                     /** @internal */
-                    lineColor: palette.backgroundColor
+                    lineColor: "#ffffff" /* backgroundColor */
                 },
                 /**
                  * Fires when the cluster point is clicked and `drillToCluster` is enabled.
@@ -401,6 +401,32 @@
             }
         });
         // 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,
@@ -521,19 +547,18 @@
         };
         Scatter.prototype.animateClusterPoint = function (clusterObj) {
             var series = this,
-                xAxis = series.xAxis,
-                yAxis = series.yAxis,
                 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,
-                parentId,
+                oldPoints = [];
+            var parentId,
                 oldPointObj,
                 newPointObj,
-                oldPoints = [],
                 newPointBBox,
                 offset = 0,
                 newX = 0,
@@ -542,8 +567,10 @@
                 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];
@@ -559,7 +586,8 @@
                         oldPointObj.point.plotY !== newPointObj.point.plotY) {
                         newPointBBox = newPointObj.point.graphic.getBBox();
                         // Marker image does not have the offset (#14342).
-                        offset = newPointObj.point.graphic && newPointObj.point.graphic.isImg ?
+                        offset = (newPointObj.point.graphic &&
+                            newPointObj.point.graphic.isImg) ?
                             0 : newPointBBox.width / 2;
                         newPointObj.point.graphic.attr({
                             x: oldPointObj.point.plotX - offset,
@@ -656,14 +684,14 @@
                 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);
             }
@@ -675,22 +703,28 @@
         Scatter.prototype.getScaledGridSize = function (options) {
             var series = this,
                 xAxis = series.xAxis,
-                search = true,
-                k = 1,
-                divider = 1,
+                mapView = this.chart.mapView,
                 processedGridSize = options.processedGridSize ||
-                    clusterDefaultOptions.layoutAlgorithm.gridSize,
-                gridSize,
-                scale,
-                level;
+                    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;
                 }
@@ -707,105 +741,97 @@
             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,
+                    mapView = chart.mapView,
                     clusterOptions = series.options.cluster,
-                    drillToCluster = (clusterOptions || {}).drillToCluster,
-                    offsetX,
-                    offsetY,
-                    sortedDataX,
-                    sortedDataY,
-                    minX,
-                    minY,
-                    maxX,
-                    maxY;
+                    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; });
         };
@@ -862,23 +888,21 @@
         };
         Scatter.prototype.markerClusterAlgorithms = {
             grid: function (dataX, dataY, dataIndexes, options) {
-                var series = this,
-                    xAxis = series.xAxis,
-                    yAxis = series.yAxis,
-                    grid = {},
-                    gridOffset = series.getGridOffset(),
-                    scaledGridSize,
-                    x,
+                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;
@@ -934,6 +958,7 @@
                 }
                 // Start kmeans iteration process.
                 while (repeat) {
+                    // eslint-disable-next-line no-loop-func
                     clusters.map(function (c) {
                         c.points.length = 0;
                         return c;
@@ -1042,10 +1067,12 @@
                         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) {
@@ -1084,8 +1111,6 @@
         };
         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],
@@ -1095,8 +1120,10 @@
                 clusterRadius = props.clusterRadius,
                 gridXPx = gridX * gridSize,
                 gridYPx = gridY * gridSize,
-                xPixel = xAxis.toPixels(props.x),
-                yPixel = yAxis.toPixels(props.y),
+                propsPx = valuesToPixels(series,
+                props),
+                xPixel = propsPx.x,
+                yPixel = propsPx.y,
                 gridsToCheckCollision = [],
                 pointsLen = 0,
                 radius = 0,
@@ -1115,9 +1142,7 @@
                 itemY,
                 nextClusterPos,
                 maxDist,
-                keys,
-                x,
-                y;
+                keys;
             // Distance to the grid start.
             xPixel -= gridOffset.plotLeft;
             yPixel -= gridOffset.plotTop;
@@ -1147,10 +1172,12 @@
                         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;
@@ -1193,11 +1220,13 @@
                     }
                 }
             });
-            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) {
@@ -1414,6 +1443,7 @@
         Scatter.prototype.generatePoints = function () {
             var series = this,
                 chart = series.chart,
+                mapView = chart.mapView,
                 xAxis = series.xAxis,
                 yAxis = series.yAxis,
                 clusterOptions = series.options.cluster,
@@ -1455,10 +1485,13 @@
                 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) {
@@ -1592,7 +1625,7 @@
                     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/modules/networkgraph.d.ts

@@ -12,6 +12,17 @@ import * as _Highcharts from "../highcharts";
  *        The imported Highcharts namespace to extend.
  */
 export function factory(highcharts: typeof Highcharts): void;
-declare module "../highcharts" {}
+declare module "../highcharts" {
+    /**
+     * Extend generatePoints by adding the nodes, which are Point objects but
+     * pushed to the this.nodes array.
+     */
+    function generatePoints(): void;
+    /**
+     * When hovering node, highlight all connected links. When hovering a link,
+     * highlight all connected nodes.
+     */
+    function setNodeState(): void;
+}
 export default factory;
 export let Highcharts: typeof _Highcharts;