highcharts 9.3.2 → 10.1.0

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

@@ -20,9 +20,11 @@ var downloadURL = DownloadURL.downloadURL;
 import Exporting from '../Exporting/Exporting.js';
 import H from '../../Core/Globals.js';
 var win = H.win, doc = H.doc;
+import HU from '../../Core/HttpUtilities.js';
+var ajax = HU.ajax;
 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;
+var addEvent = U.addEvent, error = U.error, extend = U.extend, fireEvent = U.fireEvent, pick = U.pick, 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');
 /* *
@@ -110,9 +112,82 @@ var OfflineExporting;
             '.' +
             (imageType === 'image/svg+xml' ?
                 'svg' : imageType.split('/')[1])), scale = options.scale || 1;
-        var svgurl, blob, finallyHandler, libURL = (options.libURL || defaultOptions.exporting.libURL), objectURLRevoke = true;
+        var svgurl, blob, finallyHandler, libURL = (options.libURL || defaultOptions.exporting.libURL), objectURLRevoke = true, pdfFont = options.pdfFont;
         // Allow libURL to end with or without fordward slash
         libURL = libURL.slice(-1) !== '/' ? libURL + '/' : libURL;
+        /*
+         * Detect if we need to load TTF fonts for the PDF, then load them and
+         * proceed.
+         *
+         * @private
+         */
+        var loadPdfFonts = function (svgElement, callback) {
+            var hasNonASCII = function (s) { return (
+            // eslint-disable-next-line no-control-regex
+            /[^\u0000-\u007F\u200B]+/.test(s)); };
+            // Register an event in order to add the font once jsPDF is
+            // initialized
+            var addFont = function (variant, base64) {
+                win.jspdf.jsPDF.API.events.push([
+                    'initialized',
+                    function () {
+                        this.addFileToVFS(variant, base64);
+                        this.addFont(variant, 'HighchartsFont', variant);
+                        if (!this.getFontList().HighchartsFont) {
+                            this.setFont('HighchartsFont');
+                        }
+                    }
+                ]);
+            };
+            // If there are no non-ASCII characters in the SVG, do not use
+            // bother downloading the font files
+            if (pdfFont && !hasNonASCII(svgElement.textContent || '')) {
+                pdfFont = void 0;
+            }
+            // Add new font if the URL is declared, #6417.
+            var variants = ['normal', 'italic', 'bold', 'bolditalic'];
+            // Shift the first element off the variants and add as a font.
+            // Then asynchronously trigger the next variant until calling the
+            // callback when the variants are empty.
+            var normalBase64;
+            var shiftAndLoadVariant = function () {
+                var variant = variants.shift();
+                // All variants shifted and possibly loaded, proceed
+                if (!variant) {
+                    return callback();
+                }
+                var url = pdfFont && pdfFont[variant];
+                if (url) {
+                    ajax({
+                        url: url,
+                        responseType: 'blob',
+                        success: function (data, xhr) {
+                            var reader = new FileReader();
+                            reader.onloadend = function () {
+                                if (typeof this.result === 'string') {
+                                    var base64 = this.result.split(',')[1];
+                                    addFont(variant, base64);
+                                    if (variant === 'normal') {
+                                        normalBase64 = base64;
+                                    }
+                                }
+                                shiftAndLoadVariant();
+                            };
+                            reader.readAsDataURL(xhr.response);
+                        },
+                        error: shiftAndLoadVariant
+                    });
+                }
+                else {
+                    // For other variants, fall back to normal text weight/style
+                    if (normalBase64) {
+                        addFont(variant, normalBase64);
+                    }
+                    shiftAndLoadVariant();
+                }
+            };
+            shiftAndLoadVariant();
+        };
         /*
          * @private
          */
@@ -137,13 +212,17 @@ var OfflineExporting;
             // Workaround for the text styling. Making sure it does pick up
             // settings for parent elements.
             [].forEach.call(textElements, function (el) {
-                // Workaround for the text styling. making sure it does pick up@
+                // Workaround for the text styling. making sure it does pick up
                 // the root element
                 ['font-family', 'font-size'].forEach(function (property) {
                     setStylePropertyFromParents(el, property);
                 });
-                el.style['font-family'] = (el.style['font-family'] &&
-                    el.style['font-family'].split(' ').splice(-1));
+                el.style.fontFamily = pdfFont && pdfFont.normal ?
+                    // Custom PDF font
+                    'HighchartsFont' :
+                    // Generic font (serif, sans-serif etc)
+                    String(el.style.fontFamily &&
+                        el.style.fontFamily.split(' ').splice(-1));
                 // Workaround for plotband with width, removing title from text
                 // nodes
                 titleElements = el.getElementsByTagName('title');
@@ -151,15 +230,21 @@ var OfflineExporting;
                     el.removeChild(titleElement);
                 });
             });
