Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/controllers/controller.bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,11 @@ export default class BarController extends DatasetController {
.filter(meta => meta.controller.options.grouped);
const stacked = iScale.options.stacked;
const stacks = [];
const currentParsed = this._cachedMeta.controller.getParsed(dataIndex);
const iScaleValue = currentParsed && currentParsed[iScale.axis];

const skipNull = (meta) => {
const parsed = meta.controller.getParsed(dataIndex);
const parsed = meta._parsed.find(item => item[iScale.axis] === iScaleValue);
const val = parsed && parsed[meta.vScale.axis];

if (isNullOrUndef(val) || isNaN(val)) {
Expand Down
86 changes: 86 additions & 0 deletions test/specs/controller.bar.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -1676,6 +1676,92 @@ describe('Chart.controllers.bar', function() {
expect(unevenChart).not.toThrow();
});

it('should correctly count the number of stacks when skipNull and different order datasets', function() {

const chart = window.acquireChart({
type: 'bar',
data: {
datasets: [
{
id: '1',
label: 'USA',
data: [
{
xScale: 'First',
Country: 'USA',
yScale: 524
},
{
xScale: 'Second',
Country: 'USA',
yScale: 325
}
],

yAxisID: 'yScale',
xAxisID: 'xScale',

parsing: {
yAxisKey: 'yScale',
xAxisKey: 'xScale'
}
},
{
id: '2',
label: 'BRA',
data: [
{
xScale: 'Second',
Country: 'BRA',
yScale: 183
},
{
xScale: 'First',
Country: 'BRA',
yScale: 177
}
],

yAxisID: 'yScale',
xAxisID: 'xScale',

parsing: {
yAxisKey: 'yScale',
xAxisKey: 'xScale'
}
},
{
id: '3',
label: 'DEU',
data: [
{
xScale: 'First',
Country: 'DEU',
yScale: 162
}
],

yAxisID: 'yScale',
xAxisID: 'xScale',

parsing: {
yAxisKey: 'yScale',
xAxisKey: 'xScale'
}
}
]
},
options: {
skipNull: true
}
});

var meta = chart.getDatasetMeta(0);
expect(meta.controller._getStackCount(0)).toBe(3);
expect(meta.controller._getStackCount(1)).toBe(2);

});

it('should not override tooltip title and label callbacks', async() => {
const chart = window.acquireChart({
type: 'bar',
Expand Down
Loading