marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-23 17:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix 0 values

Browse Source
This commit is contained in:
Axel Müller
2024-01-13 11:54:14 +01:00
parent 506314598e
commit 3262a06a8e
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/mermaid/src/diagrams/xychart/chartBuilder/components/plot/barPlot.ts
View File

@@ -13,6 +13,7 @@ export class BarPlot {
getDrawableElement(): DrawableElem[] { getDrawableElement(): DrawableElem[] {
const offset = new Array(this.barData[0].data.length).fill(0); const offset = new Array(this.barData[0].data.length).fill(0);
const enlarge = new Array(this.barData[0].data.length).fill(0);
return this.barData.map((barData, dataIndex) => { return this.barData.map((barData, dataIndex) => {
const finalData: [number, number][] = barData.data.map((d) => [ const finalData: [number, number][] = barData.data.map((d) => [
this.xAxis.getScaleValue(d[0]), this.xAxis.getScaleValue(d[0]),
@@ -31,12 +32,23 @@ export class BarPlot {
groupTexts: ['plot', `bar-plot-${this.plotIndex}-${dataIndex}`], groupTexts: ['plot', `bar-plot-${this.plotIndex}-${dataIndex}`],
type: 'rect', type: 'rect',
data: finalData.map((data, index) => { data: finalData.map((data, index) => {
const x = offset[index] + this.boundingRect.x; let x = offset[index] + this.boundingRect.x;
const width = let width =
data[1] - data[1] -
this.boundingRect.x - this.boundingRect.x -
(dataIndex > 0 ? this.yAxis.getAxisOuterPadding() : 0); (dataIndex > 0 ? this.yAxis.getAxisOuterPadding() : 0);
if (enlarge[index] > 0) {
x -= enlarge[index];
width += enlarge[index];
enlarge[index] = 0;
}
offset[index] += width; offset[index] += width;
if (barData.data[index][1] === 0 && enlarge[index] === 0) {
enlarge[index] = width;
}
if (barData.data[index][1] === 0) {
width = 0;
}
return { return {
x, x,
y: data[0] - barWidthHalf, y: data[0] - barWidthHalf,
@@ -55,9 +67,19 @@ export class BarPlot {
data: finalData.map((data, index) => { data: finalData.map((data, index) => {
const adjustForAxisOuterPadding = dataIndex > 0 ? this.yAxis.getAxisOuterPadding() : 0; const adjustForAxisOuterPadding = dataIndex > 0 ? this.yAxis.getAxisOuterPadding() : 0;
const y = data[1] - offset[index] + adjustForAxisOuterPadding; const y = data[1] - offset[index] + adjustForAxisOuterPadding;
const height = let height =
this.boundingRect.y + this.boundingRect.height - data[1] - adjustForAxisOuterPadding; this.boundingRect.y + this.boundingRect.height - data[1] - adjustForAxisOuterPadding;
if (enlarge[index] > 0) {
height += enlarge[index];
enlarge[index] = 0;
}
offset[index] += height; offset[index] += height;
if (barData.data[index][1] === 0 && enlarge[index] === 0) {
enlarge[index] = height;
}
if (barData.data[index][1] === 0) {
height = 0;
}
return { return {
x: data[0] - barWidthHalf, x: data[0] - barWidthHalf,
y, y,