From 41fc7dc75cd04417c6833511ee810a306b134c65 Mon Sep 17 00:00:00 2001 From: Krist Wongsuphasawat Date: Fri, 17 May 2019 09:41:36 -0700 Subject: [PATCH] refactor: rename props --- .../src/Line/ChartFormData.ts | 4 ++-- .../src/Line/DefaultTooltipRenderer.tsx | 4 ++-- .../superset-ui-preset-chart-xy/src/Line/Line.tsx | 12 ++++++------ .../src/Line/transformProps.ts | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts index e3fcd9c5e6..7292a90647 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/ChartFormData.ts @@ -1,6 +1,6 @@ import { ChartFormData } from '@superset-ui/chart'; -import { RenderingFormData } from './Line'; +import { FormDataProps } from './Line'; -type CombinedFormData = ChartFormData & RenderingFormData; +type CombinedFormData = ChartFormData & FormDataProps; export default CombinedFormData; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/DefaultTooltipRenderer.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/DefaultTooltipRenderer.tsx index 4ad383a484..66df13456c 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/DefaultTooltipRenderer.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/Line/DefaultTooltipRenderer.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { TooltipFrame, TooltipTable } from '@superset-ui/chart-composition'; import { chartTheme } from '@data-ui/theme'; -import { TooltipInput } from './Line'; +import { TooltipProps } from './Line'; const MARK_STYLE = { marginRight: 4 }; @@ -13,7 +13,7 @@ export default function DefaultTooltipRenderer({ encoder, series = {}, theme = chartTheme, -}: TooltipInput) { +}: TooltipProps) { return ( <> 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 c9d62f9757..936284a0be 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 @@ -25,7 +25,7 @@ chartTheme.gridStyles.stroke = '#f1f3f5'; const DEFAULT_MARGIN = { top: 20, right: 20, left: 20, bottom: 20 }; -export interface TooltipInput { +export interface TooltipProps { encoder: Encoder; allSeries: Series[]; datum: SeriesValue; @@ -45,13 +45,13 @@ const defaultProps = { }; /** Part of formData that is needed for rendering logic in this file */ -export type RenderingFormData = { +export type FormDataProps = { margin?: Margin; theme?: typeof chartTheme; } & PartialSpec; -export type Hooks = { - TooltipRenderer?: React.ComponentType; +export type HookProps = { + TooltipRenderer?: React.ComponentType; } & LegendHooks; type Props = { @@ -59,8 +59,8 @@ type Props = { width: string | number; height: string | number; data: Dataset; -} & Hooks & - RenderingFormData & +} & HookProps & + FormDataProps & Readonly; export interface Series { 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 2354954de5..2badb881b5 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 @@ -1,20 +1,20 @@ import { pick } from 'lodash'; import { ChartProps } from '@superset-ui/chart'; -import { Hooks, RenderingFormData } from './Line'; +import { HookProps, FormDataProps } from './Line'; /* eslint-disable sort-keys */ export default function transformProps(chartProps: ChartProps) { const { width, height, payload } = chartProps; const { data } = payload; - const formData = chartProps.formData as RenderingFormData; - const hooks = chartProps.hooks as Hooks; + const formData = chartProps.formData as FormDataProps; + const hooks = chartProps.hooks as HookProps; /** * Use type-check to make sure the field names are expected ones * and only pick these fields to pass to the chart. */ - const fieldsFromFormData: (keyof RenderingFormData)[] = [ + const fieldsFromFormData: (keyof FormDataProps)[] = [ 'commonEncoding', 'encoding', 'margin', @@ -22,7 +22,7 @@ export default function transformProps(chartProps: ChartProps) { 'theme', ]; - const fieldsFromHooks: (keyof Hooks)[] = [ + const fieldsFromHooks: (keyof HookProps)[] = [ 'TooltipRenderer', 'LegendGroupRenderer', 'LegendItemRenderer',