@visactor/vchart-types 0.10.0-alpha.3 → 0.11.6-alpha.2

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

@@ -6,7 +6,7 @@ export declare class BoxPlotSeriesTooltipHelper extends BaseSeriesTooltipHelper
     getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
     getContentKey: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => string;
     getContentValue: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => any;
-    contentShapeColorCallback: (datum: Datum) => any;
+    shapeColorCallback: (datum: Datum) => any;
     getOutlierFillColor: (datum: Datum) => any;
     isOutlierMark: (datum: Datum) => boolean;
 }

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

@@ -1,4 +1,3 @@
-import type { DataView } from '@visactor/vdataset';
 import type { ICartesianSeries } from '../interface';
 import { BaseSeries } from '../base/base-series';
 import type { IPoint } from '../../typings/coordinate';
@@ -68,7 +67,7 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     onYAxisHelperUpdate(): void;
     onZAxisHelperUpdate(): void;
     setAttrFromSpec(): void;
-    dataToPosition(datum: Datum): IPoint | null;
+    dataToPosition(datum: Datum, checkInViewData?: boolean): IPoint | null;
     protected _buildMarkAttributeContext(): void;
     valueToPosition(xValue: StringOrNumber | StringOrNumber[], yValue: StringOrNumber | StringOrNumber[]): {
         x: number;
@@ -98,8 +97,8 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     getDimensionField(): string[];
     getDimensionContinuousField(): string[];
     getMeasureField(): string[];
-    viewDataUpdate(d: DataView): void;
+    protected initEvent(): void;
     _sortDataInAxisDomain(): void;
-    protected _getInvalidDefined: (datum: Datum) => boolean;
+    protected getInvalidCheckFields(): string[];
     reInit(spec: T): void;
 }

package/types/series/circle-packing/tooltip-helper.d.ts

@@ -1,5 +1,5 @@
 import type { Datum } from '../../typings';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
 export declare class CirclePackingTooltipHelper extends BaseSeriesTooltipHelper {
-    contentKeyCallback: (datum: Datum) => any;
+    markTooltipKeyCallback: (datum: Datum) => any;
 }

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

@@ -1,5 +1,5 @@
 import type { IMarkTheme, IMarkSpec } from '../../typings';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
 import type { ISymbolMarkSpec, IRippleMarkSpec } from '../../typings';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { IPolarSeriesSpec } from '../polar/interface';
@@ -24,9 +24,9 @@ export interface ICorrelationSeriesSpec extends Omit<IPolarSeriesSpec, 'innerRad
         position?: 'top' | 'bottom' | 'left' | 'right' | 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' | 'center';
     };
     [SeriesMarkNameEnum.nodePoint]?: IMarkSpec<ISymbolMarkSpec>;
