highcharts 7.1.1 → 7.1.2

package/modules/gantt.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v7.1.1 (2019-04-09)
+ * @license Highcharts JS v7.1.2 (2019-06-04)
  *
  * Gantt series
  *
@@ -154,9 +154,50 @@
             merge = H.merge,
             pick = H.pick,
             wrap = H.wrap,
+            Chart = H.Chart,
             Axis = H.Axis,
             Tick = H.Tick;
 
+        var applyGridOptions = function applyGridOptions(axis) {
+            var options = axis.options,
+                gridOptions = options && isObject(options.grid) ? options.grid : {},
+                // TODO: Consider using cell margins defined in % of font size?
+                // 25 is optimal height for default fontSize (11px)
+                // 25 / 11 ≈ 2.28
+                fontSizeToCellHeightRatio = 25 / 11,
+                fontSize = options.labels.style.fontSize,
+                fontMetrics = axis.chart.renderer.fontMetrics(fontSize);
+
+            // Center-align by default
+            if (!options.labels) {
+                options.labels = {};
+            }
+            options.labels.align = pick(options.labels.align, 'center');
+
+            // @todo: Check against tickLabelPlacement between/on etc
+
+            /* Prevents adding the last tick label if the axis is not a category
+               axis.
+               Since numeric labels are normally placed at starts and ends of a
+               range of value, and this module makes the label point at the value,
+               an "extra" label would appear. */
+            if (!axis.categories) {
+                options.showLastLabel = false;
+            }
+
+            // Make tick marks taller, creating cell walls of a grid. Use cellHeight
+            // axis option if set
+            if (axis.horiz) {
+                options.tickLength = gridOptions.cellHeight ||
+                        fontMetrics.h * fontSizeToCellHeightRatio;
+            }
+
+            // Prevents rotation of labels when squished, as rotating them would not
+            // help.
+            axis.labelRotation = 0;
+            options.labels.rotation = 0;
+        };
+
         /**
          * Set grid options for the axis labels. Requires Highcharts Gantt.
          *
@@ -273,6 +314,13 @@
                     }
                 }
             });
+
+            if (isOuter && isNumber(axis.columnIndex)) {
+                var columns = axis.linkedParent && axis.linkedParent.columns ||
+                    axis.columns;
+                isOuter = columns.length === axis.columnIndex;
+            }
+
             // There were either no other axes on the same side,
             // or the other axes were not farther from the chart
             return isOuter;
@@ -310,6 +358,9 @@
 
                     // Find width and height of tick
                     tickHeight = label.getBBox ? label.getBBox().height : 0;
+                    if (label.textStr && !isNumber(label.textPxLength)) {
+                        label.textPxLength = label.getBBox().width;
+                    }
                     tickWidth = isNumber(label.textPxLength) ? label.textPxLength : 0;
 
                     // Update the result if width and/or height are larger
@@ -825,8 +876,6 @@
                     min = linkedMin || axis.min,
                     max = linkedMax || axis.max,
                     tickInterval = axis.tickInterval,
-                    moreThanMin = firstPos > min,
-                    lessThanMax = lastPos < max,
                     endMoreThanMin = firstPos < min && firstPos + tickInterval > min,
                     startLessThanMax = lastPos > max && lastPos - tickInterval < max;
 
@@ -835,11 +884,11 @@
                     !categoryAxis &&
                     (axis.horiz || axis.isLinked)
                 ) {
-                    if ((moreThanMin || endMoreThanMin) && !options.startOnTick) {
+                    if (endMoreThanMin && !options.startOnTick) {
                         tickPositions[0] = min;
                     }
 
-                    if ((lessThanMax || startLessThanMax) && !options.endOnTick) {
+                    if (startLessThanMax && !options.endOnTick) {
                         tickPositions[tickPositions.length - 1] = max;
                     }
                 }
@@ -971,122 +1020,155 @@
                         }
                     }
 
+                    (axis.columns || []).forEach(function (column) {
+                        column.render();
+                    });
                 }
             }
         );
 
-        // Wraps axis init to draw cell walls on vertical axes.
-        addEvent(Axis, 'init', function (e) {
+        // Handle columns and getOffset
+        var onGridAxisAfterGetOffset = function onGridAxisAfterGetOffset() {
+            (this.columns || []).forEach(function (column) {
+                column.getOffset();
+            });
+        };
+
+        var onGridAxisAfterInit = function onGridAxisAfterInit() {
             var axis = this,
                 chart = axis.chart,
-                userOptions = e.userOptions,
+                userOptions = axis.userOptions,
+                options = axis.options,
+                gridOptions = options && isObject(options.grid) ? options.grid : {};
+
+            if (gridOptions.enabled) {
+                applyGridOptions(axis);
+
+                // TODO: wrap the axis instead
+                wrap(axis, 'labelFormatter', function (proceed) {
+                    var axis = this.axis,
+                        tickPos = axis.tickPositions,
+                        value = this.value,
+                        series = (axis.isLinked ? axis.linkedParent : axis)
+                            .series[0],
+                        isFirst = value === tickPos[0],
+                        isLast = value === tickPos[tickPos.length - 1],
+                        point = series && H.find(series.options.data, function (p) {
+                            return p[axis.isXAxis ? 'x' : 'y'] === value;
+                        });
+
+                    // Make additional properties available for the
+                    // formatter
+                    this.isFirst = isFirst;
+                    this.isLast = isLast;
+                    this.point = point;
+
+                    // Call original labelFormatter
+                    return proceed.call(this);
+                });
+            }
+
+            if (gridOptions.columns) {
+                var columns = axis.columns = [],
+                    columnIndex = axis.columnIndex = 0;
+
+                // Handle columns, each column is a grid axis
+                while (++columnIndex < gridOptions.columns.length) {
+                    var columnOptions = merge(
+                        userOptions,
+                        gridOptions.columns[
+                            gridOptions.columns.length - columnIndex - 1
+                        ],
+                        {
+                            linkedTo: 0,
+                            // Force to behave like category axis
+                            type: 'category'
+                        }
+                    );
+
+                    delete columnOptions.grid.columns; // Prevent recursion
+
+                    var column = new Axis(axis.chart, columnOptions, true);
+                    column.isColumn = true;
+                    column.columnIndex = columnIndex;
+
+                    // Remove column axis from chart axes array, and place it
+                    // in the columns array.
+                    H.erase(chart.axes, column);
+                    H.erase(chart[axis.coll], column);
+                    columns.push(column);
+                }
+            }
+        };
+
+        var onGridAxisAfterSetChartSize = function onGridAxisAfterSetChartSize() {
+            this.axes.forEach(function (axis) {
+                (axis.columns || []).forEach(function (column) {
+                    column.setAxisSize();
+                    column.setAxisTranslation();
+                });
+            });
+        };
+
+        // Handle columns and setScale
+        var onGridAxisAfterSetScale = function onGridAxisAfterSetScale() {
+            (this.columns || []).forEach(function (column) {
+                column.setScale();
+            });
+        };
+
+        var onGridAxisDestroy = function onGridAxisDestroy(e) {
+            (this.columns || []).forEach(function (column) {
+                column.destroy(e.keepEvents);
+            });
+        };
+
+        // Wraps axis init to draw cell walls on vertical axes.
+        var onGridAxisInit = function onGridAxisInit(e) {
+            var userOptions = e.userOptions,
                 gridOptions = (
                     (userOptions && isObject(userOptions.grid)) ?
                         userOptions.grid :
                         {}
-                ),
-                columnOptions,
-                column,
-                columnIndex,
-                i;
-
-            function applyGridOptions() {
-                var options = axis.options,
-                    // TODO: Consider using cell margins defined in % of font size?
-                    // 25 is optimal height for default fontSize (11px)
-                    // 25 / 11 ≈ 2.28
-                    fontSizeToCellHeightRatio = 25 / 11,
-                    fontSize = options.labels.style.fontSize,
-                    fontMetrics = axis.chart.renderer.fontMetrics(fontSize);
-
-                // Center-align by default
-                if (!options.labels) {
-                    options.labels = {};
-                }
-                options.labels.align = pick(options.labels.align, 'center');
-
-                // @todo: Check against tickLabelPlacement between/on etc
-
-                /* Prevents adding the last tick label if the axis is not a category
-                   axis.
-                   Since numeric labels are normally placed at starts and ends of a
-                   range of value, and this module makes the label point at the value,
-                   an "extra" label would appear. */
-                if (!axis.categories) {
-                    options.showLastLabel = false;
-                }
-
-                // Make tick marks taller, creating cell walls of a grid. Use cellHeight
-                // axis option if set
-                if (axis.horiz) {
-                    options.tickLength = gridOptions.cellHeight ||
-                            fontMetrics.h * fontSizeToCellHeightRatio;
-                }
-
-                // Prevents rotation of labels when squished, as rotating them would not
-                // help.
-                axis.labelRotation = 0;
-                options.labels.rotation = 0;
-            }
+                );
 
