apply hoverLabelText in waterfall hover

archmoj · archmoj · commit 07b6c9c296b2 · 2019-04-02T10:21:18.000-04:00
diff --git a/src/traces/waterfall/hover.js b/src/traces/waterfall/hover.js
@@ -8,30 +8,34 @@
 
 'use strict';
 
-var Color = require('../../components/color');
+var hoverLabelText = require('../../plots/cartesian/axes').hoverLabelText;
+var opacity = require('../../components/color').opacity;
 var hoverOnBars = require('../bar/hover').hoverOnBars;
 
 var DIRSYMBOL = {
     increasing: '▲',
     decreasing: '▼'
 };
 
-function formatNumber(a) {
-    return parseFloat(a.toPrecision(10));
-}
-
 module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     var point = hoverOnBars(pointData, xval, yval, hovermode);
     if(!point) return;
 
     var cd = point.cd;
     var trace = cd[0].trace;
+    var isHorizontal = (trace.orientation === 'h');
+
+    var vAxis = isHorizontal ? pointData.xa : pointData.ya;
+
+    function formatNumber(a) {
+        return hoverLabelText(vAxis, a);
+    }
 
     // the closest data point
     var index = point.index;
     var di = cd[index];
 
-    var sizeLetter = (trace.orientation === 'h') ? 'x' : 'y';
+    var sizeLetter = isHorizontal ? 'x' : 'y';
 
     var size = (di.isSum) ? di.b + di.s : di.rawS;
 
@@ -60,6 +64,6 @@ function getTraceColor(trace, di) {
     var mc = cont.color;
     var mlc = cont.line.color;
     var mlw = cont.line.width;
-    if(Color.opacity(mc)) return mc;
-    else if(Color.opacity(mlc) && mlw) return mlc;
+    if(opacity(mc)) return mc;
+    else if(opacity(mlc) && mlw) return mlc;
 }
diff --git a/test/jasmine/tests/waterfall_test.js b/test/jasmine/tests/waterfall_test.js
@@ -1296,7 +1296,7 @@ describe('waterfall hover', function() {
 
                 Plotly.plot(gd, {
                     data: [{
-                        x: [1, 2, 3, 4, 5],
+                        x: ['A', 'B', 'C', 'D', 'E'],
                         y: [0, -1.1, 2.2, -3.3, 4.4],
                         type: 'waterfall'
                     }],
@@ -1308,9 +1308,9 @@ describe('waterfall hover', function() {
                 })
                 .then(function() {
                     assertHoverLabelContent({
-                        nums: '2.2\n4.4 ▲\nInitial: -2.2',
+                        nums: '2.2\n4.4 ▲\nInitial: −2.2',
                         name: '',
-                        axis: '5'
+                        axis: 'E'
                     });
                 })
                 .catch(failTest)
