Skip to content

Annotation dragging #505

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
May 4, 2016
Merged

Annotation dragging #505

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
5aa2d9a
Annotations: Update to use translations for positioning
mdtusz May 4, 2016
6abb696
Tests: added test for dragging annotations
mdtusz May 4, 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
22 changes: 13 additions & 9 deletions src/components/annotations/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ annotations.draw = function(gd, index, opt, value) {

var annX = Math.round(annPosPx.x - outerwidth / 2),
annY = Math.round(annPosPx.y - outerheight / 2);
ann.attr('transform', 'translate(' + annX + ', ' + annY + ')');
ann.call(Lib.setTranslate, annX, annY);

var annbase = 'annotations['+index+']';

Expand Down Expand Up @@ -591,8 +591,10 @@ annotations.draw = function(gd, index, opt, value) {
dragElement.init({
element: arrowdrag.node(),
prepFn: function() {
annx0 = Number(ann.attr('x'));
anny0 = Number(ann.attr('y'));
var pos = Lib.getTranslate(ann);

annx0 = pos.x;
anny0 = pos.y;
update = {};
if(xa && xa.autorange) {
update[xa._name+'.autorange'] = true;
Expand All @@ -607,7 +609,7 @@ annotations.draw = function(gd, index, opt, value) {
var annxy0 = applyTransform(annx0, anny0),
xcenter = annxy0[0] + dx,
ycenter = annxy0[1] + dy;
ann.call(Drawing.setPosition, xcenter, ycenter);
ann.call(Lib.setTranslate, xcenter, ycenter);

update[annbase+'.x'] = xa ?
(options.x + dx / xa._m) :
Expand Down Expand Up @@ -648,12 +650,14 @@ annotations.draw = function(gd, index, opt, value) {
dragElement.init({
element: ann.node(),
prepFn: function() {
x0 = Number(ann.attr('x'));
y0 = Number(ann.attr('y'));
var pos = Lib.getTranslate(ann);

x0 = pos.x;
y0 = pos.y;
update = {};
},
moveFn: function(dx, dy) {
ann.call(Drawing.setPosition, x0 + dx, y0 + dy);
ann.call(Lib.setTranslate, x0 + dx, y0 + dy);
var csr = 'pointer';
if(options.showarrow) {
update[annbase+'.ax'] = options.ax + dx;
Expand All @@ -679,7 +683,7 @@ annotations.draw = function(gd, index, opt, value) {
heightFraction, 0, 1, options.yanchor);
}
if(!xa || !ya) {
csr = dragElement.cursor(
csr = dragElement.getCursor(
xa ? 0.5 : update[annbase + '.x'],
ya ? 0.5 : update[annbase + '.y'],
options.xanchor, options.yanchor
Expand All @@ -691,7 +695,7 @@ annotations.draw = function(gd, index, opt, value) {
x1 = xy1[0] + dx,
y1 = xy1[1] + dy;

ann.call(Drawing.setPosition, x1, y1);
ann.call(Lib.setTranslate, x0 + dx, y0 + dy);

anng.attr({
transform: 'rotate(' + textangle + ',' +
Expand Down
48 changes: 34 additions & 14 deletions test/jasmine/tests/config_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ describe('config argument', function() {
{ x: [1,2,3], y: [3,2,1] }
], {
width: 600,
height: 400
height: 400,
annotations: [
{ text: 'testing', x: 1, y: 1, showarrow: true }
]
}, { editable: true })
.then(done);
});
Expand All @@ -78,6 +81,24 @@ describe('config argument', function() {
expect(editBox.getAttribute('contenteditable')).toBe('true');
}

function checkIfDraggable(elClass) {
var el = document.getElementsByClassName(elClass)[0];

var elBox = el.getBoundingClientRect(),
elX = elBox.left + elBox.width / 2,
elY = elBox.top + elBox.height / 2;

mouseEvent('mousedown', elX, elY);
mouseEvent('mousemove', elX - 20, elY + 20);

var movedBox = el.getBoundingClientRect();

expect(movedBox.left).toBe(elBox.left - 20);
expect(movedBox.top).toBe(elBox.top + 20);

mouseEvent('mouseup', elX - 20, elY + 20);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double ➕ good test!

}

it('should make titles editable', function() {
checkIfEditable('gtitle', 'Click to enter Plot title');
});
Expand All @@ -94,22 +115,21 @@ describe('config argument', function() {
checkIfEditable('legendtext', 'trace 0');
});

it('should make legends draggable', function() {

var legend = document.getElementsByClassName('legend')[0],
legendBox = legend.getBoundingClientRect(),
legendX = legendBox.left + legendBox.width / 2,
legendY = legendBox.top + legendBox.height / 2;

mouseEvent('mousedown', legendX, legendY);
mouseEvent('mousemove', legendX - 20, legendY + 20);
mouseEvent('mouseup', legendX - 20, legendY + 20);
it('should make annotation labels editable', function() {
checkIfEditable('annotation-text-g', 'testing');
});

var movedlegendBox = legend.getBoundingClientRect();
it('should make annotation labels draggable', function() {
checkIfDraggable('annotation-text-g');
});

expect(movedlegendBox.left).not.toBe(legendBox.left);
expect(movedlegendBox.top).not.toBe(legendBox.top);
it('should make annotation arrows draggable', function() {
checkIfDraggable('annotation-arrow-g');
});

it('should make legends draggable', function() {
checkIfDraggable('legend');
});

});
});