fix(scatterplot): fix scatterplot voronoi overlay

plouc · Apr 17, 2019 · 3bdc783 · 3bdc783
1 parent 4b0bcb9
commit 3bdc783
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/packages/scatterplot/src/ScatterPlot.js b/packages/scatterplot/src/ScatterPlot.js
@@ -242,7 +242,7 @@ class ScatterPlot extends Component {
                         layerById.mesh = (
                             <Mesh
                                 key="mesh"
-                                points={points}
+                                nodes={points}
                                 width={width}
                                 height={height}
                                 onMouseEnter={onMouseEnter}

diff --git a/packages/scatterplot/src/enhance.js b/packages/scatterplot/src/enhance.js
@@ -66,7 +66,7 @@ export const enhanceCanvas = Component =>
         withPropsOnChange(
             ['points', 'width', 'height', 'debugMesh'],
             ({ points, width, height, debugMesh }) => {
-                const points2d = computeMeshPoints({ points }).points
+                const points2d = computeMeshPoints({ points })
 
                 return computeMesh({ points: points2d, width, height, debug: debugMesh })
             }

diff --git a/packages/swarmplot/src/SwarmPlot.js b/packages/swarmplot/src/SwarmPlot.js
@@ -212,7 +212,7 @@ const SwarmPlot = memo(
                     if (typeof layer === 'function') {
                         return <Fragment key={i}>{layer(layerContext)}</Fragment>
                     }
-                    
+
                     return null
                 })}
             </SvgWrapper>

diff --git a/packages/voronoi/src/meshCanvas.js b/packages/voronoi/src/meshCanvas.js
@@ -14,7 +14,7 @@ export const renderVoronoiToCanvas = (ctx, voronoi) => {
     ctx.beginPath()
     voronoi.render(ctx)
     ctx.strokeStyle = 'red'
-    ctx.lineWidth = 0.5
+    ctx.lineWidth = 1
     ctx.stroke()
 
     ctx.restore()
@@ -23,7 +23,7 @@ export const renderVoronoiToCanvas = (ctx, voronoi) => {
 export const renderVoronoiCellToCanvas = (ctx, voronoi, index) => {
     ctx.save()
 
-    ctx.globalAlpha = 0.25
+    ctx.globalAlpha = 0.35
     ctx.beginPath()
     voronoi.renderCell(index, ctx)
     ctx.fillStyle = 'red'

diff --git a/website/src/pages/scatterplot/canvas.js b/website/src/pages/scatterplot/canvas.js
@@ -133,6 +133,7 @@ const ScatterPlotCanvas = () => {
                                 label: `[point] serie: ${node.serie.id}, x: ${node.x}, y: ${
                                     node.y
                                 }`,
+                                color: node.color,
                                 data: node,
                             })
                         }}

diff --git a/website/src/pages/scatterplot/index.js b/website/src/pages/scatterplot/index.js
@@ -87,8 +87,8 @@ const initialProperties = {
     motionDamping: 15,
 
     isInteractive: true,
-    useMesh: true,
-    debugMesh: true,
+    useMesh: false,
+    debugMesh: false,
 
     'custom tooltip example': false,
     tooltip: null,
@@ -145,6 +145,7 @@ const ScatterPlot = () => {
                                 label: `[point] serie: ${node.serie.id}, x: ${node.x}, y: ${
                                     node.y
                                 }`,
+                                color: node.color,
                                 data: node,
                             })
                         }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,6 +133,7 @@ const ScatterPlotCanvas = () => { @@
                                     label: `[point] serie: ${node.serie.id}, x: ${node.x}, y: ${
                                         node.y
                                     }`,
+                                    color: node.color,
                                     data: node,
                                 })
                             }}
@@ Expand Down @@