highcharts 9.2.2 → 9.3.3

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];
@@ -475,7 +496,8 @@ Scatter.prototype.animateClusterPoint = function (clusterObj) {
                 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,
@@ -567,14 +589,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 +606,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 +640,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 +745,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;
@@ -776,6 +793,7 @@ Scatter.prototype.markerClusterAlgorithms = {
         }
         // Start kmeans iteration process.
         while (repeat) {
+            // eslint-disable-next-line no-loop-func
             clusters.map(function (c) {
                 c.points.length = 0;
                 return c;
@@ -875,10 +893,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 +933,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 +963,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 +1011,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 +1209,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 +1227,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 +1361,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/Math3D.js

@@ -85,7 +85,8 @@ function rotate3D(x, y, z, angles) {
  * @requires highcharts-3d
  */
 function perspective3D(coordinate, origin, distance) {
-    var projection = ((distance > 0) && (distance < Number.POSITIVE_INFINITY)) ?
+    var projection = ((distance > 0) &&
+        (distance < Number.POSITIVE_INFINITY)) ?
         distance / (coordinate.z + origin.z + distance) :
         1;
     return {
@@ -119,9 +120,8 @@ H.perspective3D = perspective3D;
  */
 function perspective(points, chart, insidePlotArea, useInvertedPersp) {
     var options3d = chart.options.chart.options3d, 
-    /* The useInvertedPersp argument is used for
-     * inverted charts with already inverted elements,
-     * such as dataLabels or tooltip positions.
+    /* The useInvertedPersp argument is used for inverted charts with
+     * already inverted elements, such as dataLabels or tooltip positions.
      */
     inverted = pick(useInvertedPersp, insidePlotArea ? chart.inverted : false), origin = {
         x: chart.plotWidth / 2,

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

@@ -11,6 +11,7 @@
  * */
 /* global MSBlobBuilder */
 'use strict';
+import AST from '../../Core/Renderer/HTML/AST.js';
 import Chart from '../../Core/Chart/Chart.js';
 import D from '../../Core/DefaultOptions.js';
 var defaultOptions = D.defaultOptions;
@@ -22,6 +23,8 @@ var win = H.win, doc = H.doc;
 import OfflineExportingDefaults from './OfflineExportingDefaults.js';
 import U from '../../Core/Utilities.js';
 var addEvent = U.addEvent, error = U.error, extend = U.extend, fireEvent = U.fireEvent, merge = U.merge;
+AST.allowedAttributes.push('data-z-index', 'fill-opacity', 'rx', 'ry', 'stroke-dasharray', 'stroke-linejoin', 'text-anchor', 'transform', 'version', 'viewBox', 'visibility', 'xmlns', 'xmlns:xlink');
+AST.allowedTags.push('desc', 'clippath', 'g');
 /* *
  *
  * Constants
@@ -101,21 +104,20 @@ var OfflineExporting;
      * @param {Function} [successCallback]
      * The callback function in case of success
      *
-     * @return {void}
      */
     function downloadSVGLocal(svg, options, failCallback, successCallback) {
         var dummySVGContainer = doc.createElement('div'), imageType = options.type || 'image/png', filename = ((options.filename || 'chart') +
             '.' +
-            (imageType === 'image/svg+xml' ? 'svg' : imageType.split('/')[1])), scale = options.scale || 1;
+            (imageType === 'image/svg+xml' ?
+                'svg' : imageType.split('/')[1])), scale = options.scale || 1;
         var svgurl, blob, finallyHandler, libURL = (options.libURL || defaultOptions.exporting.libURL), objectURLRevoke = true;
         // Allow libURL to end with or without fordward slash
         libURL = libURL.slice(-1) !== '/' ? libURL + '/' : libURL;
-        /**
+        /*
          * @private
-         * @return {void}
          */
         var downloadPDF = function () {
-            dummySVGContainer.innerHTML = svg;
+            AST.setElementHTML(dummySVGContainer, svg);
             var textElements = dummySVGContainer.getElementsByTagName('text'), 
             // Copy style property to element from parents if it's not
             // there. Searches up hierarchy until it finds prop, or hits the
@@ -288,9 +290,9 @@ var OfflineExporting;
      *         a different background color can be added here, or
      *         `dataLabels` for export only.
      *
-     * @return {void}
      *
      * @requires modules/exporting
+     * @requires modules/offline-exporting
      */
     function exportChartLocal(exportingOptions, chartOptions) {
         var chart = this, options = merge(chart.options.exporting, exportingOptions), fallbackToExportServer = function (err) {
@@ -312,27 +314,26 @@ var OfflineExporting;
             if (svg.indexOf('<foreignObject') > -1 &&
                 options.type !== 'image/svg+xml' &&
                 (H.isMS || options.type === 'application/pdf')) {
-                fallbackToExportServer('Image type not supported' +
-                    'for charts with embedded HTML');
+                fallbackToExportServer(new Error('Image type not supported for charts with embedded HTML'));
             }
             else {
                 OfflineExporting.downloadSVGLocal(svg, extend({ filename: chart.getFilename() }, options), fallbackToExportServer, function () { return fireEvent(chart, 'exportChartLocalSuccess'); });
             }
         }, 
-        // Return true if the SVG contains images with external data.
-        // With the boost module there are `image` elements with encoded
-        // PNGs, these are supported by svg2pdf and should
-        // pass (#10243).
+        // Return true if the SVG contains images with external data. With
+        // the boost module there are `image` elements with encoded PNGs,
+        // these are supported by svg2pdf and should pass (#10243).
         hasExternalImages = function () {
             return [].some.call(chart.container.getElementsByTagName('image'), function (image) {
                 var href = image.getAttribute('href');
-                return href !== '' && href.indexOf('data:') !== 0;
+                return (href !== '' &&
+                    typeof href === 'string' &&
+                    href.indexOf('data:') !== 0);
             });
         };
-        // If we are on IE and in styled mode, add a whitelist to the
-        // 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 we are on IE and in styled mode, add a whitelist to the 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 && !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$/);
         }
@@ -344,7 +345,7 @@ var OfflineExporting;
                 chart.container.getElementsByTagName('image').length &&
                     options.type !== 'image/svg+xml')) || (options.type === 'application/pdf' &&
             hasExternalImages())) {
-            fallbackToExportServer('Image type not supported for this chart/browser.');
+            fallbackToExportServer(new Error('Image type not supported for this chart/browser.'));
             return;
         }
         chart.getSVGForLocalExport(options, chartOptions || {}, fallbackToExportServer, svgSuccess);
@@ -380,7 +381,6 @@ var OfflineExporting;
      * @param {Highcharts.Options} chartOptions
      * @param {Function} failCallback
      * @param {Function} successCallback
-     * @return {void}
      */
     function getSVGForLocalExport(options, chartOptions, failCallback, successCallback) {
         var chart = this, 
@@ -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,15 @@ 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') || [];
+            images = chartCopyContainer && chartCopyContainer
+                .getElementsByTagName('image') || [];
+            imagesLength = images.length;
         });
         // Trigger hook to get chart copy
         chart.getSVGForExport(options, chartOptions);
@@ -418,7 +420,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 +434,9 @@ var OfflineExporting;
                     // Hidden, boosted series have blank href (#10243)
                 }
                 else {
-                    ++imagesEmbedded;
+                    imagesEmbedded++;
                     el.parentNode.removeChild(el);
+                    i--;
                     checkDone();
                 }
             }
@@ -542,8 +545,6 @@ var OfflineExporting;
      *
      * @private
      * @function Highcharts.svgToDataURL
-     * @param {string} svg
-     * @return {string}
      */
     function svgToDataUrl(svg) {
         // Webkit and not chrome
@@ -552,10 +553,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'
                 }));
@@ -573,8 +573,8 @@ var OfflineExporting;
      */
     function svgToPdf(svgElement, margin) {
         var width = svgElement.width.baseVal.value + 2 * margin, height = svgElement.height.baseVal.value + 2 * margin, pdf = new win.jsPDF(// eslint-disable-line new-cap
-        height > width ? 'p' : 'l', // setting orientation to portrait if height exceeds width
-        'pt', [width, height]);
+        // setting orientation to portrait if height exceeds width
+        height > width ? 'p' : 'l', 'pt', [width, height]);
         // Workaround for #7090, hidden elements were drawn anyway. It comes
         // down to https://github.com/yWorks/svg2pdf.js/issues/28. Check this
         // later.

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

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