@visactor/vchart-types 1.11.0-alpha.2 → 1.11.0

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

@@ -4,7 +4,7 @@ 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 { BaseModel } from '../../model/base-model';
-import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo, ISeriesStackDataLeaf, ISeriesStackDataMeta } from '../interface';
+import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo, ISeriesStackDataLeaf, ISeriesStackDataMeta, ISeriesSeriesInfo } from '../interface';
 import type { IModelEvaluateOption, IModelRenderOption } from '../../model/interface';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { IBaseInteractionSpec } from '../../interaction/interface';
@@ -78,6 +78,8 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     created(): void;
     protected _buildMarkAttributeContext(): void;
     setAttrFromSpec(): void;
+    protected getInvalidCheckFields(): string[];
+    protected initInvalidDataTransform(): void;
     protected initData(): void;
     protected initGroups(): void;
     protected initStatisticalData(): void;
@@ -120,12 +122,13 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     setValueFieldToStackOffsetSilhouette(): void;
     abstract getActiveMarks(): IMark[];
     initRootMark(): void;
+    private _getExtensionMarkNamePrefix;
     protected _initExtensionMark(options: {
         hasAnimation: boolean;
         depend?: IMark[];
     }): void;
     private _createExtensionMark;
-    protected _updateExtensionMarkSpec(lastSpec?: any): void;
+    protected _updateExtensionMarkSpec(): void;
     getStackData(): ISeriesStackData;
     protected _parseSelectorOfInteraction(interactionSpec: IBaseInteractionSpec, marks: IMark[]): string[];
     protected _parseDefaultInteractionConfig(mainMarks?: IMark[]): ({
@@ -184,21 +187,9 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     setLayoutRect({ width, height }: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>): void;
     getSeriesKeys(): string[];
     getSeriesStyle(datum: Datum): (attribute: string) => unknown;
-    protected _getSeriesInfo(field: string, keys: string[]): {
-        key: string;
-        style: (attribute: string) => unknown;
-        shapeType: string;
-    }[];
-    getSeriesInfoInField(field: string): {
-        key: string;
-        style: (attribute: string) => unknown;
-        shapeType: string;
-    }[];
-    getSeriesInfoList(): {
-        key: string;
-        style: (attribute: string) => unknown;
-        shapeType: string;
-    }[];
+    protected _getSeriesInfo(field: string, keys: string[]): ISeriesSeriesInfo[];
+    getSeriesInfoInField(field: string): ISeriesSeriesInfo[];
+    getSeriesInfoList(): ISeriesSeriesInfo[];
     protected _getDefaultColorScale(): any;
     protected _getDataScheme(): import("../..").ColorSchemeItem[] | import("../..").ProgressiveDataScheme<import("../..").ColorSchemeItem>;
     getDefaultColorDomain(): any[];
@@ -226,4 +217,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _getRelatedComponentSpecInfo(specKey: string): import("../../model/interface").IModelSpecInfo<any>[];
     protected _forEachStackGroup(callback: (node: ISeriesStackDataLeaf) => void, node?: ISeriesStackDataMeta): void;
     isDatumInViewData(datum: Datum): any;
+    getSeriesFieldValue(datum: Datum, seriesField?: string): any;
 }

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

@@ -20,11 +20,14 @@ export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implement
     protected _getMeasureData: (datum: any) => any;
     protected _getSeriesFieldData: (datum: any) => any;
     protected _getSeriesStyle: (datum: any, styleKey: string | string[], defaultValue?: any) => any;
-    contentKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
-    contentValueCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
-    contentShapeTypeCallback: (datum: Datum, params?: TooltipHandlerParams) => ShapeType | undefined;
-    contentShapeColorCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
-    titleValueCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
+    markTooltipKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
+    markTooltipValueCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
+    shapeTypeCallback: (datum: Datum, params?: TooltipHandlerParams) => ShapeType | undefined;
+    shapeColorCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
+    shapeStrokeCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
+    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;
 }
 export declare const addExtraInfoToTooltipTitlePattern: <T>(pattern: ITooltipPattern['title'], extraInfo: T | ((line: ITooltipLinePattern) => T), overwrite?: boolean) => ITooltipPattern['title'] | undefined;

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

