Skip to content

fillData sorted data assumption fixed #3062

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fillData sorted data assumption fixed #3062

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
37 changes: 20 additions & 17 deletions packages/victory-stack/src/helper-methods.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const fallbackProps = {
padding: 50,
};

// Assumes data in `datasets` is sorted by `Data.getData`.
// Not required now: Assumes data in `datasets` is sorted by `Data.getData`
function fillData(props, datasets) {
const { fillInMissingData } = props;
const xMap = datasets.reduce((prev, dataset) => {
Expand All @@ -22,28 +22,31 @@ function fillData(props, datasets) {
const xArr = orderBy(xKeys);

return datasets.map((dataset) => {
let indexOffset = 0;
const isDate = dataset[0] && dataset[0]._x instanceof Date;
const filledInData = xArr.map((x: number | Date, index) => {
const dataMap = new Map();
dataset.forEach((datum) => {
const key = datum._x instanceof Date ? datum._x.getTime() : datum._x;
const numKey = Number(key);
if (!dataMap.has(numKey)) {
dataMap.set(numKey, datum);
}
});
return xArr.map((x) => {
const existingDatum = dataMap.get(x);
let parsedX: number | Date = Number(x);
const datum = dataset[index - indexOffset];

if (datum) {
const x1 = isDate ? datum._x.getTime() : datum._x;
if (x1 === parsedX) {
return datum;
}
indexOffset++;
if (existingDatum) {
return existingDatum;
} else {
const y = fillInMissingData ? 0 : null;
parsedX = isDate ? new Date(parsedX) : parsedX;
return { x: parsedX, y, _x: parsedX, _y: y };
return {
x: parsedX,
y,
_x: parsedX,
_y: y,
};
}
const y = fillInMissingData ? 0 : null;
parsedX = isDate ? new Date(parsedX) : parsedX;
return { x: parsedX, y, _x: parsedX, _y: y };
});

return filledInData;
});
}

Expand Down