-            var svgData = svgToPdf(dummySVGContainer.firstChild, 0);
-            try {
-                downloadURL(svgData, filename);
-                if (successCallback) {
-                    successCallback();
-                }
-            }
-            catch (e) {
-                failCallback(e);
+            var svgNode = dummySVGContainer.querySelector('svg');
+            if (svgNode) {
+                loadPdfFonts(svgNode, function () {
+                    svgToPdf(svgNode, 0, function (pdfData) {
+                        try {
+                            downloadURL(pdfData, filename);
+                            if (successCallback) {
+                                successCallback();
+                            }
+                        }
+                        catch (e) {
+                            failCallback(e);
+                        }
+                    });
+                });
             }
         };
         // Initiate download depending on file type
@@ -185,7 +270,7 @@ var OfflineExporting;
             }
         }
         else if (imageType === 'application/pdf') {
-            if (win.jsPDF && win.svg2pdf) {
+            if (win.jspdf && win.jspdf.jsPDF) {
                 downloadPDF();
             }
             else {
@@ -194,9 +279,7 @@ var OfflineExporting;
                 // solution would be nice, but this will do for now.
                 objectURLRevoke = true;
                 getScript(libURL + 'jspdf.js', function () {
-                    getScript(libURL + 'svg2pdf.js', function () {
-                        downloadPDF();
-                    });
+                    getScript(libURL + 'svg2pdf.js', downloadPDF);
                 });
             }
         }
@@ -571,8 +654,8 @@ var OfflineExporting;
     /**
      * @private
      */
-    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
+    function svgToPdf(svgElement, margin, callback) {
+        var width = Number(svgElement.getAttribute('width')) + 2 * margin, height = Number(svgElement.getAttribute('height')) + 2 * margin, pdfDoc = new win.jspdf.jsPDF(// eslint-disable-line new-cap
         // 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
@@ -604,8 +687,13 @@ var OfflineExporting;
                 tspan.setAttribute('dx', -5);
             }
         });
-        win.svg2pdf(svgElement, pdf, { removeInvalid: true });
-        return pdf.output('datauristring');
+        pdfDoc.svg(svgElement, {
+            x: 0,
+            y: 0,
+            width: width,
+            height: height,
+            removeInvalid: true
+        }).then(function () { return callback(pdfDoc.output('datauristring')); });
     }
     OfflineExporting.svgToPdf = svgToPdf;
 })(OfflineExporting || (OfflineExporting = {}));

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

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

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

@@ -36,7 +36,7 @@ var VMLRenderer, VMLElement;
  * @apioption global.VMLRadialGradientURL
  */
 getOptions().global.VMLRadialGradientURL =
