feat(core): fix typings for ValueFormat context support

plouc · Sep 7, 2021 · 828e06b · 828e06b
1 parent e0adf5a
commit 828e06b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
@@ -382,18 +382,18 @@ declare module '@nivo/core' {
         y: number
     }
 
-    export type ValueFormat<Value, Context = never> =
+    export type ValueFormat<Value, Context = void> =
         | string // d3 formatter
         // explicit formatting function
-        | Context extends never
+        | Context extends void
         ? (value: Value) => string
         : (value: Value, context: Context) => string
-    export function getValueFormatter<Value, Context = never>(
-        format?: ValueFormat<Value>
-    ): Context extends never ? (value: Value) => string : (value: Value, context: Context) => string
-    export function useValueFormatter<Value, Context = never>(
-        format?: ValueFormat<Value>
-    ): Context extends never ? (value: Value) => string : (value: Value, context: Context) => string
+    export function getValueFormatter<Value, Context = void>(
+        format?: ValueFormat<Value, Context>
+    ): Context extends void ? (value: Value) => string : (value: Value, context: Context) => string
+    export function useValueFormatter<Value, Context = void>(
+        format?: ValueFormat<Value, Context>
+    ): Context extends void ? (value: Value) => string : (value: Value, context: Context) => string
 
     export type PropertyAccessor<Datum, Value> =
         // path to use with `lodash.get()`

diff --git a/packages/tooltip/src/BasicTooltip.tsx b/packages/tooltip/src/BasicTooltip.tsx
@@ -17,7 +17,7 @@ interface BasicTooltipProps {
 export const BasicTooltip = memo<BasicTooltipProps>(
     ({ id, value: _value, format, enableChip = false, color, renderContent }) => {
         const theme = useTheme()
-        const formatValue = useValueFormatter(format)
+        const formatValue = useValueFormatter<number | string | Date>(format)
 
         let content: JSX.Element
         if (typeof renderContent === 'function') {

diff --git a/packages/tooltip/src/Tooltip.tsx b/packages/tooltip/src/Tooltip.tsx
@@ -4,7 +4,7 @@ import { TooltipStateContextData, TooltipStateContextDataVisible } from './conte
 
 export const isVisibleTooltipState = (
     state: TooltipStateContextData
-): state is TooltipStateContextDataVisible => state.isVisible === true
+): state is TooltipStateContextDataVisible => state.isVisible
 
 export const Tooltip = () => {
     const state = useTooltipState()