Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 04:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

check the data set type in DoughnutController (#10867)

Browse Source
This commit is contained in:
t-mangoe 2022-11-13 05:41:21 +09:00 committed by GitHub
parent 89487501b6
commit 63993b03b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/controller.doughnut.js
View File

@ -183,7 +183,7 @@ export default class DoughnutController extends DatasetController {
let max = -TAU;
for (let i = 0; i < this.chart.data.datasets.length; ++i) {
if (this.chart.isDatasetVisible(i)) {
if (this.chart.isDatasetVisible(i) && this.chart.getDatasetMeta(i).type === this._type) {
const controller = this.chart.getDatasetMeta(i).controller;
const rotation = controller._getRotation();
const circumference = controller._getCircumference();

43
test/specs/mixed.tests.js
View File

@ -1,3 +1,46 @@
describe('Mixed charts', function() {
describe('auto', jasmine.fixture.specs('mixed'));
it('shoud be constructed with doughnuts chart', function() {
const chart = window.acquireChart({
data: {
datasets: [{
type: 'line',
data: [10, 20, 30, 40],
}, {
type: 'doughnut',
data: [10, 20, 30, 50],
}
],
labels: []
}
});
const meta0 = chart.getDatasetMeta(0);
expect(meta0.type).toEqual('line');
const meta1 = chart.getDatasetMeta(1);
expect(meta1.type).toEqual('doughnut');
});
it('shoud be constructed with pie chart', function() {
const chart = window.acquireChart({
data: {
datasets: [{
type: 'bar',
data: [10, 20, 30, 40],
}, {
type: 'pie',
data: [10, 20, 30, 50],
}
],
labels: []
}
});
const meta0 = chart.getDatasetMeta(0);
expect(meta0.type).toEqual('bar');
const meta1 = chart.getDatasetMeta(1);
expect(meta1.type).toEqual('pie');
});
});