From bde5499552ca7a273f1fc39905192a85579f99ac Mon Sep 17 00:00:00 2001
From: Tyler Tolley <tyler.tolley@domo.com>
Date: Fri, 2 Feb 2018 07:29:54 -0700
Subject: [PATCH] #10724 Fix finding the x bucket

---
 public/app/plugins/panel/heatmap/heatmap_tooltip.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts
index 17621dfe398..a1f8691f84f 100644
--- a/public/app/plugins/panel/heatmap/heatmap_tooltip.ts
+++ b/public/app/plugins/panel/heatmap/heatmap_tooltip.ts
@@ -153,7 +153,15 @@ export class HeatmapTooltip {
 
   getXBucketIndex(offsetX, data) {
     let x = this.scope.xScale.invert(offsetX - this.scope.yAxisWidth).valueOf();
-    let xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1);
+    let xBucket = _.find(data.buckets, (bucket, bucketIndex) => {
+      return x-bucket.x <= data.xBucketSize && x-bucket.x >0;
+    });
+    let xBucketIndex;
+    if(!xBucket)
+      xBucketIndex = getValueBucketBound(x, data.xBucketSize, 1);
+    else
+      xBucketIndex = xBucket.x;
+
     return xBucketIndex;
   }