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

fix: calc visible points on update (#10667)

Browse Source
This commit is contained in:
Dan Onoshko 2022-09-25 04:01:47 +07:00 committed by GitHub
parent 1253ceddb1
commit 22f32af1bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/controller.line.js
View File

@ -82,12 +82,20 @@ export default class LineController extends DatasetController {
const {spanGaps, segment} = this.options;
const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY;
const directUpdate = this.chart._animationsDisabled || reset || mode === 'none';
const end = start + count;
const pointsCount = points.length;
let prevParsed = start > 0 && this.getParsed(start - 1);
for (let i = start; i < start + count; ++i) {
for (let i = 0; i < pointsCount; ++i) {
const point = points[i];
const parsed = this.getParsed(i);
const properties = directUpdate ? point : {};
if (i < start || i >= end) {
properties.skip = true;
continue;
}
const parsed = this.getParsed(i);
const nullData = isNullOrUndef(parsed[vAxis]);
const iPixel = properties[iAxis] = iScale.getPixelForValue(parsed[iAxis], i);
const vPixel = properties[vAxis] = reset || nullData ? vScale.getBasePixel() : vScale.getPixelForValue(_stacked ? this.applyStack(vScale, parsed, _stacked) : parsed[vAxis], i);

5
src/helpers/helpers.collection.js
View File

@ -35,7 +35,10 @@ export function _lookup(table, value, cmp) {
*/
export const _lookupByKey = (table, key, value, last) =>
_lookup(table, value, last
? index => table[index][key] <= value
? index => {
const ti = table[index][key];
return ti < value || ti === value && table[index + 1][key] === value;
}
: index => table[index][key] < value);
/**

7
test/specs/controller.line.tests.js
View File

@ -1051,6 +1051,9 @@ describe('Chart.controllers.line', function() {
{x: 50, y: 9},
{x: 50, y: 9},
{x: 50, y: 9},
{x: 51, y: 9},
{x: 52, y: 9},
{x: 52, y: 9},
];
chart.update();
@ -1062,6 +1065,10 @@ describe('Chart.controllers.line', function() {
};
chart._handleEvent(event, false, true);
const visiblePoints = chart.getSortedVisibleDatasetMetas()[0].data.filter(_ => !_.skip);
expect(visiblePoints.length).toBe(6);
}, 500);
it('should not override tooltip title and label callbacks', async() => {

10
test/specs/helpers.collection.tests.js
View File

@ -19,6 +19,16 @@ describe('helpers.collection', function() {
expect(_lookupByKey(data, 'x', 9)).toEqual({lo: 2, hi: 3});
});
it('Should do binary search by key with last', () => {
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 6}, {x: 9}], 'x', 25, true)).toEqual({lo: 2, hi: 3});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 9}, {x: 9}], 'x', 25, true)).toEqual({lo: 2, hi: 3});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 9}, {x: 9}, {x: 22}], 'x', 25, true)).toEqual({lo: 3, hi: 4});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 25}, {x: 28}], 'x', 25, true)).toEqual({lo: 1, hi: 2});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 25}, {x: 25}], 'x', 25, true)).toEqual({lo: 2, hi: 3});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 25}, {x: 25}, {x: 28}], 'x', 25, true)).toEqual({lo: 2, hi: 3});
expect(_lookupByKey([{x: 0}, {x: 2}, {x: 25}, {x: 25}, {x: 25}, {x: 28}, {x: 29}], 'x', 25, true)).toEqual({lo: 3, hi: 4});
});
it('Should do reverse binary search by key', function() {
const data = [{x: 10}, {x: 7}, {x: 3}, {x: 0}];
expect(_rlookupByKey(data, 'x', 0)).toEqual({lo: 2, hi: 3});