@visactor/vchart-types 1.12.4-alpha.0 → 1.12.4-alpha.2

package/types/plugin/components/tooltip-handler/base.d.ts

@@ -1,5 +1,5 @@
 import type { Options } from './constants';
-import type { Maybe, ILayoutPoint, RenderMode } from '../../../typings';
+import type { Maybe, RenderMode } from '../../../typings';
 import type { TooltipData, ITooltipActual, TooltipActiveType, ITooltipHandler, ITooltipPositionActual } from '../../../typings/tooltip';
 import type { IGroup } from '@visactor/vrender-core';
 import type { Compiler } from '../../../compile/compiler';
@@ -25,34 +25,19 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _attributes?: ITooltipAttributes | null;
     protected _chartContainer: Maybe<HTMLElement>;
     protected _compiler: Compiler;
-    protected _isTooltipPaused: boolean;
-    protected _isPointerEscaped: boolean;
-    protected _cachePointerTimer: number;
-    protected _cachePointerPosition: ILayoutPoint;
-    protected _cacheTooltipPosition: ILayoutPoint;
-    protected _cacheTooltipSize: IContainerSize;
     protected _container: Maybe<IGroup | HTMLElement>;
     protected _isReleased: boolean;
     onAdd(service: IComponentPluginService<any>): void;
     showTooltip: (activeType: TooltipActiveType, data: TooltipData, params: TooltipHandlerParams) => TooltipResult;
     protected changeTooltip: ChangeTooltipFunc;
-    protected _changeTooltip: ChangeTooltipFunc;
     protected changeTooltipPosition: ChangeTooltipPositionFunc;
-    protected _changeTooltipPosition: ChangeTooltipPositionFunc;
     hideTooltip(params: TooltipHandlerParams): TooltipResult;
     release(): void;
-    protected _clearAllCache(): void;
     protected abstract _updateTooltip(visible: boolean, params: TooltipHandlerParams): void;
     protected abstract _removeTooltip(): void;
-    protected _throttle(callback: any): (...args: unknown[]) => unknown;
     protected _getDefaultOption(): Options;
     protected _getActualTooltipPosition: (actualTooltip: ITooltipActual, params: TooltipHandlerParams, tooltipBoxSize: IContainerSize | undefined) => ITooltipPositionActual;
     protected _getTooltipBoxSize(actualTooltip: ITooltipActual, changePositionOnly: boolean): IContainerSize | undefined;
-    protected _getPointerPositionRelativeToTooltipParent(params: TooltipHandlerParams): {
-        x: any;
-        y: any;
-    };
-    protected _isPointerMovingToTooltip(params: TooltipHandlerParams): boolean;
     protected _getParentElement(spec: ITooltipSpec): HTMLElement;
     getTooltipContainer(): HTMLElement | IGroup;
     protected _initFromSpec(): void;

package/types/plugin/components/tooltip-handler/dom/dom-tooltip-handler.d.ts

@@ -27,6 +27,5 @@ export declare class DomTooltipHandler extends BaseTooltipHandler {
     isTooltipShown(): boolean;
     reInit(): void;
     protected _updatePosition({ x, y }: ITooltipPositionActual): void;
-    protected _initEvent(el: HTMLElement): void;
 }
 export declare const registerDomTooltipHandler: () => void;

package/types/plugin/components/tooltip-handler/interface/style.d.ts

@@ -1,10 +1,9 @@
 import type { TooltipAttributes } from '@visactor/vrender-components';
