@visactor/vchart-types 1.10.0-alpha.4 → 1.10.0-alpha.5

package/types/typings/spec/common.d.ts

@@ -7,14 +7,14 @@ import type { IHoverSpec, ISelectSpec, IInteractionSpec } from '../../interactio
 import type { IRenderOption } from '../../compile/interface';
 import type { ITooltipSpec } from '../../component/tooltip/interface';
 import type { ILayoutSpec } from '../../layout/interface';
-import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IProgressArcMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
+import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
 import type { StateValue } from '../../compile/mark';
 import type { ISeriesStyle, SeriesType } from '../../series/interface';
 import type { Datum, StringOrNumber } from '../common';
 import type { IInvalidType } from '../data';
 import type { IMorphSeriesSpec } from '../../animation/spec';
 import type { IPlayer } from '../../component/player';
-import { IMarkProgressiveConfig, MarkTypeEnum } from '../../mark/interface';
+import type { IMarkProgressiveConfig, MarkTypeEnum } from '../../mark/interface';
 import type { IDataZoomSpec, IScrollBarSpec } from '../../component/data-zoom';
 import type { ICrosshairSpec } from '../../component/crosshair/interface';
 import type { ITheme } from '../../theme';
@@ -252,13 +252,13 @@ export type IBuildinMarkSpec = {
     pyramid3d: IPyramid3dMarkSpec;
     boxPlot: IBoxPlotMarkSpec;
     linkPath: ILinkPathMarkSpec;
-    progressArc: IProgressArcMarkSpec;
     ripple: IRippleMarkSpec;
 };
 export type EnableMarkType = keyof IBuildinMarkSpec;
 export interface ICustomMarkSpec<T extends EnableMarkType> extends IMarkSpec<IBuildinMarkSpec[T]> {
     type: T;
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
 }
@@ -267,6 +267,7 @@ export interface ICustomMarkGroupSpec extends ICustomMarkSpec<MarkTypeEnum.group
 }
 export interface IExtensionMarkSpec<T extends Exclude<EnableMarkType, 'group'>> extends ICustomMarkSpec<T> {
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
 }

package/types/typings/tooltip/line.d.ts

@@ -2,9 +2,11 @@ import type { TooltipContentProperty } from './common';
 import type { ITooltipLabelActual, ITooltipLabelPattern } from './label';
 import type { ITooltipShapeActual, ITooltipShapePattern } from './shape';
 import type { TooltipRichTextAttrs } from '@visactor/vrender-components';
