change tooltipAnchor for useMesh

plouc · Mar 13, 2024 · 0a3d670 · 0a3d670
1 parent 2a4f03b
commit 0a3d670
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/packages/bump/src/bump/Bump.tsx b/packages/bump/src/bump/Bump.tsx
@@ -90,7 +90,7 @@ const InnerBump = <Datum extends BumpDatum, ExtraProps extends BumpSerieExtraPro
     onPointMouseMove,
     onPointMouseLeave,
     onPointClick,
-    tooltipAnchor = bumpSvgDefaultProps.tooltipAnchor,
+    useMesh = bumpSvgDefaultProps.useMesh,
     lineTooltip = bumpSvgDefaultProps.lineTooltip as NonNullable<
         BumpSvgProps<Datum, ExtraProps>['lineTooltip']
     >,
@@ -196,14 +196,14 @@ const InnerBump = <Datum extends BumpDatum, ExtraProps extends BumpSerieExtraPro
                         onMouseLeave={onSerieMouseLeave}
                         onClick={onSerieClick}
                         lineTooltip={lineTooltip}
-                        tooltipAnchor={tooltipAnchor}
+                        useMesh={useMesh}
                     />
                 ))}
             </Fragment>
         )
     }
 
-    if (isInteractive && tooltipAnchor === 'point') {
+    if (isInteractive && useMesh && layers.includes('mesh')) {
         layerById.mesh = (
             <Mesh
                 key="mesh"

diff --git a/packages/bump/src/bump/Line.tsx b/packages/bump/src/bump/Line.tsx
@@ -15,7 +15,7 @@ interface LineProps<Datum extends BumpDatum, ExtraProps extends BumpSerieExtraPr
     onClick?: BumpCommonProps<Datum, ExtraProps>['onSerieClick']
     setActiveSerieIds: (serieIds: string[]) => void
     lineTooltip: BumpCommonProps<Datum, ExtraProps>['lineTooltip']
-    tooltipAnchor: string
+    useMesh: BumpCommonProps<Datum, ExtraProps>['useMesh']
 }
 
 export const Line = <Datum extends BumpDatum, ExtraProps extends BumpSerieExtraProps>({
@@ -29,7 +29,7 @@ export const Line = <Datum extends BumpDatum, ExtraProps extends BumpSerieExtraP
     onClick,
     setActiveSerieIds,
     lineTooltip,
-    tooltipAnchor,
+    useMesh,
 }: LineProps<Datum, ExtraProps>) => {
     const handlers = useBumpSerieHandlers<Datum, ExtraProps>({
         serie,
@@ -71,7 +71,7 @@ export const Line = <Datum extends BumpDatum, ExtraProps extends BumpSerieExtraP
                 strokeOpacity={animatedProps.opacity}
                 style={{ pointerEvents: 'none' }}
             />
-            {isInteractive && tooltipAnchor === 'line' && (
+            {isInteractive && !useMesh && (
                 <path
                     data-testid={`line.${serie.id}.interactive`}
                     fill="none"

diff --git a/packages/bump/src/bump/defaults.ts b/packages/bump/src/bump/defaults.ts
@@ -60,9 +60,8 @@ const commonDefaultProps: Omit<
     defaultActiveSerieIds: [],
     lineTooltip: LineTooltip,
     pointTooltip: PointTooltip,
-    tooltipAnchor: 'line',
+    useMesh: false,
     debugMesh: false,
-
     role: 'img',
 }
 

diff --git a/packages/bump/src/bump/types.ts b/packages/bump/src/bump/types.ts
@@ -185,7 +185,7 @@ export interface BumpCommonProps<Datum extends BumpDatum, ExtraProps extends Bum
     onPointClick: BumpPointMouseHandler<Datum, ExtraProps>
     lineTooltip: BumpLineTooltip<Datum, ExtraProps>
     pointTooltip: BumpPointTooltip<Datum, ExtraProps>
-    tooltipAnchor: 'line' | 'point'
+    useMesh: boolean
     debugMesh: boolean
     role: string