@kevinburke/flot 5.1.0 → 5.1.2

package/source/jquery.flot.legend.js

@@ -54,7 +54,7 @@ import { plugins } from './jquery.flot.js';
 
         var left = 0;
         var columnWidths = [];
-        var style = window.getComputedStyle(document.querySelector('body'));
+        var style = window.getComputedStyle(document.body);
         for (i = 0; i < entries.length; ++i) {
             let columnIndex = i % options.legend.noColumns;
             entry = entries[i];
@@ -119,6 +119,17 @@ import { plugins } from './jquery.flot.js';
                 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>';
@@ -158,9 +169,17 @@ import { plugins } from './jquery.flot.js';
             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';
         }
     }
 
@@ -254,6 +273,14 @@ import { plugins } from './jquery.flot.js';
                     '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" ' +
@@ -276,6 +303,12 @@ import { plugins } from './jquery.flot.js';
                 '<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/source/jquery.flot.navigate.js

@@ -555,6 +555,17 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 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;
@@ -719,6 +730,13 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 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;
@@ -772,7 +790,7 @@ import { bind, unbind, trigger, css } from './helpers.js';
                 ctx.lineJoin = "round";
                 var startx = Math.round(panHint.start.x),
                     starty = Math.round(panHint.start.y),
-                    endx, endy;
+                    endx = 0, endy = 0;
 
                 if (panAxes) {
                     if (panAxes[0].direction === 'x') {

package/source/jquery.flot.pie.js

@@ -539,6 +539,11 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
         // Placed here because it needs to be accessed from multiple locations
 
         function drawDonutHole(layer) {
+            // The closure-scoped `options` is set by the processDatapoints
+            // hook on first draw, but drawDonutHole can be reached from
+            // paths that fire before that hook, leaving `options` null.
+            // Read it eagerly. Upstream flot/flot#1559.
+            var options = plot.getOptions();
             if (options.series.pie.innerRadius > 0) {
                 // subtract the center
                 layer.save();
@@ -651,9 +656,12 @@ import { extend, bind, unbind, trigger, width, height } from './helpers.js';
         // trigger click or hover event (they send the same parameters so we share their code)
 
         function triggerClickHoverEvent(eventname, e) {
+            // See drawDonutHole above: read `options` fresh in case the
+            // event fires before processDatapoints has run.
+            var options = plot.getOptions();
             var offset = plot.offset();
-            var canvasX = parseInt(e.pageX - offset.left);
-            var canvasY = parseInt(e.pageY - offset.top);
+            var canvasX = parseInt(String(e.pageX - offset.left));
+            var canvasY = parseInt(String(e.pageY - offset.top));
             var item = findNearbySlice(canvasX, canvasY);
 
             if (options.grid.autoHighlight) {

package/source/jquery.flot.selection.js

@@ -203,6 +203,7 @@ import { bind, trigger, unbind } from './helpers.js';
         }
 
         function triggerSelectedEvent() {
+            /** @type {any} */
             var r = getSelection();
 
             trigger(plot.getPlaceholder(), "plotselected", [ r ]);
@@ -285,7 +286,7 @@ import { bind, trigger, unbind } from './helpers.js';
 
         // function taken from markings support in Flot
         function extractRange(ranges, coord) {
-            var axis, from, to, key, axes = plot.getAxes();
+            var axis, from, to, /** @type {string|undefined} */ key, axes = plot.getAxes();
 
             for (var k in axes) {
                 axis = axes[k];
@@ -305,7 +306,7 @@ import { bind, trigger, unbind } from './helpers.js';
             }
 
             // backwards-compat stuff - to be removed in future
-            if (!ranges[key]) {
+            if (key && !ranges[key]) {
                 axis = coord === "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
                 from = ranges[coord + "1"];
                 to = ranges[coord + "2"];

package/source/jquery.flot.time.js

@@ -329,9 +329,9 @@ import { saturated } from './jquery.flot.saturated.js';
         }
 
         for (var i = 0; i < spec.length - 1; ++i) {
-            if (axis.delta < (spec[i][0] * timeUnitSize[spec[i][1]] +
-                spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2 &&
-                spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) {
+            if (axis.delta < (Number(spec[i][0]) * timeUnitSize[spec[i][1]] +
+                Number(spec[i + 1][0]) * timeUnitSize[spec[i + 1][1]]) / 2 &&
+                Number(spec[i][0]) * timeUnitSize[spec[i][1]] >= minSize) {
                 break;
             }
         }

package/source/jquery.flot.touch.js

@@ -14,6 +14,7 @@ import { plugins } from './jquery.flot.js';
     }
 
     function initTouchNavigation(plot, options) {
+        /** @type {{ twoTouches: boolean, currentTapStart: {x: number, y: number}, currentTapEnd: {x: number, y: number}, prevTap: {x: number, y: number}, currentTap: {x: number, y: number}, interceptedLongTap: boolean, isUnsupportedGesture: boolean, prevTapTime: number | null, tapStartTime: number | null, longTapTriggerId: ReturnType<typeof setTimeout> | null }} */
         var gestureState = {
                 twoTouches: false,
                 currentTapStart: { x: 0, y: 0 },
@@ -167,6 +168,7 @@ import { plugins } from './jquery.flot.js';
             },
 
             isLongTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration >= minLongTapDuration && !gestureState.interceptedLongTap) {
@@ -207,6 +209,7 @@ import { plugins } from './jquery.flot.js';
             },
 
             isTap: function(e) {
+                if (gestureState.tapStartTime == null) return false;
                 var currentTime = new Date().getTime(),
                     tapDuration = currentTime - gestureState.tapStartTime;
                 if (tapDuration <= pressedTapDuration) {
@@ -259,7 +262,9 @@ import { plugins } from './jquery.flot.js';
 
         function isDoubleTap(e) {
             var currentTime = new Date().getTime(),
-                intervalBetweenTaps = currentTime - gestureState.prevTapTime;
+                intervalBetweenTaps = gestureState.prevTapTime != null
+                    ? currentTime - gestureState.prevTapTime
+                    : Infinity;
 
             if (intervalBetweenTaps >= 0 && intervalBetweenTaps < maxIntervalBetweenTaps) {
                 if (distance(gestureState.prevTap.x, gestureState.prevTap.y, gestureState.currentTap.x, gestureState.currentTap.y) < maxDistanceBetweenTaps) {

package/source/jquery.flot.touchNavigate.js

@@ -24,6 +24,7 @@ import { trigger } from './helpers.js';
     }
 
     function initTouchNavigation(plot, options) {
+        /** @type {{ zoomEnable: boolean, prevDistance: number | null, prevTapTime: number, prevPanPosition: {x: number, y: number}, prevTapPosition: {x: number, y: number} }} */
         var gestureState = {
                 zoomEnable: false,
                 prevDistance: null,
@@ -31,6 +32,7 @@ import { trigger } from './helpers.js';
                 prevPanPosition: { x: 0, y: 0 },
                 prevTapPosition: { x: 0, y: 0 }
             },
+            /** @type {{ prevTouchedAxis: string, currentTouchedAxis: string, touchedAxis: any, navigationConstraint: string, initialState: any }} */
             navigationState = {
                 prevTouchedAxis: 'none',
                 currentTouchedAxis: 'none',
@@ -87,7 +89,7 @@ import { trigger } from './helpers.js';
             drag: function(e) {
                 presetNavigationState(e, 'pan', gestureState);
 
-                if (useSmartPan) {
+                if (useSmartPan && navigationState.initialState) {
                     var point = getPoint(e, 'pan');
                     plot.smartPan({
                         x: navigationState.initialState.startPageX - point.x,
@@ -111,7 +113,7 @@ import { trigger } from './helpers.js';
                 }
 
                 if (wasPinchEvent(e, gestureState)) {
-                    updateprevPanPosition(e, 'pan', gestureState, navigationState);
+                    updatePrevPanPosition(e, 'pan', gestureState, navigationState);
                 }
             }
         };
@@ -143,7 +145,7 @@ import { trigger } from './helpers.js';
 
                     var dist = pinchDistance(e);
 
-                    if (gestureState.zoomEnable || Math.abs(dist - gestureState.prevDistance) > ZOOM_DISTANCE_MARGIN) {
+                    if (gestureState.zoomEnable || (gestureState.prevDistance != null && Math.abs(dist - gestureState.prevDistance) > ZOOM_DISTANCE_MARGIN)) {
                         zoomPlot(plot, e, gestureState, navigationState);
 
                         //activate zoom mode

package/types/test.ts

@@ -2,10 +2,10 @@
 // sensible types. Run `npx tsc --noEmit types/test.ts` to check.
 
 import {
+	color,
 	type DataSeries,
 	type Plot,
 	type PlotOptions,
-	color,
 	plot,
 	saturated,
 	version,
@@ -44,11 +44,11 @@ const p: Plot = plot(el, data, options);
 // Plot methods
 p.getData();
 p.setData(data);
-const offset = p.getPlotOffset();
-const width: number = p.width();
-const height: number = p.height();
-const axes = p.getAxes();
-const xAxes = p.getXAxes();
+const _offset = p.getPlotOffset();
+const _width: number = p.width();
+const _height: number = p.height();
+const _axes = p.getAxes();
+const _xAxes = p.getXAxes();
 
 // Plugin methods (optional)
 p.highlight?.(0, 0);
@@ -66,7 +66,7 @@ saturated.floorInBase(17, 5);
 saturated.multiplyAdd(1e300, 10, 5);
 
 // Version string
-const v: string = version;
+const _v: string = version;
 
 // String placeholder also works
 plot("#placeholder", data);