Skip to content

Properly handle staticPlot plot config in ternary subplots #645

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

Merged
merged 2 commits into from
Jun 15, 2016
Merged

Properly handle staticPlot plot config in ternary subplots #645

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
fa92af2
don't init ternary interaction handlers if staticPlot true
etpinard Jun 14, 2016
f459b5c
add ternary drag test (including staticPlot case)
etpinard Jun 14, 2016
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
4 changes: 3 additions & 1 deletion src/plots/ternary/ternary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ proto.makeFramework = function() {
_this.plotContainer.selectAll('.backplot,.frontplot,.grids')
.call(Drawing.setClipUrl, clipId);

_this.initInteractions();
if(!_this.graphDiv._context.staticPlot) {
_this.initInteractions();
}
};

var w_over_h = Math.sqrt(4 / 3);
Expand Down
49 changes: 45 additions & 4 deletions test/jasmine/tests/ternary_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,46 @@ describe('ternary plots', function() {
it('should respond zoom drag interactions', function(done) {
assertRange(gd, [0.231, 0.2, 0.11]);

Plotly.relayout(gd, 'ternary.aaxis.min', 0.1).then(function() {
assertRange(gd, [0.1, 0.2, 0.11]);
drag([[390, 220], [300, 250]]);
assertRange(gd, [0.4486, 0.2480, 0.1453]);

return doubleClick(pointPos[0], pointPos[1]);
}).then(function() {
doubleClick(pointPos[0], pointPos[1]).then(function() {
assertRange(gd, [0, 0, 0]);

done();
});
});
});

describe('static plots', function() {
var mock = require('@mocks/ternary_simple.json');
var gd;

beforeEach(function(done) {
gd = createGraphDiv();

var mockCopy = Lib.extendDeep({}, mock);
var config = { staticPlot: true };

Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(done);
});

it('should not respond to drag', function(done) {
var range = [0.231, 0.2, 0.11];

assertRange(gd, range);

drag([[390, 220], [300, 250]]);
assertRange(gd, range);

doubleClick(390, 220).then(function() {
assertRange(gd, range);

done();
});
});
});

function countTernarySubplot() {
return d3.selectAll('.ternary').size();
}
Expand Down Expand Up @@ -227,6 +255,19 @@ describe('ternary plots', function() {
});
}

function drag(path) {
var len = path.length;

mouseEvent('mousemove', path[0][0], path[0][1]);
mouseEvent('mousedown', path[0][0], path[0][1]);

path.slice(1, len).forEach(function(pt) {
mouseEvent('mousemove', pt[0], pt[1]);
});

mouseEvent('mouseup', path[len - 1][0], path[len - 1][1]);
}

function assertRange(gd, expected) {
var ternary = gd._fullLayout.ternary;
var actual = [
Expand Down