Forráskód Böngészése

heatmap tooltip: minor refactor

Alexander Zobnin 7 éve
szülő
commit
fd5e838f0e
1 módosított fájl, 5 hozzáadás és 9 törlés
  1. 5 9
      public/app/plugins/panel/heatmap/heatmap_tooltip.ts

+ 5 - 9
public/app/plugins/panel/heatmap/heatmap_tooltip.ts

@@ -153,16 +153,12 @@ export class HeatmapTooltip {
 
   getXBucketIndex(offsetX, data) {
     let x = this.scope.xScale.invert(offsetX - this.scope.yAxisWidth).valueOf();
-    let xBucket = _.find(data.buckets, (bucket, bucketIndex) => {
-      return x-bucket.x <= data.xBucketSize && x-bucket.x >0;
+    // First try to find X bucket by checking x pos is in the
+    // [bucket.x, bucket.x + xBucketSize] interval
+    let xBucket = _.find(data.buckets, bucket => {
+      return x > bucket.x && x - bucket.x <= data.xBucketSize;
     });
-    let xBucketIndex;
-    if (!xBucket) {
-      xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1);
-    } else {
-      xBucketIndex = xBucket.x;
-    }
-    return xBucketIndex;
+    return xBucket ? xBucket.x : getValueBucketBound(x, data.xBucketSize, 1);
   }
 
   getYBucketIndex(offsetY, data) {