fix(scales): improve constraints for scales

plouc · Apr 30, 2023 · 96862f9 · 96862f9
1 parent 478cfd3
commit 96862f9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/packages/bar/src/compute/grouped.ts b/packages/bar/src/compute/grouped.ts
@@ -186,7 +186,7 @@ export const generateGroupedBars = <RawDatum extends BarDatum>({
     getIndex: (datum: RawDatum) => string
     getTooltipLabel: (datum: ComputedDatum<RawDatum>) => string
     margin: Margin
-    hiddenIds?: string[]
+    hiddenIds?: (string | number)[]
 }) => {
     const keys = props.keys.filter(key => !hiddenIds.includes(key))
     const data = normalizeData(props.data, keys)

diff --git a/packages/bar/src/compute/stacked.ts b/packages/bar/src/compute/stacked.ts
@@ -179,7 +179,7 @@ export const generateStackedBars = <RawDatum extends BarDatum>({
     getIndex: (datum: RawDatum) => string
     getTooltipLabel: (datum: ComputedDatum<RawDatum>) => string
     margin: Margin
-    hiddenIds?: string[]
+    hiddenIds?: (string | number)[]
 }) => {
     const keys = props.keys.filter(key => !hiddenIds.includes(key))
     const stackedData = stack<RawDatum, string>().keys(keys).offset(stackOffsetDiverging)(

diff --git a/packages/bar/src/hooks.ts b/packages/bar/src/hooks.ts
@@ -72,7 +72,7 @@ export const useBar = <RawDatum extends BarDatum>({
     legendLabel?: BarCommonProps<RawDatum>['legendLabel']
 }) => {
     const [hiddenIds, setHiddenIds] = useState(initialHiddenIds ?? [])
-    const toggleSerie = useCallback(id => {
+    const toggleSerie = useCallback((id: string | number) => {
         setHiddenIds(state =>
             state.indexOf(id) > -1 ? state.filter(item => item !== id) : [...state, id]
         )

diff --git a/packages/bar/src/types.ts b/packages/bar/src/types.ts
@@ -258,7 +258,7 @@ export type BarCommonProps<RawDatum> = {
 
     renderWrapper?: boolean
 
-    initialHiddenIds: string[]
+    initialHiddenIds: (string | number)[]
 }
 
 export type BarSvgProps<RawDatum extends BarDatum> = Partial<BarCommonProps<RawDatum>> &

diff --git a/packages/scales/src/types.ts b/packages/scales/src/types.ts
@@ -27,16 +27,16 @@ export interface ScaleTypeToSpec {
 export type ScaleType = keyof ScaleTypeToSpec
 export type ScaleSpec = ScaleTypeToSpec[keyof ScaleTypeToSpec]
 
-export interface ScaleTypeToScale<Input extends StringValue, Output> {
-    linear: ScaleLinear<Output>
-    log: ScaleLog
-    symlog: ScaleSymlog
-    point: ScalePoint<Input>
-    band: ScaleBand<Input>
-    time: ScaleTime<Input>
+export interface ScaleTypeToScale<Input, Output> {
+    linear: Input extends NumericValue ? ScaleLinear<Output> : never
+    log: Input extends NumericValue ? ScaleLog : never
+    symlog: Input extends NumericValue ? ScaleSymlog : never
+    point: Input extends StringValue ? ScalePoint<Input> : never
+    band: Input extends StringValue ? ScaleBand<Input> : never
+    time: Input extends (StringValue | Date) ? ScaleTime<Input> : never
 }
 
-export type Scale<Input extends StringValue, Output> = ScaleTypeToScale<
+export type Scale<Input, Output> = ScaleTypeToScale<
     Input,
     Output
 >[keyof ScaleTypeToScale<Input, Output>]