-    [SeriesMarkNameEnum.label]?: ILabelSpec & {
+    [SeriesMarkNameEnum.label]?: IMultiLabelSpec<ILabelSpec & {
         position?: 'top' | 'bottom' | 'left' | 'right' | 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' | 'center';
-    };
+    }>;
 }
 export interface ICorrelationSeriesTheme {
     [SeriesMarkNameEnum.nodePoint]?: IMarkTheme<ISymbolMarkSpec>;

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

@@ -1,10 +1,10 @@
 import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';
-import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
+import type { IFormatMethod, IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { ISymbolMarkSpec, IRuleMarkSpec, ITextMarkSpec, ConvertToMarkStyleSpec } from '../../typings/visual';
 import type { SeriesMarkNameEnum } from '../interface/type';
 interface ISequenceLabel {
     visible?: boolean;
-    formatMethod?: (text: string | string[], datum?: any) => string | string[];
+    formatMethod?: IFormatMethod<[text: string | string[], datum?: any]>;
     style?: Omit<ConvertToMarkStyleSpec<ITextMarkSpec>, 'visible'>;
 }
 interface ISequenceGrid {

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

@@ -69,7 +69,7 @@ export declare class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpe
         x: number;
         y: number;
     };
-    dataToPosition(datum: any): {
+    dataToPosition(datum: any, checkInViewData?: boolean): {
         x: number;
         y: number;
     };

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

@@ -1,6 +1,7 @@
-import type { Datum, IMarkSpec, IMarkTheme, ISeriesSpec, IOrientType, IPathMarkSpec, IPolygonMarkSpec, IRuleMarkSpec, ITextMarkSpec, IPyramid3dMarkSpec, IPercent } from '../../typings';
+import type { Datum, IMarkSpec, IMarkTheme, ISeriesSpec, IOrientType, IPathMarkSpec, IPolygonMarkSpec, IRuleMarkSpec, ITextMarkSpec, IPyramid3dMarkSpec, IPercent, IComposedTextMarkSpec, IFormatMethod } from '../../typings';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { SeriesMarkNameEnum } from '../interface/type';
+import { ILabelSpec } from '../../component';
 type FunnelMarks = 'funnel';
 export type FunnelAppearPreset = 'clipIn' | 'fadeIn';
 export interface IFunnelSeriesSpec extends ISeriesSpec, IAnimationSpec<FunnelMarks, FunnelAppearPreset> {
@@ -19,17 +20,18 @@ export interface IFunnelSeriesSpec extends ISeriesSpec, IAnimationSpec<FunnelMar
     };
     maxSize?: number | IPercent;
     minSize?: number | IPercent;
+    heightRatio?: number;
     [SeriesMarkNameEnum.funnel]?: IMarkSpec<IPathMarkSpec>;
     [SeriesMarkNameEnum.transform]?: IMarkSpec<IPathMarkSpec>;
     [SeriesMarkNameEnum.label]?: IFunnelLabelSpec;
     [SeriesMarkNameEnum.outerLabel]?: IFunnelOuterLabelSpec;
     [SeriesMarkNameEnum.transformLabel]?: IFunnelLabelSpec;
 }
-interface IFunnelLabelSpec extends IMarkSpec<ITextMarkSpec> {
+interface IFunnelLabelSpec extends Omit<ILabelSpec, 'position' | 'offset'> {
     limit?: 'shapeSize' | number;
-    formatMethod?: (text: string | string[], datum?: Datum) => string | string[];
 }
-export interface IFunnelOuterLabelSpec extends IFunnelLabelSpec {
+export interface IFunnelOuterLabelSpec extends IMarkSpec<IComposedTextMarkSpec> {
+    formatMethod?: IFormatMethod<[text: string | string[], datum?: Datum]>;
     position?: 'left' | 'right' | 'top' | 'bottom';
     spaceWidth?: number;
     alignLabel?: boolean;

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

@@ -3,7 +3,7 @@ import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
 import type { TooltipHandlerParams } from '../../component/tooltip/interface';
 import type { Datum } from '@visactor/vgrammar-core';
 export declare class FunnelSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    titleValueCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
-    contentValueCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
-    contentKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
+    dimensionTooltipTitleCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
+    markTooltipValueCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
+    markTooltipKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => any;
 }

package/types/series/gauge/gauge-pointer-transformer.d.ts

@@ -0,0 +1,5 @@
+import { BaseSeriesSpecTransformer } from '../base';
+import type { IGaugePointerSeriesSpec, IGaugePointerSeriesTheme } from './interface';
+export declare class GaugePointerSeriesSpecTransformer<T extends IGaugePointerSeriesSpec = IGaugePointerSeriesSpec, K extends IGaugePointerSeriesTheme = IGaugePointerSeriesTheme> extends BaseSeriesSpecTransformer<T, K> {
+    protected _supportStack: boolean;
+}

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

@@ -5,14 +5,16 @@ import { SeriesTypeEnum } from '../interface/type';
 import type { IGaugePointerSeriesSpec, PinMarkSpec, PointerMarkSpec } from './interface';
 import type { Datum } from '../../typings';
 import { ProgressLikeSeries } from '../polar/progress-like';
+import { GaugePointerSeriesSpecTransformer } from './gauge-pointer-transformer';
 export declare class GaugePointerSeries<T extends IGaugePointerSeriesSpec = IGaugePointerSeriesSpec> extends ProgressLikeSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: typeof GaugePointerSeriesSpecTransformer;
     private _pinMark;
     private _pointerMark;
     private _pinBackgroundMark;
-    protected _stack: boolean;
     protected _pointerType: MarkTypeEnum;
     setAttrFromSpec(): void;
     initMark(): void;

package/types/series/gauge/gauge-transformer.d.ts

@@ -1,5 +1,6 @@
 import { BaseSeriesSpecTransformer } from '../base';
 import type { IGaugeSeriesSpec, IGaugeSeriesTheme } from './interface';
 export declare class GaugeSeriesSpecTransformer<T extends IGaugeSeriesSpec = IGaugeSeriesSpec, K extends IGaugeSeriesTheme = IGaugeSeriesTheme> extends BaseSeriesSpecTransformer<T, K> {
+    protected _supportStack: boolean;
     protected _transformLabelSpec(spec: T): void;
 }

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

@@ -13,7 +13,6 @@ export declare class GaugeSeries<T extends IGaugeSeriesSpec = IGaugeSeriesSpec>
     readonly transformerConstructor: typeof GaugeSeriesSpecTransformer;
     private _segmentMark;
     private _trackMark;
-    protected _stack: boolean;
     protected _padAngle: number;
     setAttrFromSpec(): void;
     initData(): void;

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

@@ -1,5 +1,5 @@
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec';
-import type { IArcMarkSpec, IPathMarkSpec, IProgressArcMarkSpec, IRectMarkSpec } from '../../typings/visual';
+import type { IArcMarkSpec, IPathMarkSpec, IRectMarkSpec } from '../../typings/visual';
 import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { ProgressLikeAppearPreset } from '../polar/progress-like';
@@ -37,13 +37,13 @@ export type GaugeMarks = 'segment' | 'track';
 export interface IGaugeSeriesSpec extends IProgressLikeSeriesSpec, IAnimationSpec<GaugeMarks, ProgressLikeAppearPreset> {
     type: 'gauge';
     padAngle?: number;
-    [SeriesMarkNameEnum.segment]?: IMarkSpec<IProgressArcMarkSpec>;
+    [SeriesMarkNameEnum.segment]?: IMarkSpec<IArcMarkSpec>;
     [SeriesMarkNameEnum.track]?: IMarkSpec<IArcMarkSpec>;
     [SeriesMarkNameEnum.label]?: IGaugeLabelSpec;
 }
 export interface IGaugeSeriesTheme extends IProgressLikeSeriesTheme {
     padAngle?: number;
-    [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
+    [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IArcMarkSpec>>;
     [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IArcMarkSpec>>;
     [SeriesMarkNameEnum.label]?: IGaugeLabelSpec;
 }

package/types/series/geo/geo.d.ts

@@ -31,8 +31,9 @@ export declare abstract class GeoSeries<T extends IGeoSeriesSpec = IGeoSeriesSpe
         operations: Array<'max' | 'min' | 'values'>;
     }[];
     getGroupFields(): string[];
-    dataToPosition(datum: any): IPoint | null;
+    dataToPosition(datum: any, checkInViewData?: boolean): IPoint | null;
     protected nameToPosition(datum: any): IPoint | null;
+    nameValueToPosition(name: string): IPoint | null;
     abstract getDatumCenter(datum: any): [number, number];
     abstract getDatumName(datum: any): string;
     dataToLatitude(latValue: number): number;

package/types/series/index.d.ts

@@ -63,8 +63,12 @@ import type { IProgressLikeSeriesSpec } from './polar/progress-like';
 import { ProgressLikeSeries } from './polar/progress-like';
 import type { IRoseLikeSeriesSpec } from './polar/rose-like';
 import { RoseLikeSeries } from './polar/rose-like';
+import type { ILiquidSeriesSpec } from './liquid/interface';
+import { LiquidSeries, registerLiquidSeries } from './liquid/liquid';
+import type { IVennSeriesSpec } from './venn/interface';
+import { VennSeries, registerVennSeries } from './venn/venn';
 import type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries } from './interface';
-export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries };
-export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries };
-export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec };
+export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries, VennSeries };
+export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries, registerLiquidSeries, registerVennSeries };
+export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec, IVennSeriesSpec };
 export * from './interface';

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