-import type { ITextAttribute, IFillStyle, RichTextWordBreak } from '@visactor/vrender-core';
+import type { ITextAttribute, IFillStyle } from '@visactor/vrender-core';
 export interface ITooltipTextStyle extends Partial<ITextAttribute & IFillStyle> {
     spacing?: number;
     multiLine?: boolean;
     maxWidth?: number;
-    wordBreak?: RichTextWordBreak;
     autoWidth?: boolean;
 }
 export interface ITooltipAttributes extends TooltipAttributes {

package/types/plugin/components/tooltip-handler/utils/position.d.ts

@@ -2,11 +2,9 @@ import type { IDimensionData } from '../../../../event';
 import { type ILayoutPoint } from '../../../../typings';
 import type { IFixedTooltipPositionPattern, IGlobalTooltipPositionPattern, TooltipFixedPosition } from '../../../../typings/tooltip/position';
 export declare const getActualTooltipPositionValue: (position: number | ((event: MouseEvent) => number), event: MouseEvent) => number;
-export type TooltipHorizontalPositionType = 'left' | 'right' | 'center' | 'centerLeft' | 'centerRight';
-export type TooltipVerticalPositionType = 'top' | 'bottom' | 'center' | 'centerTop' | 'centerBottom';
-export declare const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]>;
-export declare const getHorizontalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipHorizontalPositionType) => TooltipHorizontalPositionType;
-export declare const getVerticalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipVerticalPositionType) => TooltipVerticalPositionType;
+export type TooltipPositionType = -2 | -1 | 0 | 1 | 2;
+export declare const positionType: Record<TooltipFixedPosition, [TooltipPositionType, TooltipPositionType]>;
+export declare const getPositionType: (position: TooltipFixedPosition, dim: 'x' | 'y', defaultCase?: TooltipPositionType) => TooltipPositionType;
 export declare const getCartesianCrosshairRect: (dimensionData: IDimensionData, layoutStartPoint: ILayoutPoint) => {
     visible: boolean;
     start: {

package/types/region/interface.d.ts

@@ -53,7 +53,9 @@ export interface IRegionSpec extends ILayoutItemSpec {
 }
 export interface IGeoRegionSpec extends IRegionSpec {
     coordinate?: 'geo';
-    roam?: boolean;
+    roam?: boolean | {
+        blank?: boolean;
+    };
     longitudeField?: string;
     latitudeField?: string;
     projection?: Partial<Omit<IProjectionSpec, 'name'>>;

package/types/series/area/area.d.ts

@@ -22,6 +22,8 @@ export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> ext
     initMarkStyle(): void;
     initAreaMarkStyle(): void;
     initAnimation(): void;
+    protected _isAreaVisible(): boolean;
+    protected _isLineVisible(): boolean;
     protected initTooltip(): void;
     viewDataStatisticsUpdate(d: DataView): void;
     compile(): void;

package/types/series/bar/bar.d.ts

@@ -1,6 +1,6 @@
 import type { IBaseScale } from '@visactor/vscale';
 import { CartesianSeries } from '../cartesian/cartesian';
-import type { IMark, IMarkProgressiveConfig } from '../../mark/interface';
+import type { IMark } from '../../mark/interface';
 import { MarkTypeEnum } from '../../mark/interface/type';
 import type { Datum, DirectionType } from '../../typings';
 import type { IBarSeriesSpec } from './interface';
@@ -27,7 +27,7 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
     protected _barBackgroundMark: IRectMark;
     protected _barBackgroundViewData: SeriesData;
     initMark(): void;
-    protected _initBarBackgroundMark(progressive?: IMarkProgressiveConfig): void;
+    protected _initBarBackgroundMark(): void;
     initMarkStyle(): void;
     initLabelMarkStyle(textMark: ITextMark): void;
     protected initTooltip(): void;
@@ -40,8 +40,8 @@ export declare class BarSeries<T extends IBarSeriesSpec = IBarSeriesSpec> extend
     protected _dataToPosX1(datum: Datum): number;
     protected _dataToPosY(datum: Datum): number;
     protected _dataToPosY1(datum: Datum): number;
-    protected _getBarXStart: (datum: Datum, scale: IBaseScale) => any;
-    protected _getBarXEnd: (datum: Datum, scale: IBaseScale) => any;
+    protected _getBarXStart: (datum: Datum, scale: IBaseScale, useWholeRange?: boolean) => any;
+    protected _getBarXEnd: (datum: Datum, scale: IBaseScale, useWholeRange?: boolean) => any;
     protected _getBarYStart: (datum: Datum, scale: IBaseScale) => any;
     protected _getBarYEnd: (datum: Datum, scale: IBaseScale) => any;
     initBandRectMarkStyle(): void;

package/types/series/bar/interface.d.ts

@@ -7,7 +7,11 @@ import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
 import type { IDataSamping, IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { Functional } from '@visactor/vrender-components';
+import type { IRectGraphicAttribute } from '@visactor/vrender-core';
+import type { Datum } from '../../typings';
+import type { ISeriesMarkAttributeContext } from '../../compile/mark';
 type BarMarks = 'bar';
+export type IStackCornerRadiusCallback = (attr: IRectGraphicAttribute, datum: Datum, ctx: ISeriesMarkAttributeContext) => number | number[];
 export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig, IDataSamping {
     type: 'bar';
     xField?: string | string[];
@@ -22,7 +26,7 @@ export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Bar
     barMaxWidth?: number | string;
     barGapInGroup?: number | string | (number | string)[];
     barMinHeight?: number;
-    stackCornerRadius?: number | number[];
+    stackCornerRadius?: number | number[] | IStackCornerRadiusCallback;
 }
 export interface IBarBackgroundSpec {
     fieldLevel?: number;

package/types/series/base/base-series.d.ts

@@ -1,11 +1,11 @@
 import { DataView } from '@visactor/vdataset';
 import type { DataSet, ITransformOptions } from '@visactor/vdataset';
 import type { IRegion } from '../../region/interface';
-import type { IMark } from '../../mark/interface';
-import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IGroup, ILayoutType, ILayoutPoint, ILayoutRect } from '../../typings';
+import type { ICompileMarkConfig, IMark } from '../../mark/interface';
+import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IExtensionMarkSpec, IExtensionGroupMarkSpec, EnableMarkType, IGroup, ILayoutType, ILayoutPoint, ILayoutRect } from '../../typings';
 import { BaseModel } from '../../model/base-model';
 import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo, ISeriesStackDataLeaf, ISeriesStackDataMeta, ISeriesSeriesInfo } from '../interface';
-import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
+import type { IModelEvaluateOption, IModelRenderOption, IUpdateSpecResult } from '../../model/interface';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { IBaseInteractionSpec } from '../../interaction/interface';
 import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
@@ -15,6 +15,7 @@ import type { ISeriesMarkAttributeContext } from '../../compile/mark';
 import { STATE_VALUE_ENUM } from '../../compile/mark';
 import { BaseSeriesSpecTransformer } from './base-series-transformer';
 import type { EventType } from '@visactor/vgrammar-core';
+import type { ILabelSpec } from '../../component/label/interface';
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly specKey: string;
     readonly type: string;
@@ -169,9 +170,9 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected initEvent(): void;
     protected _releaseEvent(): void;
     protected initTooltip(): void;
-    _compareSpec(spec: T, prevSpec: T, ignoreCheckKeys?: {
-        [key: string]: true;
-    }): {
+    _compareExtensionMarksSpec(newMarks: (IExtensionMarkSpec<Exclude<EnableMarkType, 'group'>> | IExtensionGroupMarkSpec)[], prevMarks: (IExtensionMarkSpec<Exclude<EnableMarkType, 'group'>> | IExtensionGroupMarkSpec)[], compareResult: IUpdateSpecResult): void;
+    _compareLabelSpec(newLabels: ILabelSpec[], prevLabels: ILabelSpec[], compareResult: IUpdateSpecResult): void;
+    _compareSpec(spec: T, prevSpec: T, ignoreCheckKeys?: Record<string, boolean>): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;
@@ -201,7 +202,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getMeasureField(): string[];
     protected onMarkPositionUpdate(): void;
     protected onMarkTreePositionUpdate(marks: IMark[]): void;
-    protected _createMark<M extends IMark>(markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption): NonNullable<M>;
+    protected _createMark<M extends IMark>(markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption, config?: ICompileMarkConfig): NonNullable<M>;
     protected _getDataIdKey(): string | ((datum: Datum) => string);
     protected _getSeriesDataKey(datum: Datum): string;
     addViewDataFilter(option: ITransformOptions): void;

package/types/series/base/tooltip-helper.d.ts

@@ -1,17 +1,25 @@
-import type { TooltipHandlerParams } from '../../component/tooltip/interface';
-import type { ITooltipPattern, ShapeType, TooltipActiveType } from '../../typings';
+import type { ISeriesTooltipSpec, ITooltipSpec, TooltipHandlerParams } from '../../component/tooltip/interface';
+import type { ITooltipActual, ITooltipLineActual, ITooltipLinePattern, ITooltipPattern, MaybeArray, ShapeType, TooltipActiveType, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../typings';
 import type { ISeries, ISeriesTooltipHelper } from '../interface';
-import { BaseTooltipHelper } from '../../model/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 import type { Datum } from '@visactor/vgrammar-core';
+import type { IMark } from '../../mark/interface/common';
 interface ISeriesCacheInfo {
     seriesFields: string[];
     dimensionFields: string[];
     measureFields: string[];
     type: string;
 }
-export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implements ISeriesTooltipHelper {
+export declare class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
     series: ISeries;
+    spec: ISeriesTooltipSpec | undefined;
+    activeType: TooltipActiveType[];
+    activeTriggerSet: {
+        mark: Set<IMark>;
+        group: Set<IMark>;
+    };
+    ignoreTriggerSet: {
+        mark: Set<IMark>;
+    };
     protected _seriesCacheInfo: ISeriesCacheInfo;
     constructor(series: ISeries);
     updateTooltipSpec(): void;
@@ -28,6 +36,22 @@ export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implement
     dimensionTooltipTitleCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     groupTooltipTitleCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     groupTooltipKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    getHasShape: (isContent: boolean) => boolean;
+    protected getShapeAttrs(activeType: TooltipActiveType, isContent: boolean, chartTooltipSpec?: ITooltipSpec): {
+        shapeType: TooltipContentProperty<string>;
+        shapeFill: TooltipContentProperty<string>;
+        shapeStroke: TooltipContentProperty<string>;
+        shapeHollow: TooltipContentProperty<boolean>;
+        shapeLineWidth: TooltipContentProperty<number>;
+        shapeSize: any;
+        hasShape: boolean;
+    };
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultContentList(activeType: TooltipActiveType): MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
+    protected getContentList(activeType: TooltipActiveType, spec: ITooltipPattern, shapeAttrs: Record<string, TooltipContentProperty<any>>, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipLineActual[];
+    protected getTitleResult(activeType: TooltipActiveType, titleSpec: TooltipPatternProperty<ITooltipLinePattern>, shapeAttrs: Record<string, TooltipContentProperty<any>>, data?: TooltipData, params?: TooltipHandlerParams): ITooltipLineActual;
+    getTooltipData(activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipActual | null;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    protected getDefaultContentPattern(activeType: TooltipActiveType): ITooltipLinePattern;
 }
 export {};

package/types/series/box-plot/box-plot.d.ts

@@ -45,6 +45,7 @@ export declare class BoxPlotSeries<T extends IBoxPlotSeriesSpec = IBoxPlotSeries
     initMarkStyle(): void;
     initBoxPlotMarkStyle(): void;
     initData(): void;
+    compileData(): void;
     init(option: IModelInitOption): void;
     private _getMarkWidth;
     onLayoutEnd(ctx: any): void;

package/types/series/box-plot/tooltip-helper.d.ts

@@ -1,9 +1,9 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { Datum, ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum, ITooltipLinePattern, TooltipActiveType } from '../../typings';
 import { BOX_PLOT_TOOLTIP_KEYS } from '../../constant/box-plot';
 export declare class BoxPlotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected getDefaultContentList(activeType: TooltipActiveType): ITooltipLinePattern[];
     getContentKey: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => string;
     getContentValue: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => any;
     shapeColorCallback: (datum: Datum) => any;

package/types/series/cartesian/cartesian.d.ts

@@ -31,7 +31,7 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     protected _specXField: string[];
     protected _specYField: string[];
     protected _direction: DirectionType;
-    get direction(): "vertical" | "horizontal";
+    get direction(): "horizontal" | "vertical";
     protected _scaleX: IBaseScale;
     get scaleX(): IBaseScale;
     setScaleX(s: IBaseScale): void;

package/types/series/correlation/correlation.d.ts

@@ -36,6 +36,7 @@ export declare class CorrelationSeries<T extends ICorrelationSeriesSpec = ICorre
     protected _viewDataTransform: SeriesData;
     setAttrFromSpec(): void;
     protected initData(): void;
+    compileData(): void;
     protected _statisticViewData(): void;
     initMark(): void;
     initMarkStyle(): void;

package/types/series/dot/dot.d.ts

@@ -29,7 +29,6 @@ export declare class DotSeries<T extends IDotSeriesSpec = IDotSeriesSpec> extend
     protected _gridBackground?: IFillMarkSpec;
     setGridBackground(gridBackground: IFillMarkSpec): void;
     initData(): void;
-    setSeriesField(field: string): void;
     getStatisticFields(): {
         key: string;
         operations: Array<'max' | 'min' | 'values'>;

package/types/series/dot/tooltip-helper.d.ts

@@ -1,6 +1,12 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum, ITooltipActual, ITooltipLinePattern, MaybeArray, TooltipActiveType, TooltipData, TooltipPatternProperty } from '../../typings';
+import type { ITooltipSpec } from '../../component/tooltip/interface/spec';
+import type { TooltipHandlerParams } from '../../component/tooltip/interface/common';
 export declare class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    shapeTypeCallback: () => string;
+    protected getDefaultContentList(): MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
+    getTooltipData(activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipActual | null;
 }

package/types/series/funnel/funnel.d.ts

@@ -40,8 +40,10 @@ export declare class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpe
         label?: ITextMark;
         line?: IRuleMark;
     };
+    protected _minLabelLineWidth: number;
     setAttrFromSpec(): void;
     initData(): void;
+    compileData(): void;
     getStatisticFields(): {
         key: string;
         operations: Array<'max' | 'min' | 'values'>;

package/types/series/funnel/interface.d.ts

@@ -36,7 +36,9 @@ export interface IFunnelOuterLabelSpec extends IMarkSpec<IComposedTextMarkSpec>
     spaceWidth?: number;
     alignLabel?: boolean;
     style?: ITextMarkSpec;
-    line?: IMarkSpec<IRuleMarkSpec>;
+    line?: {
+        minLength?: number;
+    } & IMarkSpec<IRuleMarkSpec>;
 }
 export interface IFunnelSeriesTheme {
     [SeriesMarkNameEnum.funnel]?: Partial<IMarkTheme<IPolygonMarkSpec>>;

package/types/series/gauge/interface.d.ts

@@ -15,7 +15,7 @@ export interface IGaugePointerSeriesSpec extends IProgressLikeSeriesSpec, IAnima
     [SeriesMarkNameEnum.pointer]?: IMarkSpec<IPathMarkSpec | IRectMarkSpec> & PointerMarkSpec;
 }
 export type PointerMarkSpec = {
-    type: 'path' | 'rect';
+    type?: 'path' | 'rect';
     width?: number;
     height?: number;
     innerPadding?: number;

package/types/series/gauge/pointer-tooltip-helper.d.ts

@@ -0,0 +1,6 @@
+import type { ISeriesTooltipHelper } from '../interface';
+import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
+import type { TooltipActiveType } from '../../typings';
+export declare class GaugePointerTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
+    protected enableByType(activeType: TooltipActiveType): boolean;
+}

package/types/series/heatmap/tooltip-helper.d.ts

@@ -1,6 +1,5 @@
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { TooltipActiveType } from '../../typings';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 export declare class HeatmapSeriesTooltipHelper extends BaseSeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
 }

package/types/series/interface/common.d.ts

@@ -5,12 +5,10 @@ import type { IBaseModelSpecTransformerResult, IModelConstructor, IModelMarkInfo
 import type { IRegion } from '../../region/interface';
 import type { RenderMode } from '../../typings/spec/common';
 import type { ISeries } from './series';
-import type { IMarkOption, IMarkProgressiveConfig } from '../../mark/interface';
+import type { IMarkOption } from '../../mark/interface';
 import type { ISeriesSpec, StringOrNumber } from '../../typings';
 import type { TransformedLabelSpec } from '../../component/label';
 import type { SeriesMarkNameEnum, SeriesTypeEnum } from './type';
-import type { ICustomPath2D } from '@visactor/vrender-core';
-import type { MarkClip } from '../../compile/mark';
 export interface ISeriesSeriesInfo {
     key: string;
     originalKey: any;
@@ -63,17 +61,11 @@ export interface ISeriesMarkInitOption extends Partial<IMarkOption> {
     depend?: IGrammarItem | IGrammarItem[];
     key?: string | ((datum: any) => string);
     groupKey?: string;
-    morph?: boolean;
-    defaultMorphElementKey?: string;
     dataView?: DataView | false;
     dataProductId?: string;
     seriesId?: number;
-    progressive?: IMarkProgressiveConfig;
-    support3d?: boolean;
-    customShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;
     stateSort?: (stateA: string, stateB: string) => number;
     componentType?: string;
-    clip?: MarkClip;
 }
 export interface ISeriesMarkInfo extends IModelMarkInfo {
     name: SeriesMarkNameEnum | string;

package/types/series/interface/tooltip-helper.d.ts

@@ -1,10 +1,11 @@
-import type { ITooltipPattern, ShapeType, TooltipActiveType, TooltipContentCallback } from '../../typings';
+import type { Datum, ITooltipActual, ShapeType, TooltipActiveType, TooltipContentCallback, TooltipData } from '../../typings';
 import type { ISeries } from './series';
-import type { ITooltipHelper } from '../../model/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
+import type { ITooltipHelper } from '../../model/interface';
+import type { ITooltipSpec } from '../../component/tooltip/interface/spec';
+import type { TooltipHandlerParams } from '../../component/tooltip/interface/common';
 export interface ISeriesTooltipHelper extends ITooltipHelper {
     series: ISeries;
-    getDefaultTooltipPattern: (activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null;
+    getTooltipData: (activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, allData?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams) => ITooltipActual | null;
     markTooltipKeyCallback: TooltipContentCallback<string>;
     markTooltipValueCallback: TooltipContentCallback<string>;
     shapeTypeCallback: TooltipContentCallback<ShapeType>;

package/types/series/link/tooltip-helper.d.ts

@@ -1,6 +1,9 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { ITooltipLinePattern, TooltipActiveType } from '../../typings';
 export declare class LinkSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    shapeTypeCallback: () => string;
+    protected getDefaultContentList(): ITooltipLinePattern[];
 }

package/types/series/liquid/tooltip-helper.d.ts

@@ -1,9 +1,8 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { Datum, ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum } from '../../typings';
 export declare class LiquidSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
-    getContentKey: () => (datum: any) => string;
-    getContentValue: () => (datum: any) => any;
-    getLiquidFillColor: (datum: Datum) => any;
+    markTooltipKeyCallback: (datum: any) => string;
+    markTooltipValueCallback: (datum: any) => any;
+    shapeStrokeCallback: (datum: Datum) => any;
 }

package/types/series/map/map.d.ts

@@ -30,6 +30,7 @@ export declare class MapSeries<T extends IMapSeriesSpec = IMapSeriesSpec> extend
     private _labelMark;
     setAttrFromSpec(): void;
     initData(): void;
+    compileData(): void;
     initMark(): void;
     initMarkStyle(): void;
     initLabelMarkStyle(labelMark: ILabelMark): void;

package/types/series/mixin/line-mixin.d.ts

@@ -1,6 +1,6 @@
 import type { ISeriesOption } from '../interface/common';
 import type { ISeries } from '../interface/series';
-import type { IMark, IMarkProgressiveConfig } from '../../mark/interface';
+import type { ICompileMarkConfig, IMark, IMarkProgressiveConfig } from '../../mark/interface';
 import type { ILineMark } from '../../mark/line';
 import type { ISymbolMark } from '../../mark/symbol';
 import type { ITextMark } from '../../mark/text';
@@ -39,7 +39,7 @@ export interface LineLikeSeriesMixin extends ISeries {
     _fieldX?: string[];
     _fieldY?: string[];
     _fieldZ?: string[];
-    _createMark: (markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption) => IMark;
+    _createMark: (markInfo: ISeriesMarkInfo, option?: ISeriesMarkInitOption, config?: ICompileMarkConfig) => IMark;
     _getInvalidDefined: () => boolean;
     _getInvalidConnectType: () => IInvalidType;
     getLayoutRect: () => ILayoutRect;

package/types/series/pie/interface.d.ts

@@ -6,7 +6,7 @@ import type { IPolarSeriesSpec, IPolarSeriesTheme } from '../polar/interface';
 import type { PieAppearPreset } from './animation/animation';
 import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
 import type { ICustomPath2D, ILineGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
-import type { ILayoutRect } from '../../typings/layout';
+import type { ILayoutRect, IPercent } from '../../typings/layout';
 import type { IPointLike } from '@visactor/vutils';
 export type PieMarks = 'pie' | 'label' | 'labelLine';
 export type IBasePieSeriesSpec = Omit<IPieSeriesSpec, 'type'> & {
@@ -16,8 +16,8 @@ export interface IPieSeriesSpec extends IPolarSeriesSpec, IAnimationSpec<PieMark
     type: 'pie';
     categoryField: string;
     valueField: string;
-    centerX?: number;
-    centerY?: number;
+    centerX?: number | IPercent;
+    centerY?: number | IPercent;
     centerOffset?: number;
     radius?: number;
     outerRadius?: number;

package/types/series/pie/pie.d.ts

@@ -34,6 +34,7 @@ export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSe
     protected _buildMarkAttributeContext(): void;
     setAttrFromSpec(): void;
     initData(): void;
+    compileData(): void;
     initMark(): void;
     private startAngleScale;
     private endAngleScale;

package/types/series/polar/animation.d.ts

@@ -1,6 +1,6 @@
 import type { EasingType } from '@visactor/vrender-core';
+import type { IPointLike } from '@visactor/vutils';
 import { ACustomAnimate, TagPointsUpdate } from '@visactor/vrender-core';
-import type { IPolarAxisHelper } from '../../component/axis';
 export declare class PolarPointUpdate extends ACustomAnimate<{
     x: number;
     y: number;
@@ -10,18 +10,17 @@ export declare class PolarPointUpdate extends ACustomAnimate<{
     private _fromRadius;
     private _toAngle;
     private _toRadius;
-    private _pointToCoord;
-    private _coordToPoint;
+    private _center;
+    private _prevCenter;
     constructor(from: {
         x: number;
         y: number;
+        center: IPointLike;
     }, to: {
         x: number;
         y: number;
-    }, duration: number, easing: EasingType, params: {
-        pointToCoord: IPolarAxisHelper['pointToCoord'];
-        coordToPoint: IPolarAxisHelper['coordToPoint'];
-    });
+        center: IPointLike;
+    }, duration: number, easing: EasingType, params: any);
     getEndProps(): Record<string, any>;
     onBind(): void;
     onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
@@ -29,13 +28,12 @@ export declare class PolarPointUpdate extends ACustomAnimate<{
 export declare class PolarTagPointsUpdate extends TagPointsUpdate {
     private points;
     private interpolatePoints;
-    private _pointToCoord;
-    private _coordToPoint;
+    private _center;
+    private _prevCenter;
     constructor(from: any, to: any, duration: number, easing: EasingType, params?: {
         newPointAnimateType?: 'grow' | 'appear';
-        pointToCoord: IPolarAxisHelper['pointToCoord'];
-        coordToPoint: IPolarAxisHelper['coordToPoint'];
     });
     onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
+    private _interpolationSinglePoint;
     private polarPointInterpolation;
 }

package/types/series/progress/linear/tooltip-helper.d.ts

@@ -1,7 +1,6 @@
 import { BaseSeriesTooltipHelper } from '../../base/tooltip-helper';
 import type { ISeriesTooltipHelper } from '../../interface';
-import type { ITooltipPattern, TooltipActiveType } from '../../../typings';
-import type { IDimensionInfo } from '../../../event/events/dimension/interface';
+import type { TooltipActiveType } from '../../../typings';
 export declare class LinearProgressSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
 }

package/types/series/radar/animation.d.ts

@@ -1,12 +1,9 @@
 import type { Datum, IAnimationTypeConfig, IElement } from '@visactor/vgrammar-core';
 import type { IPoint, Maybe } from '../../typings';
-import type { IPolarAxisHelper } from '../../component/axis';
 export interface IRadarAnimationParams {
     center: () => Maybe<IPoint>;
     radius: () => number;
     startAngle: number;
-    pointToCoord: IPolarAxisHelper['pointToCoord'];
-    coordToPoint: IPolarAxisHelper['coordToPoint'];
 }
 export type RadarAppearPreset = 'grow' | 'fadeIn' | 'clipIn';
 export declare const radarFadeAnimation: (animationType: 'in' | 'out') => {

package/types/series/range-area/tooltip-helper.d.ts

@@ -1,7 +1,5 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 export declare class RangeAreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected _getMeasureData: (datum: any) => string;
 }

package/types/series/range-column/tooltip-helper.d.ts

@@ -1,6 +1,5 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
 export declare class RangeColumnSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected _getMeasureData: (datum: any) => string;
 }

package/types/series/sankey/interface.d.ts

@@ -18,6 +18,7 @@ export interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimation
     targetField?: string;
     direction?: DirectionType;
     nodeAlign?: 'left' | 'right' | 'center' | 'justify' | 'start' | 'end';
+    crossNodeAlign?: 'start' | 'end' | 'middle';
     inverse?: boolean;
     nodeGap?: number;
     nodeWidth?: string | number | ((node: SankeyNodeElement) => number);