fix: 补充types的定义

antvis · Jul 9, 2020 · 7e25cec · 7e25cec
1 parent 55ba804
commit 7e25cec
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 54 deletions.
diff --git a/test/unit/graphic/canvas-spec.js b/test/unit/graphic/canvas-spec.js
@@ -6,6 +6,7 @@ import '../../../src/graphic/shape/circle';
 
 const dom = document.createElement('canvas');
 dom.id = 'canvas';
+dom.style.width = '300px';
 document.body.appendChild(dom);
 
 describe('Canvas', function() {

diff --git a/types/Plot.d.ts b/types/Plot.d.ts
@@ -0,0 +1,8 @@
+import { Point } from './Point';
+
+export interface Plot {
+  tl: Point;
+  tr: Point;
+  br: Point;
+  bl: Point;
+}
diff --git a/types/Util.d.ts b/types/Util.d.ts
@@ -1,5 +1,6 @@
 import { PartialDeep } from 'type-fest';
 import { Point } from './Point';
+import { Plot } from './Plot';
 
 /**
  * 常用工具库。
@@ -56,6 +57,10 @@ export const Util: {
    * 判断是否为对象类型。
    */
   isObject(value: any): value is object;
+  /**
+   * 判断2个对象是否相等
+   */
+  isEqual(value: any, other: any): boolean;
 
   /**
    * 深拷贝。
@@ -91,6 +96,12 @@ export const Util: {
     func: <K extends keyof T>(value: T[K], key: K) => void | false,
   ): void;
 
+  /**
+   * 数组查找
+   * @param arr
+   */
+  find<T>(arr: T[], fn: (value: T, index: number) => boolean): T;
+
   /**
    * 获取当前设备的像素比。
    */
@@ -102,4 +113,17 @@ export const Util: {
    * @todo 明确参数 canvas 和返回结果的类型
    */
   getRelativePosition(point: Point, canvas: any): any;
+  /**
+   * 计算padding
+   * @param padding 
+   */
+  parsePadding(padding: number | number[]): number[];
 };
+
+export const Helper: {
+  getClip: (coord: any) => any;
+  /**
+   * 判断点是否在plot之内
+   */
+  isPointInPlot: (point: Point, plot: Plot) => boolean;
+}
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,4 +1,4 @@
-import { Util } from './Util';
+import { Util, Helper } from './Util';
 import {
   CanvasCommonProps,
   CanvasLineProps,
@@ -110,6 +110,7 @@ import { ChartParams, ChartInnerProps, ChartPlugins, Chart } from './Chart';
 declare namespace F2 {
   export {
     Util,
+    Helper,
     CanvasCommonProps,
     CanvasLineProps,
     CanvasTextProps,
@@ -202,59 +203,104 @@ declare namespace F2 {
     ChartInnerProps,
     ChartPlugins,
     Chart,
-  };
+  }
 }
 
-export = F2;
-
-// ==== src ====
-declare module '@antv/f2/src/index-all.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/src/index-simple.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/src/index.js' {
-  export = F2;
-}
-
-// ==== lib ====
-declare module '@antv/f2/lib/index-all.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/lib/index-simple.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/lib/index.js' {
-  export = F2;
-}
-
-// ==== build ====
-declare module '@antv/f2/build/f2-all.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/build/f2-simple.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/build/f2.js' {
-  export = F2;
-}
-
-// ==== dist ====
-declare module '@antv/f2/dist/f2-all.min.js' {
-  export = F2;
-}
-
-declare module '@antv/f2/dist/f2-simple.min.js' {
-  export = F2;
-}
+export {
+  Util,
+  Helper,
+  CanvasCommonProps,
+  CanvasLineProps,
+  CanvasTextProps,
+  CanvasPointProps,
+  CanvasBackgroundProps,
+  CanvasProps,
+  Point,
+  Data,
+  DataRecord,
+  DataField,
+  DataRecordScale,
+  DataFieldScale,
+  ScaleType,
+  ScaleCommonProps,
+  ScaleIdentityProps,
+  ScaleLinearProps,
+  ScaleCatProps,
+  ScaleTimeCatProps,
+  ScaleProps,
+  AnimateKind,
+  AnimateElement,
+  AnimateAnimationName,
+  AnimateAnimationFunc,
+  AnimateEasingName,
+  AnimateEasingFunc,
+  AnimateDelayFunc,
+  AnimateConfig,
+  AnimateElementParams,
+  AnimateChartParams,
+  Animate,
+  GeometryKind,
+  GeometryShapeKind,
+  GeometryAdjustKind,
+  GeometryAdjustParams,
+  GeometryParams,
+  Geometry,
+  CoordinateKind,
+  CoordinateRectParams,
+  CoordinatePolarParams,
+  CoordinateParams,
+  AxisPositionKind,
+  AxisLineParams,
+  AxisGridParams,
+  AxisTickLineParams,
+  AxisLabelParams,
+  AxisParams,
+  LegendMarkerSymbol,
+  LegendMarkerParams,
+  LegendMarkerFunc,
+  LegendMarker,
+  LegendItem,
+  LegendParams,
+  LegendControllerLegend,
+  LegendControllerLegends,
+  LegendController,
+  G,
+  PluginLifecycle,
+  Plugin,
+  TooltipItem,
+  Tooltip,
+  TooltipParams,
+  InteractionKind,
+  InteractionPieSelectParams,
+  InteractionIntervalSelectParams,
+  InteractionPanParams,
+  InteractionPinchParams,
+  InteractionSwipeParams,
+  InteractionParams,
+  GestureParams,
+  ScrollBarParams,
+  PieLabelText,
+  PieLabelParams,
+  GuideElementPositionLiteral,
+  GuideElementPositionFunc,
+  GuideElementPosition,
+  GuideLineParams,
+  GuideTextParams,
+  GuidePointParams,
+  GuideTagParams,
+  GuideRectParams,
+  GuideHtmlParams,
+  GuideArcParams,
+  GuideRegionFilterParams,
+  GuideResult,
+  Guide,
+  Shape,
+  Global,
+  IntervalLabelParams,
+  ChartParams,
+  ChartInnerProps,
+  ChartPlugins,
+  Chart,
+};
 
-declare module '@antv/f2/dist/f2.min.js' {
-  export = F2;
-}
+export default F2;