-            if (gridOptions.enabled) {
-                if (defined(gridOptions.borderColor)) {
-                    userOptions.tickColor =
-                        userOptions.lineColor = gridOptions.borderColor;
-                }
+            if (gridOptions.enabled && defined(gridOptions.borderColor)) {
+                userOptions.tickColor = userOptions.lineColor = gridOptions.borderColor;
+            }
+        };
 
-                // Handle columns, each column is a grid axis
-                if (isArray(gridOptions.columns)) {
-                    columnIndex = 0;
-                    i = gridOptions.columns.length;
-                    while (i--) {
-                        columnOptions = merge(
-                            userOptions,
-                            gridOptions.columns[i],
-                            {
-                                // Force to behave like category axis
-                                type: 'category'
-                            }
-                        );
+        var onGridAxisAfterSetOptions = function onGridAxisAfterSetOptions(e) {
+            var axis = this,
+                userOptions = e.userOptions,
+                gridOptions = (
+                    (userOptions && isObject(userOptions.grid)) ?
+                        userOptions.grid :
+                        {}
+                ),
+                columns = gridOptions.columns;
 
-                        delete columnOptions.grid.columns; // Prevent recursion
-
-                        column = new Axis(axis.chart, columnOptions);
-                        column.isColumn = true;
-                        column.columnIndex = columnIndex;
-
-                        wrap(column, 'labelFormatter', function (proceed) {
-                            var axis = this.axis,
-                                tickPos = axis.tickPositions,
-                                value = this.value,
-                                series = axis.series[0],
-                                isFirst = value === tickPos[0],
-                                isLast = value === tickPos[tickPos.length - 1],
-                                point = H.find(series.options.data, function (p) {
-                                    return p[axis.isXAxis ? 'x' : 'y'] === value;
-                                });
+            // Add column options to the parent axis.
+            // Children has their column options set on init in onGridAxisAfterInit.
+            if (gridOptions.enabled && columns) {
+                merge(true, axis.options, columns[columns.length - 1]);
+            }
+        };
 
-                            // Make additional properties available for the formatter
-                            this.isFirst = isFirst;
-                            this.isLast = isLast;
-                            this.point = point;
 
-                            // Call original labelFormatter
-                            return proceed.call(this);
-                        });
+        var axisEvents = {
+            afterGetOffset: onGridAxisAfterGetOffset,
+            afterInit: onGridAxisAfterInit,
+            afterSetOptions: onGridAxisAfterSetOptions,
+            afterSetScale: onGridAxisAfterSetScale,
+            destroy: onGridAxisDestroy,
+            init: onGridAxisInit
+        };
 
-                        columnIndex++;
-                    }
-                    // This axis should not be shown, instead the column axes take over
-                    addEvent(this, 'afterInit', function () {
-                        H.erase(chart.axes, this);
-                        H.erase(chart[axis.coll], this);
-                    });
-                } else {
-                    addEvent(this, 'afterInit', applyGridOptions);
-                }
-            }
+        // Add event handlers
+        Object.keys(axisEvents).forEach(function (event) {
+            addEvent(Axis, event, axisEvents[event]);
         });
