From d470090609828e37043766e755a5603284ab6a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Fri, 31 Jan 2020 12:58:15 -0500 Subject: [PATCH 1/2] fix waterfall sizeFn for hover values below the size axis --- src/traces/bar/hover.js | 7 ++++++- test/jasmine/tests/waterfall_test.js | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/traces/bar/hover.js b/src/traces/bar/hover.js index ac18038c9e1..11cb91485ed 100644 --- a/src/traces/bar/hover.js +++ b/src/traces/bar/hover.js @@ -91,7 +91,12 @@ function hoverOnBars(pointData, xval, yval, hovermode) { var s = di[sizeLetter]; if(isWaterfall) { - s += Math.abs(di.rawS || 0); + var rawS = Math.abs(di.rawS) || 0; + if(v > 0) { + s += rawS; + } else if(v < 0) { + s -= rawS; + } } // add a gradient so hovering near the end of a diff --git a/test/jasmine/tests/waterfall_test.js b/test/jasmine/tests/waterfall_test.js index 39d4cdd466d..c9877e655c7 100644 --- a/test/jasmine/tests/waterfall_test.js +++ b/test/jasmine/tests/waterfall_test.js @@ -1357,6 +1357,13 @@ describe('waterfall hover', function() { expect(out.style).toBeCloseToArray([1, '#FF4136', 1, -9.47]); assertPos(out.pos, [137, 181, 266, 266]); }); + + it('should return the correct hover point data (case closest - decreasing case, below y=0)', function() { + var out = _hover(gd, 1.8, -5, 'closest'); + + expect(out.style).toBeCloseToArray([2, '#3D9970', 2, 16.59]); + assertPos(out.pos, [260, 304, 21, 21]); + }); }); describe('text labels', function() { From ff71362bfad3d3ab7573879106b49566b172c7eb Mon Sep 17 00:00:00 2001 From: archmoj Date: Fri, 31 Jan 2020 15:06:51 -0500 Subject: [PATCH 2/2] modify the list of flaky mocks again --- test/image/compare_pixels_test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js index 3b08dcbdf20..a80d2e65d51 100644 --- a/test/image/compare_pixels_test.js +++ b/test/image/compare_pixels_test.js @@ -101,6 +101,7 @@ if(allMock || argv.filter) { } var FLAKY_LIST = [ + 'treemap_coffee', 'treemap_textposition', 'treemap_with-without_values', 'trace_metatext',