fix: broken build due to vega type (#96)

* fix: broken build due to vega type * fix: remove unused * fix: type * fix: margin
apache-superset · May 14, 2019 · 1bcaa7f · 1bcaa7f
1 parent 1ffeb77
commit 1bcaa7f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/encodeable/AxisAgent.ts b/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/encodeable/AxisAgent.ts
@@ -1,10 +1,10 @@
 /* eslint-disable no-magic-numbers */
 import { CSSProperties } from 'react';
 import { Value } from 'vega-lite/build/src/channeldef';
-import { getTextDimension } from '@superset-ui/dimension';
+import { getTextDimension, Margin } from '@superset-ui/dimension';
 import { CategoricalColorScale } from '@superset-ui/color';
 import { extractFormatFromTypeAndFormat } from './parsers/extractFormat';
-import { CoreAxis, LabelOverlapStrategy } from './types/Axis';
+import { CoreAxis, LabelOverlapStrategy, AxisOrient } from './types/Axis';
 import { PositionFieldDef, ChannelDef } from './types/ChannelDef';
 import ChannelEncoder from './ChannelEncoder';
 import { DEFAULT_LABEL_ANGLE } from '../utils/constants';
@@ -108,7 +108,14 @@ export default class AxisAgent<Def extends ChannelDef<Output>, Output extends Va
     labelAngle?: number;
     tickLength: number;
     tickTextStyle: CSSProperties;
-  }) {
+  }): {
+    labelAngle: number;
+    labelOffset: number;
+    labelOverlap: 'flat' | 'rotate';
+    minMargin: Partial<Margin>;
+    orient: AxisOrient;
+    tickTextAnchor?: string;
+  } {
     const tickLabels = this.getTickLabels();
 
     const labelDimensions = tickLabels.map((text: string) =>

diff --git a/...ins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/encodeable/types/Axis.ts b/...ins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/encodeable/types/Axis.ts
@@ -1,5 +1,6 @@
 import { DateTime } from 'vega-lite/build/src/datetime';
-import { AxisOrient } from 'vega';
+
+export type AxisOrient = 'top' | 'bottom' | 'left' | 'right';
 
 export type LabelOverlapStrategy = 'auto' | 'flat' | 'rotate';
 

diff --git a/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/XYChartLayout.tsx b/plugins/superset-ui-plugins/packages/superset-ui-preset-chart-xy/src/utils/XYChartLayout.tsx
@@ -5,10 +5,10 @@ import collectScalesFromProps from '@data-ui/xy-chart/esm/utils/collectScalesFro
 import { XAxis, YAxis } from '@data-ui/xy-chart';
 import { ChartTheme } from '@data-ui/theme';
 import { Margin, mergeMargin } from '@superset-ui/dimension';
-import { AxisOrient } from 'vega';
 import createTickComponent from './createTickComponent';
 import ChartFrame from '../components/ChartFrame';
 import ChannelEncoder from '../encodeable/ChannelEncoder';
+import { AxisOrient } from '../encodeable/types/Axis';
 import { XFieldDef, YFieldDef } from '../encodeable/types/ChannelDef';
 import { PlainObject } from '../encodeable/types/Data';
 import { DEFAULT_LABEL_ANGLE } from './constants';