Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-15 04:36:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dataset metadata when axisID changes (#6321)

Browse Source
This commit is contained in:
Akihiko Kusanagi
2019-06-14 11:34:56 +02:00
committed by GitHub
parent bf094c59db
commit 9eecdf4da1
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,13 +139,16 @@ helpers.extend(DatasetController.prototype, {
linkScales: function() {
var me = this;
var meta = me.getMeta();
var chart = me.chart;
var scales = chart.scales;
var dataset = me.getDataset();
var scalesOpts = chart.options.scales;
if (meta.xAxisID === null || !(meta.xAxisID in me.chart.scales)) {
meta.xAxisID = dataset.xAxisID || me.chart.options.scales.xAxes[0].id;
if (meta.xAxisID === null || !(meta.xAxisID in scales) || dataset.xAxisID) {
meta.xAxisID = dataset.xAxisID || scalesOpts.xAxes[0].id;
}
if (meta.yAxisID === null || !(meta.yAxisID in me.chart.scales)) {
meta.yAxisID = dataset.yAxisID || me.chart.options.scales.yAxes[0].id;
if (meta.yAxisID === null || !(meta.yAxisID in scales) || dataset.yAxisID) {
meta.yAxisID = dataset.yAxisID || scalesOpts.yAxes[0].id;
}
},

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

@@ -221,6 +221,45 @@ describe('Chart.DatasetController', function() {
expect(meta.data.length).toBe(42);
});
it('should re-synchronize metadata when scaleID changes', function() {
var chart = acquireChart({
type: 'line',
data: {
datasets: [{
data: [],
xAxisID: 'firstXScaleID',
yAxisID: 'firstYScaleID',
}]
},
options: {
scales: {
xAxes: [{
id: 'firstXScaleID'
}, {
id: 'secondXScaleID'
}],
yAxes: [{
id: 'firstYScaleID'
}, {
id: 'secondYScaleID'
}]
}
}
});
var meta = chart.getDatasetMeta(0);
expect(meta.xAxisID).toBe('firstXScaleID');
expect(meta.yAxisID).toBe('firstYScaleID');
chart.data.datasets[0].xAxisID = 'secondXScaleID';
chart.data.datasets[0].yAxisID = 'secondYScaleID';
chart.update();
expect(meta.xAxisID).toBe('secondXScaleID');
expect(meta.yAxisID).toBe('secondYScaleID');
});
it('should cleanup attached properties when the reference changes or when the chart is destroyed', function() {
var data0 = [0, 1, 2, 3, 4, 5];
var data1 = [6, 7, 8];