chore(bar): refactor commonProps for reuse

plouc · Jun 28, 2021 · 82262a2 · 82262a2
1 parent 3f0bb4e
commit 82262a2
Showing 1 changed file with 32 additions and 41 deletions.
diff --git a/packages/bar/src/Bar.tsx b/packages/bar/src/Bar.tsx
@@ -186,20 +186,36 @@ const InnerBar = <RawDatum extends BarDatum>({
         [enableLabel, labelSkipHeight, labelSkipWidth]
     )
 
-    const commonProps = {
-        borderRadius,
-        borderWidth,
-        enableLabel,
-        isInteractive,
-        labelSkipWidth,
-        labelSkipHeight,
-        onClick,
-        onMouseEnter,
-        onMouseLeave,
-        getTooltipLabel,
-        tooltipFormat,
-        tooltip,
-    }
+    const commonProps = useMemo(
+        () => ({
+            borderRadius,
+            borderWidth,
+            enableLabel,
+            isInteractive,
+            labelSkipWidth,
+            labelSkipHeight,
+            onClick,
+            onMouseEnter,
+            onMouseLeave,
+            getTooltipLabel,
+            tooltipFormat,
+            tooltip,
+        }),
+        [
+            borderRadius,
+            borderWidth,
+            enableLabel,
+            getTooltipLabel,
+            isInteractive,
+            labelSkipHeight,
+            labelSkipWidth,
+            onClick,
+            onMouseEnter,
+            onMouseLeave,
+            tooltip,
+            tooltipFormat,
+        ]
+    )
 
     const boundDefs = bindDefs(defs, result.bars, fill, {
         dataKey: 'data',
@@ -313,35 +329,10 @@ const InnerBar = <RawDatum extends BarDatum>({
     // We use `any` here until we can figure out the best way to type xScale/yScale
     const layerContext: any = useMemo(
         () => ({
-            borderRadius,
-            borderWidth,
-            enableLabel,
-            isInteractive,
-            labelSkipWidth,
-            labelSkipHeight,
-            onClick,
-            onMouseEnter,
-            onMouseLeave,
-            getTooltipLabel,
-            tooltipFormat,
-            tooltip,
+            ...commonProps,
             ...result,
         }),
-        [
-            borderRadius,
-            borderWidth,
-            enableLabel,
-            getTooltipLabel,
-            isInteractive,
-            labelSkipHeight,
-            labelSkipWidth,
-            onClick,
-            onMouseEnter,
-            onMouseLeave,
-            result,
-            tooltip,
-            tooltipFormat,
-        ]
+        [commonProps, result]
     )
 
     return (