archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge x/y interaction mode functions (#7794)

Browse Source
This commit is contained in:
Jukka Kurkela 2020-09-14 18:36:35 +03:00 committed by GitHub
parent c20360d08a
commit 2563ff174e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/core/core.interaction.js
View File

@ -180,6 +180,31 @@ function getNearestItems(chart, position, axis, intersect, useFinalPosition) {
return items;
}
function getAxisItems(chart, e, options, useFinalPosition) {
const position = getRelativePosition(e, chart);
const items = [];
const axis = options.axis;
const rangeMethod = axis === 'x' ? 'inXRange' : 'inYRange';
let intersectsItem = false;
evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
if (element[rangeMethod](position[axis], useFinalPosition)) {
items.push({element, datasetIndex, index});
}
if (element.inRange(position.x, position.y, useFinalPosition)) {
intersectsItem = true;
}
});
// If we want to trigger on an intersect and we don't have any items
// that intersect the position, return nothing
if (options.intersect && !intersectsItem) {
return [];
}
return items;
}
/**
* Contains interaction related functions
* @namespace Chart.Interaction
@ -294,26 +319,8 @@ export default {
* @return {InteractionItem[]} - items that are found
*/
x(chart, e, options, useFinalPosition) {
const position = getRelativePosition(e, chart);
const items = [];
let intersectsItem = false;
evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
if (element.inXRange(position.x, useFinalPosition)) {
items.push({element, datasetIndex, index});
}
if (element.inRange(position.x, position.y, useFinalPosition)) {
intersectsItem = true;
}
});
// If we want to trigger on an intersect and we don't have any items
// that intersect the position, return nothing
if (options.intersect && !intersectsItem) {
return [];
}
return items;
options.axis = 'x';
return getAxisItems(chart, e, options, useFinalPosition);
},
/**
@ -326,26 +333,8 @@ export default {
* @return {InteractionItem[]} - items that are found
*/
y(chart, e, options, useFinalPosition) {
const position = getRelativePosition(e, chart);
const items = [];
let intersectsItem = false;
evaluateAllVisibleItems(chart, (element, datasetIndex, index) => {
if (element.inYRange(position.y, useFinalPosition)) {
items.push({element, datasetIndex, index});
}
if (element.inRange(position.x, position.y, useFinalPosition)) {
intersectsItem = true;
}
});
// If we want to trigger on an intersect and we don't have any items
// that intersect the position, return nothing
if (options.intersect && !intersectsItem) {
return [];
}
return items;
options.axis = 'y';
return getAxisItems(chart, e, options, useFinalPosition);
}
}
};