+        addEvent(Chart, 'afterSetChartSize', onGridAxisAfterSetChartSize);
 
     });
     _registerModule(_modules, 'modules/static-scale.src.js', [_modules['parts/Globals.js']], function (H) {
@@ -1119,10 +1201,17 @@
          */
 
         H.addEvent(H.Axis, 'afterSetOptions', function () {
+            var chartOptions = this.chart.options && this.chart.options.chart;
             if (
                 !this.horiz &&
                 H.isNumber(this.options.staticScale) &&
-                !this.chart.options.chart.height
+                (
+                    !chartOptions.height ||
+                    (
+                        chartOptions.scrollablePlotArea &&
+                        chartOptions.scrollablePlotArea.minHeight
+                    )
+                )
             ) {
                 this.staticScale = this.options.staticScale;
             }
@@ -1594,7 +1683,7 @@
         return result;
     });
     _registerModule(_modules, 'modules/broken-axis.src.js', [_modules['parts/Globals.js']], function (H) {
-        /**
+        /* *
          * (c) 2009-2019 Torstein Honsi
          *
          * License: www.highcharts.com/license
@@ -2612,6 +2701,19 @@
                         removeFoundExtremesEvent,
                         uniqueNames = options.uniqueNames,
                         numberOfSeries = 0,
+                        isDirty,
+                        data,
+                        treeGrid;
+                    // Check whether any of series is rendering for the first time,
+                    // visibility has changed, or its data is dirty,
+                    // and only then update. #10570, #10580
+                    isDirty = axis.series.some(function (series) {
+                        return !series.hasRendered ||
+                            series.isDirtyData ||
+                            series.isDirty;
+                    });
+
+                    if (isDirty) {
                         // Concatenate data from all series assigned to this axis.
                         data = axis.series.reduce(function (arr, s) {
                             if (s.visible) {
@@ -2631,7 +2733,7 @@
                                 }
                             }
                             return arr;
-                        }, []),
+                        }, []);
                         // setScale is fired after all the series is initialized,
                         // which is an ideal time to update the axis.categories.
                         treeGrid = getTreeGridFromData(
@@ -2640,48 +2742,52 @@
                             (uniqueNames === true) ? numberOfSeries : 1
                         );
 
-                    // Assign values to the axis.
-                    axis.categories = treeGrid.categories;
-                    axis.mapOfPosToGridNode = treeGrid.mapOfPosToGridNode;
-                    axis.hasNames = true;
-                    axis.tree = treeGrid.tree;
-
-                    // Update yData now that we have calculated the y values
-                    axis.series.forEach(function (series) {
-                        var data = series.options.data.map(function (d) {
-                            return isObject(d) ? merge(d) : d;
-                        });
-
-                        // Avoid destroying points when series is not visible
-                        if (series.visible) {
-                            series.setData(data, false);
-                        }
-                    });
+                        // Assign values to the axis.
+                        axis.categories = treeGrid.categories;
+                        axis.mapOfPosToGridNode = treeGrid.mapOfPosToGridNode;
+                        axis.hasNames = true;
+                        axis.tree = treeGrid.tree;
 
-                    // Calculate the label options for each level in the tree.
-                    axis.mapOptionsToLevel = getLevelOptions({
-                        defaults: labelOptions,
-                        from: 1,
-                        levels: labelOptions.levels,
-                        to: axis.tree.height
-                    });
+                        // Update yData now that we have calculated the y values
+                        axis.series.forEach(function (series) {
+                            var data = series.options.data.map(function (d) {
+                                return isObject(d) ? merge(d) : d;
+                            });
 
-                    // Collapse all the nodes belonging to a point where collapsed
-                    // equals true.
-                    // Can be called from beforeRender, if getBreakFromNode removes
-                    // its dependency on axis.max.
-                    removeFoundExtremesEvent =
-                        H.addEvent(axis, 'foundExtremes', function () {
-                            treeGrid.collapsedNodes.forEach(function (node) {
-                                var breaks = collapse(axis, node);
+                            // Avoid destroying points when series is not visible
+                            if (series.visible) {
+                                series.setData(data, false);
+                            }
+                        });
 
-                                axis.setBreaks(breaks, false);
-                            });
-                            removeFoundExtremesEvent();
+                        // Calculate the label options for each level in the tree.
+                        axis.mapOptionsToLevel = getLevelOptions({
+                            defaults: labelOptions,
+                            from: 1,
+                            levels: labelOptions.levels,
+                            to: axis.tree.height
                         });
+
+                        // Collapse all the nodes belonging to a point where collapsed
+                        // equals true. Only do this on init.
+                        // Can be called from beforeRender, if getBreakFromNode removes
+                        // its dependency on axis.max.
+                        if (e.type === 'beforeRender') {
+                            removeFoundExtremesEvent =
+                                H.addEvent(axis, 'foundExtremes', function () {
+                                    treeGrid.collapsedNodes.forEach(function (node) {
+                                        var breaks = collapse(axis, node);
+
+                                        axis.setBreaks(breaks, false);
+                                    });
+                                    removeFoundExtremesEvent();
+                                });
+                        }
+                    }
                 });
         };
 
+
         override(GridAxis.prototype, {
             init: function (proceed, chart, userOptions) {
                 var axis = this,
@@ -3403,8 +3509,8 @@
                     // If we are going back again, switch direction to get around start
                     // obstacle.
                     if (
-                        waypoint[dir] > start[dir] === // Going towards max from start
-                        waypoint[dir] > endPoint[dir] // Going towards min to end
+                        waypoint[dir] >= start[dir] === // Going towards max from start
+                        waypoint[dir] >= endPoint[dir] // Going towards min to end
                     ) {
                         dir = dir === 'y' ? 'x' : 'y';
                         useMax = start[dir] < end[dir];
@@ -5593,10 +5699,9 @@
                         if (isObject(amount)) {
                             amount = amount.amount;
                         }
-                        if (!defined(amount)) {
-                            amount = 0;
+                        if (isNumber(amount) && amount > 0) {
+                            return correctFloat(amount * 100) + '%';
                         }
-                        return correctFloat(amount * 100) + '%';
                     },
                     /** @ignore-option */
                     inside: true,
@@ -5624,15 +5729,16 @@
                 cropShoulder: 1,
                 getExtremesFromAll: true,
                 autoIncrement: H.noop,
+                buildKDTree: H.noop,
                 /**
-             * Borrow the column series metrics, but with swapped axes. This gives free
-             * access to features like groupPadding, grouping, pointWidth etc.
-             *
-             * @private
-             * @function Higcharts.Series#getColumnMetrics
-             *
-             * @return {Highcharts.ColumnMetricsObject}
-             */
+                 * Borrow the column series metrics, but with swapped axes. This gives
+                 * free access to features like groupPadding, grouping, pointWidth etc.
+                 *
+                 * @private
+                 * @function Higcharts.Series#getColumnMetrics
+                 *
+                 * @return {Highcharts.ColumnMetricsObject}
+                 */
                 getColumnMetrics: function () {
                     var metrics,
                         chart = this.chart;
@@ -5656,24 +5762,24 @@
                 },
 
                 /**
-             * Override cropData to show a point where x or x2 is outside visible range,
-             * but one of them is inside.
-             *
-             * @private
-             * @function Highcharts.Series#cropData
-             *
-             * @param {Array<number>} xData
-             *
-             * @param {Array<number>} yData
-             *
-             * @param {number} min
-             *
-             * @param {number} max
-             *
-             * @param {number} [cropShoulder]
-             *
-             * @return {*}
-             */
+                 * Override cropData to show a point where x or x2 is outside visible
+                 * range, but one of them is inside.
+                 *
+                 * @private
+                 * @function Highcharts.Series#cropData
+                 *
+                 * @param {Array<number>} xData
+                 *
+                 * @param {Array<number>} yData
+                 *
+                 * @param {number} min
+                 *
+                 * @param {number} max
+                 *
+                 * @param {number} [cropShoulder]
+                 *
+                 * @return {*}
+                 */
                 cropData: function (xData, yData, min, max) {
 
                     // Replace xData with x2Data to find the appropriate cropStart
@@ -5731,11 +5837,11 @@
                     return pointIndex;
                 },
                 /**
-             * @private
-             * @function Highcharts.Series#translatePoint
-             *
-             * @param {Highcharts.Point} point
-             */
+                 * @private
+                 * @function Highcharts.Series#translatePoint
+                 *
+                 * @param {Highcharts.Point} point
+                 */
                 translatePoint: function (point) {
                     var series = this,
                         xAxis = series.xAxis,
@@ -5874,9 +5980,9 @@
                 },
 
                 /**
-             * @private
-             * @function Highcharts.Series#translate
-             */
+                 * @private
+                 * @function Highcharts.Series#translate
+                 */
                 translate: function () {
                     columnType.prototype.translate.apply(this, arguments);
                     this.points.forEach(function (point) {
@@ -5885,20 +5991,20 @@
                 },
 
                 /**
-             * Draws a single point in the series. Needed for partial fill.
-             *
-             * This override turns point.graphic into a group containing the original
-             * graphic and an overlay displaying the partial fill.
-             *
-             * @private
-             * @function Highcharts.Series#drawPoint
-             *
-             * @param {Highcharts.Point} point
-             *        An instance of Point in the series.
-             *
-             * @param {"animate"|"attr"} verb
-             *        'animate' (animates changes) or 'attr' (sets options)
-             */
+                 * Draws a single point in the series. Needed for partial fill.
+                 *
+                 * This override turns point.graphic into a group containing the
+                 * original graphic and an overlay displaying the partial fill.
+                 *
+                 * @private
+                 * @function Highcharts.Series#drawPoint
+                 *
+                 * @param {Highcharts.Point} point
+                 *        An instance of Point in the series.
+                 *
+                 * @param {"animate"|"attr"} verb
+                 *        'animate' (animates changes) or 'attr' (sets options)
+                 */
                 drawPoint: function (point, verb) {
                     var series = this,
                         seriesOpts = series.options,
@@ -5912,7 +6018,7 @@
                         cutOff = seriesOpts.stacking && !seriesOpts.borderRadius,
                         pointState = point.state,
                         stateOpts = seriesOpts.states[pointState || 'normal'] || {},
-                        attrOrAnim = pointState === undefined ? 'attr' : 'animate',
+                        pointStateVerb = pointState === undefined ? 'attr' : verb,
                         pointAttr = series.pointAttribs(point, pointState),
                         animation = pick(
                             series.chart.options.chart.animation,
@@ -5942,7 +6048,7 @@
                                 point.graphicOverlay[verb](
                                     merge(partShapeArgs)
                                 );
-                                point.clipRect.animate(
+                                point.clipRect[verb](
                                     merge(clipRectArgs)
                                 );
 
@@ -5965,8 +6071,11 @@
 
                         // Presentational
                         if (!series.chart.styledMode) {
-                            point.graphicOriginal
-                                .animate(pointAttr, animation)
+                            point
+                                .graphicOriginal[verb](
+                                    pointAttr,
+                                    animation
+                                )
                                 .shadow(seriesOpts.shadow, null, cutOff);
 
                             if (partShapeArgs) {
@@ -5988,7 +6097,11 @@
                                 );
 
                                 pointAttr.fill = fill;
-                                point.graphicOverlay[attrOrAnim](pointAttr, animation)
+                                point
+                                    .graphicOverlay[pointStateVerb](
+                                        pointAttr,
+                                        animation
+                                    )
                                     .shadow(seriesOpts.shadow, null, cutOff);
                             }
                         }
@@ -5999,9 +6112,9 @@
                 },
 
                 /**
-             * @private
-             * @function Highcharts.Series#drawPoints
-             */
+                 * @private
+                 * @function Highcharts.Series#drawPoints
+                 */
                 drawPoints: function () {
                     var series = this,
                         verb = series.getAnimationVerb();
@@ -6014,14 +6127,14 @@
 
 
                 /**
-             * Returns "animate", or "attr" if the number of points is above the
-             * animation limit.
-             *
-             * @private
-             * @function Highcharts.Series#getAnimationVerb
-             *
-             * @return {string}
-             */
+                 * Returns "animate", or "attr" if the number of points is above the
+                 * animation limit.
+                 *
+                 * @private
+                 * @function Highcharts.Series#getAnimationVerb
+                 *
+                 * @return {string}
+                 */
                 getAnimationVerb: function () {
                     return (
                         this.chart.pointCount < (this.options.animationLimit || 250) ?
@@ -6031,26 +6144,27 @@
                 }
 
                 /*
-            // Override to remove stroke from points. For partial fill.
-            pointAttribs: function () {
-                var series = this,
-                    retVal = columnType.prototype.pointAttribs.apply(series, arguments);
+                // Override to remove stroke from points. For partial fill.
+                pointAttribs: function () {
+                    var series = this,
+                        retVal = columnType.prototype.pointAttribs
+                            .apply(series, arguments);
 
-                //retVal['stroke-width'] = 0;
-                return retVal;
-            }
-            //*/
+                    //retVal['stroke-width'] = 0;
+                    return retVal;
+                }
+                //*/
 
             }, { // Point class properties
-            /**
-             * Extend applyOptions so that `colorByPoint` for x-range means that one
-             * color is applied per Y axis category.
-             *
-             * @private
-             * @function Highcharts.Point#applyOptions
-             *
-             * @return {Highcharts.Series}
-             */
+                /**
+                 * Extend applyOptions so that `colorByPoint` for x-range means that one
+                 * color is applied per Y axis category.
+                 *
+                 * @private
+                 * @function Highcharts.Point#applyOptions
+                 *
+                 * @return {Highcharts.Series}
+                 */
                 resolveColor: function () {
                     var series = this.series,
                         colorByPoint;
@@ -6071,13 +6185,13 @@
 
                 },
                 /**
-             * Extend init to have y default to 0.
-             *
-             * @private
-             * @function Highcharts.Point#init
-             *
-             * @return {Highcharts.Series}
-             */
+                 * Extend init to have y default to 0.
+                 *
+                 * @private
+                 * @function Highcharts.Point#init
+                 *
+                 * @return {Highcharts.Series}
+                 */
                 init: function () {
                     Point.prototype.init.apply(this, arguments);
 
@@ -6089,9 +6203,9 @@
                 },
 
                 /**
-             * @private
-             * @function Highcharts.Point#setState
-             */
+                 * @private
+                 * @function Highcharts.Point#setState
+                 */
                 setState: function () {
                     Point.prototype.setState.apply(this, arguments);
 
@@ -6099,11 +6213,11 @@
                 },
 
                 /**
-             * @private
-             * @function Highcharts.Point#getLabelConfig
-             *
-             * @return {Highcharts.PointLabelObject}
-             */
+                 * @private
+                 * @function Highcharts.Point#getLabelConfig
+                 *
+                 * @return {Highcharts.PointLabelObject}
+                 */
                 // Add x2 and yCategory to the available properties for tooltip formats
                 getLabelConfig: function () {
                     var point = this,
@@ -6117,11 +6231,11 @@
                 tooltipDateKeys: ['x', 'x2'],
 
                 /**
-             * @private
-             * @function Highcharts.Point#isValid
-             *
-             * @return {boolean}
-             */
+                 * @private
+                 * @function Highcharts.Point#isValid
+                 *
+                 * @return {boolean}
+                 */
                 isValid: function () {
                     return typeof this.x === 'number' &&
                     typeof this.x2 === 'number';
@@ -6276,13 +6390,11 @@
 
 
         var dateFormat = H.dateFormat,
-            isObject = H.isObject,
             isNumber = H.isNumber,
             merge = H.merge,
             pick = H.pick,
             seriesType = H.seriesType,
             seriesTypes = H.seriesTypes,
-            stop = H.stop,
             Series = H.Series,
             parent = seriesTypes.xrange;
 
@@ -6310,19 +6422,7 @@
 
                 dataLabels: {
                     /** @ignore-option */
-                    enabled: true,
-                    /** @ignore-option */
-                    formatter: function () {
-                        var point = this,
-                            amount = point.point.partialFill;
-
-                        if (isObject(amount)) {
-                            amount = amount.amount;
-                        }
-                        if (isNumber(amount) && amount > 0) {
-                            return (amount * 100) + '%';
-                        }
-                    }
+                    enabled: true
                 },
                 tooltip: {
                     headerFormat: '<span style="font-size: 10px">{series.name}</span><br/>',
@@ -6332,12 +6432,10 @@
                             series = point.series,
                             tooltip = series.chart.tooltip,
                             xAxis = series.xAxis,
-                            options = xAxis.options,
-                            formats = options.dateTimeLabelFormats,
+                            formats = series.tooltipOptions.dateTimeLabelFormats,
                             startOfWeek = xAxis.options.startOfWeek,
                             ttOptions = series.tooltipOptions,
                             format = ttOptions.xDateFormat,
-                            range = point.end ? point.end - point.start : 0,
                             start,
                             end,
                             milestone = point.options.milestone,
@@ -6350,7 +6448,7 @@
                         if (!format) {
                             format = H.splat(
                                 tooltip.getDateFormat(
-                                    range,
+                                    xAxis.closestPointRange,
                                     point.start,
                                     startOfWeek,
                                     formats
@@ -6367,7 +6465,7 @@
                             retVal += 'Start: ' + start + '<br/>';
                             retVal += 'End: ' + end + '<br/>';
                         } else {
-                            retVal += 'Date ' + start + '<br/>';
+                            retVal += start + '<br/>';
                         }
 
                         return retVal;
@@ -6456,7 +6554,6 @@
                             );
 
                             if (graphic) {
-                                stop(graphic);
                                 graphic[verb]({
                                     d: diamondShape
                                 });
@@ -6524,6 +6621,19 @@
                     retVal = parent.prototype.pointClass.prototype.applyOptions
                         .call(point, retVal, x);
                     return retVal;
+                },
+                isValid: function () {
+                    return (
+                        (
+                            typeof this.start === 'number' ||
+                            typeof this.x === 'number'
+                        ) &&
+                        (
+                            typeof this.end === 'number' ||
+                            typeof this.x2 === 'number' ||
+                            this.milestone
+                        )
+                    );
                 }
             }));
 
@@ -7865,7 +7975,9 @@
                         pick(axis.dataMax, axis.max) // #6930
                     ),
                     scrollbar = axis.scrollbar,
-                    titleOffset = axis.titleOffset || 0,
+                    offset = axis.axisTitleMargin + (axis.titleOffset || 0),
+                    scrollbarsOffsets = axis.chart.scrollbarsOffsets,
+                    axisMargin = axis.options.margin || 0,
                     offsetsIndex,
                     from,
                     to;
@@ -7873,49 +7985,62 @@
                 if (scrollbar) {
 
                     if (axis.horiz) {
+
+                        // Reserve space for labels/title
+                        if (!axis.opposite) {
+                            scrollbarsOffsets[1] += offset;
+                        }
+
                         scrollbar.position(
                             axis.left,
-                            axis.top + axis.height + 2 +
-                                axis.chart.scrollbarsOffsets[1] +
-                                (axis.opposite ?
-                                    0 :
-                                    titleOffset + axis.axisTitleMargin + axis.offset
-                                ),
+                            axis.top + axis.height + 2 + scrollbarsOffsets[1] -
+                                (axis.opposite ? axisMargin : 0),
                             axis.width,
                             axis.height
                         );
+
+                        // Next scrollbar should reserve space for margin (if set)
+                        if (!axis.opposite) {
+                            scrollbarsOffsets[1] += axisMargin;
+                        }
+
                         offsetsIndex = 1;
                     } else {
+
+                        // Reserve space for labels/title
+                        if (axis.opposite) {
+                            scrollbarsOffsets[0] += offset;
+                        }
+
                         scrollbar.position(
-                            axis.left + axis.width + 2 +
-                                axis.chart.scrollbarsOffsets[0] +
-                                (axis.opposite ?
-                                    titleOffset + axis.axisTitleMargin + axis.offset :
-                                    0
-                                ),
+                            axis.left + axis.width + 2 + scrollbarsOffsets[0] -
+                                (axis.opposite ? 0 : axisMargin),
                             axis.top,
                             axis.width,
                             axis.height
                         );
+
+                        // Next scrollbar should reserve space for margin (if set)
+                        if (axis.opposite) {
+                            scrollbarsOffsets[0] += axisMargin;
+                        }
+
                         offsetsIndex = 0;
                     }
 
-                    if (
-                        (!axis.opposite && !axis.horiz) || (axis.opposite && axis.horiz)
-                    ) {
-                        axis.chart.scrollbarsOffsets[offsetsIndex] +=
-                            axis.scrollbar.size + axis.scrollbar.options.margin;
-                    }
+                    scrollbarsOffsets[offsetsIndex] += scrollbar.size +
+                        scrollbar.options.margin;
 
                     if (
                         isNaN(scrollMin) ||
                         isNaN(scrollMax) ||
                         !defined(axis.min) ||
-                        !defined(axis.max)
+                        !defined(axis.max) ||
+                        axis.min === axis.max // #10733
                     ) {
-                        // default action: when there is not extremes on the axis, but
-                        // scrollbar exists, make it full size
-                        scrollbar.setRange(0, 0);
+                        // default action: when extremes are the same or there is not
+                        // extremes on the axis, but scrollbar exists, make it full size
+                        scrollbar.setRange(0, 1);
                     } else {
                         from = (axis.min - scrollMin) / (scrollMax - scrollMin);
                         to = (axis.max - scrollMin) / (scrollMax - scrollMin);
@@ -9183,13 +9308,15 @@
                 };
                 // Hide away the input box
                 input.onblur = function () {
+                    // update extermes only when inputs are active
                     if (input === H.doc.activeElement) { // Only when focused
                         // Update also when no `change` event is triggered, like when
                         // clicking inside the SVG (#4710)
                         updateExtremes();
-                        rangeSelector.hideInput(name);
-                        input.blur(); // #4606
                     }
+                    // #10404 - move hide and blur outside focus
+                    rangeSelector.hideInput(name);
+                    input.blur(); // #4606
                 };
 
                 // handle changes in the input boxes
@@ -9769,7 +9896,7 @@
                     time.set(timeName, date, basePeriod + count);
 
                     if (basePeriod === time.get(timeName, date)) {
-                        date.setDate(0); // #6537
+                        time.set('Date', date, 0); // #6537
                     }
 
                     return date.getTime() - base;