highcharts 9.2.2 → 9.3.3

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, 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 */
 /**
@@ -164,8 +164,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
@@ -223,9 +223,11 @@ extend(Chart.prototype, /** @lends Chart.prototype */ {
         return inner;
     },
     /**
-     * Highmaps only. Zoom in or out of the map. See also {@link Point#zoomTo}.
-     * See {@link Chart#fromLatLonToPoint} for how to get the `centerX` and
-     * `centerY` parameters for a geographic location.
+     * Highcharts Maps only. Zoom in or out of the map. See also
+     * {@link Point#zoomTo}. See {@link Chart#fromLatLonToPoint} for how to get
+     * the `centerX` and `centerY` parameters for a geographic location.
+     *
+     * Deprecated as of v9.3 in favor of [MapView.zoomBy](https://api.highcharts.com/class-reference/Highcharts.MapView#zoomBy).
      *
      * @function Highcharts.Chart#mapZoom
      *
@@ -234,76 +236,36 @@ extend(Chart.prototype, /** @lends Chart.prototype */ {
      *        in to half the current view. 2 zooms to twice the current view. If
      *        omitted, the zoom is reset.
      *
-     * @param {number} [centerX]
-     *        The X axis position to center around if available space.
+     * @param {number} [xProjected]
+     *        The projected x position to keep stationary when zooming, if
+     *        available space.
      *
-     * @param {number} [centerY]
-     *        The Y axis position to center around if available space.
+     * @param {number} [yProjected]
+     *        The projected y position to keep stationary when zooming, if
+     *        available space.
      *
-     * @param {number} [mouseX]
-     *        Fix the zoom to this position if possible. This is used for
+     * @param {number} [chartX]
+     *        Keep this chart position stationary if possible. This is used for
      *        example in mousewheel events, where the area under the mouse
      *        should be fixed as we zoom in.
      *
-     * @param {number} [mouseY]
-     *        Fix the zoom to this position if possible.
+     * @param {number} [chartY]
+     *        Keep this chart position stationary if possible.
      *
-     * @return {void}
+     * @deprecated
      */
-    mapZoom: function (howMuch, centerXArg, centerYArg, mouseX, mouseY, animation) {
-        var chart = this, xAxis = chart.xAxis[0], xRange = xAxis.max - xAxis.min, centerX = pick(centerXArg, xAxis.min + xRange / 2), newXRange = xRange * howMuch, yAxis = chart.yAxis[0], yRange = yAxis.max - yAxis.min, centerY = pick(centerYArg, yAxis.min + yRange / 2), newYRange = yRange * howMuch, fixToX = mouseX ? ((mouseX - xAxis.pos) / xAxis.len) : 0.5, fixToY = mouseY ? ((mouseY - yAxis.pos) / yAxis.len) : 0.5, newXMin = centerX - newXRange * fixToX, newYMin = centerY - newYRange * fixToY, newExt = chart.fitToBox({
-            x: newXMin,
-            y: newYMin,
-            width: newXRange,
-            height: newYRange
-        }, {
-            x: xAxis.dataMin,
-            y: yAxis.dataMin,
-            width: xAxis.dataMax - xAxis.dataMin,
-            height: yAxis.dataMax - yAxis.dataMin
-        }), zoomOut = (newExt.x <= xAxis.dataMin &&
-            newExt.width >=
-                xAxis.dataMax - xAxis.dataMin &&
-            newExt.y <= yAxis.dataMin &&
-            newExt.height >= yAxis.dataMax - yAxis.dataMin);
-        // When mousewheel zooming, fix the point under the mouse
-        if (mouseX && xAxis.mapAxis) {
-            xAxis.mapAxis.fixTo = [mouseX - xAxis.pos, centerXArg];
-        }
-        if (mouseY && yAxis.mapAxis) {
-            yAxis.mapAxis.fixTo = [mouseY - yAxis.pos, centerYArg];
-        }
-        // Zoom
-        if (typeof howMuch !== 'undefined' && !zoomOut) {
-            xAxis.setExtremes(newExt.x, newExt.x + newExt.width, false);
-            yAxis.setExtremes(newExt.y, newExt.y + newExt.height, false);
-            // Reset zoom
-        }
-        else {
-            xAxis.setExtremes(void 0, void 0, false);
-            yAxis.setExtremes(void 0, void 0, false);
-        }
-        // Prevent zooming until this one is finished animating
-        /*
-        chart.holdMapZoom = true;
-        setTimeout(function () {
-            chart.holdMapZoom = false;
-        }, 200);
-        */
-        /*
-        delay = animation ? animation.duration || 500 : 0;
-        if (delay) {
-            chart.isMapZooming = true;
-            setTimeout(function () {
-                chart.isMapZooming = false;
-                if (chart.mapZoomQueue) {
-                    chart.mapZoom.apply(chart, chart.mapZoomQueue);
-                }
-                chart.mapZoomQueue = null;
-            }, delay);
+    mapZoom: function (howMuch, xProjected, yProjected, chartX, chartY) {
+        if (this.mapView) {
+            if (isNumber(howMuch)) {
+                // Compliance, mapView.zoomBy uses different values
+                howMuch = Math.log(howMuch) / Math.log(0.5);
+            }
+            this.mapView.zoomBy(howMuch, isNumber(xProjected) && isNumber(yProjected) ?
+                this.mapView.projection.inverse([xProjected, yProjected]) :
+                void 0, isNumber(chartX) && isNumber(chartY) ?
+                [chartX, chartY] :
+                void 0);
         }
-        */
-        chart.redraw(animation);
     }
 });
 // Extend the Chart.render method to add zooming and panning

