From 012f5165da3cc1ebf9d66d4662a43ef5fd4adb05 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Wed, 15 May 2019 23:56:45 -0700 Subject: [PATCH] fix: gradient not working when y axis title has space (#98) * fix: gradient not working when y axis title has space * fix: pass theme * fix: pass theme --- .../packages/superset-ui-preset-chart-xy/src/Line/Line.tsx | 5 +++-- .../superset-ui-preset-chart-xy/src/Line/transformProps.ts | 3 ++- .../src/ScatterPlot/transformProps.ts | 3 ++- 3 files changed, 7 insertions(+), 4 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 8bcd81b819..af1b4afd97 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 @@ -1,6 +1,7 @@ /* eslint-disable sort-keys, no-magic-numbers, complexity */ import React, { PureComponent } from 'react'; +import { kebabCase, groupBy, flatMap, uniqueId, values } from 'lodash'; import { AreaSeries, LinearGradient, @@ -11,7 +12,7 @@ import { } from '@data-ui/xy-chart'; import { chartTheme, ChartTheme } from '@data-ui/theme'; import { Margin, Dimension } from '@superset-ui/dimension'; -import { groupBy, flatMap, uniqueId, values } from 'lodash'; + import { createSelector } from 'reselect'; import createTooltip from './createTooltip'; import XYChartLayout from '../utils/XYChartLayout'; @@ -95,7 +96,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.getTitle() : key, + key: kebabCase(key.length === 0 ? channels.y.definition.field : key), color: channels.color.encode(firstDatum, '#222'), fill: channels.fill.encode(firstDatum, false), strokeDasharray: channels.strokeDasharray.encode(firstDatum, ''), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts index d9c6e4e384..dd7d4c5f58 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/transformProps.ts @@ -4,7 +4,7 @@ import { ChartProps } from '@superset-ui/chart'; export default function transformProps(chartProps: ChartProps) { const { width, height, formData, payload } = chartProps; - const { encoding, margin } = formData; + const { encoding, margin, theme } = formData; const { data } = payload; return { @@ -13,5 +13,6 @@ export default function transformProps(chartProps: ChartProps) { height, encoding, margin, + theme, }; } diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts index 94f2c864ec..262c038f96 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/ScatterPlot/transformProps.ts @@ -4,7 +4,7 @@ import { ChartProps } from '@superset-ui/chart'; export default function transformProps(chartProps: ChartProps) { const { width, height, formData, payload } = chartProps; - const { encoding, commonEncoding, margin } = formData; + const { encoding, commonEncoding, margin, theme } = formData; const { data } = payload; return { @@ -14,5 +14,6 @@ export default function transformProps(chartProps: ChartProps) { encoding, commonEncoding, margin, + theme, }; }