@visactor/vchart-types 2.0.0-alpha.0 → 2.0.0-alpha.1

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

@@ -11,6 +11,9 @@ export declare class MapSeries<T extends IMapSeriesSpec = IMapSeriesSpec> extend
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        map: import("./interface").IMapSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof MapSeriesSpecTransformer;
     map: string;

package/types/series/mosaic/mosaic.d.ts

@@ -1,10 +1,12 @@
 import { BarSeries } from '../bar/bar';
 import { SeriesTypeEnum } from '../interface/type';
 import type { IMosaicSeriesSpec } from './interface';
+import type { IBarSeriesTheme } from '../bar/interface';
 export declare class MosaicSeries<T extends IMosaicSeriesSpec = IMosaicSeriesSpec> extends BarSeries<any> {
     static readonly type: string;
     type: SeriesTypeEnum;
     protected _spec: T;
+    static readonly builtInTheme: Record<string, IBarSeriesTheme>;
     static readonly transformerConstructor: any;
     readonly transformerConstructor: any;
     getStack(): boolean;

package/types/series/pictogram/pictogram.d.ts

@@ -8,12 +8,12 @@ import type { GroupMark } from '../../mark';
 import { PictogramSeriesSpecTransformer } from './pictogram-transformer';
 import type { IMatrix } from '@visactor/vutils';
 import type { Datum } from '../../typings';
-import type { GraphicEventType, IGroup } from '@visactor/vrender-core';
-import type { IHoverSpec, ISelectSpec } from '../../interaction/interface/spec';
+import type { Group } from '@visactor/vrender-core';
+import type { IHoverSpec, ISelectSpec } from '../../interaction/interface';
 import { STATE_VALUE_ENUM } from '../../compile/mark';
+import type { EventType } from '@visactor/vgrammar-core';
 import type { IMark } from '../../mark/interface';
 import type { IPoint } from '../../typings/coordinate';
-import { TRIGGER_TYPE_ENUM } from '../../interaction/triggers/enum';
 export interface SVGParsedElementExtend extends SVGParsedElement {
     _finalAttributes: Record<string, any>;
     _uniqueId: string;
@@ -33,17 +33,23 @@ export declare class PictogramSeries<T extends IPictogramSeriesSpec = IPictogram
     getDatumName(datum: SVGParsedElementExtend): string;
     getMarksWithoutRoot(): IMark[];
     protected _buildMarkAttributeContext(): void;
-    protected _defaultHoverConfig(finalHoverSpec: IHoverSpec): {
-        type: TRIGGER_TYPE_ENUM;
-        trigger: GraphicEventType;
-        triggerOff: GraphicEventType;
+    protected _defaultHoverConfig(selector: string[], finalHoverSpec: IHoverSpec): {
+        seriesId: number;
+        regionId: number;
+        selector: string[];
+        type: string;
+        trigger: EventType;
+        triggerOff: EventType;
         blurState: STATE_VALUE_ENUM;
         highlightState: STATE_VALUE_ENUM;
     };
-    protected _defaultSelectConfig(finalSelectSpec: ISelectSpec): {
-        type: TRIGGER_TYPE_ENUM;
-        trigger: GraphicEventType;
-        triggerOff: GraphicEventType;
+    protected _defaultSelectConfig(selector: string[], finalSelectSpec: ISelectSpec): {
+        type: string;
+        seriesId: number;
+        regionId: number;
+        selector: string[];
+        trigger: EventType;
+        triggerOff: EventType;
         reverseState: STATE_VALUE_ENUM;
         state: STATE_VALUE_ENUM;
         isMultiple: boolean;
@@ -57,10 +63,10 @@ export declare class PictogramSeries<T extends IPictogramSeriesSpec = IPictogram
     dataToPosition(datum: Datum, global?: boolean): IPoint;
     coordToPosition(point: IPoint): IPoint | undefined;
     getRootMatrix(): IMatrix;
-    getPictogramRootGraphic(): IGroup;
+    getPictogramRootGraphic(): Group;
     initData(): void;
     mapViewDataUpdate(): void;
-    onLayoutEnd(): void;
+    onLayoutEnd(ctx: any): void;
     updateSVGSize(): void;
     protected initEvent(): void;
     handleZoom(e: ZoomEventParam): void;

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

@@ -1,7 +1,7 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import { TooltipHandlerParams } from '../../component';
-import { Datum } from '../../typings';
+import type { TooltipHandlerParams } from '../../component';
+import type { Datum } from '../../typings';
 export declare class PictogramSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
     dimensionTooltipTitleCallback: (datum: any) => any;
     markTooltipValueCallback: (datum: Datum, params?: TooltipHandlerParams) => any;

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

@@ -2,8 +2,8 @@ import type { IAnimationTypeConfig } from '../../../animation/interface';
 import { AnimationStateEnum } from '../../../animation/interface';
 import type { Datum } from '../../../typings';
 import type { IPieAnimationParams, PieAppearPreset } from '../interface';
-import type { IGraphic } from '@visactor/vrender-core';
-export declare function pieGrowOption(pieParams: IPieAnimationParams, isOverall: boolean, state: AnimationStateEnum): (datum: Datum, element: IGraphic, params: AnimationStateEnum) => {
+import type { IMarkGraphic } from '../../../core';
+export declare function pieGrowOption(pieParams: IPieAnimationParams, isOverall: boolean, state: AnimationStateEnum): (datum: Datum, graphic: IMarkGraphic, params: AnimationStateEnum) => {
     overall: number;
 } | {
     overall: boolean;
@@ -20,4 +20,3 @@ export declare function piePresetAnimation(params: IPieAnimationParams, preset:
 };
 export declare const registerPieAnimation: () => void;
 export declare const registerEmptyCircleAnimation: () => void;
-export declare const registerPie3dAnimation: () => void;

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

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

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

@@ -1,6 +1,6 @@
 import type { IAnimationSpec } from '../../animation/spec';
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
-import type { IArcMarkSpec, ITextMarkSpec, IArc3dMarkSpec, ILineMarkSpec } from '../../typings/visual';
+import type { IArcMarkSpec, ITextMarkSpec, ILineMarkSpec } from '../../typings/visual';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { IPolarSeriesSpec, IPolarSeriesTheme } from '../polar/interface';
 import type { ILabelSpec, IMultiLabelSpec } from '../../component/label/interface';
@@ -51,16 +51,6 @@ export interface IPieSeriesTheme extends IPolarSeriesTheme {
     outerLabel?: IArcLabelSpec;
     emptyCircle?: Partial<IMarkTheme<IArcMarkSpec>>;
 }
-export type IPie3dSeriesSpec = {
-    type: 'pie3d';
-    angle3d?: number;
-} & Omit<IPieSeriesSpec, 'type'>;
-export interface IPie3dSeriesTheme extends IPolarSeriesTheme {
-    [SeriesMarkNameEnum.pie3d]?: Partial<IMarkTheme<IArc3dMarkSpec>>;
-    [SeriesMarkNameEnum.label]?: IArcLabelSpec;
-    innerLabel?: IArcLabelSpec;
-    outerLabel?: IArcLabelSpec;
-}
 export interface IArcLabelLineSpec extends Omit<IMarkSpec<ILineMarkSpec>, 'customShape'> {
     visible?: boolean;
     line1MinLength?: number;

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

@@ -1,18 +1,18 @@
 import type { IPoint, Datum, StateValueType } from '../../typings';
 import { PolarSeries } from '../polar/polar';
 import type { IArcMark, IMark, IPathMark, ITextMark } from '../../mark/interface';
-import { MarkTypeEnum } from '../../mark/interface/type';
 import type { IArcSeries, SeriesMarkMap } from '../interface';
-import { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';
-import type { IBasePieSeriesSpec, IPieSeriesSpec } from './interface';
+import { SeriesTypeEnum } from '../interface/type';
+import type { IBasePieSeriesSpec, IPieSeriesSpec, IPieSeriesTheme } from './interface';
 import { PieSeriesSpecTransformer } from './pie-transformer';
 import type { ICompilableData } from '../../compile/data';
 export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSeries<T> implements IArcSeries {
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof PieSeriesSpecTransformer;
-    protected _pieMarkName: SeriesMarkNameEnum;
-    protected _pieMarkType: MarkTypeEnum;
+    protected _pieMarkName: string;
+    protected _pieMarkType: string;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: Record<string, IPieSeriesTheme>;
     protected _viewDataLabel: ICompilableData;
     getCenter: () => IPoint;
     protected _centerOffset: number;

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 { ACustomAnimate, TagPointsUpdate } from '@visactor/vrender-animate';
 export declare class PolarPointUpdate extends ACustomAnimate<{
     x: number;
     y: number;
@@ -30,9 +30,7 @@ export declare class PolarTagPointsUpdate extends TagPointsUpdate {
     private interpolatePoints;
     private _center;
     private _prevCenter;
-    constructor(from: any, to: any, duration: number, easing: EasingType, params?: {
-        newPointAnimateType?: 'grow' | 'appear';
-    });
+    onBind(): void;
     onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
     private _interpolationSinglePoint;
     private polarPointInterpolation;

package/types/series/polar/progress-like/interface.d.ts

@@ -17,6 +17,7 @@ export interface IProgressLikeSeriesSpec extends IPolarSeriesSpec {
     roundCap?: boolean | [boolean, boolean];
     cornerRadius?: number;
     tickMask?: Omit<IMarkSpec<IArcMarkSpec>, 'state'> & ITickMaskSpec;
+    clamp?: boolean;
 }
 export interface IProgressLikeSeriesTheme extends IPolarSeriesTheme {
     roundCap?: boolean | [boolean, boolean];

package/types/series/progress/circular/circular.d.ts

@@ -9,6 +9,9 @@ export declare class CircularProgressSeries<T extends ICircularProgressSeriesSpe
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        circularProgress: import("./interface").ICircularProgressSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof CircularProgressSeriesSpecTransformer;
     private _progressMark;

package/types/series/progress/linear/animation.d.ts

@@ -2,5 +2,5 @@ import type { ILinearProgressAnimationParams, LinearProgressAppearPreset } from
 import type { IAnimationTypeConfig } from '../../../animation/interface';
 export declare const linearProgressDisappear: (params: ILinearProgressAnimationParams) => IAnimationTypeConfig;
 export declare const Appear_FadeIn: IAnimationTypeConfig;
-export declare function linearProgressPresetAnimation(params: ILinearProgressAnimationParams, preset: LinearProgressAppearPreset | boolean): IAnimationTypeConfig;
+export declare function linearProgressPresetAnimation(params: ILinearProgressAnimationParams, preset?: LinearProgressAppearPreset | boolean): IAnimationTypeConfig;
 export declare const registerLinearProgressAnimation: () => void;

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

@@ -14,6 +14,7 @@ export interface ILinearProgressSeriesSpec extends IProgressSeriesSpec, IAnimati
     yField: string | string[];
     direction?: DirectionType;
     bandWidth?: number;
+    clamp?: boolean;
     [SeriesMarkNameEnum.progress]?: IMarkSpec<IRectMarkSpec> & {
         topPadding?: number;
         bottomPadding?: number;

package/types/series/progress/linear/linear.d.ts

@@ -7,6 +7,9 @@ export declare class LinearProgressSeries<T extends ILinearProgressSeriesSpec =
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        linearProgress: import("./interface").ILinearProgressSeriesTheme;
+    };
     private _progressMark;
     private _trackMark;
     initMark(): void;

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

@@ -8,7 +8,7 @@ export declare const radarFadeAnimation: (animationType: 'in' | 'out') => {
 export declare const radarGrowAnimation: (params: IRadarAnimationParams, animationType: 'in' | 'out') => {
     type: string;
     options: () => {
-        center: import("../../typings").IPoint;
+        center: import("../..").IPoint;
     };
 };
 export declare function radarPresetAnimation(params: IRadarAnimationParams, preset: RadarAppearPreset, animationType: 'in' | 'out'): {

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

@@ -12,6 +12,9 @@ export declare class RadarSeries<T extends IRadarSeriesSpec = IRadarSeriesSpec>
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        radar: import("./interface").IRadarSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof LineLikeSeriesSpecTransformer;
     private _areaMark;

package/types/series/range-column/constant.d.ts

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

package/types/series/range-column/interface.d.ts

@@ -54,7 +54,4 @@ export interface IRangeColumnSeriesTheme extends ICartesianSeriesTheme {
         }>;
     };
 }
-export interface IRangeColumn3dSeriesSpec extends Omit<IRangeColumnSeriesSpec, 'type'> {
-    type: 'rangeColumn3d';
-}
 export {};

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

@@ -1,18 +1,19 @@
 import { BarSeries } from '../bar/bar';
-import { MarkTypeEnum } from '../../mark/interface/type';
 import type { SeriesMarkMap } from '../interface';
-import { SeriesTypeEnum } from '../interface/type';
 import type { Datum } from '../../typings';
 import type { IRangeColumnSeriesSpec } from './interface';
 import type { ITextMark } from '../../mark/interface';
 export declare const DefaultBandWidth = 6;
 export declare class RangeColumnSeries<T extends IRangeColumnSeriesSpec = IRangeColumnSeriesSpec> extends BarSeries<any> {
     static readonly type: string;
-    type: SeriesTypeEnum;
-    protected _barMarkType: MarkTypeEnum;
+    type: string;
+    protected _barMarkType: string;
     protected _barName: string;
     protected _spec: T;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        rangeColumn: import("./interface").IRangeColumnSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: any;
     private _minLabelMark?;

package/types/series/rose/rose.d.ts

@@ -9,6 +9,9 @@ export declare class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> ext
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        rose: import("./interface").IRoseSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof RoseSeriesSpecTransformer;
     private _roseMark;

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

@@ -1,7 +1,20 @@
 import type { ISankeyAnimationParams, SankeyAppearPreset } from './interface';
 import type { IAnimationTypeConfig } from '../../animation/interface';
+import { ACustomAnimate } from '@visactor/vrender-animate';
 export declare const sankeyGrowIn: (params: ISankeyAnimationParams, isOverall?: boolean) => IAnimationTypeConfig;
 export declare const sankeyGrowOut: (params: ISankeyAnimationParams, isOverall?: boolean) => IAnimationTypeConfig;
 export declare const sankeyNodePresetAnimation: (params: ISankeyAnimationParams, preset: SankeyAppearPreset) => IAnimationTypeConfig;
 export declare const sankeyLinkPresetAnimation: (preset: SankeyAppearPreset) => IAnimationTypeConfig;
+export declare class LinkPathGrowIn extends ACustomAnimate<Record<string, number>> {
+    onBind(): void;
+    onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
+}
+export declare class LinkPathGrowOut extends ACustomAnimate<Record<string, number>> {
+    onBind(): void;
+    onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
+}
+export declare class LinkPathUpdate extends ACustomAnimate<Record<string, number>> {
+    onBind(): void;
+    onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
+}
 export declare const registerSankeyAnimation: () => void;

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

@@ -15,7 +15,6 @@ export type ISankeyLabelSpec = ILabelSpec & {
     limit?: number;
 };
 export interface ISankeySeriesSpec extends Omit<ISeriesSpec, 'data'>, IAnimationSpec<SankeyMark, SankeyAppearPreset> {
-    nameKey: any;
     type: 'sankey';
     categoryField: string;
     valueField: string;

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

@@ -14,6 +14,9 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof SankeySeriesSpecTransformer;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        sankey: import("./interface").ISankeySeriesTheme;
+    };
     private _nodeMark;
     private _linkMark;
     private _nodeLayoutZIndex;

package/types/series/scatter/scatter.d.ts

@@ -10,6 +10,9 @@ export declare class ScatterSeries<T extends IScatterSeriesSpec = IScatterSeries
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        scatter: import("./interface").IScatterSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: typeof ScatterSeriesSpecTransformer;
     private _symbolMark;

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

@@ -1,6 +1,6 @@
 import type { IAnimationSpec } from '../../animation/spec';
 import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec';
-import type { SunburstLabelConfig } from '@visactor/vgrammar-hierarchy';
+import type { SunburstLabelConfig } from '@visactor/vlayouts';
 import type { SunburstAppearPreset, SunburstMark } from './animation/interface';
 import type { IArcMarkSpec, ITextMarkSpec } from '../../typings';
 import type { IPolarSeriesTheme } from '../polar/interface';

package/types/series/sunburst/sunburst.d.ts

@@ -9,6 +9,9 @@ export declare class SunburstSeries extends PolarSeries<any> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        sunburst: import("./interface").ISunburstSeriesTheme;
+    };
     private _sunburstMark;
     private _labelMark;
     protected _categoryField: string;

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

@@ -1,6 +1,6 @@
 import type { IRectMarkSpec, ITextMarkSpec } from '../../typings';
 import type { IHierarchyData, IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec';
-import type { TreemapOptions } from '@visactor/vgrammar-hierarchy';
+import type { TreemapOptions } from '@visactor/vlayouts';
 import type { ICartesianSeriesTheme } from '../cartesian/interface';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { SeriesMarkNameEnum } from '../interface/type';

package/types/series/treemap/treemap.d.ts

@@ -11,6 +11,9 @@ export declare class TreemapSeries extends CartesianSeries<any> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        treemap: import("./interface").ITreemapSeriesTheme;
+    };
     static readonly transformerConstructor: typeof TreemapSeriesSpecTransformer;
     readonly transformerConstructor: typeof TreemapSeriesSpecTransformer;
     private _leafMark;

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

@@ -1,5 +1,16 @@
+import { ACustomAnimate } from '@visactor/vrender-animate';
+import type { IVennCircle, IVennOverlapArc, VennCircleName } from '@visactor/vlayouts';
 import type { VennAppearPreset } from './interface';
 import type { IAnimationTypeConfig } from '../../animation/interface';
 export declare const vennCirclePresetAnimation: (preset: VennAppearPreset) => IAnimationTypeConfig;
 export declare const vennOverlapPresetAnimation: (preset: VennAppearPreset) => IAnimationTypeConfig;
+export declare class VennOverlapAnimation extends ACustomAnimate<{
+    path: string;
+    arcs: IVennOverlapArc[];
+}> {
+    protected fromCircles: Record<VennCircleName, IVennCircle>;
+    protected toCircles: Record<VennCircleName, IVennCircle>;
+    onBind(): void;
+    onUpdate(end: boolean, ratio: number, out: Record<string, any>): void;
+}
 export declare const registerVennAnimation: () => void;

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

@@ -10,6 +10,9 @@ export declare class VennSeries<T extends IVennSeriesSpec = IVennSeriesSpec> ext
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        venn: import("./interface").IVennSeriesTheme;
+    };
     static readonly transformerConstructor: typeof VennSeriesSpecTransformer;
     readonly transformerConstructor: typeof VennSeriesSpecTransformer;
     private _circleMark;

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

@@ -13,6 +13,9 @@ export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfall
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: {
+        waterfall: import("./interface").IWaterfallSeriesTheme;
+    };
     static readonly transformerConstructor: any;
     readonly transformerConstructor: any;
     protected _totalData?: ICompilableData;
@@ -45,5 +48,6 @@ export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfall
     totalPositionX(datum: Datum, field: string, pos?: number): number;
     totalPositionY(datum: Datum, field: string, pos?: number): number;
     initMarkStyle(): void;
+    protected isVisibleLeaderLine(datum: Datum): boolean;
 }
 export declare const registerWaterfallSeries: () => void;

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

@@ -1,7 +1,5 @@
-import type { IWordcloud3dAnimationParams, IWordcloudAnimationParams, WordcloudAppearPreset } from './interface';
+import type { IWordcloudAnimationParams, WordcloudAppearPreset } from './interface';
 import type { IAnimationTypeConfig } from '../../animation/interface';
-export declare const WordCloud3dAnimation: (params: IWordcloud3dAnimationParams | (() => any)) => IAnimationTypeConfig;
 export declare const WordCloudScaleInAnimation: (params: IWordcloudAnimationParams) => IAnimationTypeConfig;
 export declare function wordcloudPresetAnimation(params: IWordcloudAnimationParams, preset: WordcloudAppearPreset | boolean): IAnimationTypeConfig;
 export declare const registerWordCloudAnimation: () => void;
-export declare const registerWordCloud3dAnimation: () => void;

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

@@ -1,15 +1,16 @@
 import type { IPadding } from '@visactor/vutils';
 import type { SeriesMarkMap } from '../interface';
-import type { IWordCloudSeriesSpec, WordCloudConfigType, WordCloudShapeConfigType, WordCloudShapeType } from './interface';
+import type { IWordCloudSeriesSpec, IWordCloudSeriesTheme, WordCloudConfigType, WordCloudShapeConfigType, WordCloudShapeType } from './interface';
 import type { Datum, IMarkSpec, IPoint, ITextMarkSpec } from '../../typings';
 import { BaseSeries } from '../base/base-series';
 import type { IMark, IRectMark, ITextMark } from '../../mark/interface';
-import type { GeometricMaskShape, TextShapeMask } from '@visactor/vgrammar-util';
+import type { GeometricMaskShape, TextShapeMask } from '@visactor/vlayouts';
 export type IBaseWordCloudSeriesSpec = Omit<IWordCloudSeriesSpec, 'type'> & {
     type: string;
 };
 export declare class BaseWordCloudSeries<T extends IBaseWordCloudSeriesSpec = IBaseWordCloudSeriesSpec> extends BaseSeries<T> {
     static readonly mark: SeriesMarkMap;
+    static readonly builtInTheme: Record<string, IWordCloudSeriesTheme>;
     protected _nameField: string;
     protected _valueField?: string;
     setValueField(field: string): void;

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

@@ -1,13 +1,8 @@
 import type { ITextMarkSpec, IMarkSpec, ISeriesSpec, ITextFormatMethod, IRectMarkSpec } from '../../typings';
 import type { IAnimationSpec, IMarkAnimateSpec, IStateAnimateSpec } from '../../animation/spec';
 import type { SeriesMarkNameEnum } from '../interface/type';
-import type { shapes } from '@visactor/vgrammar-wordcloud';
-import type { GeometricMaskShape, TextShapeMask } from '@visactor/vgrammar-util';
+import type { shapes, GeometricMaskShape, TextShapeMask } from '@visactor/vlayouts';
 import type { IAnimationTypeConfig } from '../../animation/interface';
-export interface IWordcloud3dAnimationParams {
-    radius: number;
-    depth_3d: number;
-}
 export interface IWordcloudAnimationParams {
     animationConfig: () => IAnimationTypeConfig;
 }
@@ -103,16 +98,3 @@ export interface IWordCloudSeriesTheme {
         padding?: number;
     };
 }
-export interface IWordCloud3dSeriesSpec extends IWordCloudSeriesBaseSpec {
-    type: 'wordCloud3d';
-    depth_3d?: number;
-    postProjection?: 'StereographicProjection';
-}
-export interface IWordCloud3dSeriesTheme {
-    [SeriesMarkNameEnum.word]?: IMarkSpec<ITextMarkSpec> & {
-        padding?: number;
-    };
-    [SeriesMarkNameEnum.fillingWord]?: IMarkSpec<ITextMarkSpec> & {
-        padding?: number;
-    };
-}

package/types/theme/builtin/common/component/axis/cartesian-axis.d.ts

@@ -1,4 +1,3 @@
 import type { ICartesianAxisCommonTheme } from '../../../../../component/axis/cartesian/interface';
 export declare const axisX: ICartesianAxisCommonTheme;
 export declare const axisY: ICartesianAxisCommonTheme;
-export declare const axisZ: ICartesianAxisCommonTheme;

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

@@ -1,3 +1,3 @@
-import type { IFunnel3dSeriesTheme, IFunnelSeriesTheme } from '../../../../series/funnel/interface';
+import type { IFunnelSeriesTheme } from '../../../../series/funnel/interface';
+export declare const getFunnelTheme: (is3d?: boolean) => IFunnelSeriesTheme;
 export declare const funnel: IFunnelSeriesTheme;
-export declare const funnel3d: IFunnel3dSeriesTheme;

package/types/theme/builtin/common/series/word-cloud.d.ts

@@ -1,3 +1,2 @@
-import type { IWordCloudSeriesTheme, IWordCloud3dSeriesTheme } from '../../../../series/word-cloud/interface';
+import type { IWordCloudSeriesTheme } from '../../../../series/word-cloud/interface';
 export declare const wordCloud: IWordCloudSeriesTheme;
-export declare const wordCloud3d: IWordCloud3dSeriesTheme;

package/types/theme/builtin/index.d.ts

@@ -1,12 +1,14 @@
 export * from './light';
 export * from './dark';
 import type { ITheme } from '../interface';
+import { getFunnelTheme } from './common/series/funnel';
 export declare const builtinThemes: Record<string, ITheme>;
 export declare const defaultThemeName: string;
 export declare const themes: Map<string, ITheme>;
 export declare const hasThemeMerged: Map<string, boolean>;
 export declare const registerTheme: (name: string, theme: Partial<ITheme>) => void;
-export declare const getTheme: (name?: string, transformed?: boolean) => ITheme;
+export declare const getTheme: (name?: string) => ITheme;
 export declare const removeTheme: (name: string) => boolean;
 export declare const themeExist: (name: any) => boolean;
 export declare const getMergedTheme: (theme: Partial<ITheme>) => ITheme;
+export { getFunnelTheme };

package/types/theme/color-scheme/util.d.ts

@@ -3,7 +3,7 @@ import type { ISeriesSpec } from '../../typings';
 export declare function getDataScheme(colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>;
 export declare function computeActualDataScheme(dataScheme: Array<ColorSchemeItem> | ProgressiveDataScheme<ColorSchemeItem>, colorDomain: any[]): Array<ColorSchemeItem>;
 export declare function queryColorFromColorScheme(colorScheme: IThemeColorScheme, colorKey: IColorKey, seriesSpec?: ISeriesSpec): ColorSchemeItem | undefined;
-export declare const getActualColor: (value: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec) => any;
+export declare const getActualColor: (value: any, colorScheme?: IThemeColorScheme) => any;
 export declare function isColorKey(obj: any): obj is IColorKey;
 export declare function isProgressiveDataColorScheme<T>(obj: any): obj is ProgressiveDataScheme<T>;
 export declare function transformColorSchemeToStandardStruct(colorScheme: ColorScheme): IColorSchemeStruct;

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

@@ -1,20 +1,20 @@
 import type { IAreaChartSpec } from '../../chart/area/interface';
-import type { IBarChartSpec, IBar3dChartSpec } from '../../chart/bar/interface';
+import type { IBarChartSpec } from '../../chart/bar/interface';
 import type { IBoxPlotChartSpec } from '../../chart/box-plot/interface';
 import type { ICirclePackingChartSpec } from '../../chart/circle-packing/interface';
 import type { ICommonChartSpec } from '../../chart/common/interface';
-import type { IFunnelChartSpec, IFunnel3dChartSpec } from '../../chart/funnel/interface';
+import type { IFunnelChartSpec } from '../../chart/funnel/interface';
 import type { IGaugeChartSpec } from '../../chart/gauge/interface';
 import type { IHeatmapChartSpec } from '../../chart/heatmap/interface';
-import type { IHistogramChartSpec, IHistogram3dChartSpec } from '../../chart/histogram/interface';
+import type { IHistogramChartSpec } from '../../chart/histogram/interface';
 import type { ILineChartSpec } from '../../chart/line/interface';
 import type { IMapChartSpec } from '../../chart/map/interface';
-import type { IPieChartSpec, IPie3dChartSpec } from '../../chart/pie/interface';
+import type { IPieChartSpec } from '../../chart/pie/interface';
 import type { ICircularProgressChartSpec } from '../../chart/progress/circular/interface';
 import type { ILinearProgressChartSpec } from '../../chart/progress/linear/interface';
 import type { IRadarChartSpec } from '../../chart/radar/interface';
 import type { IRangeAreaChartSpec } from '../../chart/range-area/interface';
-import type { IRangeColumnChartSpec, IRangeColumn3dChartSpec } from '../../chart/range-column/interface';
+import type { IRangeColumnChartSpec } from '../../chart/range-column/interface';
 import type { IRoseChartSpec } from '../../chart/rose/interface';
 import type { ISankeyChartSpec } from '../../chart/sankey/interface';
 import type { IScatterChartSpec } from '../../chart/scatter/interface';
@@ -23,7 +23,7 @@ import type { ISunburstChartSpec } from '../../chart/sunburst/interface';
 import type { ITreemapChartSpec } from '../../chart/treemap/interface';
 import type { IWaterfallChartSpec } from '../../chart/waterfall/interface';
 import type { ICorrelationChartSpec } from '../../chart/correlation/interface';
-import type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud/interface';
+import type { IWordCloudChartSpec } from '../../chart/word-cloud/interface';
 import type { IChartSpec } from './common';
 import type { ILiquidChartSpec } from '../../chart/liquid/interface';
 export interface ChartSpecMap {
@@ -31,15 +31,11 @@ export interface ChartSpecMap {
     readonly area: IAreaChartSpec;
     readonly line: ILineChartSpec;
     readonly bar: IBarChartSpec;
-    readonly bar3d: IBar3dChartSpec;
     readonly histogram: IHistogramChartSpec;
-    readonly histogram3d: IHistogram3dChartSpec;
     readonly rangeColumn: IRangeColumnChartSpec;
-    readonly rangeColumn3d: IRangeColumn3dChartSpec;
     readonly rangeArea: IRangeAreaChartSpec;
     readonly map: IMapChartSpec;
     readonly pie: IPieChartSpec;
-    readonly pie3d: IPie3dChartSpec;
     readonly radar: IRadarChartSpec;
     readonly rose: IRoseChartSpec;
     readonly scatter: IScatterChartSpec;
@@ -47,9 +43,7 @@ export interface ChartSpecMap {
     readonly circleProgress: ICircularProgressChartSpec;
     readonly linearProgress: ILinearProgressChartSpec;
     readonly wordCloud: IWordCloudChartSpec;
-    readonly wordCloud3d: IWordCloud3dChartSpec;
     readonly funnel: IFunnelChartSpec;
-    readonly funnel3d: IFunnel3dChartSpec;
     readonly waterfall: IWaterfallChartSpec;
     readonly boxplot: IBoxPlotChartSpec;
     readonly gauge: IGaugeChartSpec;