Skip to content

Commit 5c10cf6

Browse files
committed
fix(Scatter Chart): fixed onDataPointClickHandler
1 parent a3a9ca5 commit 5c10cf6

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

packages/charts/src/components/ScatterChart/ScatterChart.tsx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,15 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
146146
const onItemLegendClick = useLegendItemClick(onLegendClick);
147147

148148
const onDataPointClickInternal = useCallback(
149-
(payload, eventOrIndex) => {
150-
if (eventOrIndex.dataKey && onDataPointClick) {
149+
(payload, eventOrIndex, event) => {
150+
if (payload && onDataPointClick) {
151151
onDataPointClick(
152-
enrichEventWithDetails(
153-
{},
154-
{
155-
value: eventOrIndex.value,
156-
dataKey: eventOrIndex.dataKey,
157-
dataIndex: eventOrIndex.index,
158-
payload: eventOrIndex.payload
159-
}
160-
)
152+
enrichEventWithDetails(event, {
153+
value: payload.node,
154+
dataKey: payload.zAxis.dataKey,
155+
dataIndex: eventOrIndex,
156+
payload: payload.payload
157+
})
161158
);
162159
}
163160
},
@@ -187,7 +184,6 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
187184
>
188185
<ScatterChartLib
189186
margin={marginChart}
190-
onClick={onDataPointClickInternal}
191187
className={typeof onDataPointClick === 'function' ? 'has-click-handler' : undefined}
192188
>
193189
<CartesianGrid
@@ -227,9 +223,12 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
227223
{dataset?.map((dataSet, index) => {
228224
return (
229225
<Scatter
226+
className={typeof onDataPointClick === 'function' ? 'has-click-handler' : undefined}
227+
onMouseDown={onDataPointClickInternal}
230228
opacity={dataSet.opacity}
231229
data={dataSet?.data}
232230
name={dataSet?.label}
231+
key={dataSet?.label}
233232
fill={dataSet?.color ?? `var(--sapChart_OrderedColor_${(index % 11) + 1})`}
234233
isAnimationActive={noAnimation === false}
235234
/>

0 commit comments

Comments
 (0)