highcharts 9.3.1 → 10.0.0

package/es-modules/Gantt/Pathfinder.js

@@ -448,7 +448,8 @@ var Pathfinder = /** @class */ (function () {
                     // For Gantt series the connect could be
                     // defined as a dependency
                     if (ganttPointOptions && ganttPointOptions.dependency) {
-                        ganttPointOptions.connect = ganttPointOptions.dependency;
+                        ganttPointOptions.connect = ganttPointOptions
+                            .dependency;
                     }
                     var to, connects = (point.options &&
                         point.options.connect &&
@@ -548,7 +549,7 @@ var Pathfinder = /** @class */ (function () {
      *
      * @function Highcharts.Pathfinder#getChartObstacles
      *
-     * @param {object} options
+     * @param {Object} options
      *        Options for the calculation. Currenlty only
      *        options.algorithmMargin.
      *
@@ -604,7 +605,7 @@ var Pathfinder = /** @class */ (function () {
      * @param {Array<object>} obstacles
      *        An array of obstacles to inspect.
      *
-     * @return {object}
+     * @return {Object}
      *         The calculated metrics, as an object with maxHeight and maxWidth
      *         properties.
      */
@@ -728,11 +729,11 @@ extend(Point.prototype, /** @lends Point.prototype */ {
      *        The radius of the marker, to calculate the additional distance to
      *        the center of the marker.
      *
-     * @param {object} anchor
+     * @param {Object} anchor
      *        The anchor point of the path and marker as an object with x/y
      *        properties.
      *
-     * @return {object}
+     * @return {Object}
      *         The marker vector as an object with x/y properties.
      */
     getMarkerVector: function (radians, markerRadius, anchor) {

package/es-modules/Gantt/PathfinderAlgorithms.js

@@ -57,7 +57,7 @@ function findLastObstacleBefore(obstacles, xMin, startIx) {
  * @private
  * @function pointWithinObstacle
  *
- * @param {object} obstacle
+ * @param {Object} obstacle
  *        Obstacle to test.
  *
  * @param {Highcharts.Point} point
@@ -128,10 +128,10 @@ function pathFromSegments(segments) {
  * @private
  * @function limitObstacleToBounds
  *
- * @param {object} obstacle
+ * @param {Object} obstacle
  *        Obstacle to limit.
  *
- * @param {object} bounds
+ * @param {Object} bounds
  *        Bounds to use as limit.
  *
  * @return {void}
@@ -154,7 +154,7 @@ function limitObstacleToBounds(obstacle, bounds) {
  * @param {Highcharts.PositionObject} end
  *        Ending coordinate, object with x/y props.
  *
- * @return {object}
+ * @return {Object}
  *         An object with the SVG path in Array form as accepted by the SVG
  *         renderer, as well as an array of new obstacles making up this
  *         path.
@@ -181,14 +181,14 @@ function straight(start, end) {
  * @param {Highcharts.PositionObject} end
  *        Ending coordinate, object with x/y props.
  *
- * @param {object} options
+ * @param {Object} options
  *        Options for the algorithm:
  *        - chartObstacles: Array of chart obstacles to avoid
  *        - startDirectionX: Optional. True if starting in the X direction.
  *          If not provided, the algorithm starts in the direction that is
  *          the furthest between start/end.
  *
- * @return {object}
+ * @return {Object}
  *         An object with the SVG path in Array form as accepted by the SVG
  *         renderer, as well as an array of new obstacles making up this
  *         path.
@@ -296,7 +296,7 @@ simpleConnect.requiresObstacles = true;
  * @param {Highcharts.PositionObject} end
  *        Ending coordinate, object with x/y props.
  *
- * @param {object} options
+ * @param {Object} options
  *        Options for the algorithm.
  *        - chartObstacles:  Array of chart obstacles to avoid
  *        - lineObstacles:   Array of line obstacles to jump over
@@ -308,7 +308,7 @@ simpleConnect.requiresObstacles = true;
  *                           direction that is the furthest between
  *                           start/end.
  *
- * @return {object}
+ * @return {Object}
  *         An object with the SVG path in Array form as accepted by the SVG
  *         renderer, as well as an array of new obstacles making up this
  *         path.
@@ -414,19 +414,19 @@ var fastAvoid = function (start, end, options) {
      * @private
      * @function
      *
-     * @param {object} obstacle
+     * @param {Object} obstacle
      *        Obstacle to dodge/escape.
      *
-     * @param {object} fromPoint
+     * @param {Object} fromPoint
      *        Point with x/y props that's dodging/escaping.
      *
-     * @param {object} toPoint
+     * @param {Object} toPoint
      *        Goal point.
      *
      * @param {boolean} dirIsX
      *        Dodge in X dimension.
      *
-     * @param {object} bounds
+     * @param {Object} bounds
      *        Hard and soft boundaries.
      *
      * @return {boolean}

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, 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
@@ -109,11 +114,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 +137,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);
 };
@@ -164,8 +204,8 @@ MapNavigation.prototype.updateEvents = function (options) {
         this.unbindMouseWheel = this.unbindMouseWheel || addEvent(chart.container, doc.onwheel !== void 0 ? 'wheel' : // Newer Firefox
             doc.onmousewheel !== void 0 ? 'mousewheel' :
                 'DOMMouseScroll', function (e) {
-            // Prevent scrolling when the pointer is over the element
-            // with that class, for example anotation popup #12100.
+            // Prevent scrolling when the pointer is over the element with
+            // that class, for example anotation popup #12100.
             if (!chart.pointer.inClass(e.target, 'highcharts-no-mousewheel')) {
                 chart.pointer.onContainerMouseWheel(e);
                 // Issue #5011, returning false from non-jQuery event does
@@ -229,6 +269,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]
@@ -253,17 +294,16 @@ extend(Chart.prototype, /** @lends Chart.prototype */ {
      *        Keep this chart position stationary if possible.
      *
      * @deprecated
-     * @return {void}
      */
     mapZoom: function (howMuch, xProjected, yProjected, chartX, chartY) {
         if (this.mapView) {
-            if (typeof howMuch === 'number') {
+            if (isNumber(howMuch)) {
                 // Compliance, mapView.zoomBy uses different values
                 howMuch = Math.log(howMuch) / Math.log(0.5);
             }
-            this.mapView.zoomBy(howMuch, typeof xProjected === 'number' && typeof yProjected === 'number' ?
+            this.mapView.zoomBy(howMuch, isNumber(xProjected) && isNumber(yProjected) ?
                 this.mapView.projection.inverse([xProjected, yProjected]) :
-                void 0, typeof chartX === 'number' && typeof chartY === 'number' ?
+                void 0, isNumber(chartX) && isNumber(chartY) ?
                 [chartX, chartY] :
                 void 0);
         }

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;
@@ -54,7 +70,8 @@ extend(Pointer.prototype, {
             }, 50);
         }
         if (totalWheelDelta < 10 && chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop) && chart.mapView) {
-            chart.mapView.zoomBy((chart.options.mapNavigation.mouseWheelSensitivity - 1) * -delta, void 0, [e.chartX, e.chartY], 
+            chart.mapView.zoomBy((chart.options.mapNavigation.mouseWheelSensitivity -
+                1) * -delta, void 0, [e.chartX, e.chartY], 
             // Delta less than 1 indicates stepless/trackpad zooming, avoid
             // animation delaying the zoom
             Math.abs(delta) < 1 ? false : void 0);

package/es-modules/Maps/MapSymbols.js

@@ -30,15 +30,35 @@ function selectiveRoundedRect(x, y, w, h, rTopLeft, rTopRight, rBottomRight, rBo
         // top side
         ['L', x + w - rTopRight, y],
         // top right corner
-        ['C', x + w - rTopRight / 2, y, x + w, y + rTopRight / 2, x + w, y + rTopRight],
+        [
+            'C',
+            x + w - rTopRight / 2,
+            y,
+            x + w,
+            y + rTopRight / 2,
+            x + w,
+            y + rTopRight
+        ],
         // right side
         ['L', x + w, y + h - rBottomRight],
         // bottom right corner
-        ['C', x + w, y + h - rBottomRight / 2, x + w - rBottomRight / 2, y + h, x + w - rBottomRight, y + h],
+        [
+            'C', x + w, y + h - rBottomRight / 2,
+            x + w - rBottomRight / 2, y + h,
+            x + w - rBottomRight, y + h
+        ],
         // bottom side
         ['L', x + rBottomLeft, y + h],
         // bottom left corner
-        ['C', x + rBottomLeft / 2, y + h, x, y + h - rBottomLeft / 2, x, y + h - rBottomLeft],
+        [
+            'C',
+            x + rBottomLeft / 2,
+            y + h,
+            x,
+            y + h - rBottomLeft / 2,
+            x,
+            y + h - rBottomLeft
+        ],
         // left side
         ['L', x, y + rTopLeft],
         // top left corner

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;