Skip to content

fix: stacked percentage with zero values #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markov00 merged 1 commit into from
Apr 9, 2020
Merged

fix: stacked percentage with zero values #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified ...ries-area-chart-stacked-percentage-with-zeros-visually-looks-correct-1-snap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/chart_types/xy_chart/rendering/rendering.areas.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,10 +1114,10 @@ describe('Rendering points - areas', () => {
{
datum: [1546300800000, 0],
initialY0: null,
initialY1: null,
initialY1: 0,
x: 1546300800000,
y0: null,
y1: null,
y1: 0,
},
{
datum: [1546387200000, 5],
Expand Down
6 changes: 3 additions & 3 deletions src/chart_types/xy_chart/utils/stacked_series_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,17 +449,17 @@ describe('Stacked Series Utils', () => {
const stackedValues: Map<any, StackedValues> = new Map();
stackedValues.set(1, {
values: [0, 0, 0],
percent: [null, null, null],
percent: [0, 0, 0],
total: 0,
});
const formattedDatum = getStackedFormattedSeriesDatum({ x: 1, y1: 0 }, stackedValues, 0, false, true);
expect(formattedDatum).toEqual({
datum: undefined,
initialY0: null,
initialY1: null,
initialY1: 0,
x: 1,
y0: null,
y1: null,
y1: 0,
});
});
});
12 changes: 6 additions & 6 deletions src/chart_types/xy_chart/utils/stacked_series_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { ScaleType } from '../../../scales';
/** @internal */
export interface StackedValues {
values: number[];
percent: Array<number | null>;
percent: Array<number>;
total: number;
}

Expand Down Expand Up @@ -105,7 +105,7 @@ export function computeYStackedMapValues(
);
const percent = stackArray.values.map((value) => {
if (stackArray.total === 0) {
return null;
return 0;
}
return value / stackArray.total;
});
Expand Down Expand Up @@ -192,11 +192,11 @@ export function getStackedFormattedSeriesDatum(
let y1: number | null = null;
let y0: number | null | undefined = null;
if (isPercentageMode) {
if (data.y1 != null && stack.total !== 0) {
y1 = data.y1 / stack.total;
if (data.y1 != null) {
y1 = stack.total !== 0 ? data.y1 / stack.total : 0;
}
if (data.y0 != null && stack.total !== 0) {
y0 = data.y0 / stack.total;
if (data.y0 != null) {
y0 = stack.total !== 0 ? data.y0 / stack.total : 0;
}
} else {
y1 = data.y1;
Expand Down
6 changes: 3 additions & 3 deletions stories/area/8_stacked_percentage_zeros.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const DATA = [
[1585735200000, 83],
[1585749600000, 46],
[1585764000000, 7],
[1585778400000, 2],
[1585778400000, null],
[1585792800000, 12],
[1585807200000, 44],
[1585821600000, 84],
Expand Down Expand Up @@ -172,7 +172,7 @@ const DATA = [
[1585735200000, 8],
[1585749600000, 2],
[1585764000000, 0],
[1585778400000, 0],
[1585778400000, null],
[1585792800000, 0],
[1585807200000, 1],
[1585821600000, 6],
Expand Down Expand Up @@ -227,7 +227,7 @@ const DATA = [
[1585735200000, 3],
[1585749600000, 1],
[1585764000000, 1],
[1585778400000, 0],
[1585778400000, null],
[1585792800000, 0],
[1585807200000, 2],
[1585821600000, 1],
Expand Down