feat: gauge 支持 view 的 props ts 类型扩展

antvis · Feb 15, 2023 · a81258d · a81258d
1 parent 38d378f
commit a81258d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/packages/f2/src/components/gauge/gaugeView.tsx b/packages/f2/src/components/gauge/gaugeView.tsx
@@ -1,4 +1,5 @@
 import { jsx } from '@antv/f-engine';
+import { GuageProps as GuageBaseProps } from './withGauge';
 
 export interface Point {
   x: number;
@@ -11,16 +12,11 @@ export interface Tick {
   end: Point;
 }
 
-export interface GaugeViewProps {
-  center: Point;
-  startAngle: number;
-  endAngle: number;
-  r: number | string;
+export interface GaugeProps extends GuageBaseProps {
   percent: number;
-  ticks: Tick[];
 }
 
-export default (props: GaugeViewProps) => {
+export default (props: GaugeProps) => {
   const { center, startAngle, endAngle, r, percent, ticks } = props;
   const { x, y } = center;
   const diff = endAngle - startAngle;

diff --git a/packages/f2/src/components/gauge/index.tsx b/packages/f2/src/components/gauge/index.tsx
@@ -1,5 +1,5 @@
-import withGauge, { GuageProps } from './withGauge';
-import GaugeView from './gaugeView';
+import withGauge from './withGauge';
+import GaugeView, { GaugeProps } from './gaugeView';
 
-export { GuageProps, withGauge, GaugeView };
-export default withGauge(GaugeView);
+export { GaugeProps, withGauge, GaugeView };
+export default withGauge<GaugeProps>(GaugeView);
diff --git a/packages/f2/src/components/gauge/withGauge.tsx b/packages/f2/src/components/gauge/withGauge.tsx
@@ -40,11 +40,11 @@ export interface GuageProps {
   r?: number | string;
   r0?: number | string;
   center?: Point;
-  percent?: number;
+  ticks?: Tick[];
 }
 
-export default (View: ComponentType) => {
-  return class Guage<IProps extends GuageProps = GuageProps> extends Component<IProps> {
+const withGauge = <IProps extends GuageProps = GuageProps>(View: ComponentType<IProps>) => {
+  return class Guage<P extends IProps = IProps> extends Component<P> {
     render() {
       const { props, context } = this;
       const { startAngle, endAngle, tickCount, center, r, tickOffset, tickLength } = props;
@@ -62,3 +62,5 @@ export default (View: ComponentType) => {
     }
   };
 };
+
+export default withGauge;
diff --git a/packages/f2/src/components/index.ts b/packages/f2/src/components/index.ts
@@ -22,6 +22,6 @@ export { default as Tooltip, TooltipProps, withTooltip, TooltipView } from './to
 export { default as Treemap, TreemapProps, withTreemap, TreemapView } from './treemap';
 export { default as Sunburst, SunburstProps, withSunburst, SunburstView } from './sunburst';
 export { default as PieLabel, PieLabelProps, withPieLabel, PieLabelView } from './pieLabel';
-export { default as Gauge, GuageProps, withGauge, GaugeView } from './gauge';
+export { default as Gauge, GaugeProps, withGauge, GaugeView } from './gauge';
 export { default as Zoom, ZoomProps } from './zoom';
 export { default as ScrollBar, ScrollBarProps, withScrollBar, ScrollBarView } from './scrollBar';