@@ -99,6 +99,6 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     getMeasureField(): string[];
     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/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/geo/geo.d.ts

@@ -33,6 +33,7 @@ export declare abstract class GeoSeries<T extends IGeoSeriesSpec = IGeoSeriesSpe
     getGroupFields(): string[];
     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

@@ -5,7 +5,7 @@ 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 { 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';
@@ -13,6 +13,7 @@ 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;
@@ -51,7 +52,7 @@ export type ISeriesStyleItem = {
         style?: any;
     };
 };
-export interface ISeriesMarkInitOption {
+export interface ISeriesMarkInitOption extends Partial<IMarkOption> {
     themeSpec?: any;
     markSpec?: any;
     skipBeforeLayouted?: 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;
@@ -92,9 +94,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';
@@ -158,6 +164,7 @@ export interface IGeoSeries extends ISeries {
     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;

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

@@ -26,6 +26,7 @@ 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;
@@ -86,6 +87,7 @@ export interface ISeriesTheme {
     [SeriesTypeEnum.heatmap]?: IHeatmapSeriesTheme;
     [SeriesTypeEnum.correlation]?: ICorrelationSeriesTheme;
     [SeriesTypeEnum.liquid]?: ILiquidSeriesTheme;
+    [SeriesTypeEnum.venn]?: IVennSeriesTheme;
 }
 export declare enum SeriesTypeForThemeEnum {
     area_horizontal = "area_horizontal",

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/map/geo-source.d.ts

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

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/polar/polar.d.ts

@@ -54,7 +54,7 @@ export declare abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSer
     onAngleAxisHelperUpdate(): void;
     afterInitMark(): void;
     protected _computeLayoutRadius(): number;
-    fillData(): void;
+    protected initEvent(): void;
     _sortDataInAxisDomain(): void;
-    protected _getInvalidDefined(datum: Datum): boolean;
+    protected getInvalidCheckFields(): string[];
 }

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

@@ -1,7 +1,6 @@
 import { AreaSeries } from '../area/area';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { Datum } from '../../typings';
 import type { IAreaSeriesSpec } from '../area/interface';
 export declare class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends AreaSeries<T> {
     static readonly type: string;
@@ -12,6 +11,5 @@ export declare class RangeAreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec
     initAreaMarkStyle(): void;
     protected initTooltip(): void;
     protected _isFieldAllValid(): boolean;
-    protected _getInvalidDefined(datum: Datum): boolean;
 }
 export declare const registerRangeAreaSeries: () => void;

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

@@ -25,6 +25,11 @@ export interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimation
     linkSortBy?: (a: SankeyLinkElement, b: SankeyLinkElement) => number;
     nodeSortBy?: (a: SankeyNodeElement, b: SankeyNodeElement) => number;
     setNodeLayer?: (datum: SankeyNodeDatum) => number;
+    dropIsolatedNode?: boolean;
+    nodeHeight?: number | ((node: SankeyNodeElement) => number);
+    linkHeight?: number | ((link: SankeyLinkElement, sourceNode: SankeyNodeElement, sourceNodeHeight: number) => number);
+    equalNodeHeight?: boolean;
+    linkOverlap?: 'start' | 'center' | 'end';
     [SeriesMarkNameEnum.node]?: IMarkSpec<IRectMarkSpec>;
     [SeriesMarkNameEnum.link]?: IMarkSpec<ILinkPathMarkSpec>;
     emphasis?: {

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

@@ -1,11 +1,11 @@
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { Datum } from '../../typings';
+import type { Datum, StringOrNumber } from '../../typings';
 import { SeriesData } from '../base/series-data';
 import type { ISankeySeriesSpec } from './interface';
 import type { ExtendEventParam } from '../../event/interface';
-import type { IElement, IGlyphElement } from '@visactor/vgrammar-core';
+import type { IElement, IGlyphElement, IMark as IVgrammarMark } from '@visactor/vgrammar-core';
 import type { IMark } from '../../mark/interface';
 export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpec> extends CartesianSeries<T> {
     static readonly type: string;
@@ -30,6 +30,11 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     setAttrFromSpec(): void;
     initData(): void;
     initMark(): void;
+    protected _buildMarkAttributeContext(): void;
+    valueToNode(value: StringOrNumber | StringOrNumber[]): any;
+    valueToLink(value: StringOrNumber | StringOrNumber[]): any;
+    valueToPositionX(value: StringOrNumber | StringOrNumber[]): any;
+    valueToPositionY(value: StringOrNumber | StringOrNumber[]): any;
     initMarkStyle(): void;
     protected _initNodeMarkStyle(): void;
     protected _initLinkMarkStyle(): void;
@@ -39,18 +44,19 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     protected initEvent(): void;
     private nodesSeriesDataUpdate;
     private linksSeriesDataUpdate;
-    protected _handleAdjacencyClick: (params: ExtendEventParam) => void;
-    protected _handleRelatedClick: (params: ExtendEventParam) => void;
+    protected _handleEmphasisElement: (params: ExtendEventParam) => void;
     protected _handleClearEmpty: () => void;
     protected _handleNodeAdjacencyClick: (element: IElement) => void;
     protected _handleLinkAdjacencyClick: (element: IGlyphElement) => void;
     protected _handleNodeRelatedClick: (element: IElement) => void;
     protected _handleLinkRelatedClick: (element: IGlyphElement) => void;
+    protected _highLightElements(vGrammarElements: IVgrammarMark['elements'], highlightNodes: string[]): void;
     protected initTooltip(): void;
     _setNodeOrdinalColorScale(): void;
     getNodeList(): any;
     _getNodeNameFromData(datum: Datum): any;
     extractNamesFromTree(tree: any, categoryName: string): Set<unknown>;
+    extractNamesFromLink(links: any[]): Set<unknown>;
     getDimensionField(): string[];
     getMeasureField(): string[];
     getRawDataStatisticsByField(field: string, isNumeric?: boolean): {

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

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

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

@@ -1,5 +1,5 @@
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
 export declare class TreemapTooltipHelper extends BaseSeriesTooltipHelper {
     get defaultShapeType(): string;
-    contentKeyCallback: (datum: any) => any;
+    markTooltipKeyCallback: (datum: any) => any;
 }

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

@@ -0,0 +1,6 @@
+import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
+export type VennMark = 'circle' | 'overlap';
+export type VennAppearPreset = 'growIn' | 'fadeIn' | 'scaleIn';
+export declare const vennCirclePresetAnimation: (preset: VennAppearPreset) => IAnimationTypeConfig;
+export declare const vennOverlapPresetAnimation: (preset: VennAppearPreset) => IAnimationTypeConfig;
+export declare const registerVennAnimation: () => void;

package/types/series/venn/constant.d.ts

@@ -0,0 +1,2 @@
+import type { SeriesMarkMap } from '../interface/common';
+export declare const vennSeriesMark: SeriesMarkMap;

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

@@ -0,0 +1,21 @@
+import type { IArcMarkSpec, IPathMarkSpec } from '../../typings';
+import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec';
+import type { IAnimationSpec } from '../../animation/spec';
+import type { VennAppearPreset, VennMark } from './animation';
+import type { SeriesMarkNameEnum } from '../interface/type';
+import type { ILabelSpec } from '../../component';
+export interface IVennSeriesSpec extends ISeriesSpec, IAnimationSpec<VennMark, VennAppearPreset> {
+    type: 'venn';
+    categoryField?: string;
+    valueField: string;
+    [SeriesMarkNameEnum.circle]?: IMarkSpec<IArcMarkSpec>;
+    [SeriesMarkNameEnum.overlap]?: IMarkSpec<IPathMarkSpec>;
+    [SeriesMarkNameEnum.label]?: Omit<ILabelSpec, 'position'>;
+    [SeriesMarkNameEnum.overlapLabel]?: Omit<ILabelSpec, 'position'>;
+}
+export interface IVennSeriesTheme {
+    [SeriesMarkNameEnum.circle]?: Partial<IMarkTheme<IArcMarkSpec>>;
+    [SeriesMarkNameEnum.overlap]?: Partial<IMarkTheme<IPathMarkSpec>>;
+    [SeriesMarkNameEnum.label]?: Omit<ILabelSpec, 'position'>;
+    [SeriesMarkNameEnum.overlapLabel]?: Omit<ILabelSpec, 'position'>;
+}

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

@@ -0,0 +1,5 @@
+import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
+export declare class VennTooltipHelper extends BaseSeriesTooltipHelper {
+    dimensionTooltipTitleCallback: (datum: any) => string;
+    markTooltipKeyCallback: (datum: any) => string;
+}

package/types/series/venn/util.d.ts

@@ -0,0 +1 @@
+export declare const getVennSeriesDataKey: (sets: string | string[]) => string;

package/types/series/venn/venn-transform.d.ts

@@ -0,0 +1,6 @@
+import type { ISeriesSpec } from '../../typings';
+import { BaseSeriesSpecTransformer } from '../base';
+import type { IVennSeriesSpec, IVennSeriesTheme } from './interface';
+export declare class VennSeriesSpecTransformer<T extends ISeriesSpec = Omit<IVennSeriesSpec, 'data'>, K extends IVennSeriesTheme = IVennSeriesTheme> extends BaseSeriesSpecTransformer<T, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

package/types/series/venn/venn.d.ts

@@ -0,0 +1,63 @@
+import type { IMark } from '../../mark/interface';
+import type { Datum, IPoint, StringOrNumber } from '../../typings';
+import type { SeriesMarkMap } from '../interface';
+import { SeriesTypeEnum } from '../interface/type';
+import type { IVennSeriesSpec } from './interface';
+import type { ILabelMark } from '../../mark/label';
+import { VennSeriesSpecTransformer } from './venn-transform';
+import { BaseSeries } from '../base';
+import type { BaseLegend } from '../../component/legend/base-legend';
+export declare class VennSeries<T extends IVennSeriesSpec = IVennSeriesSpec> extends BaseSeries<T> {
+    static readonly type: string;
+    type: SeriesTypeEnum;
+    static readonly mark: SeriesMarkMap;
+    static readonly transformerConstructor: typeof VennSeriesSpecTransformer;
+    readonly transformerConstructor: typeof VennSeriesSpecTransformer;
+    private _circleMark;
+    private _overlapMark;
+    private _labelMark;
+    protected _spec: T;
+    private _viewBox;
+    protected _categoryField: string;
+    getCategoryField(): string;
+    setCategoryField(f: string): string;
+    protected _valueField: string;
+    getValueField(): string;
+    setValueField(f: string): string;
+    setAttrFromSpec(): void;
+    compile(): void;
+    protected _runVennTransform(render?: boolean): void;
+    initMark(): void;
+    initMarkStyle(): void;
+    protected _initCircleMarkStyle(): void;
+    protected _initOverlapMarkStyle(): void;
+    initLabelMarkStyle(labelMark: ILabelMark): void;
+    initOverlapLabelMarkStyle(labelMark: ILabelMark): void;
+    protected initTooltip(): void;
+    getDimensionField(): string[];
+    getMeasureField(): string[];
+    onLayoutEnd(ctx: any): void;
+    getDefaultShapeType(): string;
+    getActiveMarks(): IMark[];
+    getStatisticFields(): {
+        key: string;
+        operations: Array<'max' | 'min' | 'values'>;
+    }[];
+    getGroupFields(): string[];
+    dataToPosition(data: Datum, checkInViewData?: boolean): IPoint;
+    dataToPositionX(data: Datum): number;
+    dataToPositionY(data: Datum): number;
+    valueToPosition(value1: any, value2?: any): IPoint;
+    getStackGroupFields(): string[];
+    getStackValueField(): string;
+    protected _getSeriesInfo(field: string, keys: string[]): {
+        key: string;
+        originalKey: string;
+        style: (attribute: string) => unknown;
+        shapeType: string;
+    }[];
+    getSeriesFieldValue(datum: Datum, seriesField?: string): string;
+    legendSelectedFilter(component: BaseLegend<any>, selectedKeys: StringOrNumber[]): StringOrNumber[];
+    initAnimation(): void;
+}
+export declare const registerVennSeries: () => void;

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

@@ -2,7 +2,7 @@ import type { Datum, IMarkSpec, IMarkTheme, IRuleMarkSpec, ITextMarkSpec } from
 import type { IAnimationSpec } from '../../animation/spec';
 import type { WaterfallAppearPreset } from './animation';
 import type { IBarSeriesSpec, IBarSeriesTheme } from '../bar/interface';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec, ITotalLabelSpec } from '../../component/label';
 import type { SeriesMarkNameEnum } from '../interface/type';
 type WaterfallMarks = 'bar';
 export interface IWaterfallTotalText {
@@ -40,6 +40,11 @@ export interface IWaterfallSeriesSpec extends Omit<IBarSeriesSpec, 'type' | 'lab
         offset?: number;
         valueType?: IWaterfallStackLabelValueType;
     };
+    totalLabel?: ITotalLabelSpec & {
+        position?: IWaterfallStackLabelPosition;
+        offset?: number;
+        valueType?: IWaterfallStackLabelValueType;
+    };
     [SeriesMarkNameEnum.label]?: ILabelSpec & {
         visible: boolean;
         offset?: number;

package/types/series/waterfall/waterfall.d.ts

@@ -9,6 +9,7 @@ import type { ITextMark } from '../../mark/text';
 import type { IModelEvaluateOption } from '../../model/interface';
 import type { Datum } from '../../typings';
 import type { ILabelMark } from '../../mark/label';
+import type { ILabelInfo } from '../../component/label/label';
 export declare const DefaultBandWidth = 6;
 export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfallSeriesSpec> extends BarSeries<any> {
     static readonly type: string;
@@ -33,6 +34,14 @@ export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfall
     onEvaluateEnd(ctx: IModelEvaluateOption): void;
     initMark(): void;
     initLabelMarkStyle(labelMark: ILabelMark): void;
+    initTotalLabelMarkStyle(labelMark: ILabelMark): void;
+    getTotalLabelComponentStyle(info: Pick<ILabelInfo, 'baseMark' | 'labelMark'>): {
+        customLayoutFunc: (labels: import("@visactor/vrender-components").LabelItem[]) => import("@visactor/vrender-core").IText[];
+        dataFilter: (labels: import("@visactor/vrender-components").LabelItem[]) => import("@visactor/vrender-components").LabelItem[];
+        overlap: {
+            strategy: any;
+        };
+    };
     totalPositionX(datum: Datum, field: string, pos?: number): number;
     totalPositionY(datum: Datum, field: string, pos?: number): number;
     initMarkStyle(): void;

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

@@ -36,7 +36,9 @@ export declare class BaseWordCloudSeries<T extends IBaseWordCloudSeriesSpec = IB
     protected _defaultFontFamily: string;
     protected _keyWordColorCallback: (datum: Datum) => string;
     protected _fillingColorCallback: (datum: Datum) => string;
+    protected _dataChange: boolean;
     setAttrFromSpec(): void;
+    protected initData(): void;
     protected _wordMark: ITextMark;
     initMark(): void;
     initMarkStyle(): void;

package/types/theme/builtin/common/series/venn.d.ts

@@ -0,0 +1,2 @@
+import type { IVennSeriesTheme } from '../../../../series/venn/interface';
+export declare const venn: IVennSeriesTheme;

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

@@ -25,6 +25,7 @@ import type { IWaterfallChartSpec } from '../../chart/waterfall';
 import type { ICorrelationChartSpec } from '../../chart/correlation';
 import type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud';
 import type { IChartSpec } from './common';
+import type { ILiquidChartSpec } from '../../chart/liquid/interface';
 export interface ChartSpecMap {
     readonly common: ICommonChartSpec;
     readonly area: IAreaChartSpec;
@@ -58,5 +59,6 @@ export interface ChartSpecMap {
     readonly circlePacking: ICirclePackingChartSpec;
     readonly heatmap: IHeatmapChartSpec;
     readonly correlation: ICorrelationChartSpec;
+    readonly liquid: ILiquidChartSpec;
 }
 export type ISpec = ChartSpecMap[keyof ChartSpecMap] | IChartSpec;