package/es-modules/Maps/MapNavigationOptionsDefault.js

@@ -17,6 +17,9 @@ var extend = U.extend;
  *
  * */
 /**
+ * The `mapNavigation` option handles buttons for navigation in addition to
+ * mousewheel and doubleclick handlers for map zooming.
+ *
  * @product      highmaps
  * @optionparent mapNavigation
  */

package/es-modules/Maps/MapPointer.js

@@ -10,7 +10,7 @@
 'use strict';
 import Pointer from '../Core/Pointer.js';
 import U from '../Core/Utilities.js';
-var extend = U.extend, pick = U.pick, wrap = U.wrap;
+var defined = U.defined, extend = U.extend, pick = U.pick, wrap = U.wrap;
 /* eslint-disable no-invalid-this */
 var totalWheelDelta = 0;
 var totalWheelDeltaTimer;
@@ -27,7 +27,7 @@ extend(Pointer.prototype, {
             }
         }
         else if (chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) {
-            chart.mapZoom(0.5, chart.xAxis[0].toValue(e.chartX), chart.yAxis[0].toValue(e.chartY), e.chartX, e.chartY);
+            chart.mapZoom(0.5, void 0, void 0, e.chartX, e.chartY);
         }
     },
     // The event handler for the mouse scroll event
@@ -35,7 +35,9 @@ extend(Pointer.prototype, {
         var chart = this.chart;
         e = this.normalize(e);
         // Firefox uses e.deltaY or e.detail, WebKit and IE uses wheelDelta
-        var delta = e.deltaY || e.detail || -(e.wheelDelta / 120);
+        // try wheelDelta first #15656
+        var delta = (defined(e.wheelDelta) && -e.wheelDelta / 120) ||
+            e.deltaY || e.detail;
         // Wheel zooming on trackpads have different behaviours in Firefox vs
         // WebKit. In Firefox the delta increments in steps by 1, so it is not
         // distinguishable from true mouse wheel. Therefore we use this timer
@@ -51,8 +53,9 @@ extend(Pointer.prototype, {
                 totalWheelDelta = 0;
             }, 50);
         }
-        if (totalWheelDelta < 10 && chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) {
-            chart.mapZoom(Math.pow(chart.options.mapNavigation.mouseWheelSensitivity, delta), chart.xAxis[0].toValue(e.chartX), chart.yAxis[0].toValue(e.chartY), e.chartX, e.chartY, 
+        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], 
             // 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