Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions src/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,14 @@ function keyDown(chart, event) {
}

function getPointPosition(event, chart) {
const point = getRelativePosition(event, chart);
const canvasArea = chart.canvas.getBoundingClientRect();
if (!_isPointInArea(event, canvasArea)) {
point.x = event.clientX - canvasArea.left;
point.y = event.clientY - canvasArea.top;
if (event.target !== chart.canvas) {
const canvasArea = chart.canvas.getBoundingClientRect();
return {
x: event.clientX - canvasArea.left,
y: event.clientY - canvasArea.top,
};
}
return point;
return getRelativePosition(event, chart);
}

function zoomStart(chart, event, zoomOptions) {
Expand Down
57 changes: 57 additions & 0 deletions test/specs/zoom.drag.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,63 @@ describe('zoom with drag', function() {
expect(scaleY.options.min).toBeCloseTo(1.2);
expect(scaleY.options.max).toBeCloseTo(1.7);
});

it('handles dragging off the right edge of the chart canvas', function() {
chart = window.acquireChart({
type: 'line',
data,
options: {
scales: {
xScale0: {
id: 'xScale0',
type: 'linear',
min: 0,
max: 4
},
yScale0: {
id: 'yScale0',
type: 'linear',
min: 0,
max: 4,
}
},
plugins: {
zoom: {
zoom: {
drag: {
enabled: true
},
mode: 'xy'
}
}
}
}
}, {
wrapper: {style: 'position: absolute; left: 50px; top: 50px;'}
});

scaleX = chart.scales.xScale0;
scaleY = chart.scales.yScale0;

jasmine.triggerMouseEvent(chart, 'mousedown', {
x: scaleX.getPixelForValue(1.5),
y: scaleY.getPixelForValue(1.2)
});

const rect = chart.canvas.getBoundingClientRect();
document.documentElement.dispatchEvent(new MouseEvent('mouseup', {
clientX: rect.right,
clientY: rect.top + scaleY.getPixelForValue(1.7),
cancelable: true,
bubbles: true,
view: window
}));

expect(scaleX.options.min).toBeCloseTo(1.5);
expect(scaleX.options.max).toBeCloseTo(4);
expect(scaleY.options.min).toBeCloseTo(1.2);
expect(scaleY.options.max).toBeCloseTo(1.7);
});
});

describe('events', function() {
Expand Down
Loading