Skip to content

Legend: fix drag movement when editable: true #487

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 4 commits into from
Apr 29, 2016
Merged

Legend: fix drag movement when editable: true #487

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b55f9c0
Legend: fix drag movement when `editable: true`
mdtusz Apr 27, 2016
0cf82fe
Lib: Add getTranslate and setTranslate methods and tests
mdtusz Apr 28, 2016
7269c33
Legend: Switch to using Lib.getTranslate
mdtusz Apr 28, 2016
ee0b452
Tests: add tests for when editable
mdtusz Apr 29, 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
36 changes: 13 additions & 23 deletions src/components/legend/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ var d3 = require('d3');

var Plotly = require('../../plotly');
var Lib = require('../../lib');
var setCursor = require('../../lib/setcursor');
var Plots = require('../../plots/plots');
var dragElement = require('../dragelement');
var Drawing = require('../drawing');
Expand Down Expand Up @@ -326,38 +325,29 @@ module.exports = function draw(gd) {
}

if(gd._context.editable) {
var xf,
yf,
x0,
y0,
lw,
lh;
var xf, yf, x0, y0;
Copy link
Contributor

@etpinard etpinard Apr 29, 2016

Choose a reason for hiding this comment

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

@mdtusz if you feel adventurous, maybe you add our first editable: true jasmine test ...


legend.classed('cursor-move', true);

dragElement.init({
element: legend.node(),
prepFn: function() {
x0 = Number(legend.attr('x'));
y0 = Number(legend.attr('y'));
lw = Number(legend.attr('width'));
lh = Number(legend.attr('height'));
setCursor(legend);
var transform = Lib.getTranslate(legend);

x0 = transform.x;
y0 = transform.y;
},
moveFn: function(dx, dy) {
var gs = gd._fullLayout._size;

legend.call(Drawing.setPosition, x0+dx, y0+dy);
var newX = x0 + dx,
newY = y0 + dy;

xf = dragElement.align(x0+dx, lw, gs.l, gs.l+gs.w,
opts.xanchor);
yf = dragElement.align(y0+dy+lh, -lh, gs.t+gs.h, gs.t,
opts.yanchor);
var transform = 'translate(' + newX + ', ' + newY + ')';
legend.attr('transform', transform);

var csr = dragElement.getCursor(xf, yf,
opts.xanchor, opts.yanchor);
setCursor(legend, csr);
xf = dragElement.align(newX, 0, gs.l, gs.l+gs.w, opts.xanchor);
yf = dragElement.align(newY, 0, gs.t+gs.h, gs.t, opts.yanchor);
},
doneFn: function(dragged) {
setCursor(legend);
if(dragged && xf !== undefined && yf !== undefined) {
Plotly.relayout(gd, {'legend.x': xf, 'legend.y': yf});
}
Expand Down
36 changes: 36 additions & 0 deletions src/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,42 @@ lib.addStyleRule = function(selector, styleString) {
else console.warn('addStyleRule failed');
};

lib.getTranslate = function(element) {

var re = /(\btranslate\()(\d*\.?\d*)([^\d]*)(\d*\.?\d*)([^\d]*)(.*)/,
getter = element.attr ? 'attr' : 'getAttribute',
transform = element[getter]('transform') || '';

var translate = transform.replace(re, function(match, p1, p2, p3, p4) {
return [p2, p4].join(' ');
})
.split(' ');

return {
x: +translate[0] || 0,
y: +translate[1] || 0
};
};

lib.setTranslate = function(element, x, y) {

var re = /(\btranslate\(.*?\);?)/,
getter = element.attr ? 'attr' : 'getAttribute',
setter = element.attr ? 'attr' : 'setAttribute',
transform = element[getter]('transform') || '';

x = x || 0;
y = y || 0;

transform = transform.replace(re, '').trim();
transform += ' translate(' + x + ', ' + y + ')';
transform = transform.trim();

element[setter]('transform', transform);

return transform;
};

lib.isIE = function() {
return typeof window.navigator.msSaveBlob !== 'undefined';
};
87 changes: 87 additions & 0 deletions test/jasmine/tests/lib_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,4 +770,91 @@ describe('Test lib.js:', function() {
});
});

describe('getTranslate', function() {

it('should work with regular DOM elements', function() {
var el = document.createElement('div');

expect(Lib.getTranslate(el)).toEqual({ x: 0, y: 0 });

el.setAttribute('transform', 'translate(123.45px, 67)');
expect(Lib.getTranslate(el)).toEqual({ x: 123.45, y: 67 });

el.setAttribute('transform', 'translate(123.45)');
expect(Lib.getTranslate(el)).toEqual({ x: 123.45, y: 0 });

el.setAttribute('transform', 'translate(1 2)');
expect(Lib.getTranslate(el)).toEqual({ x: 1, y: 2 });

el.setAttribute('transform', 'translate(1 2); rotate(20deg)');
expect(Lib.getTranslate(el)).toEqual({ x: 1, y: 2 });

el.setAttribute('transform', 'rotate(20deg)');
expect(Lib.getTranslate(el)).toEqual({ x: 0, y: 0 });
});

it('should work with d3 elements', function() {
var el = d3.select(document.createElement('div'));

el.attr('transform', 'translate(123.45px, 67)');
expect(Lib.getTranslate(el)).toEqual({ x: 123.45, y: 67 });

el.attr('transform', 'translate(123.45)');
expect(Lib.getTranslate(el)).toEqual({ x: 123.45, y: 0 });

el.attr('transform', 'translate(1 2)');
expect(Lib.getTranslate(el)).toEqual({ x: 1, y: 2 });

el.attr('transform', 'translate(1 2); rotate(20)');
expect(Lib.getTranslate(el)).toEqual({ x: 1, y: 2 });

el.attr('transform', 'rotate(20)');
expect(Lib.getTranslate(el)).toEqual({ x: 0, y: 0 });
});

});

describe('setTranslate', function() {

it('should work with regular DOM elements', function() {
var el = document.createElement('div');

Lib.setTranslate(el, 5);
expect(el.getAttribute('transform')).toBe('translate(5, 0)');

Lib.setTranslate(el, 10, 20);
expect(el.getAttribute('transform')).toBe('translate(10, 20)');

Lib.setTranslate(el, 30, 40);
expect(el.getAttribute('transform')).toBe('translate(30, 40)');

Lib.setTranslate(el);
expect(el.getAttribute('transform')).toBe('translate(0, 0)');

el.setAttribute('transform', 'translate(0, 0); rotate(30)');
Lib.setTranslate(el, 30, 40);
expect(el.getAttribute('transform')).toBe('rotate(30) translate(30, 40)');
});

it('should work with d3 elements', function() {
var el = d3.select(document.createElement('div'));

Lib.setTranslate(el, 5);
expect(el.attr('transform')).toBe('translate(5, 0)');

Lib.setTranslate(el, 10, 20);
expect(el.attr('transform')).toBe('translate(10, 20)');

Lib.setTranslate(el, 30, 40);
expect(el.attr('transform')).toBe('translate(30, 40)');

Lib.setTranslate(el);
expect(el.attr('transform')).toBe('translate(0, 0)');

el.attr('transform', 'translate(0, 0); rotate(30)');
Lib.setTranslate(el, 30, 40);
expect(el.attr('transform')).toBe('rotate(30) translate(30, 40)');
});
});

});