From da2abc7f1546b75bdc4cc393802360581face4db Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Thu, 16 May 2019 23:33:47 -0700 Subject: [PATCH] fix: line chart tooltip when there is only one lien (#103) * fix: line chart tooltip when there is only one lien * fix: type * fix: combine export default --- .../superset-ui-preset-chart-xy/src/Line/Line.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/Line.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/Line.tsx index 26889909aef4..c83d91a80339 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/Line.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/Line.tsx @@ -10,7 +10,7 @@ import { CrossHair, WithTooltip, } from '@data-ui/xy-chart'; -import { chartTheme, ChartTheme } from '@data-ui/theme'; +import { chartTheme } from '@data-ui/theme'; import { Margin, Dimension } from '@superset-ui/dimension'; import { createSelector } from 'reselect'; @@ -35,7 +35,7 @@ export interface TooltipInput { y: number; }; }; - theme: ChartTheme; + theme: typeof chartTheme; } const defaultProps = { @@ -48,7 +48,7 @@ const defaultProps = { /** Part of formData that is needed for rendering logic in this file */ export type RenderingFormData = { margin?: Margin; - theme?: ChartTheme; + theme?: typeof chartTheme; } & PartialSpec; export type Hooks = { @@ -81,7 +81,7 @@ export interface SeriesValue { const CIRCLE_STYLE = { strokeWidth: 1.5 }; -class LineChart extends PureComponent { +export default class LineChart extends PureComponent { static defaultProps = defaultProps; encoder: Encoder; @@ -119,7 +119,7 @@ class LineChart extends PureComponent { const firstDatum = seriesData[0]; const key = fieldNames.map(f => firstDatum[f]).join(','); const series: Series = { - key: key.length === 0 ? channels.y.definition.field : key, + key: key.length === 0 ? channels.y.getTitle() : key, fill: channels.fill.encode(firstDatum, false), stroke: channels.stroke.encode(firstDatum, '#222'), strokeDasharray: channels.strokeDasharray.encode(firstDatum, ''), @@ -305,5 +305,3 @@ class LineChart extends PureComponent { ); } } - -export default LineChart;