-    'http://code.highcharts.com/9.3.2/gfx/vml-radial-gradient.png';
+    'http://code.highcharts.com/10.1.0/gfx/vml-radial-gradient.png';
 // Utilites
 if (doc && !doc.defaultView) {
     H.getStyle = U.getStyle = function getStyle(el, prop) {

package/es-modules/Extensions/OverlappingDataLabels.js

@@ -34,9 +34,7 @@ addEvent(Chart, 'render', function collectAndHide() {
             !yAxis.options.stackLabels.allowOverlap) {
             objectEach(yAxis.stacking.stacks, function (stack) {
                 objectEach(stack, function (stackItem) {
-                    if (stackItem.label &&
-                        stackItem.label.visibility !== 'hidden' // #15607
-                    ) {
+                    if (stackItem.label) {
                         labels.push(stackItem.label);
                     }
                 });
@@ -162,7 +160,10 @@ Chart.prototype.hideOverlappingLabels = function (labels) {
                 box2 &&
                 label1 !== label2 && // #6465, polar chart with connectEnds
                 label1.newOpacity !== 0 &&
-                label2.newOpacity !== 0) {
+                label2.newOpacity !== 0 &&
+                // #15863 dataLabels are no longer hidden by translation
+                label1.visibility !== 'hidden' &&
+                label2.visibility !== 'hidden') {
                 if (isIntersectRect(box1, box2)) {
                     (label1.labelrank < label2.labelrank ? label1 : label2)
                         .newOpacity = 0;

package/es-modules/Extensions/Polar.js

@@ -652,7 +652,10 @@ if (seriesTypes.column) {
             // visible y range
             if (this.isRadialBar && point.shapeArgs &&
                 point.shapeArgs.start === point.shapeArgs.end) {
-                dataLabel.hide(true);
+                dataLabel.hide();
+            }
+            else {
+                dataLabel.show();
             }
         }
         else {

package/es-modules/Extensions/ScrollablePlotArea.js

@@ -227,7 +227,7 @@ Chart.prototype.applyFixed = function () {
             .addClass('highcharts-scrollable-mask')
             .add();
         addEvent(this, 'afterShowResetZoom', this.moveFixedElements);
-        addEvent(this, 'afterDrilldown', this.moveFixedElements);
+        addEvent(this, 'afterApplyDrilldown', this.moveFixedElements);
         addEvent(this, 'afterLayOutTitles', this.moveFixedElements);
     }
     else {
@@ -348,6 +348,7 @@ addEvent(Series, 'show', function () {
  * area will become scrollable.
  *
  * @type      {number}
+ * @since     7.1.2
  * @apioption chart.scrollablePlotArea.minHeight
  */
 /**
@@ -355,6 +356,7 @@ addEvent(Series, 'show', function () {
  * area will become scrollable.
  *
  * @type      {number}
+ * @since     6.1.0
  * @apioption chart.scrollablePlotArea.minWidth
  */
 /**
@@ -363,6 +365,7 @@ addEvent(Series, 'show', function () {
  * Typically we would use 1 if the chart has right aligned Y axes.
  *
  * @type      {number}
+ * @since     6.1.0
  * @apioption chart.scrollablePlotArea.scrollPositionX
  */
 /**
@@ -370,6 +373,7 @@ addEvent(Series, 'show', function () {
  * 1, where 0 aligns the plot area to the top and 1 aligns it to the bottom.
  *
  * @type      {number}
+ * @since     7.1.2
  * @apioption chart.scrollablePlotArea.scrollPositionY
  */
 /**

package/es-modules/Extensions/Stacking.js

@@ -179,7 +179,7 @@ var StackItem = /** @class */ (function () {
             }
             else {
                 // Move label away to avoid the overlapping issues
-                label.alignAttr.y = -9999;
+                label.hide();
                 isJustify = false;
             }
             if (isJustify) {
@@ -453,11 +453,12 @@ Series.prototype.getStackIndicator = function (stackIndicator, x, index, key) {
     // changed:
     if (!defined(stackIndicator) ||
         stackIndicator.x !== x ||
-        (key && stackIndicator.key !== key)) {
+        (key && stackIndicator.stackKey !== key)) {
         stackIndicator = {
             x: x,
             index: 0,
-            key: key
+            key: key,
+            stackKey: key
         };
     }
     else {

package/es-modules/Extensions/Themes/HighContrastDark.js

@@ -31,16 +31,16 @@ var HighContrastDarkTheme;
     var textBright = '#F0F0F3';
     HighContrastDarkTheme.options = {
         colors: [
-            '#a6f0ff',
-            '#70d49e',
-            '#e898a5',
-            '#007faa',
-            '#f9db72',
-            '#f45b5b',
-            '#1e824c',
-            '#e7934c',
-            '#dadfe1',
-            '#a0618b'
+            '#67B9EE',
+            '#CEEDA5',
+            '#9F6AE1',
+            '#FEA26E',
+            '#6BA48F',
+            '#EA3535',
+            '#8D96B7',
+            '#ECCA15',
+            '#20AA09',
+            '#E0C3E4'
         ],
         chart: {
             backgroundColor: '#1f1f20',

package/es-modules/Extensions/Themes/HighContrastLight.js

@@ -30,16 +30,16 @@ var HighContrastLightTheme;
      * */
     HighContrastLightTheme.options = {
         colors: [
-            '#5f98cf',
-            '#434348',
-            '#49a65e',
-            '#f45b5b',
-            '#708090',
-            '#b68c51',
-            '#397550',
-            '#c0493d',
-            '#4f4a7a',
-            '#b381b3'
+            '#265FB5',
+            '#222',
+            '#698F01',
+            '#F4693E',
+            '#4C0684',
+            '#0FA388',
+            '#B7104A',
+            '#AF9023',
+            '#1A704C',
+            '#B02FDD'
         ],
         navigator: {
             series: {

package/es-modules/Maps/MapNavigation.js

@@ -12,7 +12,7 @@ import Chart from '../Core/Chart/Chart.js';
 import H from '../Core/Globals.js';
 var doc = H.doc;
 import U from '../Core/Utilities.js';
-var addEvent = U.addEvent, extend = U.extend, isNumber = U.isNumber, merge = U.merge, objectEach = U.objectEach, pick = U.pick;
+var addEvent = U.addEvent, defined = U.defined, extend = U.extend, isNumber = U.isNumber, merge = U.merge, objectEach = U.objectEach, pick = U.pick;
 import './MapNavigationOptionsDefault.js';
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
@@ -41,6 +41,7 @@ function stopEvent(e) {
  *        The Chart instance.
  */
 function MapNavigation(chart) {
+    this.navButtons = [];
     this.init(chart);
 }
 /**
@@ -55,7 +56,6 @@ function MapNavigation(chart) {
  */
 MapNavigation.prototype.init = function (chart) {
     this.chart = chart;
-    chart.mapNavButtons = [];
 };
 /**
  * Update the map navigation with new options. Calling this is the same as
@@ -69,10 +69,10 @@ MapNavigation.prototype.init = function (chart) {
  * @return {void}
  */
 MapNavigation.prototype.update = function (options) {
-    var chart = this.chart, o = chart.options.mapNavigation, attr, states, hoverStates, selectStates, outerHandler = function (e) {
+    var mapNav = this, chart = this.chart, o = chart.options.mapNavigation, attr, states, hoverStates, selectStates, outerHandler = function (e) {
         this.handler.call(chart, e);
         stopEvent(e); // Stop default click event (#4444)
-    }, mapNavButtons = chart.mapNavButtons;
+    }, navButtons = mapNav.navButtons;
     // Merge in new options in case of update, and register back to chart
     // options.
     if (options) {
@@ -80,10 +80,15 @@ MapNavigation.prototype.update = function (options) {
             merge(chart.options.mapNavigation, options);
     }
     // Destroy buttons in case of dynamic update
-    while (mapNavButtons.length) {
-        mapNavButtons.pop().destroy();
+    while (navButtons.length) {
+        navButtons.pop().destroy();
     }
     if (pick(o.enableButtons, o.enabled) && !chart.renderer.forExport) {
+        if (!mapNav.navButtonsGroup) {
+            mapNav.navButtonsGroup = chart.renderer.g().attr({
+                zIndex: 4 // #4955, // #8392
+            }).add();
+        }
         objectEach(o.buttons, function (buttonOptions, n) {
             buttonOptions = merge(o.buttonOptions, buttonOptions);
             // Presentational
@@ -91,13 +96,9 @@ MapNavigation.prototype.update = function (options) {
                 attr = buttonOptions.theme;
                 attr.style = merge(buttonOptions.theme.style, buttonOptions.style // #3203
                 );
-                states = attr.states;
-                hoverStates = states && states.hover;
-                selectStates = states && states.select;
-                delete attr.states;
             }
             var button = chart.renderer
-                .button(buttonOptions.text || '', 0, 0, outerHandler, attr, hoverStates, selectStates, void 0, n === 'zoomIn' ? 'topbutton' : 'bottombutton')
+                .button(buttonOptions.text || '', 0, 0, outerHandler, attr, void 0, void 0, void 0, n === 'zoomIn' ? 'topbutton' : 'bottombutton')
                 .addClass('highcharts-map-navigation highcharts-' + {
                 zoomIn: 'zoom-in',
                 zoomOut: 'zoom-out'
@@ -109,11 +110,11 @@ MapNavigation.prototype.update = function (options) {
                 padding: buttonOptions.padding,
                 zIndex: 5
             })
-                .add();
+                .add(mapNav.navButtonsGroup);
             button.handler = buttonOptions.onclick;
             // Stop double click event (#4444)
             addEvent(button.element, 'dblclick', stopEvent);
-            mapNavButtons.push(button);
+            navButtons.push(button);
             extend(buttonOptions, {
                 width: button.width,
                 height: 2 * button.height
@@ -132,6 +133,41 @@ MapNavigation.prototype.update = function (options) {
                 button.align(buttonOptions, false, buttonOptions.alignTo);
             }
         });
+        // Borrowed from overlapping-datalabels. Consider a shared module.
+        var isIntersectRect_1 = function (box1, box2) { return !(box2.x >= box1.x + box1.width ||
+            box2.x + box2.width <= box1.x ||
+            box2.y >= box1.y + box1.height ||
+            box2.y + box2.height <= box1.y); };
+        // Check the mapNavigation buttons collision with exporting button
+        // and translate the mapNavigation button if they overlap.
+        var adjustMapNavBtn = function () {
+            var expBtnBBox = chart.exportingGroup && chart.exportingGroup.getBBox();
+            if (expBtnBBox) {
+                var navBtnsBBox = mapNav.navButtonsGroup.getBBox();
+                // If buttons overlap
+                if (isIntersectRect_1(expBtnBBox, navBtnsBBox)) {
+                    // Adjust the mapNav buttons' position by translating them
+                    // above or below the exporting button
+                    var aboveExpBtn = -navBtnsBBox.y - navBtnsBBox.height +
+                        expBtnBBox.y - 5, belowExpBtn = expBtnBBox.y + expBtnBBox.height -
+                        navBtnsBBox.y + 5, mapNavVerticalAlign = o.buttonOptions && o.buttonOptions.verticalAlign;
+                    // If bottom aligned and adjusting the mapNav button would
+                    // translate it out of the plotBox, translate it up
+                    // instead of down
+                    mapNav.navButtonsGroup.attr({
+                        translateY: mapNavVerticalAlign === 'bottom' ?
+                            aboveExpBtn :
+                            belowExpBtn
+                    });
+                }
+            }
+        };
+        if (!chart.hasLoaded) {
+            // Align it after the plotBox is known (#12776) and after the
+            // hamburger button's position is known so they don't overlap
+            // (#15782)
+            addEvent(chart, 'render', adjustMapNavBtn);
+        }
     }
     this.updateEvents(o);
 };
@@ -229,6 +265,7 @@ extend(Chart.prototype, /** @lends Chart.prototype */ {
      *
      * Deprecated as of v9.3 in favor of [MapView.zoomBy](https://api.highcharts.com/class-reference/Highcharts.MapView#zoomBy).
      *
+     * @deprecated
      * @function Highcharts.Chart#mapZoom
      *
      * @param {number} [howMuch]

package/es-modules/Maps/MapPointer.js

@@ -12,10 +12,26 @@ import Pointer from '../Core/Pointer.js';
 import U from '../Core/Utilities.js';
 var defined = U.defined, extend = U.extend, pick = U.pick, wrap = U.wrap;
 /* eslint-disable no-invalid-this */
+var normalize = Pointer.prototype.normalize;
 var totalWheelDelta = 0;
 var totalWheelDeltaTimer;
 // Extend the Pointer
 extend(Pointer.prototype, {
+    // Add lon and lat information to pointer events
+    normalize: function (e, chartPosition) {
+        var chart = this.chart;
+        e = normalize.call(this, e, chartPosition);
+        if (chart && chart.mapView) {
+            var lonLat = chart.mapView.pixelsToLonLat({
+                x: e.chartX - chart.plotLeft,
+                y: e.chartY - chart.plotTop
+            });
+            if (lonLat) {
+                extend(e, lonLat);
+            }
+        }
+        return e;
+    },
     // The event handler for the doubleclick event
     onContainerDblClick: function (e) {
         var chart = this.chart;

package/es-modules/Maps/MapUtilities.js

@@ -0,0 +1,56 @@
+/* *
+ *
+ *  (c) 2010-2021 Torstein Honsi
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ * */
+'use strict';
+// Compute bounds from a path element
+var boundsFromPath = function (path) {
+    var x2 = -Number.MAX_VALUE, x1 = Number.MAX_VALUE, y2 = -Number.MAX_VALUE, y1 = Number.MAX_VALUE, validBounds;
+    path.forEach(function (seg) {
+        var x = seg[seg.length - 2], y = seg[seg.length - 1];
+        if (typeof x === 'number' &&
+            typeof y === 'number') {
+            x1 = Math.min(x1, x);
+            x2 = Math.max(x2, x);
+            y1 = Math.min(y1, y);
+            y2 = Math.max(y2, y);
+            validBounds = true;
+        }
+    });
+    if (validBounds) {
+        return { x1: x1, y1: y1, x2: x2, y2: y2 };
+    }
+};
+/**
+ * Test for point in polygon. Polygon defined as array of [x,y] points.
+ * @private
+ */
+var pointInPolygon = function (point, polygon) {
+    var i, j, rel1, rel2, c = false, x = point.x, y = point.y;
+    for (i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+        rel1 = polygon[i][1] > y;
+        rel2 = polygon[j][1] > y;
+        if (rel1 !== rel2 &&
+            (x < (polygon[j][0] - polygon[i][0]) * (y - polygon[i][1]) /
+                (polygon[j][1] - polygon[i][1]) +
+                polygon[i][0])) {
+            c = !c;
+        }
+    }
+    return c;
+};
+/* *
+ *
+ *  Default Export
+ *
+ * */
+var MapUtilities = {
+    boundsFromPath: boundsFromPath,
+    pointInPolygon: pointInPolygon
+};
+export default MapUtilities;