@@ -1,17 +1,19 @@
 import type { DataView } from '@visactor/vdataset';
 import type { IGrammarItem } from '../../compile/interface';
 import type { IGroupMark } from '../../mark/group';
-import type { IModelConstructor, IModelMarkInfo, IModelOption, IModelSpecInfo } from '../../model/interface';
+import type { IBaseModelSpecTransformerResult, IModelConstructor, IModelMarkInfo, IModelOption, IModelSpecInfo } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { RenderMode } from '../../typings/spec/common';
 import type { ISeries } from './series';
-import type { IMarkProgressiveConfig } from '../../mark/interface';
+import type { IMarkOption, IMarkProgressiveConfig } 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;
     index?: number;
     style: (attribute: string) => any;
     shapeType: string;
@@ -50,14 +52,14 @@ export type ISeriesStyleItem = {
         style?: any;
     };
 };
-export interface ISeriesMarkInitOption {
+export interface ISeriesMarkInitOption extends Partial<IMarkOption> {
     themeSpec?: any;
     markSpec?: any;
     skipBeforeLayouted?: boolean;
     parent?: IGroupMark | false;
     isSeriesMark?: boolean;
     depend?: IGrammarItem | IGrammarItem[];
-    key?: string;
+    key?: string | ((datum: any) => string);
     groupKey?: string;
     morph?: boolean;
     defaultMorphElementKey?: string;
@@ -69,13 +71,18 @@ export interface ISeriesMarkInitOption {
     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;
 }
 export type SeriesMarkMap = Partial<Record<SeriesMarkNameEnum, ISeriesMarkInfo>>;
-export interface ISeriesSpecInfo<T extends ISeriesSpec = ISeriesSpec> extends IModelSpecInfo {
+export interface ISeriesSpecInfo<T extends ISeriesSpec = ISeriesSpec> extends IModelSpecInfo, ISeriesSpecTransformerResult<T, any> {
     type: string | SeriesTypeEnum;
     spec: T;
+    theme: any;
+}
+export interface ISeriesSpecTransformerResult<T, K> extends IBaseModelSpecTransformerResult<T, K> {
     markLabelSpec?: Partial<Record<SeriesMarkNameEnum, TransformedLabelSpec[]>>;
+    stack?: boolean;
 }

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

@@ -1,3 +1,4 @@
+import type { ILabelInfo } from './../../component/label/label';
 import type { PanEventParam, ZoomEventParam } from '../../event/interface';
 import type { IModel } from '../../model/interface';
 import type { DataSet, DataView, ITransformOptions } from '@visactor/vdataset';
@@ -15,6 +16,7 @@ import type { StatisticOperations } from '../../data/transforms/dimension-statis
 import type { IGroupMark } from '../../mark/group';
 import type { IGeoCoordinateHelper } from '../../component/geo/interface';
 import type { ILabelMark } from '../../mark/label';
+import type { BaseLegend } from '../../component/legend/base-legend';
 export interface ISeries extends IModel {
     readonly type: string;
     readonly name?: string;
@@ -43,6 +45,7 @@ export interface ISeries extends IModel {
     reFilterViewData: () => void;
     reTransformViewData: () => void;
     fillData: () => void;
+    isHierarchyData?: () => boolean;
     getRegion: () => IRegion;
     initMark: () => void;
     getMarks: () => IMark[];
@@ -53,6 +56,7 @@ export interface ISeries extends IModel {
     getMarkInId: (id: number) => IMark | undefined;
     getRootMark: () => IGroupMark;
     getActiveMarks: () => IMark[];
+    getSeriesMark: () => IMark;
     getStackData: () => ISeriesStackData;
     getStack: () => boolean;
     getStackValue: () => StringOrNumber | undefined;
@@ -78,7 +82,7 @@ export interface ISeries extends IModel {
     setSeriesField: (field: string) => void;
     handleZoom?: (e: ZoomEventParam) => void;
     handlePan?: (e: PanEventParam) => void;
-    dataToPosition: (datum: Datum) => IPoint | null;
+    dataToPosition: (datum: Datum, checkInViewData?: boolean) => IPoint | null;
     dataToPositionX: (datum: Datum) => number | null;
     dataToPositionY: (datum: Datum) => number | null;
     dataToPositionZ?: (datum: Datum) => number | null;
@@ -91,9 +95,13 @@ export interface ISeries extends IModel {
     getInvalidType: () => IInvalidType;
     getDefaultShapeType: () => string;
     initLabelMarkStyle?: (labelMark: ILabelMark) => void;
+    initTotalLabelMarkStyle?: (labelMark: ILabelMark) => void;
+    getTotalLabelComponentStyle?: (info: Pick<ILabelInfo, 'baseMark' | 'labelMark'>) => any;
     getGroupFields: () => string[];
     getSpecInfo: () => ISeriesSpecInfo;
     getMarkAttributeContext: () => ISeriesMarkAttributeContext;
+    getSeriesFieldValue: (datum: Datum, seriesField?: string) => any;
+    legendSelectedFilter?: (component: BaseLegend<any>, selectedKeys: StringOrNumber[]) => StringOrNumber[];
 }
 export interface ICartesianSeries extends ISeries {
     readonly coordinate: 'cartesian';
@@ -154,9 +162,10 @@ export interface IGeoSeries extends ISeries {
     valueField?: string;
     getMapViewData: () => DataView;
     getNameProperty: () => string;
-    dataToPosition: (datum: any) => IPoint | null;
+    dataToPosition: (datum: any, checkInViewData?: boolean) => IPoint | null;
     dataToLatitude: (latValue: any) => number | null;
     dataToLongitude: (lonValue: any) => number | null;
+    nameValueToPosition: (name: string) => IPoint | null;
     positionToData: (p: IPoint) => any;
     latitudeToData: (lat: number) => any;
     longitudeToData: (lon: number) => any;
@@ -166,7 +175,7 @@ export interface IGeoSeries extends ISeries {
     getDatumCenter: (datum: any) => [number, number];
 }
 export interface IArcSeries extends IPolarSeries {
-    center: (() => IPoint) | IPoint;
+    getCenter: () => IPoint;
     getRadius: (state?: StateValueType) => number;
     getInnerRadius: (state?: StateValueType) => number;
     computeRadius: (r: number, k?: number) => number;

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

@@ -26,19 +26,24 @@ import { SeriesTypeEnum } from './type';
 import type { SeriesMarkMap } from './common';
 import type { IRangeAreaSeriesTheme } from '../range-area/interface';
 import type { ILiquidSeriesTheme } from '../liquid/interface';
+import type { IVennSeriesTheme } from '../venn/interface';
 export interface ISeriesTheme {
     [SeriesTypeEnum.bar]?: IBarSeriesTheme;
     [SeriesTypeForThemeEnum.bar_vertical]?: IBarSeriesTheme;
     [SeriesTypeForThemeEnum.bar_horizontal]?: IBarSeriesTheme;
+    [SeriesTypeForThemeEnum.bar_stack]?: IBarSeriesTheme;
     [SeriesTypeEnum.bar3d]?: IBar3dSeriesTheme;
     [SeriesTypeForThemeEnum.bar3d_vertical]?: IBar3dSeriesTheme;
     [SeriesTypeForThemeEnum.bar3d_horizontal]?: IBar3dSeriesTheme;
+    [SeriesTypeForThemeEnum.bar3d_stack]?: IBar3dSeriesTheme;
     [SeriesTypeEnum.line]?: ILineSeriesTheme;
     [SeriesTypeForThemeEnum.line_vertical]?: ILineSeriesTheme;
     [SeriesTypeForThemeEnum.line_horizontal]?: ILineSeriesTheme;
+    [SeriesTypeForThemeEnum.line_stack]?: ILineSeriesTheme;
     [SeriesTypeEnum.area]?: IAreaSeriesTheme;
     [SeriesTypeForThemeEnum.area_vertical]?: IAreaSeriesTheme;
     [SeriesTypeForThemeEnum.area_horizontal]?: IAreaSeriesTheme;
+    [SeriesTypeForThemeEnum.area_stack]?: IAreaSeriesTheme;
     [SeriesTypeEnum.rangeColumn]?: IRangeColumnSeriesTheme;
     [SeriesTypeForThemeEnum.rangeColumn_vertical]?: IRangeColumnSeriesTheme;
     [SeriesTypeForThemeEnum.rangeColumn_horizontal]?: IRangeColumnSeriesTheme;
@@ -48,6 +53,7 @@ export interface ISeriesTheme {
     [SeriesTypeEnum.linearProgress]?: ILinearProgressSeriesTheme;
     [SeriesTypeForThemeEnum.linearProgress_vertical]?: ILinearProgressSeriesTheme;
     [SeriesTypeForThemeEnum.linearProgress_horizontal]?: ILinearProgressSeriesTheme;
+    [SeriesTypeForThemeEnum.linearProgress_stack]?: ILinearProgressSeriesTheme;
     [SeriesTypeEnum.boxPlot]?: IBoxPlotSeriesTheme;
     [SeriesTypeForThemeEnum.boxPlot_vertical]?: IBoxPlotSeriesTheme;
     [SeriesTypeForThemeEnum.boxPlot_horizontal]?: IBoxPlotSeriesTheme;
@@ -59,11 +65,14 @@ export interface ISeriesTheme {
     [SeriesTypeForThemeEnum.waterfall_horizontal]?: IWaterfallSeriesTheme;
     [SeriesTypeEnum.scatter]?: IScatterSeriesTheme;
     [SeriesTypeEnum.radar]?: IRadarSeriesTheme;
+    [SeriesTypeForThemeEnum.radar_stack]?: IRadarSeriesTheme;
     [SeriesTypeEnum.pie]?: IPieSeriesTheme;
     [SeriesTypeEnum.pie3d]?: IPie3dSeriesTheme;
     [SeriesTypeEnum.rose]?: IRoseSeriesTheme;
+    [SeriesTypeForThemeEnum.rose_stack]?: IRoseSeriesTheme;
     [SeriesTypeEnum.map]?: IMapSeriesTheme;
     [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme;
+    [SeriesTypeForThemeEnum.circularProgress_stack]?: ICircularProgressSeriesTheme;
     [SeriesTypeEnum.link]?: ILinkSeriesTheme;
     [SeriesTypeEnum.dot]?: IDotSeriesTheme;
     [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme;
@@ -78,16 +87,21 @@ export interface ISeriesTheme {
     [SeriesTypeEnum.heatmap]?: IHeatmapSeriesTheme;
     [SeriesTypeEnum.correlation]?: ICorrelationSeriesTheme;
     [SeriesTypeEnum.liquid]?: ILiquidSeriesTheme;
+    [SeriesTypeEnum.venn]?: IVennSeriesTheme;
 }
 export declare enum SeriesTypeForThemeEnum {
     area_horizontal = "area_horizontal",
     area_vertical = "area_vertical",
+    area_stack = "area_stack",
     line_horizontal = "line_horizontal",
     line_vertical = "line_vertical",
+    line_stack = "line_stack",
     bar_horizontal = "bar_horizontal",
     bar_vertical = "bar_vertical",
+    bar_stack = "bar_stack",
     bar3d_horizontal = "bar3d_horizontal",
     bar3d_vertical = "bar3d_vertical",
+    bar3d_stack = "bar3d_stack",
     rangeColumn_horizontal = "rangeColumn_horizontal",
     rangeColumn_vertical = "rangeColumn_vertical",
     rangeColumn3d_horizontal = "rangeColumn3d_horizontal",
@@ -96,11 +110,15 @@ export declare enum SeriesTypeForThemeEnum {
     rangeArea_vertical = "rangeArea_vertical",
     linearProgress_horizontal = "linearProgress_horizontal",
     linearProgress_vertical = "linearProgress_vertical",
+    linearProgress_stack = "linearProgress_stack",
     boxPlot_horizontal = "boxPlot_horizontal",
     boxPlot_vertical = "boxPlot_vertical",
     sankey_horizontal = "sankey_horizontal",
     sankey_vertical = "sankey_vertical",
     waterfall_horizontal = "waterfall_horizontal",
-    waterfall_vertical = "waterfall_vertical"
+    waterfall_vertical = "waterfall_vertical",
+    circularProgress_stack = "circularProgress_stack",
+    radar_stack = "radar_stack",
+    rose_stack = "rose_stack"
 }
 export declare const seriesMarkInfoMap: Record<SeriesTypeEnum, SeriesMarkMap>;

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

@@ -5,9 +5,12 @@ import type { IDimensionInfo } from '../../event/events/dimension/interface';
 export interface ISeriesTooltipHelper extends ITooltipHelper {
     series: ISeries;
     getDefaultTooltipPattern: (activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null;
-    contentKeyCallback: TooltipContentCallback<string>;
-    contentValueCallback: TooltipContentCallback<string>;
-    contentShapeTypeCallback: TooltipContentCallback<ShapeType>;
-    contentShapeColorCallback: TooltipContentCallback<string>;
-    titleValueCallback: TooltipContentCallback<string>;
+    markTooltipKeyCallback: TooltipContentCallback<string>;
+    markTooltipValueCallback: TooltipContentCallback<string>;
+    shapeTypeCallback: TooltipContentCallback<ShapeType>;
+    shapeColorCallback: TooltipContentCallback<string>;
+    shapeStrokeCallback: TooltipContentCallback<string>;
+    dimensionTooltipTitleCallback: TooltipContentCallback<string>;
+    groupTooltipTitleCallback: TooltipContentCallback<string>;
+    groupTooltipKeyCallback: TooltipContentCallback<string>;
 }

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

@@ -32,7 +32,8 @@ export declare enum SeriesTypeEnum {
     waterfall = "waterfall",
     heatmap = "heatmap",
     correlation = "correlation",
-    liquid = "liquid"
+    liquid = "liquid",
+    venn = "venn"
 }
 export declare const enum SeriesMarkNameEnum {
     label = "label",
@@ -92,5 +93,8 @@ export declare const enum SeriesMarkNameEnum {
     areaLabel = "areaLabel",
     liquid = "liquid",
     liquidBackground = "liquidBackground",
-    liquidOutline = "liquidOutline"
+    liquidOutline = "liquidOutline",
+    circle = "circle",
+    overlap = "overlap",
+    overlapLabel = "overlapLabel"
 }

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

@@ -7,6 +7,7 @@ import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mix
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { ILabelSpec } from '../../component';
+import { IMultiLabelSpec } from '../../component/label';
 type LineMarks = 'point' | 'line';
 export interface ILineSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<LineMarks, LineAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'line';
@@ -14,9 +15,9 @@ export interface ILineSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Li
     yField?: string | string[];
     [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;
     [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
-    [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;
+    [SeriesMarkNameEnum.label]?: IMultiLabelSpec<ILineLikeLabelSpec>;
     [SeriesMarkNameEnum.lineLabel]?: Omit<ILabelSpec, 'position'> & {
-        position: 'start' | 'end';
+        position?: 'start' | 'end';
     };
     seriesMark?: 'line' | 'point';
     activePoint?: boolean;

package/types/series/map/geo-source.d.ts

@@ -1,9 +1,11 @@
 import { DataView } from '@visactor/vdataset';
 import type { GeoSourceType } from '../../typings/geo';
 export interface IGeoJsonOption {
-    type: 'geojson';
+    type?: 'geojson';
     centroid?: boolean;
-    simplify?: boolean;
+    simplify?: boolean | {
+        tolerance: number;
+    };
     rewind?: boolean | {
         reverse?: boolean;
     };

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

@@ -1,6 +1,7 @@
 import type { IPathMarkSpec, ITextMarkSpec } from '../../typings/visual';
 import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common';
 import type { IAnimationSpec } from '../../animation/spec';
+import { ILabelSpec } from '../../component';
 type LineMarks = 'area';
 export interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, 'fadeIn'> {
     type: 'map';
@@ -14,11 +15,8 @@ export interface IMapSeriesSpec extends ISeriesSpec, IAnimationSpec<LineMarks, '
     };
     area?: IMarkSpec<Omit<IPathMarkSpec, 'smoothScale'>>;
     defaultFillColor?: string;
-    label?: IMarkSpec<ITextMarkSpec> & {
-        offset?: number;
-        position?: string;
-        formatMethod?: (text: string | string[], datum?: any) => string | string[];
-    };
+    showDefaultName?: boolean;
+    label?: Omit<ILabelSpec, 'position'>;
 }
 export interface IMapSeriesTheme {
     defaultFillColor?: string;

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

@@ -1,5 +1,5 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
 export declare class MapSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    titleValueCallback: (datum: any) => any;
+    dimensionTooltipTitleCallback: (datum: any) => any;
 }

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

@@ -59,4 +59,5 @@ export declare class LineLikeSeriesMixin {
     initLabelMarkStyle(labelMark?: ILabelMark): void;
     initLineLabelMarkStyle(labelMark?: ILabelMark): void;
     encodeDefined(mark: IMark, attr: string): void;
+    protected _isFieldAllValid(): any;
 }

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

@@ -15,6 +15,6 @@ export declare class Pie3dSeries<T extends IPie3dSeriesSpec = IPie3dSeriesSpec>
     protected _angle3d: number;
     setAttrFromSpec(): void;
     initMarkStyle(): void;
-    initLabelMarkStyle(textMark: ITextMark): void;
+    initLabelMarkStyle(textMark: ITextMark, spec?: any): void;
 }
 export declare const registerPie3dSeries: () => void;

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

@@ -4,7 +4,7 @@ import type { IArcMarkSpec, ITextMarkSpec, IArc3dMarkSpec, ILineMarkSpec } from
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { IPolarSeriesSpec, IPolarSeriesTheme } from '../polar/interface';
 import type { PieAppearPreset } from './animation/animation';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
 export type PieMarks = 'pie' | 'label' | 'labelLine';
 export type IBasePieSeriesSpec = Omit<IPieSeriesSpec, 'type'> & {
     type: string;
@@ -25,7 +25,7 @@ export interface IPieSeriesSpec extends IPolarSeriesSpec, IAnimationSpec<PieMark
     padAngle?: number;
     minAngle?: number;
     [SeriesMarkNameEnum.pie]?: IMarkSpec<IArcMarkSpec>;
-    [SeriesMarkNameEnum.label]?: IArcLabelSpec;
+    [SeriesMarkNameEnum.label]?: IMultiLabelSpec<IArcLabelSpec>;
 }
 export interface IPieSeriesTheme extends IPolarSeriesTheme {
     [SeriesMarkNameEnum.pie]?: Partial<IMarkTheme<IArcMarkSpec>>;
@@ -57,14 +57,15 @@ export interface IArcLabelLayoutSpec {
     strategy?: ArcLabelStrategyType;
     tangentConstraint?: boolean;
 }
-export interface IArcLabelSpec extends ILabelSpec {
+export type IArcLabelSpec = Omit<ILabelSpec, 'position'> & {
     position?: 'outside' | 'inside';
     showRule?: 'all' | 'max' | 'min' | 'minAndMax' | 'headAndTail';
     coverEnable?: boolean;
     rotate?: boolean;
     spaceWidth?: number;
     layoutArcGap?: number;
+    centerOffset?: number;
     style?: ITextMarkSpec;
     line?: IArcLabelLineSpec;
     layout?: IArcLabelLayoutSpec;
-}
+};

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

@@ -6,4 +6,5 @@ export declare class PieSeriesSpecTransformer<T extends IBasePieSeriesSpec = IBa
         spec: T;
         theme: K;
     };
+    protected _getDefaultSpecFromChart(chartSpec: any): any;
 }