-export interface IToolTipLinePattern extends ITooltipShapePattern, ITooltipLabelPattern {
+export interface ITooltipLinePattern extends ITooltipShapePattern, ITooltipLabelPattern {
     key?: TooltipContentProperty<string>;
+    keyFormatter?: string;
     value?: TooltipContentProperty<string | TooltipRichTextAttrs>;
+    valueFormatter?: string;
     visible?: TooltipContentProperty<boolean>;
     isKeyAdaptive?: TooltipContentProperty<boolean>;
     spaceRow?: TooltipContentProperty<number>;
@@ -13,9 +15,10 @@ export interface IToolTipLinePattern extends ITooltipShapePattern, ITooltipLabel
     valueTimeFormat?: string;
     valueTimeFormatMode?: 'utc' | 'local';
 }
-export interface IToolTipLineActual extends ITooltipShapeActual, ITooltipLabelActual {
+export interface ITooltipLineActual extends ITooltipShapeActual, ITooltipLabelActual {
     key?: string;
     value?: string | TooltipRichTextAttrs;
+    valueFormatter?: string;
     visible?: boolean;
     isKeyAdaptive?: boolean;
     spaceRow?: number;

package/types/typings/tooltip/position.d.ts

@@ -1,13 +1,24 @@
-export type ITooltipPositionCallback = (event: MouseEvent) => number;
-export interface ITooltipPositionPattern {
-    left?: number | ITooltipPositionCallback;
-    right?: number | ITooltipPositionCallback;
-    top?: number | ITooltipPositionCallback;
-    bottom?: number | ITooltipPositionCallback;
-}
-export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'inside';
-export type TooltipPositionMode = 'pointer' | 'mark';
-export type TooltipPosition = ITooltipPositionPattern | TooltipFixedPosition;
+export type TooltipPositionCallback<T> = (event: MouseEvent) => T;
+export type TooltipPositionValue = number | TooltipPositionCallback<number>;
+export interface ITooltipPositionFixedValue {
+    orient: TooltipFixedPosition;
+    mode: TooltipPositionMode;
+    offset?: number;
+}
+export type TooltipPositionPatternItem = TooltipPositionValue | ITooltipPositionFixedValue;
+export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside';
+export type TooltipPositionMode = 'pointer' | 'mark' | 'crosshair';
+export interface IGlobalTooltipPositionPattern {
+    left?: TooltipPositionValue;
+    right?: TooltipPositionValue;
+    top?: TooltipPositionValue;
+    bottom?: TooltipPositionValue;
+}
+export interface IFixedTooltipPositionPattern {
+    x: TooltipPositionPatternItem;
+    y: TooltipPositionPatternItem;
+}
+export type TooltipPosition = IGlobalTooltipPositionPattern | IFixedTooltipPositionPattern | TooltipFixedPosition;
 export interface ITooltipPositionActual {
     x: number;
     y: number;

package/types/typings/tooltip/shape.d.ts

@@ -8,8 +8,8 @@ export interface ITooltipShapePattern {
     shapeStroke?: TooltipContentProperty<string>;
     shapeLineWidth?: TooltipContentProperty<number>;
     shapeSize?: TooltipContentProperty<number>;
+    shapeHollow?: TooltipContentProperty<boolean>;
     shapeColor?: TooltipContentProperty<string>;
-    shapeHollow?: boolean;
 }
 export interface ITooltipShapeActual {
     hasShape?: boolean;
@@ -18,6 +18,6 @@ export interface ITooltipShapeActual {
     shapeStroke?: string;
     shapeLineWidth?: number;
     shapeSize?: number;
-    shapeColor?: string;
     shapeHollow?: boolean;
+    shapeColor?: string;
 }

package/types/typings/tooltip/tooltip.d.ts

@@ -1,25 +1,25 @@
 import type { MaybeArray } from '../common';
 import type { TooltipPatternProperty, TooltipUpdateCallback } from './common';
 import type { TooltipActiveType, TooltipData } from './handler';
-import type { IToolTipLineActual, IToolTipLinePattern } from './line';
+import type { ITooltipLineActual, ITooltipLinePattern } from './line';
 import type { ITooltipPositionActual, TooltipPositionMode, TooltipPosition } from './position';
 import type { ITooltipShapePattern } from './shape';
 export interface ITooltipPattern extends ITooltipShapePattern {
     visible?: TooltipPatternProperty<boolean>;
-    title?: TooltipPatternProperty<IToolTipLinePattern>;
-    content?: MaybeArray<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>>;
+    title?: TooltipPatternProperty<ITooltipLinePattern>;
+    content?: MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
     position?: TooltipPatternProperty<TooltipPosition>;
     positionMode?: TooltipPatternProperty<TooltipPositionMode>;
-    updateTitle?: TooltipUpdateCallback<IToolTipLineActual>;
-    updateContent?: TooltipUpdateCallback<IToolTipLineActual[]>;
+    updateTitle?: TooltipUpdateCallback<ITooltipLineActual>;
+    updateContent?: TooltipUpdateCallback<ITooltipLineActual[]>;
     updatePosition?: TooltipUpdateCallback<ITooltipPositionActual>;
     maxLineCount?: number;
     activeType?: TooltipActiveType;
 }
-export interface IToolTipActual {
+export interface ITooltipActual {
     visible?: boolean;
-    title?: IToolTipLineActual;
-    content?: IToolTipLineActual[];
+    title?: ITooltipLineActual;
+    content?: ITooltipLineActual[];
     activeType?: TooltipActiveType;
     position?: ITooltipPositionActual;
     data?: TooltipData;

package/types/typings/visual.d.ts

@@ -207,6 +207,8 @@ export interface IArcMarkSpec extends IFillMarkSpec {
     outerRadius?: number;
     innerRadius?: number;
     cornerRadius?: number;
+    innerPadding?: number;
+    outerPadding?: number;
     centerOffset?: number;
     cap?: boolean | [boolean, boolean];
     autoCapConical?: boolean;
@@ -214,10 +216,6 @@ export interface IArcMarkSpec extends IFillMarkSpec {
 export interface IArc3dMarkSpec extends IArcMarkSpec {
     height?: number;
 }
-export interface IProgressArcMarkSpec extends IArcMarkSpec {
-    innerPadding?: number;
-    outerPadding?: number;
-}
 export interface ICellMarkSpec extends ISymbolMarkSpec {
     padding?: number | number[] | IPadding;
 }

package/types/util/index.d.ts

@@ -1,5 +1,4 @@
-import { TimeUtil } from '../component/axis/cartesian/util/time';
-import { debounce, throttle, clamp } from '@visactor/vutils';
+import { debounce, throttle, clamp, TimeUtil } from '@visactor/vutils';
 export { debounce, throttle, clamp };
 export * from './array';
 export * from './color';