Skip to content

Commit

Permalink
fix(bar): Fix stacking bar position on multiple xs
Browse files Browse the repository at this point in the history
When is same group, but bound to different xs,
should stack if they're at same x axis value

Fix #3372
  • Loading branch information
netil authored Sep 4, 2023
1 parent dc46717 commit 216da62
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 5 deletions.
13 changes: 9 additions & 4 deletions src/ChartInternal/shape/shape.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default {
},

/**
* Get shape's indices according it's position
* Get shape's indices according it's position within each axis tick.
*
* From the below example, indices will be:
* ==> {data1: 0, data2: 0, data3: 1, data4: 1, __max__: 1}
Expand Down Expand Up @@ -125,11 +125,16 @@ export default {
continue;
}

for (let k = 0, row; (row = groups[k]); k++) {
if (row in ind) {
ind[d.id] = ind[row];
for (let k = 0, key; (key = groups[k]); k++) {
if (key in ind) {
ind[d.id] = ind[key];
break;
}

// for same grouped data, add other data to same indices
if (d.id !== key && xKey) {
ind[key] = ind[d.id] ?? i[xKey];
}
}
}

Expand Down
62 changes: 61 additions & 1 deletion test/shape/bar-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ describe("SHAPE BAR", () => {
type: "bar",
columns: [
["x1", "05"],
["Sep", 2],
["x2", "01", "08", "29"],
["Sep", 2],
["Jul", 1, 1, 1],
["Aug", 2, 2, 2]
],
Expand Down Expand Up @@ -551,6 +551,66 @@ describe("SHAPE BAR", () => {
expect(this.getAttribute("d")).to.be.equal(expectedPath.shift());
});
});

it("set options", () => {
args = {
data: {
xs: {
"Buy": "x1",
"Sell": "x2"
},
columns: [
["x1", "2018-07-05", "2018-07-11"],
["x2","2018-07-02","2018-07-05"],
["Buy", 33, 3],
["Sell", 7, 33]
],
type: "bar",
groups: [[ "Buy", "Sell"]]
},
axis: {
x: {
type: "timeseries",
tick: {
format: "%y-%m-%d"
},
}
}
}
});

it("should stack bars, form same multiple xs.", () => {
const {bars} = chart.$.bar;
const expectedPath = {
Buy: [
[219, 426],
[419, 426]
],
Sell: [
[119, 426],
[219, 232]
]
}

const getStartPoint = str => str.replace(/^M([^V]+)V.*/, "$1").split(",").map(Math.floor);

bars.filter(d => d.id === "Buy").each(function(d, i) {
const expected = expectedPath[d.id][i];

getStartPoint(this.getAttribute("d")).forEach((v, j) => {
expect(v).to.be.closeTo(expected[j], 1);
});
});


bars.filter(d => d.id === "Sell").each(function(d, i) {
const expected = expectedPath[d.id][i];

getStartPoint(this.getAttribute("d")).forEach((v, j) => {
expect(v).to.be.closeTo(expected[j], 1);
});
});
});
});

describe("options", () => {
Expand Down

0 comments on commit 216da62

Please sign in to comment.