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

Make dataset animations obey chart level disable (#7820)

Browse Source
This commit is contained in:
Jukka Kurkela 2020-09-28 16:51:28 +03:00 committed by GitHub
parent 391e4b6f2e
commit c4243683fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.datasetController.js
View File

@ -804,9 +804,9 @@ export default class DatasetController {
const info = {cacheable: true};
const context = me._getContext(index, active);
const datasetAnim = resolve([me._config.animation], context, index, info);
const chartAnim = resolve([chart.options.animation], context, index, info);
let config = mergeIf({}, [datasetAnim, chartAnim]);
const datasetAnim = resolve([me._config.animation], context, index, info);
let config = chartAnim && mergeIf({}, [datasetAnim, chartAnim]);
if (config[mode]) {
config = Object.assign({}, config, config[mode]);

99
test/specs/core.datasetController.tests.js
View File

@ -624,43 +624,82 @@ describe('Chart.DatasetController', function() {
// Remove test from global defaults
delete Chart.defaults.elements.line.globalTest;
});
});
it('should resove names in object notation', function() {
Chart.defaults.elements.line.global = 'global';
it('should resove names in object notation', function() {
Chart.defaults.elements.line.global = 'global';
const chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: [1],
datasetTest: 'dataset'
}]
},
options: {
elements: {
line: {
element: 'element'
const chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: [1],
datasetTest: 'dataset'
}]
},
options: {
elements: {
line: {
element: 'element'
}
}
}
}
});
const controller = chart.getDatasetMeta(0).controller;
expect(controller._resolveOptions(
{
dataset: 'datasetTest',
element: 'elementTest',
global: 'globalTest'},
{type: 'line'})
).toEqual({
dataset: 'dataset',
element: 'element',
global: 'global'
});
// Remove test from global defaults
delete Chart.defaults.elements.line.global;
});
});
describe('_resolveAnimations', function() {
it('should resolve to empty Animations when globally disabled', function() {
const chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: [1],
animation: {
test: {duration: 10}
}
}]
},
options: {
animation: false
}
});
const controller = chart.getDatasetMeta(0).controller;
expect(controller._resolveAnimations(0)._properties.size).toEqual(0);
});
const controller = chart.getDatasetMeta(0).controller;
it('should resolve to empty Animations when disabled at dataset level', function() {
const chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: [1],
animation: false
}]
}
});
expect(controller._resolveOptions(
{
dataset: 'datasetTest',
element: 'elementTest',
global: 'globalTest'},
{type: 'line'})
).toEqual({
dataset: 'dataset',
element: 'element',
global: 'global'
const controller = chart.getDatasetMeta(0).controller;
expect(controller._resolveAnimations(0)._properties.size).toEqual(0);
});
// Remove test from global defaults
delete Chart.defaults.elements.line.global;
});
});