Skip to content

Commit

Permalink
fix(shape): Fix for empty data in normalization (#649)
Browse files Browse the repository at this point in the history
When value is non numeric, set zero as a replacement

Ref #623
Close #649
  • Loading branch information
netil committed Nov 13, 2018
1 parent 014537a commit 76f3558
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
25 changes: 25 additions & 0 deletions spec/internals/data-spec.js
Expand Up @@ -1518,6 +1518,31 @@ describe("DATA", () => {
}, 300);
});

it("set options data.columns", () => {
args.data.columns = [
["data1", 230, null, 300],
["data2", 198, 87, null]
];
});

it("check for null data", done => {
const main = chart.$.main;
const data1Bar = main.select(`.${CLASS.bars}-data1 .${CLASS.bar}-2`).node();
const data2Bar = main.select(`.${CLASS.bars}-data2 .${CLASS.bar}-1`).node();

expect(data1Bar.getBBox().height).to.be.equal(chartHeight);
expect(data2Bar.getBBox().height).to.be.equal(chartHeight);

// when
chart.hide("data2");

setTimeout(() => {
expect(data2Bar.getBBox().height).to.be.equal(0);

done();
}, 500)
});

it("set options data.type='area'", () => {
args.data.type = "area";
args.data.columns = [
Expand Down
9 changes: 6 additions & 3 deletions src/data/data.js
Expand Up @@ -18,6 +18,7 @@ import {
isBoolean,
isDefined,
isFunction,
isNumber,
isObject,
isObjectType,
isString,
Expand Down Expand Up @@ -306,7 +307,7 @@ extend(ChartInternal.prototype, {
sum[i] = 0;
}

sum[i] += v.value;
sum[i] += isNumber(v.value) ? v.value : 0;
});
});
}
Expand Down Expand Up @@ -795,12 +796,14 @@ extend(ChartInternal.prototype, {

if ($$.hiddenTargetIds.length) {
const hiddenSum = dataValues($$.hiddenTargetIds, false)
.reduce((acc, curr) => acc.map((v, i) => v + curr[i]));
.reduce((acc, curr) => acc.map((v, i) => (isNumber(v) ? v : 0) + curr[i]));

total = total.map((v, i) => v - hiddenSum[i]);
}

if (total && d.value) {
d.ratio = 0;

if (isNumber(d.value) && total && total[d.index] > 0) {
d.ratio = d.value / total[d.index];
}

Expand Down

0 comments on commit 76f3558

Please sign in to comment.