Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sankey: fix position of link hover labels in vertical orientation #4404

Merged
merged 2 commits into from
Dec 3, 2019
Merged

sankey: fix position of link hover labels in vertical orientation #4404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d45161
sankey: fix position of link hover labels in vertical orientation
antoinerg Dec 3, 2019
1c29be9
sankey_test: increase position tolerance to run on CI
antoinerg Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/traces/sankey/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,17 @@ module.exports = function plot(gd, calcData) {
function hoverCenterPosition(link) {
var hoverCenterX, hoverCenterY;
if(link.circular) {
hoverCenterX = (link.circularPathData.leftInnerExtent + link.circularPathData.rightInnerExtent) / 2 + d.parent.translateX;
hoverCenterY = link.circularPathData.verticalFullExtent + d.parent.translateY;
hoverCenterX = (link.circularPathData.leftInnerExtent + link.circularPathData.rightInnerExtent) / 2;
hoverCenterY = link.circularPathData.verticalFullExtent;
} else {
hoverCenterX = (link.source.x1 + link.target.x0) / 2 + d.parent.translateX;
hoverCenterY = (link.y0 + link.y1) / 2 + d.parent.translateY;
hoverCenterX = (link.source.x1 + link.target.x0) / 2;
hoverCenterY = (link.y0 + link.y1) / 2;
}
return [hoverCenterX, hoverCenterY];
var center = [hoverCenterX, hoverCenterY];
if(link.trace.orientation === 'v') center.reverse();
center[0] += d.parent.translateX;
center[1] += d.parent.translateY;
return center;
}

// For each related links, create a hoverItem
Expand Down
36 changes: 36 additions & 0 deletions test/jasmine/tests/sankey_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,42 @@ describe('sankey tests', function() {
.then(done);
});

it('should position hover labels correctly', function(done) {
var gd = createGraphDiv();
var mockCopy = Lib.extendDeep({}, mock);

Plotly.plot(gd, mockCopy)
.then(function() {
_hover(900, 230);

assertLabel(
['source: Thermal generation', 'target: Losses', '787TWh'],
['rgb(0, 0, 96)', 'rgb(255, 255, 255)', 13, 'Arial', 'rgb(255, 255, 255)']
);

var g = d3.select('.hovertext');
var pos = g.node().getBoundingClientRect();
expect(pos.x).toBeCloseTo(555, -1.5, 'it should have correct x position');
expect(pos.y).toBeCloseTo(196, -1.5, 'it should have correct y position');
return Plotly.restyle(gd, 'orientation', 'v');
})
.then(function() {
_hover(520, 500);

assertLabel(
['source: Thermal generation', 'target: Losses', '787TWh'],
['rgb(0, 0, 96)', 'rgb(255, 255, 255)', 13, 'Arial', 'rgb(255, 255, 255)']
);

var g = d3.select('.hovertext');
var pos = g.node().getBoundingClientRect();
expect(pos.x).toBeCloseTo(279, -1.5, 'it should have correct x position');
expect(pos.y).toBeCloseTo(500, -1.5, 'it should have correct y position');
})
.catch(failTest)
.then(done);
});

it('should show the correct hover labels when hovertemplate is specified', function(done) {
var gd = createGraphDiv();
var mockCopy = Lib.extendDeep({}, mock);
Expand Down