From 281598d2cb0af6fb79c6dc62d2d55f77395c7a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Etienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Thu, 18 Jan 2018 15:05:41 -0500
Subject: [PATCH] rm box hover labels prefixes in candlestick calcdata

---
 src/traces/box/calc.js             |  5 +++++
 src/traces/box/hover.js            |  2 +-
 test/jasmine/tests/finance_test.js | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/traces/box/calc.js b/src/traces/box/calc.js
index 69384044d13..93532067058 100644
--- a/src/traces/box/calc.js
+++ b/src/traces/box/calc.js
@@ -136,6 +136,11 @@ module.exports = function calc(gd, trace) {
             }
         };
 
+        // don't show labels in candlestick hover labels
+        if(trace._fullInput && trace._fullInput.type === 'candlestick') {
+            delete cd[0].t.labels;
+        }
+
         fullLayout[numKey]++;
         return cd;
     } else {
diff --git a/src/traces/box/hover.js b/src/traces/box/hover.js
index 196abe37886..3f5fb006fd8 100644
--- a/src/traces/box/hover.js
+++ b/src/traces/box/hover.js
@@ -159,7 +159,7 @@ function hoverOnBoxes(pointData, xval, yval, hovermode) {
 
         pointData2[vLetter + '0'] = pointData2[vLetter + '1'] = valPx;
         pointData2[vLetter + 'LabelVal'] = val;
-        pointData2[vLetter + 'Label'] = t.labels[attr] + ' ' + Axes.hoverLabelText(vAxis, val);
+        pointData2[vLetter + 'Label'] = (t.labels ? t.labels[attr] + ' ' : '') + Axes.hoverLabelText(vAxis, val);
 
         if(attr === 'mean' && ('sd' in di) && trace.boxmean === 'sd') {
             pointData2[vLetter + 'err'] = di.sd;
diff --git a/test/jasmine/tests/finance_test.js b/test/jasmine/tests/finance_test.js
index 5df5ba59e10..aeddf64b1c2 100644
--- a/test/jasmine/tests/finance_test.js
+++ b/test/jasmine/tests/finance_test.js
@@ -384,7 +384,7 @@ describe('finance charts calc transforms:', function() {
         return calcTrace[0].trace;
     }
 
-    function _calc(data, layout) {
+    function _calcRaw(data, layout) {
         var gd = {
             data: data,
             layout: layout || {}
@@ -392,8 +392,11 @@ describe('finance charts calc transforms:', function() {
 
         supplyAllDefaults(gd);
         Plots.doCalcdata(gd);
+        return gd.calcdata;
+    }
 
-        return gd.calcdata.map(calcDatatoTrace);
+    function _calc(data, layout) {
+        return _calcRaw(data, layout).map(calcDatatoTrace);
     }
 
     // add some points that shouldn't make it into calcdata because
@@ -758,6 +761,15 @@ describe('finance charts calc transforms:', function() {
             2, 2, 2, 2, 2, 2
         ]);
     });
+
+    it('should not include box hover labels prefix in candlestick calcdata', function() {
+        var trace0 = Lib.extendDeep({}, mock0, {
+            type: 'candlestick',
+        });
+        var out = _calcRaw([trace0]);
+
+        expect(out[0][0].t.labels).toBeUndefined();
+    });
 });
 
 describe('finance charts updates:', function() {