Skip to content
Open
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
35 changes: 18 additions & 17 deletions src/core/core.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,42 +404,44 @@ class Chart {
const metasets = this._metasets;
const numData = this.data.datasets.length;
const numMeta = metasets.length;
const sortedMetasetByIndex = this.data.datasets.map(currentDataset => metasets.find(currentMetaset => currentMetaset._dataset === currentDataset));

metasets.sort((a, b) => a.index - b.index);
if (numMeta > numData) {
for (let i = numData; i < numMeta; ++i) {
this._destroyDatasetMeta(i);
}
metasets.splice(numData, numMeta - numData);
sortedMetasetByIndex.splice(numData, numMeta - numData);
}
this._sortedMetasets = metasets.slice(0).sort(compare2Level('order', 'index'));
this._metasets = sortedMetasetByIndex;
this._sortedMetasets = sortedMetasetByIndex.slice(0).sort(compare2Level('order', 'index'));
}

/**
* @private
*/
_removeUnreferencedMetasets() {
* @private
*/
_rebuildMetasets() {
const {_metasets: metasets, data: {datasets}} = this;
if (metasets.length > datasets.length) {
delete this._stacks;
}
metasets.forEach((meta, index) => {
if (datasets.filter(x => x === meta._dataset).length === 0) {
this._destroyDatasetMeta(index);
}
const newMetasets = [];

datasets.forEach((dataset) => {
const matchingMetaset = metasets.find(metaset => dataset === metaset._dataset);
newMetasets.push(matchingMetaset);
});

this._metasets = newMetasets;
}

buildOrUpdateControllers() {
const newControllers = [];
const datasets = this.data.datasets;
let i, ilen;

this._removeUnreferencedMetasets();
this._rebuildMetasets();

for (i = 0, ilen = datasets.length; i < ilen; i++) {
const dataset = datasets[i];
let meta = this.getDatasetMeta(i);

const type = dataset.type || this.config.type;

if (meta.type && meta.type !== type) {
Expand Down Expand Up @@ -852,8 +854,7 @@ class Chart {
getDatasetMeta(datasetIndex) {
const dataset = this.data.datasets[datasetIndex];
const metasets = this._metasets;
let meta = metasets.filter(x => x && x._dataset === dataset).pop();

let meta = metasets[datasetIndex];
if (!meta) {
meta = {
type: null,
Expand All @@ -869,7 +870,7 @@ class Chart {
_parsed: [],
_sorted: false
};
metasets.push(meta);
metasets[datasetIndex] = meta;
}

return meta;
Expand Down
Loading