@kevinburke/flot 5.1.0 → 5.1.1

package/dist/flot.mjs

@@ -1,4 +1,4 @@
-/*! @kevinburke/flot v5.1.0 | MIT License | https://github.com/kevinburke/flot */
+/*! @kevinburke/flot v5.1.1 | MIT License | https://github.com/kevinburke/flot */
 var browser = {
     getPageXY: function (e) {
         var doc = document.documentElement,
@@ -716,10 +716,16 @@ var Canvas = function(cls, container) {
                         var styleCache = layerCache[styleKey];
                         for (var key in styleCache) {
                             if (Object.prototype.hasOwnProperty.call(styleCache, key)) {
+                                // styleCache entries can exist without a
+                                // positions array (e.g. when a Flot plugin
+                                // populates the cache outside the normal
+                                // addText path). Upstream flot/flot#1444.
                                 var positions = styleCache[key].positions;
-                                positions.forEach(function(position) {
-                                    position.active = false;
-                                });
+                                if (positions != null) {
+                                    positions.forEach(function(position) {
+                                        position.active = false;
+                                    });
+                                }
                             }
                         }
                     }
@@ -3358,8 +3364,11 @@ Licensed under the MIT license.
                     };
 
                     // we might need an extra decimal since forced
-                    // ticks don't necessarily fit naturally
-                    if (!axis.mode && opts.tickDecimals == null) {
+                    // ticks don't necessarily fit naturally.
+                    // Guard against axis.delta <= 0 (min == max): Math.log(0)
+                    // is -Infinity, so extraDec would be +Infinity and
+                    // toFixed(Infinity) throws. Upstream #1869 / PR #1870.
+                    if (!axis.mode && opts.tickDecimals == null && axis.delta > 0) {
                         var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
                             ts = axis.tickGenerator(axis, plot);
 
@@ -4266,7 +4275,13 @@ Licensed under the MIT license.
                 maxy = maxDistance / series.yaxis.scale,
                 points = series.datapoints.points,
                 ps = series.datapoints.pointsize,
-                smallestDistance = Number.POSITIVE_INFINITY;
+                // Seed with maxDistance (or its square, matching the
+                // default squared-distance metric) so points outside
+                // the hover radius are never selected. Without this,
+                // the maxx/maxy coordinate-space pre-filter is the
+                // only radius check, and it's disabled for axes with
+                // inverseTransform — see upstream flot/flot#1871.
+                smallestDistance = computeDistance ? maxDistance : maxDistance * maxDistance;
 
             // with inverse transforms, we can't use the maxx/maxy
             // optimization, sadly
@@ -4466,7 +4481,16 @@ Licensed under the MIT license.
             } else {
                 // assume this is a gradient spec; IE currently only
                 // supports a simple vertical gradient properly, so that's
-                // what we support too
+                // what we support too.
+                // createLinearGradient throws if any coordinate is NaN or
+                // ±Infinity (e.g. when the plot container has zero size
+                // or the user supplies bogus bounds) — fall back to the
+                // default solid color instead. Global isFinite coerces
+                // null → 0 (finite), matching the drawSeriesPoints path
+                // that passes (null, null). Upstream flot/flot#1867.
+                if (!isFinite(top) || !isFinite(bottom)) {
+                    return defaultColor;
+                }
                 var gradient = ctx.createLinearGradient(0, top, 0, bottom);
 
                 for (var i = 0, l = spec.colors.length; i < l; ++i) {
@@ -4494,7 +4518,7 @@ Licensed under the MIT license.
     // Plugin registry. Plugins push to this array to register themselves.
     var plugins = [];
 
-    var version = "5.1.0";
+    var version = "5.1.1";
 
     // The main plot function.
     function plot(placeholder, data, options) {
@@ -5755,6 +5779,17 @@ Licensed under the MIT license.
                 var minD = axis.p2c(opts.panRange[0]) - axis.p2c(axis.min);
                 // calc max delta (revealing right edge of plot)
                 var maxD = axis.p2c(opts.panRange[1]) - axis.p2c(axis.max);
+                // For the y-axis, screen coordinates are inverted
+                // (p2c(smaller v) > p2c(larger v)), so minD/maxD end up
+                // with the opposite signs from the x-axis case. Swap
+                // them so the clamp comparisons below keep their
+                // x-axis semantics. Upstream flot/flot#1789, ports the
+                // minimal form of PR #1793.
+                if (axis.direction === 'y') {
+                    var swap = minD;
+                    minD = maxD;
+                    maxD = swap;
+                }
                 // limit delta to min or max if enabled
                 if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                 if (opts.panRange[1] !== undefined && d <= minD) d = minD;
@@ -5919,6 +5954,13 @@ Licensed under the MIT license.
                 var minD = p + axis.p2c(opts.panRange[0]) - axis.p2c(axisMin);
                 // calc max delta (revealing right edge of plot)
                 var maxD = p + axis.p2c(opts.panRange[1]) - axis.p2c(axisMax);
+                // Same y-axis swap as plot.pan — see comment there.
+                // Upstream flot/flot#1789 / PR #1793.
+                if (axis.direction === 'y') {
+                    var swap = minD;
+                    minD = maxD;
+                    maxD = swap;
+                }
                 // limit delta to min or max if enabled
                 if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                 if (opts.panRange[1] !== undefined && d <= minD) d = minD;
@@ -9482,6 +9524,17 @@ temporary images load their data.
                 shape.strokeWidth = entry.options.points.lineWidth;
                 iconHtml += getEntryIconHtml(shape);
             }
+            // fallback for plugin-drawn series (pie, errorbars, etc.)
+            // that don't turn on any of lines/bars/points — without
+            // this the legend entry has a label but no icon. Upstream
+            // flot/flot#1641, minus the switch to `else if` so series
+            // that deliberately overlay (e.g. lines + points) keep
+            // rendering both icons.
+            if (iconHtml === '') {
+                shape.name = 'box';
+                shape.fillColor = entry.color;
+                iconHtml += getEntryIconHtml(shape);
+            }
 
             labelHtml = '<text x="' + shape.xPos + '" y="' + shape.yPos + '" text-anchor="start"><tspan dx="2em" dy="1.2em">' + shape.label + '</tspan></text>';
             html[j++] = '<g>' + iconHtml + labelHtml + '</g>';
@@ -9521,9 +9574,17 @@ temporary images load their data.
             legendEl.style.pointerEvents = 'none';
             placeholder.appendChild(legendEl);
         } else {
-            options.legend.container.innerHTML = html.join('');
-            options.legend.container.style.width = width + 'px';
-            options.legend.container.style.height = height + 'em';
+            // Accept either a DOM Element or a jQuery-wrapped container.
+            // Upstream flot/flot#1750 switched to `$(container).get(0)` to
+            // always land on the underlying element; since this fork is
+            // jQuery-optional, do the unwrap inline.
+            var container = options.legend.container;
+            if (container && typeof container.get === 'function' && container[0]) {
+                container = container[0];
+            }
+            container.innerHTML = html.join('');
+            container.style.width = width + 'px';
+            container.style.height = height + 'em';
         }
     }
 
@@ -9617,6 +9678,14 @@ temporary images load their data.
                     'width="1.5em" height="1.5em"' +
                     '/>';
                 break;
+            case 'box':
+                html = '<use xlink:href="#box" class="legendIcon" ' +
+                    'x="' + x + '" ' +
+                    'y="' + y + '" ' +
+                    'fill="' + fill + '" ' +
+                    'width="1.5em" height="1.5em"' +
+                    '/>';
+                break;
             default:
                 // default is circle
                 html = '<use xlink:href="#circle" class="legendIcon" ' +
@@ -9639,6 +9708,12 @@ temporary images load their data.
                 '<polyline points="0,15 5,5 10,10 15,0"/>' +
             '</symbol>' +
 
+            // Fallback icon for plugin-drawn series that don't turn on
+            // any of lines / bars / points. Upstream flot/flot#1641.
+            '<symbol id="box" stroke-width="1" viewBox="-5 -5 25 25">' +
+                '<rect x="0" y="0" width="15" height="15"/>' +
+            '</symbol>' +
+
             '<symbol id="area" stroke-width="1" viewBox="-5 -5 25 25">' +
                 '<polyline points="0,15 5,5 10,10 15,0, 15,15, 0,15"/>' +
             '</symbol>' +

package/dist/jquery.flot.js

@@ -1,4 +1,4 @@
-/*! @kevinburke/flot v5.1.0 | MIT License | https://github.com/kevinburke/flot */
+/*! @kevinburke/flot v5.1.1 | MIT License | https://github.com/kevinburke/flot */
 (function ($) {
     'use strict';
 
@@ -719,10 +719,16 @@
                             var styleCache = layerCache[styleKey];
                             for (var key in styleCache) {
                                 if (Object.prototype.hasOwnProperty.call(styleCache, key)) {
+                                    // styleCache entries can exist without a
+                                    // positions array (e.g. when a Flot plugin
+                                    // populates the cache outside the normal
+                                    // addText path). Upstream flot/flot#1444.
                                     var positions = styleCache[key].positions;
-                                    positions.forEach(function(position) {
-                                        position.active = false;
-                                    });
+                                    if (positions != null) {
+                                        positions.forEach(function(position) {
+                                            position.active = false;
+                                        });
+                                    }
                                 }
                             }
                         }
@@ -3361,8 +3367,11 @@
                         };
 
                         // we might need an extra decimal since forced
-                        // ticks don't necessarily fit naturally
-                        if (!axis.mode && opts.tickDecimals == null) {
+                        // ticks don't necessarily fit naturally.
+                        // Guard against axis.delta <= 0 (min == max): Math.log(0)
+                        // is -Infinity, so extraDec would be +Infinity and
+                        // toFixed(Infinity) throws. Upstream #1869 / PR #1870.
+                        if (!axis.mode && opts.tickDecimals == null && axis.delta > 0) {
                             var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
                                 ts = axis.tickGenerator(axis, plot);
 
@@ -4269,7 +4278,13 @@
                     maxy = maxDistance / series.yaxis.scale,
                     points = series.datapoints.points,
                     ps = series.datapoints.pointsize,
-                    smallestDistance = Number.POSITIVE_INFINITY;
+                    // Seed with maxDistance (or its square, matching the
+                    // default squared-distance metric) so points outside
+                    // the hover radius are never selected. Without this,
+                    // the maxx/maxy coordinate-space pre-filter is the
+                    // only radius check, and it's disabled for axes with
+                    // inverseTransform — see upstream flot/flot#1871.
+                    smallestDistance = computeDistance ? maxDistance : maxDistance * maxDistance;
 
                 // with inverse transforms, we can't use the maxx/maxy
                 // optimization, sadly
@@ -4469,7 +4484,16 @@
                 } else {
                     // assume this is a gradient spec; IE currently only
                     // supports a simple vertical gradient properly, so that's
-                    // what we support too
+                    // what we support too.
+                    // createLinearGradient throws if any coordinate is NaN or
+                    // ±Infinity (e.g. when the plot container has zero size
+                    // or the user supplies bogus bounds) — fall back to the
+                    // default solid color instead. Global isFinite coerces
+                    // null → 0 (finite), matching the drawSeriesPoints path
+                    // that passes (null, null). Upstream flot/flot#1867.
+                    if (!isFinite(top) || !isFinite(bottom)) {
+                        return defaultColor;
+                    }
                     var gradient = ctx.createLinearGradient(0, top, 0, bottom);
 
                     for (var i = 0, l = spec.colors.length; i < l; ++i) {
@@ -4497,7 +4521,7 @@
         // Plugin registry. Plugins push to this array to register themselves.
         var plugins = [];
 
-        var version = "5.1.0";
+        var version = "5.1.1";
 
         // The main plot function.
         function plot(placeholder, data, options) {
@@ -5758,6 +5782,17 @@
                     var minD = axis.p2c(opts.panRange[0]) - axis.p2c(axis.min);
                     // calc max delta (revealing right edge of plot)
                     var maxD = axis.p2c(opts.panRange[1]) - axis.p2c(axis.max);
+                    // For the y-axis, screen coordinates are inverted
+                    // (p2c(smaller v) > p2c(larger v)), so minD/maxD end up
+                    // with the opposite signs from the x-axis case. Swap
+                    // them so the clamp comparisons below keep their
+                    // x-axis semantics. Upstream flot/flot#1789, ports the
+                    // minimal form of PR #1793.
+                    if (axis.direction === 'y') {
+                        var swap = minD;
+                        minD = maxD;
+                        maxD = swap;
+                    }
                     // limit delta to min or max if enabled
                     if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                     if (opts.panRange[1] !== undefined && d <= minD) d = minD;
@@ -5922,6 +5957,13 @@
                     var minD = p + axis.p2c(opts.panRange[0]) - axis.p2c(axisMin);
                     // calc max delta (revealing right edge of plot)
                     var maxD = p + axis.p2c(opts.panRange[1]) - axis.p2c(axisMax);
+                    // Same y-axis swap as plot.pan — see comment there.
+                    // Upstream flot/flot#1789 / PR #1793.
+                    if (axis.direction === 'y') {
+                        var swap = minD;
+                        minD = maxD;
+                        maxD = swap;
+                    }
                     // limit delta to min or max if enabled
                     if (opts.panRange[0] !== undefined && d >= maxD) d = maxD;
                     if (opts.panRange[1] !== undefined && d <= minD) d = minD;
@@ -9485,6 +9527,17 @@
                     shape.strokeWidth = entry.options.points.lineWidth;
                     iconHtml += getEntryIconHtml(shape);
                 }
+                // fallback for plugin-drawn series (pie, errorbars, etc.)
+                // that don't turn on any of lines/bars/points — without
+                // this the legend entry has a label but no icon. Upstream
+                // flot/flot#1641, minus the switch to `else if` so series
+                // that deliberately overlay (e.g. lines + points) keep
+                // rendering both icons.
+                if (iconHtml === '') {
+                    shape.name = 'box';
+                    shape.fillColor = entry.color;
+                    iconHtml += getEntryIconHtml(shape);
+                }
 
                 labelHtml = '<text x="' + shape.xPos + '" y="' + shape.yPos + '" text-anchor="start"><tspan dx="2em" dy="1.2em">' + shape.label + '</tspan></text>';
                 html[j++] = '<g>' + iconHtml + labelHtml + '</g>';
@@ -9524,9 +9577,17 @@
                 legendEl.style.pointerEvents = 'none';
                 placeholder.appendChild(legendEl);
             } else {
-                options.legend.container.innerHTML = html.join('');
-                options.legend.container.style.width = width + 'px';
-                options.legend.container.style.height = height + 'em';
+                // Accept either a DOM Element or a jQuery-wrapped container.
+                // Upstream flot/flot#1750 switched to `$(container).get(0)` to
+                // always land on the underlying element; since this fork is
+                // jQuery-optional, do the unwrap inline.
+                var container = options.legend.container;
+                if (container && typeof container.get === 'function' && container[0]) {
+                    container = container[0];
+                }
+                container.innerHTML = html.join('');
+                container.style.width = width + 'px';
+                container.style.height = height + 'em';
             }
         }
 
@@ -9620,6 +9681,14 @@
                         'width="1.5em" height="1.5em"' +
                         '/>';
                     break;
+                case 'box':
+                    html = '<use xlink:href="#box" class="legendIcon" ' +
+                        'x="' + x + '" ' +
+                        'y="' + y + '" ' +
+                        'fill="' + fill + '" ' +
+                        'width="1.5em" height="1.5em"' +
+                        '/>';
+                    break;
                 default:
                     // default is circle
                     html = '<use xlink:href="#circle" class="legendIcon" ' +
@@ -9642,6 +9711,12 @@
                     '<polyline points="0,15 5,5 10,10 15,0"/>' +
                 '</symbol>' +
 
+                // Fallback icon for plugin-drawn series that don't turn on
+                // any of lines / bars / points. Upstream flot/flot#1641.
+                '<symbol id="box" stroke-width="1" viewBox="-5 -5 25 25">' +
+                    '<rect x="0" y="0" width="15" height="15"/>' +
+                '</symbol>' +
+
                 '<symbol id="area" stroke-width="1" viewBox="-5 -5 25 25">' +
                     '<polyline points="0,15 5,5 10,10 15,0, 15,15, 0,15"/>' +
                 '</symbol>' +