From bf30db58625ba645098f3ade16ce202ebc58c219 Mon Sep 17 00:00:00 2001 From: Christopher Henn Date: Wed, 27 Jun 2018 16:58:07 -0700 Subject: [PATCH] Use ColorScale type consistently --- ui/src/shared/components/HistogramChart.tsx | 3 ++- ui/src/shared/components/HistogramChartBars.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/src/shared/components/HistogramChart.tsx b/ui/src/shared/components/HistogramChart.tsx index 820dc79ec..68e2b8f69 100644 --- a/ui/src/shared/components/HistogramChart.tsx +++ b/ui/src/shared/components/HistogramChart.tsx @@ -16,6 +16,7 @@ import { HistogramData, Margins, HoverData, + ColorScale, } from 'src/types/histogram' const PADDING_TOP = 0.2 @@ -31,7 +32,7 @@ interface Props { dataStatus: RemoteDataState width: number height: number - colorScale: (group: string) => string + colorScale: ColorScale onZoom: (TimePeriod) => void } diff --git a/ui/src/shared/components/HistogramChartBars.tsx b/ui/src/shared/components/HistogramChartBars.tsx index 69368618b..0df3edb5e 100644 --- a/ui/src/shared/components/HistogramChartBars.tsx +++ b/ui/src/shared/components/HistogramChartBars.tsx @@ -10,6 +10,7 @@ import { HistogramDatum, HoverData, TooltipAnchor, + ColorScale, } from 'src/types/histogram' const BAR_BORDER_RADIUS = 4 @@ -139,7 +140,7 @@ interface Props { data: HistogramData xScale: ScaleTime yScale: ScaleLinear - colorScale: (group: string) => string + colorScale: ColorScale hoverData?: HoverData onHover: (h: HoverData) => void }