Skip to content
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.

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

fix(#11615): fix calculating caretX position on stacked bar with index interaction. #11616

Merged
merged 2 commits into from
Dec 27, 2023
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
8 changes: 5 additions & 3 deletions src/plugins/plugin.tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,24 @@ const positioners = {
}

let i, len;
let x = 0;
let xSet = new Set();
let y = 0;
let count = 0;

for (i = 0, len = items.length; i < len; ++i) {
const el = items[i].element;
if (el && el.hasValue()) {
const pos = el.tooltipPosition();
x += pos.x;
xSet.add(pos.x);
y += pos.y;
++count;
}
}

const xAverage = [...xSet].reduce((a, b) => a + b) / xSet.size;

return {
x: x / count,
x: xAverage,
y: y / count
};
},
Expand Down
56 changes: 56 additions & 0 deletions test/specs/plugin.tooltip.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,62 @@ describe('Plugin.Tooltip', function() {
expect(Object.prototype.hasOwnProperty.call(fn.calls.first().args[1], 'y')).toBe(true);
expect(fn.calls.first().object instanceof Tooltip).toBe(true);
});

it('Should ignore same x position when calculating average position with index interaction on stacked bar', async function() {
var chart = window.acquireChart({
type: 'bar',
data: {
datasets: [{
label: 'Dataset 1',
data: [10, 20, 30],
pointHoverBorderColor: 'rgb(255, 0, 0)',
pointHoverBackgroundColor: 'rgb(0, 255, 0)',
stack: 'stack1',
}, {
label: 'Dataset 2',
data: [40, 40, 40],
pointHoverBorderColor: 'rgb(0, 0, 255)',
pointHoverBackgroundColor: 'rgb(0, 255, 255)',
stack: 'stack1',
}, {
label: 'Dataset 3',
data: [90, 100, 110],
pointHoverBorderColor: 'rgb(0, 0, 255)',
pointHoverBackgroundColor: 'rgb(0, 255, 255)'
}],
labels: ['Point 1', 'Point 2', 'Point 3']
},
options: {
interaction: {
mode: 'index'
},
plugins: {
position: 'average',
},
}
});

// Trigger an event over top of the
var pointIndex = 1;
var datasetIndex = 0;
var meta = chart.getDatasetMeta(datasetIndex);
var point = meta.data[pointIndex];
await jasmine.triggerMouseEvent(chart, 'mousemove', point);

var tooltipModel = chart.tooltip;
const activeElements = tooltipModel.getActiveElements();

const xPositionArray = activeElements.map((element) => element.element.x);
const xPositionArrayAverage = xPositionArray.reduce((a, b) => a + b) / xPositionArray.length;

const xPositionSet = new Set(xPositionArray);
const xPositionSetAverage = [...xPositionSet].reduce((a, b) => a + b) / xPositionSet.size;

expect(xPositionArray.length).toBe(3);
expect(xPositionSet.size).toBe(2);
expect(tooltipModel.caretX).not.toBe(xPositionArrayAverage);
expect(tooltipModel.caretX).toBe(xPositionSetAverage);
});
});

it('Should avoid tooltip truncation in x axis if there is enough space to show tooltip without truncation', async function() {
Expand Down
Loading