Pass getColor instead

plouc · Sep 24, 2024 · 9a8ecb7 · 9a8ecb7
1 parent 284b547
commit 9a8ecb7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/bar/src/Bar.tsx b/packages/bar/src/Bar.tsx
@@ -133,6 +133,7 @@ const InnerBar = <RawDatum extends BarDatum>({
         toggleSerie,
         legendsWithData,
         barTotals,
+        getColor,
     } = useBar<RawDatum>({
         indexBy,
         label,
@@ -250,8 +251,6 @@ const InnerBar = <RawDatum extends BarDatum>({
         () => ({
             borderRadius,
             borderWidth,
-            colorBy,
-            colors,
             enableLabel,
             isInteractive,
             labelSkipWidth,
@@ -271,8 +270,6 @@ const InnerBar = <RawDatum extends BarDatum>({
         [
             borderRadius,
             borderWidth,
-            colorBy,
-            colors,
             enableLabel,
             getTooltipLabel,
             isInteractive,
@@ -413,6 +410,7 @@ const InnerBar = <RawDatum extends BarDatum>({
             onClick,
             onMouseEnter,
             onMouseLeave,
+            getColor,
         }),
         [
             commonProps,
@@ -431,6 +429,7 @@ const InnerBar = <RawDatum extends BarDatum>({
             onClick,
             onMouseEnter,
             onMouseLeave,
+            getColor,
         ]
     )
 

diff --git a/packages/bar/src/BarCanvas.tsx b/packages/bar/src/BarCanvas.tsx
@@ -218,6 +218,7 @@ const InnerBarCanvas = <RawDatum extends BarDatum>({
         shouldRenderBarLabel,
         legendsWithData,
         barTotals,
+        getColor,
     } = useBar<RawDatum>({
         indexBy,
         label,
@@ -292,6 +293,7 @@ const InnerBarCanvas = <RawDatum extends BarDatum>({
             onClick,
             onMouseEnter,
             onMouseLeave,
+            getColor,
         }),
         [
             borderRadius,
@@ -314,6 +316,7 @@ const InnerBarCanvas = <RawDatum extends BarDatum>({
             onClick,
             onMouseEnter,
             onMouseLeave,
+            getColor,
         ]
     )
 

diff --git a/packages/bar/src/types.ts b/packages/bar/src/types.ts
@@ -124,6 +124,7 @@ interface BarCustomLayerBaseProps<RawDatum>
 
     xScale: AnyScale
     yScale: AnyScale
+    getColor: OrdinalColorScaleConfig<ComputedDatum<RawDatum>>
 }
 
 export interface BarCustomLayerProps<RawDatum>