Skip to content

Commit 816a478

Browse files
committedAug 28, 2021
feat(scatterplot): adjust stories according to API changes
1 parent c1b84c9 commit 816a478

File tree

1 file changed

+28
-33
lines changed

1 file changed

+28
-33
lines changed
 

‎packages/scatterplot/stories/ScatterPlot.stories.tsx

+28-33
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
ScatterPlot,
77
ResponsiveScatterPlot,
88
ScatterPlotNodeProps,
9-
ScatterPlotCustomSvgLayer,
109
ScatterPlotLayerProps,
1110
ScatterPlotNodeData,
1211
} from '../src'
@@ -425,10 +424,6 @@ stories.add('using mouse enter/leave', () => (
425424

426425
const CustomNode = ({
427426
node,
428-
x,
429-
y,
430-
size,
431-
color,
432427
blendMode,
433428
onMouseEnter,
434429
onMouseMove,
@@ -437,52 +432,52 @@ const CustomNode = ({
437432
}: ScatterPlotNodeProps<{ x: number; y: number }>) => {
438433
if (node.data.serieId === 'A') {
439434
return (
440-
<g transform={`translate(${x},${y})`}>
435+
<g transform={`translate(${node.x},${node.y})`}>
441436
<circle
442-
r={size / 2}
443-
fill={color}
437+
r={node.size / 2}
438+
fill={node.style.color}
444439
style={{ mixBlendMode: blendMode }}
445-
onMouseEnter={onMouseEnter}
446-
onMouseMove={onMouseMove}
447-
onMouseLeave={onMouseLeave}
448-
onClick={onClick}
440+
onMouseEnter={event => onMouseEnter?.(node, event)}
441+
onMouseMove={event => onMouseMove?.(node, event)}
442+
onMouseLeave={event => onMouseLeave?.(node, event)}
443+
onClick={event => onClick?.(node, event)}
449444
/>
450445
</g>
451446
)
452447
}
453448

454449
if (node.data.serieId === 'B') {
455450
return (
456-
<g transform={`translate(${x},${y}) rotate(45)`}>
451+
<g transform={`translate(${node.x},${node.y}) rotate(45)`}>
457452
<rect
458-
x={size * -0.5}
459-
y={size * -0.5}
460-
width={size}
461-
height={size}
462-
fill={color}
453+
x={node.size * -0.5}
454+
y={node.size * -0.5}
455+
width={node.size}
456+
height={node.size}
457+
fill={node.style.color}
463458
style={{ mixBlendMode: blendMode }}
464-
onMouseEnter={onMouseEnter}
465-
onMouseMove={onMouseMove}
466-
onMouseLeave={onMouseLeave}
467-
onClick={onClick}
459+
onMouseEnter={event => onMouseEnter?.(node, event)}
460+
onMouseMove={event => onMouseMove?.(node, event)}
461+
onMouseLeave={event => onMouseLeave?.(node, event)}
462+
onClick={event => onClick?.(node, event)}
468463
/>
469464
</g>
470465
)
471466
}
472467

473468
return (
474-
<g transform={`translate(${x},${y})`}>
469+
<g transform={`translate(${node.x},${node.y})`}>
475470
<rect
476-
x={size * -0.5}
477-
y={size * -0.5}
478-
width={size}
479-
height={size}
480-
fill={color}
471+
x={node.size * -0.5}
472+
y={node.size * -0.5}
473+
width={node.size}
474+
height={node.size}
475+
fill={node.style.color}
481476
style={{ mixBlendMode: blendMode }}
482-
onMouseEnter={onMouseEnter}
483-
onMouseMove={onMouseMove}
484-
onMouseLeave={onMouseLeave}
485-
onClick={onClick}
477+
onMouseEnter={event => onMouseEnter?.(node, event)}
478+
onMouseMove={event => onMouseMove?.(node, event)}
479+
onMouseLeave={event => onMouseLeave?.(node, event)}
480+
onClick={event => onClick?.(node, event)}
486481
/>
487482
</g>
488483
)
@@ -531,7 +526,7 @@ stories.add('custom node', () => (
531526
],
532527
},
533528
]}
534-
renderNode={CustomNode}
529+
nodeComponent={CustomNode}
535530
/>
536531
))
537532

0 commit comments

Comments
 (0)
Please sign in to comment.