@@ -146,18 +146,15 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
146
146
const onItemLegendClick = useLegendItemClick ( onLegendClick ) ;
147
147
148
148
const onDataPointClickInternal = useCallback (
149
- ( payload , eventOrIndex ) => {
150
- if ( eventOrIndex . dataKey && onDataPointClick ) {
149
+ ( payload , eventOrIndex , event ) => {
150
+ if ( payload && onDataPointClick ) {
151
151
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
+ } )
161
158
) ;
162
159
}
163
160
} ,
@@ -187,7 +184,6 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
187
184
>
188
185
< ScatterChartLib
189
186
margin = { marginChart }
190
- onClick = { onDataPointClickInternal }
191
187
className = { typeof onDataPointClick === 'function' ? 'has-click-handler' : undefined }
192
188
>
193
189
< CartesianGrid
@@ -227,9 +223,12 @@ const ScatterChart: FC<ScatterChartProps> = forwardRef((props: ScatterChartProps
227
223
{ dataset ?. map ( ( dataSet , index ) => {
228
224
return (
229
225
< Scatter
226
+ className = { typeof onDataPointClick === 'function' ? 'has-click-handler' : undefined }
227
+ onMouseDown = { onDataPointClickInternal }
230
228
opacity = { dataSet . opacity }
231
229
data = { dataSet ?. data }
232
230
name = { dataSet ?. label }
231
+ key = { dataSet ?. label }
233
232
fill = { dataSet ?. color ?? `var(--sapChart_OrderedColor_${ ( index % 11 ) + 1 } )` }
234
233
isAnimationActive = { noAnimation === false }
235
234
/>
0 commit comments