highcharts 7.1.1 → 7.1.2

package/es-modules/parts-3d/Axis.js

@@ -238,8 +238,8 @@ wrap(Axis.prototype, 'getPlotBandPath', function (proceed) {
         from = args[1],
         to = args[2],
         path = [],
-        fromPath = this.getPlotLinePath(from),
-        toPath = this.getPlotLinePath(to);
+        fromPath = this.getPlotLinePath({ value: from }),
+        toPath = this.getPlotLinePath({ value: to });
 
     if (fromPath && toPath) {
         for (var i = 0; i < fromPath.length; i += 6) {

package/es-modules/parts-3d/Column.js

@@ -241,14 +241,23 @@ wrap(
     seriesTypes.column.prototype,
     'plotGroup',
     function (proceed, prop, name, visibility, zIndex, parent) {
-        if (this.chart.is3d() && parent && !this[prop]) {
-            if (!this.chart.columnGroup) {
-                this.chart.columnGroup =
-                    this.chart.renderer.g('columnGroup').add(parent);
+        if (this.chart.is3d()) {
+            if (this[prop]) {
+                delete this[prop];
+            }
+            if (parent) {
+                if (!this.chart.columnGroup) {
+                    this.chart.columnGroup =
+                        this.chart.renderer.g('columnGroup').add(parent);
+                }
+                this[prop] = this.chart.columnGroup;
+                this.chart.columnGroup.attr(this.getPlotBox());
+                this[prop].survive = true;
+                if (prop === 'group' || prop === 'markerGroup') {
+                    arguments[3] = 'visible';
+                    // For 3D column group and markerGroup should be visible
+                }
             }
-            this[prop] = this.chart.columnGroup;
-            this.chart.columnGroup.attr(this.getPlotBox());
-            this[prop].survive = true;
         }
         return proceed.apply(this, Array.prototype.slice.call(arguments, 1));
     }
@@ -266,7 +275,8 @@ wrap(
         if (series.chart.is3d()) {
             series.data.forEach(function (point) {
                 point.visible = point.options.visible = vis =
-                    vis === undefined ? !point.visible : vis;
+                    vis === undefined ?
+                        !pick(series.visible, point.visible) : vis;
                 pointVis = vis ? 'visible' : 'hidden';
                 series.options.data[series.data.indexOf(point)] =
                     point.options;

package/es-modules/parts-gantt/GanttSeries.js

@@ -19,13 +19,11 @@ import 'Pathfinder.js';
 import '../modules/xrange.src.js';
 
 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;
 
@@ -53,19 +51,7 @@ seriesType('gantt', 'xrange'
 
         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/>',
@@ -75,12 +61,10 @@ seriesType('gantt', 'xrange'
                     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,
@@ -93,7 +77,7 @@ seriesType('gantt', 'xrange'
                 if (!format) {
                     format = H.splat(
                         tooltip.getDateFormat(
-                            range,
+                            xAxis.closestPointRange,
                             point.start,
                             startOfWeek,
                             formats
@@ -110,7 +94,7 @@ seriesType('gantt', 'xrange'
                     retVal += 'Start: ' + start + '<br/>';
                     retVal += 'End: ' + end + '<br/>';
                 } else {
-                    retVal += 'Date ' + start + '<br/>';
+                    retVal += start + '<br/>';
                 }
 
                 return retVal;
@@ -199,7 +183,6 @@ seriesType('gantt', 'xrange'
                     );
 
                     if (graphic) {
-                        stop(graphic);
                         graphic[verb]({
                             d: diamondShape
                         });
@@ -267,6 +250,19 @@ seriesType('gantt', 'xrange'
             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
+                )
+            );
         }
     }));
 

package/es-modules/parts-gantt/GridAxis.js

@@ -24,9 +24,50 @@ var addEvent = H.addEvent,
     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.
  *
@@ -143,6 +184,13 @@ Axis.prototype.isOuterAxis = function () {
             }
         }
     });
+
+    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;
@@ -180,6 +228,9 @@ Axis.prototype.getMaxLabelDimensions = function (ticks, tickPositions) {
 
             // 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
@@ -695,8 +746,6 @@ addEvent(
             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;
 
@@ -705,11 +754,11 @@ addEvent(
             !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;
             }
         }
@@ -841,119 +890,152 @@ addEvent(
                 }
             }
 
+            (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,
-        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');
+        userOptions = axis.userOptions,
+        options = axis.options,
+        gridOptions = options && isObject(options.grid) ? options.grid : {};
 
-        // @todo: Check against tickLabelPlacement between/on etc
+    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;
+                });
 
-        /* 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 additional properties available for the
+            // formatter
+            this.isFirst = isFirst;
+            this.isLast = isLast;
+            this.point = point;
 
-        // 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;
+            // Call original labelFormatter
+            return proceed.call(this);
+        });
     }
 
-    if (gridOptions.enabled) {
-        if (defined(gridOptions.borderColor)) {
-            userOptions.tickColor =
-                userOptions.lineColor = gridOptions.borderColor;
-        }
+    if (gridOptions.columns) {
+        var columns = axis.columns = [],
+            columnIndex = axis.columnIndex = 0;
 
         // 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'
-                    }
-                );
+        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
-
-                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;
-                        });
+            delete columnOptions.grid.columns; // Prevent recursion
 
-                    // Make additional properties available for the formatter
-                    this.isFirst = isFirst;
-                    this.isLast = isLast;
-                    this.point = point;
+            var column = new Axis(axis.chart, columnOptions, true);
+            column.isColumn = true;
+            column.columnIndex = columnIndex;
 
-                    // Call original labelFormatter
-                    return proceed.call(this);
-                });
-
-                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);
+            // 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 :
+                {}
+        );
+
+    if (gridOptions.enabled && defined(gridOptions.borderColor)) {
+        userOptions.tickColor = userOptions.lineColor = gridOptions.borderColor;
+    }
+};
+
+var onGridAxisAfterSetOptions = function onGridAxisAfterSetOptions(e) {
+    var axis = this,
+        userOptions = e.userOptions,
+        gridOptions = (
+            (userOptions && isObject(userOptions.grid)) ?
+                userOptions.grid :
+                {}
+        ),
+        columns = gridOptions.columns;
+
+    // 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]);
+    }
+};
+
+
+var axisEvents = {
+    afterGetOffset: onGridAxisAfterGetOffset,
+    afterInit: onGridAxisAfterInit,
+    afterSetOptions: onGridAxisAfterSetOptions,
+    afterSetScale: onGridAxisAfterSetScale,
+    destroy: onGridAxisDestroy,
+    init: onGridAxisInit
+};
+
+// Add event handlers
+Object.keys(axisEvents).forEach(function (event) {
+    addEvent(Axis, event, axisEvents[event]);
 });
+addEvent(Chart, 'afterSetChartSize', onGridAxisAfterSetChartSize);

package/es-modules/parts-gantt/PathfinderAlgorithms.js

@@ -277,8 +277,8 @@ var algorithms = {
             // 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];

package/es-modules/parts-gantt/TreeGrid.js

@@ -485,6 +485,19 @@ var onBeforeRender = function (e) {
                 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) {
@@ -504,7 +517,7 @@ var onBeforeRender = function (e) {
                         }
                     }
                     return arr;
-                }, []),
+                }, []);
                 // setScale is fired after all the series is initialized,
                 // which is an ideal time to update the axis.categories.
                 treeGrid = getTreeGridFromData(
@@ -513,48 +526,52 @@ var onBeforeRender = function (e) {
                     (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;
-                });
+                // Assign values to the axis.
+                axis.categories = treeGrid.categories;
+                axis.mapOfPosToGridNode = treeGrid.mapOfPosToGridNode;
+                axis.hasNames = true;
+                axis.tree = treeGrid.tree;
 
-                // Avoid destroying points when series is not visible
-                if (series.visible) {
-                    series.setData(data, false);
-                }
-            });
-
-            // 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,