Skip to content

refactor(Charts): rename xIndex to dataIndex in onDataPointClick event #479

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.

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
merged 1 commit into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/charts/src/components/BarChart/BarChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const BarChart: FC<BarChartProps> = forwardRef((props: BarChartProps, ref: Ref<a
.find((key) => payload[key] === value),
value,
payload: payload.payload,
xIndex: i
dataIndex: i
})
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/ColumnChart/ColumnChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const ColumnChart: FC<ColumnChartProps> = forwardRef((props: ColumnChartProps, r
: payload[key] === payload.value && key !== 'value'
)[0],
value: payload.value.length ? payload.value[1] - payload.value[0] : payload.value,
xIndex: eventOrIndex,
dataIndex: eventOrIndex,
payload: payload.payload
})
);
Expand Down
4 changes: 2 additions & 2 deletions packages/charts/src/components/ComposedChart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const ComposedChart: FC<ComposedChartProps> = forwardRef((props: ComposedChartPr
onDataPointClick(
enrichEventWithDetails(event ?? eventOrIndex, {
value: payload.value.length ? payload.value[1] - payload.value[0] : payload.value,
xIndex: payload.index ?? eventOrIndex,
dataIndex: payload.index ?? eventOrIndex,
dataKey: payload.value.length
? Object.keys(payload).filter((key) =>
payload.value.length
Expand All @@ -192,7 +192,7 @@ const ComposedChart: FC<ComposedChartProps> = forwardRef((props: ComposedChartPr
{
value: eventOrIndex.value,
dataKey: eventOrIndex.dataKey,
xIndex: eventOrIndex.index,
dataIndex: eventOrIndex.index,
payload: eventOrIndex.payload
}
)
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/LineChart/LineChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const LineChart: FC<LineChartProps> = forwardRef((props: LineChartProps, ref: Re
{
value: eventOrIndex.value,
dataKey: eventOrIndex.dataKey,
xIndex: eventOrIndex.index,
dataIndex: eventOrIndex.index,
payload: eventOrIndex.payload
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const MicroBarChart: FC<MicroBarChartProps> = forwardRef((props: MicroBarChartPr
)[0],
value: e.value.length ? e.value[1] - e.value[0] : e.value,
payload: e.payload,
xIndex: i
dataIndex: i
})
);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/charts/src/components/PieChart/PieChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ const PieChart: FC<PieChartProps> = forwardRef((props: PieChartProps, ref: Ref<a
value: payload.value,
dataKey: measure.accessor,
name: payload.name,
payload: payload.payload
payload: payload.payload,
dataIndex: index
})
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/charts/src/components/RadarChart/RadarChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const RadarChart: FC<RadarChartProps> = forwardRef((props: RadarChartProps, ref:
value: eventOrIndex.value,
dataKey: eventOrIndex.dataKey,
name: eventOrIndex.payload.label,
xIndex: eventOrIndex.index,
dataIndex: eventOrIndex.index,
payload: eventOrIndex.payload
}
)
Expand Down
4 changes: 2 additions & 2 deletions packages/charts/src/components/RadialChart/RadialChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface RadialChartProps extends CommonProps {
maxValue?: number;
displayValue?: number | string;
color?: CSSProperties['color'];
onDataPointClick?: (event: CustomEvent<{ value: unknown; payload: unknown; xIndex: number }>) => void;
onDataPointClick?: (event: CustomEvent<{ value: unknown; payload: unknown; dataIndex: number }>) => void;
}

/**
Expand All @@ -34,7 +34,7 @@ const RadialChart: FC<RadialChartProps> = forwardRef((props: RadialChartProps, r
enrichEventWithDetails(event, {
value: payload.value,
payload: payload.payload,
xIndex: i
dataIndex: i
})
);
}
Expand Down