@windborne/grapher 1.0.55 → 1.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windborne/grapher",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Graphing library",
   "main": "src/index.js",
   "module": "dist/bundle.esm.js",

package/src/renderer/draw_bars.js

@@ -33,7 +33,7 @@ export default function drawBars(individualPoints, {
     context.fillStyle = color;
 
     const {barWidth, totalBarWidth} = getBarWidths({ closestSpacing, bounds, sizing, axisSeriesCount });
-    const barBottom = hasNegatives ? zero : sizing.renderHeight;
+    const barBottom = Math.min(zero, sizing.renderHeight);
 
     if (renderCutoffGradient && cutoffIndex !== undefined && originalData) {
         drawBarsWithCutoff(individualPoints, {

package/src/renderer/graph_body_renderer.js

@@ -353,18 +353,15 @@ export default class GraphBodyRenderer extends Eventable {
 
         if (singleSeries.rendering === 'bar') {
             const barSeriesInAxis = singleSeries.axis.series.filter(s => s.rendering === 'bar');
-            let barClosestSpacing = null;
-            for (const s of barSeriesInAxis) {
-                const sp = s.dataBounds?.closestSpacing;
-                if (sp != null && sp > 0 && (barClosestSpacing === null || sp > barClosestSpacing)) {
-                    barClosestSpacing = sp;
-                }
-            }
+            const visibleBarSeries = barSeriesInAxis.filter(s =>
+                s.inDataSpace && s.inDataSpace.length > 0 &&
+                s.dataBounds && s.dataBounds.maxX >= bounds.minX && s.dataBounds.minX <= bounds.maxX
+            );
             let barParams = {
                 ...commonCPUParams,
-                indexInAxis: barSeriesInAxis.indexOf(singleSeries),
-                axisSeriesCount: barSeriesInAxis.length,
-                closestSpacing: barClosestSpacing || globalBounds.closestSpacing,
+                indexInAxis: visibleBarSeries.indexOf(singleSeries),
+                axisSeriesCount: visibleBarSeries.length || 1,
+                closestSpacing: singleSeries.dataBounds?.closestSpacing || globalBounds.closestSpacing,
                 bounds
             };
 

package/src/state/calculate_tooltip_state.js

@@ -110,19 +110,15 @@ export default function calculateTooltipState({mousePresent, mouseX, mouseY, siz
 
         if (singleSeries.rendering === 'bar') {
             const barSeriesInAxis = singleSeries.axis.series.filter(s => s.rendering === 'bar');
-            const indexInAxis = barSeriesInAxis.indexOf(singleSeries);
-            const axisSeriesCount = barSeriesInAxis.length;
-
-            let barClosestSpacing = null;
-            for (const s of barSeriesInAxis) {
-                const sp = s.dataBounds?.closestSpacing;
-                if (sp != null && sp > 0 && (barClosestSpacing === null || sp > barClosestSpacing)) {
-                    barClosestSpacing = sp;
-                }
-            }
+            const visibleBarSeries = barSeriesInAxis.filter(s =>
+                s.inDataSpace && s.inDataSpace.length > 0 &&
+                s.dataBounds && s.dataBounds.maxX >= bounds.minX && s.dataBounds.minX <= bounds.maxX
+            );
+            const indexInAxis = visibleBarSeries.indexOf(singleSeries);
+            const axisSeriesCount = visibleBarSeries.length || 1;
 
             const { totalBarWidth, barWidth } = getBarWidths({
-                closestSpacing: barClosestSpacing || closestSpacing,
+                closestSpacing: singleSeries.dataBounds?.closestSpacing || closestSpacing,
                 bounds,
                 sizing,
                 axisSeriesCount