fe9e0f2333
* Test(MapDragSpec): add mouse drag with CSS scaled container This test is failing as of this commit. * Fix(Draggable): measure drag compensating for CSS scale so that the computed offset (i.e. user drag length) is divided by the CSS scale applied on the `_element`'s container. Later on when `Draggable` updates the `_element`'s position, the latter is affected by the CSS scale by the browser. Added a `getSizedParentNode` function in `DomUtil` in order to automatically retrieve the closest parent node in the DOM hierarchy tree that has a non null size (so that we can compute the scale in `DomEvent.getMousePosition`), without having to specify the parent node explicitly (which is ugly). * Fix(getMousePosition): getBoundingClientRect is in page scale therefore it must also be divided by the container scale in order to compute the relative position of the event in the scaled container. * Test(MarkerDragSpec): add drag with CSS scaled container this should pass automatically at this commit, thanks to the previous modification of Draggable. * Debug(map-scaled): add draggable marker as well as another CSS scaled wrapper, plus some border and padding, and debugging console logs, to make sure the computations of `getMousePosition` are correct (correctly removing the border width, and compensating for CSS scale). * Docs(getMousePosition): explicitly exclude border * Docs(DomUtil): add return value of getSizedParentNode was missing in docstring. * Feat(DomUtil): add getScale function so that it can be used by DomEvent.getMousePosition and Draggable. * Refactor(Draggable): cache container scale to avoid triggering browser reflow continuously during _onMove, but only on drag start (_onDown). By compensating for the scale within Draggable instead of delegating to DomEvent.getMousePosition, it also becomes possible to check first for the clickTolerance, so that we prevents user's small movement based on screen, irrespective of rendered scale. * Test(Map+MarkerDrag): remove scale on initial movement that is intended to overcome Draggable clickTolerance, since now it is based on screen pixels, irrespective of applied CSS scale on the map. Thanks to the tolerance in the expected final position, this has no effect on the result of the test, even though the overall drag is now slightly shorter. * Refactor(DomEvent): use DomUtil.getScale in getMousePosition to factorize scale computation (also used within Draggable).
124 lines
3.3 KiB
JavaScript
124 lines
3.3 KiB
JavaScript
describe("Marker.Drag", function () {
|
|
var map,
|
|
div;
|
|
|
|
beforeEach(function () {
|
|
div = document.createElement('div');
|
|
div.style.width = div.style.height = '600px';
|
|
div.style.top = div.style.left = 0;
|
|
div.style.position = 'absolute';
|
|
document.body.appendChild(div);
|
|
|
|
map = L.map(div).setView([0, 0], 0);
|
|
});
|
|
|
|
afterEach(function () {
|
|
document.body.removeChild(div);
|
|
});
|
|
|
|
describe("drag", function () {
|
|
it("drags a marker with mouse", function (done) {
|
|
var marker = new L.Marker([0, 0], {
|
|
draggable: true
|
|
});
|
|
map.addLayer(marker);
|
|
|
|
var hand = new Hand({
|
|
timing: 'fastframe',
|
|
onStop: function () {
|
|
var center = map.getCenter();
|
|
expect(center.lat).to.be(0);
|
|
expect(center.lng).to.be(0);
|
|
|
|
var markerPos = marker.getLatLng();
|
|
// Marker drag is very timing sensitive, so we can't check
|
|
// exact values here, just verify that the drag is in the
|
|
// right ballpark
|
|
expect(markerPos.lat).to.be.within(-50, -30);
|
|
expect(markerPos.lng).to.be.within(340, 380);
|
|
|
|
done();
|
|
}
|
|
});
|
|
var toucher = hand.growFinger('mouse');
|
|
|
|
toucher.wait(100).moveTo(300, 280, 0)
|
|
.down().moveBy(5, 0, 20).moveBy(256, 32, 1000).wait(100).up().wait(100);
|
|
});
|
|
|
|
describe("in CSS scaled container", function () {
|
|
var scaleX = 2;
|
|
var scaleY = 1.5;
|
|
|
|
beforeEach(function () {
|
|
div.style.webkitTransformOrigin = 'top left';
|
|
div.style.webkitTransform = 'scale(' + scaleX + ', ' + scaleY + ')';
|
|
});
|
|
|
|
afterEach(function () {
|
|
div.style.webkitTransformOrigin = '';
|
|
div.style.webkitTransform = '';
|
|
});
|
|
|
|
it("drags a marker with mouse, compensating for CSS scale", function (done) {
|
|
var marker = new L.Marker([0, 0], {
|
|
draggable: true
|
|
});
|
|
map.addLayer(marker);
|
|
|
|
var hand = new Hand({
|
|
timing: 'fastframe',
|
|
onStop: function () {
|
|
var center = map.getCenter();
|
|
expect(center.lat).to.be(0);
|
|
expect(center.lng).to.be(0);
|
|
|
|
var markerPos = marker.getLatLng();
|
|
// Marker drag is very timing sensitive, so we can't check
|
|
// exact values here, just verify that the drag is in the
|
|
// right ballpark
|
|
expect(markerPos.lat).to.be.within(-50, -30);
|
|
expect(markerPos.lng).to.be.within(340, 380);
|
|
|
|
done();
|
|
}
|
|
});
|
|
var toucher = hand.growFinger('mouse');
|
|
|
|
toucher.wait(100).moveTo(scaleX * 300, scaleY * 280, 0)
|
|
.down().moveBy(5, 0, 20).moveBy(scaleX * 256, scaleY * 32, 1000).wait(100).up().wait(100);
|
|
});
|
|
});
|
|
|
|
it("pans map when autoPan is enabled", function (done) {
|
|
var marker = new L.Marker([0, 0], {
|
|
draggable: true,
|
|
autoPan: true
|
|
});
|
|
map.addLayer(marker);
|
|
|
|
var hand = new Hand({
|
|
timing: 'fastframe',
|
|
onStop: function () {
|
|
var center = map.getCenter();
|
|
expect(center.lat).to.be(0);
|
|
expect(center.lng).to.be.within(10, 30);
|
|
|
|
var markerPos = marker.getLatLng();
|
|
// Marker drag is very timing sensitive, so we can't check
|
|
// exact values here, just verify that the drag is in the
|
|
// right ballpark
|
|
expect(markerPos.lat).to.be.within(-50, -30);
|
|
expect(markerPos.lng).to.be.within(400, 450);
|
|
|
|
done();
|
|
}
|
|
});
|
|
var toucher = hand.growFinger('mouse');
|
|
|
|
toucher.wait(100).moveTo(300, 280, 0)
|
|
.down().moveBy(5, 0, 20).moveBy(290, 32, 1000).wait(100).up().wait(100);
|
|
});
|
|
});
|
|
});
|