highcharts 10.0.0 → 10.2.1

package/modules/series-label.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v10.0.0 (2022-03-07)
+ * @license Highcharts JS v10.2.1 (2022-08-29)
  *
  * (c) 2009-2021 Torstein Honsi
  *
@@ -35,7 +35,7 @@
             }
         }
     }
-    _registerModule(_modules, 'Extensions/SeriesLabel.js', [_modules['Core/Animation/AnimationUtilities.js'], _modules['Core/Chart/Chart.js'], _modules['Core/FormatUtilities.js'], _modules['Core/DefaultOptions.js'], _modules['Core/Series/Series.js'], _modules['Core/Renderer/SVG/SVGRenderer.js'], _modules['Core/Utilities.js']], function (A, Chart, F, D, Series, SVGRenderer, U) {
+    _registerModule(_modules, 'Extensions/SeriesLabel/SeriesLabelDefaults.js', [], function () {
         /* *
          *
          *  (c) 2009-2021 Torstein Honsi
@@ -45,162 +45,149 @@
          *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
          *
          * */
-        var animObject = A.animObject;
-        var format = F.format;
-        var setOptions = D.setOptions;
-        var symbols = SVGRenderer.prototype.symbols;
-        var addEvent = U.addEvent,
-            extend = U.extend,
-            fireEvent = U.fireEvent,
-            isNumber = U.isNumber,
-            pick = U.pick,
-            syncTimeout = U.syncTimeout;
+        /* *
+         *
+         *  Constants
+         *
+         * */
         /**
-         * Containing the position of a box that should be avoided by labels.
+         * Series labels are placed as close to the series as possible in a
+         * natural way, seeking to avoid other series. The goal of this
+         * feature is to make the chart more easily readable, like if a
+         * human designer placed the labels in the optimal position.
          *
-         * @interface Highcharts.LabelIntersectBoxObject
-         */ /**
-        * @name Highcharts.LabelIntersectBoxObject#bottom
-        * @type {number}
-        */ /**
-        * @name Highcharts.LabelIntersectBoxObject#left
-        * @type {number}
-        */ /**
-        * @name Highcharts.LabelIntersectBoxObject#right
-        * @type {number}
-        */ /**
-        * @name Highcharts.LabelIntersectBoxObject#top
-        * @type {number}
-        */
-        /*
-         * Highcharts module to place labels next to a series in a natural position.
+         * The series labels currently work with series types having a
+         * `graph` or an `area`.
          *
-         * TODO:
-         * - add column support (box collision detection, boxesToAvoid logic)
-         * - avoid data labels, when data labels above, show series label below.
-         * - add more options (connector, format, formatter)
+         * @sample highcharts/series-label/line-chart
+         *         Line chart
+         * @sample highcharts/demo/streamgraph
+         *         Stream graph
+         * @sample highcharts/series-label/stock-chart
+         *         Stock chart
          *
-         * https://jsfiddle.net/highcharts/L2u9rpwr/
-         * https://jsfiddle.net/highcharts/y5A37/
-         * https://jsfiddle.net/highcharts/264Nm/
-         * https://jsfiddle.net/highcharts/y5A37/
+         * @declare  Highcharts.SeriesLabelOptionsObject
+         * @since    6.0.0
+         * @product  highcharts highstock gantt
+         * @requires modules/series-label
+         * @optionparent plotOptions.series.label
          */
-        ''; // detach doclets above
-        var labelDistance = 3;
-        setOptions({
-            /**
-             * @optionparent plotOptions
-             *
-             * @private
-             */
-            plotOptions: {
-                series: {
-                    /**
-                     * Series labels are placed as close to the series as possible in a
-                     * natural way, seeking to avoid other series. The goal of this
-                     * feature is to make the chart more easily readable, like if a
-                     * human designer placed the labels in the optimal position.
-                     *
-                     * The series labels currently work with series types having a
-                     * `graph` or an `area`.
-                     *
-                     * @sample highcharts/series-label/line-chart
-                     *         Line chart
-                     * @sample highcharts/demo/streamgraph
-                     *         Stream graph
-                     * @sample highcharts/series-label/stock-chart
-                     *         Stock chart
-                     *
-                     * @declare  Highcharts.SeriesLabelOptionsObject
-                     * @since    6.0.0
-                     * @product  highcharts highstock gantt
-                     * @requires modules/series-label
-                     */
-                    label: {
-                        /**
-                         * Enable the series label per series.
-                         */
-                        enabled: true,
-                        /**
-                         * Allow labels to be placed distant to the graph if necessary,
-                         * and draw a connector line to the graph. Setting this option
-                         * to true may decrease the performance significantly, since the
-                         * algorithm with systematically search for open spaces in the
-                         * whole plot area. Visually, it may also result in a more
-                         * cluttered chart, though more of the series will be labeled.
-                         */
-                        connectorAllowed: false,
-                        /**
-                         * If the label is closer than this to a neighbour graph, draw a
-                         * connector.
-                         */
-                        connectorNeighbourDistance: 24,
-                        /**
-                         * A format string for the label, with support for a subset of
-                         * HTML. Variables are enclosed by curly brackets. Available
-                         * variables are `name`, `options.xxx`, `color` and other
-                         * members from the `series` object. Use this option also to set
-                         * a static text for the label.
-                         *
-                         * @type string
-                         * @since 8.1.0
-                         */
-                        format: void 0,
-                        /**
-                         * Callback function to format each of the series' labels. The
-                         * `this` keyword refers to the series object. By default the
-                         * `formatter` is undefined and the `series.name` is rendered.
-                         *
-                         * @type {Highcharts.FormatterCallbackFunction<Series>}
-                         * @since 8.1.0
-                         */
-                        formatter: void 0,
-                        /**
-                         * For area-like series, allow the font size to vary so that
-                         * small areas get a smaller font size. The default applies this
-                         * effect to area-like series but not line-like series.
-                         *
-                         * @type {number|null}
-                         */
-                        minFontSize: null,
-                        /**
-                         * For area-like series, allow the font size to vary so that
-                         * small areas get a smaller font size. The default applies this
-                         * effect to area-like series but not line-like series.
-                         *
-                         * @type {number|null}
-                         */
-                        maxFontSize: null,
-                        /**
-                         * Draw the label on the area of an area series. By default it
-                         * is drawn on the area. Set it to `false` to draw it next to
-                         * the graph instead.
-                         *
-                         * @type {boolean|null}
-                         */
-                        onArea: null,
-                        /**
-                         * Styles for the series label. The color defaults to the series
-                         * color, or a contrast color if `onArea`.
-                         *
-                         * @type {Highcharts.CSSObject}
-                         */
-                        style: {
-                            /** @internal */
-                            fontWeight: 'bold'
-                        },
-                        /**
-                         * An array of boxes to avoid when laying out the labels. Each
-                         * item has a `left`, `right`, `top` and `bottom` property.
-                         *
-                         * @type {Array<Highcharts.LabelIntersectBoxObject>}
-                         */
-                        boxesToAvoid: []
-                    }
-                }
-            }
-        });
-        /* eslint-disable valid-jsdoc */
+        var SeriesLabelDefaults = {
+                /**
+                 * Enable the series label per series.
+                 */
+                enabled: true,
+                /**
+                 * Allow labels to be placed distant to the graph if necessary,
+                 * and draw a connector line to the graph. Setting this option
+                 * to true may decrease the performance significantly,
+            since the
+                 * algorithm with systematically search for open spaces in the
+                 * whole plot area. Visually,
+            it may also result in a more
+                 * cluttered chart,
+            though more of the series will be labeled.
+                 */
+                connectorAllowed: false,
+                /**
+                 * If the label is closer than this to a neighbour graph,
+            draw a
+                 * connector.
+                 */
+                connectorNeighbourDistance: 24,
+                /**
+                 * A format string for the label,
+            with support for a subset of
+                 * HTML. Variables are enclosed by curly brackets. Available
+                 * variables are `name`,
+            `options.xxx`,
+            `color` and other
+                 * members from the `series` object. Use this option also to set
+                 * a static text for the label.
+                 *
+                 * @type string
+                 * @since 8.1.0
+                 */
+                format: void 0,
+                /**
+                 * Callback function to format each of the series' labels. The
+                 * `this` keyword refers to the series object. By default the
+                 * `formatter` is undefined and the `series.name` is rendered.
+                 *
+                 * @type {Highcharts.FormatterCallbackFunction<Series>}
+                 * @since 8.1.0
+                 */
+                formatter: void 0,
+                /**
+                 * For area-like series,
+            allow the font size to vary so that
+                 * small areas get a smaller font size. The default applies this
+                 * effect to area-like series but not line-like series.
+                 *
+                 * @type {number|null}
+                 */
+                minFontSize: null,
+                /**
+                 * For area-like series,
+            allow the font size to vary so that
+                 * small areas get a smaller font size. The default applies this
+                 * effect to area-like series but not line-like series.
+                 *
+                 * @type {number|null}
+                 */
+                maxFontSize: null,
+                /**
+                 * Draw the label on the area of an area series. By default it
+                 * is drawn on the area. Set it to `false` to draw it next to
+                 * the graph instead.
+                 *
+                 * @type {boolean|null}
+                 */
+                onArea: null,
+                /**
+                 * Styles for the series label. The color defaults to the series
+                 * color,
+            or a contrast color if `onArea`.
+                 *
+                 * @type {Highcharts.CSSObject}
+                 */
+                style: {
+                    /** @internal */
+                    fontWeight: 'bold'
+                },
+                /**
+                 * An array of boxes to avoid when laying out the labels. Each
+                 * item has a `left`,
+            `right`,
+            `top` and `bottom` property.
+                 *
+                 * @type {Array<Highcharts.LabelIntersectBoxObject>}
+                 */
+                boxesToAvoid: []
+            };
+        /* *
+         *
+         *  Default Export
+         *
+         * */
+
+        return SeriesLabelDefaults;
+    });
+    _registerModule(_modules, 'Extensions/SeriesLabel/SeriesLabelUtilities.js', [], function () {
+        /* *
+         *
+         *  (c) 2009-2021 Torstein Honsi
+         *
+         *  License: www.highcharts.com/license
+         *
+         *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+         *
+         * */
+        /* *
+         *
+         *  Functions
+         *
+         * */
         /**
          * Counter-clockwise, part of the fast line intersection logic.
          *
@@ -235,224 +222,92 @@
             );
         }
         /**
-         * General symbol definition for labels with connector.
-         */
-        symbols.connector = function (x, y, w, h, options) {
-            var anchorX = options && options.anchorX,
-                anchorY = options && options.anchorY;
-            var path,
-                yOffset,
-                lateral = w / 2;
-            if (isNumber(anchorX) && isNumber(anchorY)) {
-                path = [['M', anchorX, anchorY]];
-                // Prefer 45 deg connectors
-                yOffset = y - anchorY;
-                if (yOffset < 0) {
-                    yOffset = -h - yOffset;
-                }
-                if (yOffset < w) {
-                    lateral = anchorX < x + (w / 2) ? yOffset : w - yOffset;
-                }
-                // Anchor below label
-                if (anchorY > y + h) {
-                    path.push(['L', x + lateral, y + h]);
-                    // Anchor above label
-                }
-                else if (anchorY < y) {
-                    path.push(['L', x + lateral, y]);
-                    // Anchor left of label
-                }
-                else if (anchorX < x) {
-                    path.push(['L', x, y + h / 2]);
-                    // Anchor right of label
-                }
-                else if (anchorX > x + w) {
-                    path.push(['L', x + w, y + h / 2]);
-                }
-            }
-            return path || [];
-        };
-        /**
-         * Points to avoid. In addition to actual data points, the label should avoid
-         * interpolated positions.
-         *
          * @private
-         * @function Highcharts.Series#getPointsOnGraph
          */
-        Series.prototype.getPointsOnGraph = function () {
-            if (!this.xAxis && !this.yAxis) {
-                return;
-            }
-            var distance = 16,
-                points = this.points,
-                interpolated = [],
-                graph = this.graph || this.area,
-                node = graph.element,
-                inverted = this.chart.inverted,
-                xAxis = this.xAxis,
-                yAxis = this.yAxis,
-                paneLeft = inverted ? yAxis.pos : xAxis.pos,
-                paneTop = inverted ? xAxis.pos : yAxis.pos,
-                onArea = pick(this.options.label.onArea, !!this.area),
-                translatedThreshold = yAxis.getThreshold(this.options.threshold),
-                grid = {};
-            var point,
-                last,
-                i,
-                deltaX,
-                deltaY,
-                delta,
-                len,
-                n,
-                j,
-                d;
-            /**
-             * Push the point to the interpolated points, but only if that position in
-             * the grid has not been occupied. As a performance optimization, we divide
-             * the plot area into a grid and only add one point per series (#9815).
-             * @private
-             */
-            function pushDiscrete(point) {
-                var cellSize = 8, key = Math.round(point.plotX / cellSize) + ',' +
-                        Math.round(point.plotY / cellSize);
-                if (!grid[key]) {
-                    grid[key] = 1;
-                    interpolated.push(point);
-                }
-            }
-            // For splines, get the point at length (possible caveat: peaks are not
-            // correctly detected)
-            if (this.getPointSpline &&
-                node.getPointAtLength &&
-                !onArea &&
-                // Not performing well on complex series, node.getPointAtLength is too
-                // heavy (#9815)
-                points.length < this.chart.plotSizeX / distance) {
-                // If it is animating towards a path definition, use that briefly, and
-                // reset
-                if (graph.toD) {
-                    d = graph.attr('d');
-                    graph.attr({ d: graph.toD });
-                }
-                len = node.getTotalLength();
-                for (i = 0; i < len; i += distance) {
-                    point = node.getPointAtLength(i);
-                    pushDiscrete({
-                        chartX: paneLeft + point.x,
-                        chartY: paneTop + point.y,
-                        plotX: point.x,
-                        plotY: point.y
-                    });
-                }
-                if (d) {
-                    graph.attr({ d: d });
-                }
-                // Last point
-                point = points[points.length - 1];
-                point.chartX = paneLeft + point.plotX;
-                point.chartY = paneTop + point.plotY;
-                pushDiscrete(point);
-                // Interpolate
-            }
-            else {
-                len = points.length;
-                for (i = 0; i < len; i += 1) {
-                    point = points[i];
-                    last = points[i - 1];
-                    // Absolute coordinates so we can compare different panes
-                    point.chartX = paneLeft + point.plotX;
-                    point.chartY = paneTop + point.plotY;
-                    if (onArea) {
-                        // Vertically centered inside area
-                        point.chartCenterY = paneTop + (point.plotY +
-                            pick(point.yBottom, translatedThreshold)) / 2;
-                    }
-                    // Add interpolated points
-                    if (i > 0) {
-                        deltaX = Math.abs(point.chartX - last.chartX);
-                        deltaY = Math.abs(point.chartY - last.chartY);
-                        delta = Math.max(deltaX, deltaY);
-                        if (delta > distance) {
-                            n = Math.ceil(delta / distance);
-                            for (j = 1; j < n; j += 1) {
-                                pushDiscrete({
-                                    chartX: last.chartX +
-                                        (point.chartX - last.chartX) *
-                                            (j / n),
-                                    chartY: last.chartY +
-                                        (point.chartY - last.chartY) *
-                                            (j / n),
-                                    chartCenterY: last.chartCenterY +
-                                        (point.chartCenterY -
-                                            last.chartCenterY) * (j / n),
-                                    plotX: last.plotX +
-                                        (point.plotX - last.plotX) *
-                                            (j / n),
-                                    plotY: last.plotY +
-                                        (point.plotY - last.plotY) *
-                                            (j / n)
-                                });
-                            }
-                        }
-                    }
-                    // Add the real point in order to find positive and negative peaks
-                    if (isNumber(point.plotY)) {
-                        pushDiscrete(point);
-                    }
-                }
-            }
-            // Get the bounding box so we can do a quick check first if the bounding
-            // boxes overlap.
-            /*
-            interpolated.bBox = node.getBBox();
-            interpolated.bBox.x += paneLeft;
-            interpolated.bBox.y += paneTop;
-            */
-            return interpolated;
-        };
-        /**
-         * Overridable function to return series-specific font sizes for the labels. By
-         * default it returns bigger font sizes for series with the greater sum of y
-         * values.
+        function intersectRect(r1, r2) {
+            return !(r2.left > r1.right ||
+                r2.right < r1.left ||
+                r2.top > r1.bottom ||
+                r2.bottom < r1.top);
+        }
+        /* *
          *
-         * @private
-         * @function Highcharts.Series#labelFontSize
+         *  Default Export
+         *
+         * */
+        var SeriesLabelUtilities = {
+                boxIntersectLine: boxIntersectLine,
+                intersectRect: intersectRect
+            };
+
+        return SeriesLabelUtilities;
+    });
+    _registerModule(_modules, 'Extensions/SeriesLabel/SeriesLabel.js', [_modules['Core/Animation/AnimationUtilities.js'], _modules['Core/Chart/Chart.js'], _modules['Core/FormatUtilities.js'], _modules['Core/DefaultOptions.js'], _modules['Extensions/SeriesLabel/SeriesLabelDefaults.js'], _modules['Extensions/SeriesLabel/SeriesLabelUtilities.js'], _modules['Core/Utilities.js']], function (A, Chart, FU, D, SeriesLabelDefaults, SLU, U) {
+        /* *
+         *
+         *  (c) 2009-2021 Torstein Honsi
+         *
+         *  License: www.highcharts.com/license
+         *
+         *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+         *
+         * */
+        /*
+         * Highcharts module to place labels next to a series in a natural position.
+         *
+         * TODO:
+         * - add column support (box collision detection, boxesToAvoid logic)
+         * - avoid data labels, when data labels above, show series label below.
+         * - add more options (connector, format, formatter)
+         *
+         * https://jsfiddle.net/highcharts/L2u9rpwr/
+         * https://jsfiddle.net/highcharts/y5A37/
+         * https://jsfiddle.net/highcharts/264Nm/
+         * https://jsfiddle.net/highcharts/y5A37/
          */
-        Series.prototype.labelFontSize = function (minFontSize, maxFontSize) {
-            return minFontSize + ((this.sum / this.chart.labelSeriesMaxSum) *
-                (maxFontSize - minFontSize)) + 'px';
-        };
+        var animObject = A.animObject;
+        var format = FU.format;
+        var setOptions = D.setOptions;
+        var boxIntersectLine = SLU.boxIntersectLine,
+            intersectRect = SLU.intersectRect;
+        var addEvent = U.addEvent,
+            extend = U.extend,
+            fireEvent = U.fireEvent,
+            isNumber = U.isNumber,
+            pick = U.pick,
+            syncTimeout = U.syncTimeout;
+        /* *
+         *
+         *  Constants
+         *
+         * */
+        var composedClasses = [];
+        var labelDistance = 3;
+        /* *
+         *
+         *  Functions
+         *
+         * */
         /**
          * Check whether a proposed label position is clear of other elements.
-         *
          * @private
-         * @function Highcharts.Series#checkClearPoint
          */
-        Series.prototype.checkClearPoint = function (x, y, bBox, checkDistance) {
-            var chart = this.chart,
-                onArea = pick(this.options.label.onArea, !!this.area),
-                findDistanceToOthers = (onArea || this.options.label.connectorAllowed),
+        function checkClearPoint(series, x, y, bBox, checkDistance) {
+            var chart = series.chart,
+                onArea = pick(series.options.label.onArea, !!series.area),
+                findDistanceToOthers = (onArea || series.options.label.connectorAllowed),
                 leastDistance = 16;
             var distToOthersSquared = Number.MAX_VALUE, // distance to other graphs
                 distToPointSquared = Number.MAX_VALUE,
                 dist,
                 connectorPoint,
-                series,
+                serie,
                 points,
                 withinRange,
                 xDist,
                 yDist,
                 i,
                 j;
-            /**
-             * @private
-             */
-            function intersectRect(r1, r2) {
-                return !(r2.left > r1.right ||
-                    r2.right < r1.left ||
-                    r2.top > r1.bottom ||
-                    r2.bottom < r1.top);
-            }
             /**
              * Get the weight in order to determine the ideal position. Larger distance
              * to other series gives more weight. Smaller distance to the actual point
@@ -476,9 +331,9 @@
             // For each position, check if the lines around the label intersect with any
             // of the graphs.
             for (i = 0; i < chart.series.length; i += 1) {
-                series = chart.series[i];
-                points = series.interpolatedPoints;
-                if (series.visible && points) {
+                serie = chart.series[i];
+                points = serie.interpolatedPoints;
+                if (serie.visible && points) {
                     for (j = 1; j < points.length; j += 1) {
                         if (
                         // To avoid processing, only check intersection if the X
@@ -501,14 +356,14 @@
                             }
                             // But if it is too far away (a padded box doesn't
                             // intersect), also return.
-                            if (this === series && !withinRange && checkDistance) {
+                            if (series === serie && !withinRange && checkDistance) {
                                 withinRange = boxIntersectLine(x - leastDistance, y - leastDistance, bBox.width + 2 * leastDistance, bBox.height + 2 * leastDistance, points[j - 1].chartX, points[j - 1].chartY, points[j].chartX, points[j].chartY);
                             }
                         }
                         // Find the squared distance from the center of the label. On
                         // area series, avoid its own graph.
                         if ((findDistanceToOthers || withinRange) &&
-                            (this !== series || onArea)) {
+                            (series !== serie || onArea)) {
                             xDist = x + bBox.width / 2 - points[j].chartX;
                             yDist = y + bBox.height / 2 - points[j].chartY;
                             distToOthersSquared = Math.min(distToOthersSquared, xDist * xDist + yDist * yDist);
@@ -517,9 +372,10 @@
                     // Do we need a connector?
                     if (!onArea &&
                         findDistanceToOthers &&
-                        this === series &&
+                        series === serie &&
                         ((checkDistance && !withinRange) ||
-                            distToOthersSquared < Math.pow(this.options.label.connectorNeighbourDistance, 2))) {
+                            distToOthersSquared < Math.pow(series.options.label
+                                .connectorNeighbourDistance, 2))) {
                         for (j = 1; j < points.length; j += 1) {
                             dist = Math.min((Math.pow(x + bBox.width / 2 - points[j].chartX, 2) +
                                 Math.pow(y + bBox.height / 2 - points[j].chartY, 2)), (Math.pow(x - points[j].chartX, 2) +
@@ -542,7 +398,26 @@
                 weight: getWeight(distToOthersSquared, connectorPoint ? distToPointSquared : 0),
                 connectorPoint: connectorPoint
             } : false;
-        };
+        }
+        /**
+         * @private
+         */
+        function compose(ChartClass, SVGRendererClass) {
+            if (composedClasses.indexOf(ChartClass) === -1) {
+                composedClasses.push(ChartClass);
+                // Leave both events, we handle animation differently (#9815)
+                addEvent(Chart, 'load', onChartRedraw);
+                addEvent(Chart, 'redraw', onChartRedraw);
+            }
+            if (composedClasses.indexOf(SVGRendererClass) === -1) {
+                composedClasses.push(SVGRendererClass);
+                SVGRendererClass.prototype.symbols.connector = symbolConnector;
+            }
+            if (composedClasses.indexOf(setOptions) === -1) {
+                composedClasses.push(setOptions);
+                setOptions({ plotOptions: { series: { label: SeriesLabelDefaults } } });
+            }
+        }
         /**
          * The main initialize method that runs on chart level after initialization and
          * redraw. It runs in  a timeout to prevent locking, and loops over all series,
@@ -551,14 +426,13 @@
          * @private
          * @function Highcharts.Chart#drawSeriesLabels
          */
-        Chart.prototype.drawSeriesLabels = function () {
+        function drawSeriesLabels(chart) {
             // console.time('drawSeriesLabels');
-            var chart = this,
-                labelSeries = this.labelSeries;
+            var labelSeries = chart.labelSeries;
             chart.boxesToAvoid = [];
             // Build the interpolated points
             labelSeries.forEach(function (series) {
-                series.interpolatedPoints = series.getPointsOnGraph();
+                series.interpolatedPoints = getPointsOnGraph(series);
                 (series.options.label.boxesToAvoid || []).forEach(function (box) {
                     chart.boxesToAvoid.push(box);
                 });
@@ -610,7 +484,7 @@
                         series.labelBySeries = label.destroy();
                     }
                 }
-                if (series.visible && !series.isSeriesBoosting && points) {
+                if (series.visible && !series.boosted && points) {
                     if (!label) {
                         var labelText = series.name;
                         if (typeof labelOptions.format === 'string') {
@@ -620,7 +494,7 @@
                             labelText = labelOptions.formatter.call(series);
                         }
                         series.labelBySeries = label = chart.renderer
-                            .label(labelText, 0, -9999, 'connector')
+                            .label(labelText, 0, 0, 'connector')
                             .addClass('highcharts-series-label ' +
                             'highcharts-series-label-' + series.index + ' ' +
                             (series.options.className || '') + ' ' +
@@ -640,7 +514,7 @@
                         // Adapt label sizes to the sum of the data
                         if (minFontSize && maxFontSize) {
                             label.css({
-                                fontSize: series.labelFontSize(minFontSize, maxFontSize)
+                                fontSize: labelFontSize(series, minFontSize, maxFontSize)
                             });
                         }
                         label
@@ -660,7 +534,7 @@
                             x = points[i].chartX - bBox.width / 2;
                             y = points[i].chartCenterY - bBox.height / 2;
                             if (insidePane(x, y, bBox)) {
-                                best = series.checkClearPoint(x, y, bBox);
+                                best = checkClearPoint(series, x, y, bBox);
                             }
                             if (best) {
                                 results.push(best);
@@ -671,7 +545,7 @@
                             x = points[i].chartX + labelDistance;
                             y = points[i].chartY - bBox.height - labelDistance;
                             if (insidePane(x, y, bBox)) {
-                                best = series.checkClearPoint(x, y, bBox, true);
+                                best = checkClearPoint(series, x, y, bBox, true);
                             }
                             if (best) {
                                 results.push(best);
@@ -680,7 +554,7 @@
                             x = points[i].chartX + labelDistance;
                             y = points[i].chartY + labelDistance;
                             if (insidePane(x, y, bBox)) {
-                                best = series.checkClearPoint(x, y, bBox, true);
+                                best = checkClearPoint(series, x, y, bBox, true);
                             }
                             if (best) {
                                 results.push(best);
@@ -689,7 +563,7 @@
                             x = points[i].chartX - bBox.width - labelDistance;
                             y = points[i].chartY + labelDistance;
                             if (insidePane(x, y, bBox)) {
-                                best = series.checkClearPoint(x, y, bBox, true);
+                                best = checkClearPoint(series, x, y, bBox, true);
                             }
                             if (best) {
                                 results.push(best);
@@ -698,7 +572,7 @@
                             x = points[i].chartX - bBox.width - labelDistance;
                             y = points[i].chartY - bBox.height - labelDistance;
                             if (insidePane(x, y, bBox)) {
-                                best = series.checkClearPoint(x, y, bBox, true);
+                                best = checkClearPoint(series, x, y, bBox, true);
                             }
                             if (best) {
                                 results.push(best);
@@ -709,7 +583,7 @@
                     if (labelOptions.connectorAllowed && !results.length && !onArea) {
                         for (x = paneLeft + paneWidth - bBox.width; x >= paneLeft; x -= 16) {
                             for (y = paneTop; y < paneTop + paneHeight - bBox.height; y += 16) {
-                                clearPoint = series.checkClearPoint(x, y, bBox, true);
+                                clearPoint = checkClearPoint(series, x, y, bBox, true);
                                 if (clearPoint) {
                                     results.push(clearPoint);
                                 }
@@ -717,9 +591,7 @@
                         }
                     }
                     if (results.length) {
-                        results.sort(function (a, b) {
-                            return b.weight - a.weight;
-                        });
+                        results.sort(function (a, b) { return b.weight - a.weight; });
                         best = results[0];
                         chart.boxesToAvoid.push({
                             left: best.x,
@@ -792,15 +664,160 @@
             });
             fireEvent(chart, 'afterDrawSeriesLabels');
             // console.timeEnd('drawSeriesLabels');
-        };
-        /* eslint-disable no-invalid-this */
+        }
         /**
-         * Prepare drawing series labels.
+         * Points to avoid. In addition to actual data points, the label should avoid
+         * interpolated positions.
          *
          * @private
-         * @function drawLabels
+         * @function Highcharts.Series#getPointsOnGraph
+         */
+        function getPointsOnGraph(series) {
+            if (!series.xAxis && !series.yAxis) {
+                return;
+            }
+            var distance = 16,
+                points = series.points,
+                interpolated = [],
+                graph = series.graph || series.area,
+                node = graph.element,
+                inverted = series.chart.inverted,
+                xAxis = series.xAxis,
+                yAxis = series.yAxis,
+                paneLeft = inverted ? yAxis.pos : xAxis.pos,
+                paneTop = inverted ? xAxis.pos : yAxis.pos,
+                onArea = pick(series.options.label.onArea, !!series.area),
+                translatedThreshold = yAxis.getThreshold(series.options.threshold),
+                grid = {};
+            var point,
+                last,
+                i,
+                deltaX,
+                deltaY,
+                delta,
+                len,
+                n,
+                j,
+                d;
+            /**
+             * Push the point to the interpolated points, but only if that position in
+             * the grid has not been occupied. As a performance optimization, we divide
+             * the plot area into a grid and only add one point per series (#9815).
+             * @private
+             */
+            function pushDiscrete(point) {
+                var cellSize = 8, key = Math.round(point.plotX / cellSize) + ',' +
+                        Math.round(point.plotY / cellSize);
+                if (!grid[key]) {
+                    grid[key] = 1;
+                    interpolated.push(point);
+                }
+            }
+            // For splines, get the point at length (possible caveat: peaks are not
+            // correctly detected)
+            if (series.getPointSpline &&
+                (node.getPointAtLength) &&
+                !onArea &&
+                // Not performing well on complex series, node.getPointAtLength is too
+                // heavy (#9815)
+                points.length < series.chart.plotSizeX / distance) {
+                // If it is animating towards a path definition, use that briefly, and
+                // reset
+                if (graph.toD) {
+                    d = graph.attr('d');
+                    graph.attr({ d: graph.toD });
+                }
+                len = node.getTotalLength();
+                for (i = 0; i < len; i += distance) {
+                    point = node.getPointAtLength(i);
+                    pushDiscrete({
+                        chartX: paneLeft + point.x,
+                        chartY: paneTop + point.y,
+                        plotX: point.x,
+                        plotY: point.y
+                    });
+                }
+                if (d) {
+                    graph.attr({ d: d });
+                }
+                // Last point
+                point = points[points.length - 1];
+                point.chartX = paneLeft + point.plotX;
+                point.chartY = paneTop + point.plotY;
+                pushDiscrete(point);
+                // Interpolate
+            }
+            else {
+                len = points.length;
+                for (i = 0; i < len; i += 1) {
+                    point = points[i];
+                    last = points[i - 1];
+                    // Absolute coordinates so we can compare different panes
+                    point.chartX = paneLeft + point.plotX;
+                    point.chartY = paneTop + point.plotY;
+                    if (onArea) {
+                        // Vertically centered inside area
+                        point.chartCenterY = paneTop + (point.plotY +
+                            pick(point.yBottom, translatedThreshold)) / 2;
+                    }
+                    // Add interpolated points
+                    if (i > 0) {
+                        deltaX = Math.abs(point.chartX - last.chartX);
+                        deltaY = Math.abs(point.chartY - last.chartY);
+                        delta = Math.max(deltaX, deltaY);
+                        if (delta > distance) {
+                            n = Math.ceil(delta / distance);
+                            for (j = 1; j < n; j += 1) {
+                                pushDiscrete({
+                                    chartX: last.chartX +
+                                        (point.chartX - last.chartX) *
+                                            (j / n),
+                                    chartY: last.chartY +
+                                        (point.chartY - last.chartY) *
+                                            (j / n),
+                                    chartCenterY: last.chartCenterY +
+                                        (point.chartCenterY -
+                                            last.chartCenterY) * (j / n),
+                                    plotX: last.plotX +
+                                        (point.plotX - last.plotX) *
+                                            (j / n),
+                                    plotY: last.plotY +
+                                        (point.plotY - last.plotY) *
+                                            (j / n)
+                                });
+                            }
+                        }
+                    }
+                    // Add the real point in order to find positive and negative peaks
+                    if (isNumber(point.plotY)) {
+                        pushDiscrete(point);
+                    }
+                }
+            }
+            // Get the bounding box so we can do a quick check first if the bounding
+            // boxes overlap.
+            /*
+            interpolated.bBox = node.getBBox();
+            interpolated.bBox.x += paneLeft;
+            interpolated.bBox.y += paneTop;
+            */
+            return interpolated;
+        }
+        /**
+         * Overridable function to return series-specific font sizes for the labels. By
+         * default it returns bigger font sizes for series with the greater sum of y
+         * values.
+         * @private
+         */
+        function labelFontSize(series, minFontSize, maxFontSize) {
+            return minFontSize + ((series.sum / series.chart.labelSeriesMaxSum) *
+                (maxFontSize - minFontSize)) + 'px';
+        }
+        /**
+         * Prepare drawing series labels.
+         * @private
          */
-        function drawLabels(e) {
+        function onChartRedraw(e) {
             if (this.renderer) {
                 var chart_1 = this;
                 var delay_1 = animObject(chart_1.renderer.globalAnimation).duration;
@@ -815,7 +832,7 @@
                     if (options.enabled &&
                         series.visible &&
                         (series.graph || series.area) &&
-                        !series.isSeriesBoosting) {
+                        !series.boosted) {
                         chart_1.labelSeries.push(series);
                         if (options.minFontSize && options.maxFontSize) {
                             series.sum = series.yData.reduce(function (pv, cv) {
@@ -844,18 +861,88 @@
                 });
                 chart_1.seriesLabelTimer = syncTimeout(function () {
                     if (chart_1.series && chart_1.labelSeries) { // #7931, chart destroyed
-                        chart_1.drawSeriesLabels();
+                        drawSeriesLabels(chart_1);
                     }
                 }, chart_1.renderer.forExport || !delay_1 ? 0 : delay_1);
             }
         }
-        // Leave both events, we handle animation differently (#9815)
-        addEvent(Chart, 'load', drawLabels);
-        addEvent(Chart, 'redraw', drawLabels);
+        /**
+         * General symbol definition for labels with connector.
+         * @private
+         */
+        function symbolConnector(x, y, w, h, options) {
+            var anchorX = options && options.anchorX,
+                anchorY = options && options.anchorY;
+            var path,
+                yOffset,
+                lateral = w / 2;
+            if (isNumber(anchorX) && isNumber(anchorY)) {
+                path = [['M', anchorX, anchorY]];
+                // Prefer 45 deg connectors
+                yOffset = y - anchorY;
+                if (yOffset < 0) {
+                    yOffset = -h - yOffset;
+                }
+                if (yOffset < w) {
+                    lateral = anchorX < x + (w / 2) ? yOffset : w - yOffset;
+                }
+                // Anchor below label
+                if (anchorY > y + h) {
+                    path.push(['L', x + lateral, y + h]);
+                    // Anchor above label
+                }
+                else if (anchorY < y) {
+                    path.push(['L', x + lateral, y]);
+                    // Anchor left of label
+                }
+                else if (anchorX < x) {
+                    path.push(['L', x, y + h / 2]);
+                    // Anchor right of label
+                }
+                else if (anchorX > x + w) {
+                    path.push(['L', x + w, y + h / 2]);
+                }
+            }
+            return path || [];
+        }
+        /* *
+         *
+         *  Default Export
+         *
+         * */
+        var SeriesLabel = {
+                compose: compose
+            };
+        /* *
+         *
+         *  API Declarations
+         *
+         * */
+        /**
+         * Containing the position of a box that should be avoided by labels.
+         *
+         * @interface Highcharts.LabelIntersectBoxObject
+         */ /**
+        * @name Highcharts.LabelIntersectBoxObject#bottom
+        * @type {number}
+        */ /**
+        * @name Highcharts.LabelIntersectBoxObject#left
+        * @type {number}
+        */ /**
+        * @name Highcharts.LabelIntersectBoxObject#right
+        * @type {number}
+        */ /**
+        * @name Highcharts.LabelIntersectBoxObject#top
+        * @type {number}
+        */
+        (''); // keeps doclets above in JS file
 
+        return SeriesLabel;
     });
-    _registerModule(_modules, 'masters/modules/series-label.src.js', [], function () {
+    _registerModule(_modules, 'masters/modules/series-label.src.js', [_modules['Core/Globals.js'], _modules['Extensions/SeriesLabel/SeriesLabel.js']], function (Highcharts, SeriesLabel) {
 
+        var G = Highcharts;
+        SeriesLabel.compose(G.Chart, G.SVGRenderer);
 
     });
 }));