@visactor/vchart-types 1.15.5-alpha.8 → 2.0.0-alpha.1

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

@@ -1,3 +1,3 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
 import type { ISunburstAnimationParams } from './interface';
+import type { IAnimationTypeConfig } from '../../../animation/interface';
 export declare const sunburstExit: (params: ISunburstAnimationParams) => IAnimationTypeConfig;

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

@@ -1,3 +1,3 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
+import type { IAnimationTypeConfig } from '../../../animation/interface';
 import type { ISunburstAnimationParams, SunburstAppearPreset } from './interface';
 export declare const sunburstPresetAnimation: (_params: ISunburstAnimationParams, preset: SunburstAppearPreset) => IAnimationTypeConfig;

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

@@ -1,3 +1,3 @@
-import type { IElement } from '@visactor/vgrammar-core';
+import type { IMarkGraphic } from '../../../mark/interface/common';
 export declare const computeRatio: (angle: number, range: [number, number]) => number;
-export declare const getInnerMostElements: (element: IElement) => IElement[];
+export declare const getInnerMostElements: (graphics: IMarkGraphic[]) => IMarkGraphic[];

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;
@@ -48,7 +51,7 @@ export declare class SunburstSeries extends PolarSeries<any> {
     protected initTooltip(): void;
     initAnimation(): void;
     initEvent(): void;
-    onLayoutEnd(ctx: any): void;
+    onLayoutEnd(): void;
     private _computeRadius;
     private _computeLevel;
     getGroupFields(): string[];

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

@@ -1,4 +1,4 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
+import type { IAnimationTypeConfig } from '../../animation/interface';
 import type { TreemapAppearPreset } from './interface';
 export declare const treemapPresetAnimation: (preset: TreemapAppearPreset) => IAnimationTypeConfig;
 export declare const registerTreemapAnimation: () => void;

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;
@@ -30,7 +33,6 @@ export declare class TreemapSeries extends CartesianSeries<any> {
     private _enableAnimationHook;
     setAttrFromSpec(): void;
     initData(): void;
-    compile(): void;
     protected _runTreemapTransform(render?: boolean): void;
     protected _addDataIndexAndKey(): void;
     getRawDataStatisticsByField(field: string, isNumeric?: boolean): {
@@ -59,7 +61,7 @@ export declare class TreemapSeries extends CartesianSeries<any> {
     handleZoom(event: ZoomEventParam): void;
     getDimensionField(): string[];
     getMeasureField(): string[];
-    onLayoutEnd(ctx: any): void;
+    onLayoutEnd(): void;
     protected enableMarkAnimation(): void;
     protected disableMarkAnimation(): void;
     getDefaultShapeType(): string;

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

@@ -1,5 +1,16 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
+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;
@@ -24,6 +27,7 @@ export declare class VennSeries<T extends IVennSeriesSpec = IVennSeriesSpec> ext
     getValueField(): string;
     setValueField(f: string): string;
     setAttrFromSpec(): void;
+    initData(): void;
     compile(): void;
     protected _runVennTransform(render?: boolean): void;
     initMark(): void;
@@ -35,7 +39,7 @@ export declare class VennSeries<T extends IVennSeriesSpec = IVennSeriesSpec> ext
     protected initTooltip(): void;
     getDimensionField(): string[];
     getMeasureField(): string[];
-    onLayoutEnd(ctx: any): void;
+    onLayoutEnd(): void;
     getDefaultShapeType(): string;
     getActiveMarks(): IMark[];
     getStatisticFields(): {

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

@@ -1,5 +1,5 @@
-import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
 import type { IBarAnimationParams } from '../bar/interface';
 import type { WaterfallAppearPreset } from './interface';
+import type { IAnimationTypeConfig } from '../../animation/interface';
 export declare function waterfallPresetAnimation(params: IBarAnimationParams, preset: WaterfallAppearPreset): IAnimationTypeConfig;
 export declare const registerWaterfallAnimation: () => void;

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

@@ -3,19 +3,22 @@ import type { IWaterfallSeriesSpec } from './interface';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
 import type { ITransformOptions, DataView } from '@visactor/vdataset';
-import { SeriesData } from '../base/series-data';
 import type { IModelEvaluateOption } from '../../model/interface';
 import type { Datum } from '../../typings';
 import type { ILabelMark, IRuleMark, ITextMark } from '../../mark/interface';
 import type { ILabelInfo } from '../../component/label/interface';
+import { type ICompilableData } from '../../compile/data';
 export declare const DefaultBandWidth = 6;
 export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfallSeriesSpec> extends BarSeries<any> {
     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?: SeriesData;
+    protected _totalData?: ICompilableData;
     getTotalData(): any;
     protected _spec: T;
     protected _leaderLineMark: IRuleMark;
@@ -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 { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-import type { IWordcloud3dAnimationParams, IWordcloudAnimationParams, WordcloudAppearPreset } from './interface';
-export declare const WordCloud3dAnimation: (params: IWordcloud3dAnimationParams | (() => any)) => IAnimationTypeConfig;
+import type { IWordcloudAnimationParams, WordcloudAppearPreset } from './interface';
+import type { IAnimationTypeConfig } from '../../animation/interface';
 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;
@@ -60,7 +61,7 @@ export declare class BaseWordCloudSeries<T extends IBaseWordCloudSeriesSpec = IB
     getGroupFields(): string[];
     getStackGroupFields(): string[];
     getStackValueField(): string;
-    onLayoutEnd(ctx: any): void;
+    onLayoutEnd(): void;
     getActiveMarks(): IMark[];
     reInit(): 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 { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export interface IWordcloud3dAnimationParams {
-    radius: number;
-    depth_3d: number;
-}
+import type { shapes, GeometricMaskShape, TextShapeMask } from '@visactor/vlayouts';
+import type { IAnimationTypeConfig } from '../../animation/interface';
 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/common.d.ts

@@ -5,3 +5,16 @@ export type StringOrNumber = string | number;
 export type MaybeArray<T> = T | Array<T>;
 export type Maybe<T> = T | undefined | null;
 export type Quadrant = 1 | 2 | 3 | 4;
+export type ValueOf<T, K extends keyof T = keyof T> = T[K];
+export type DiffResult<Prev, Next> = {
+    enter: {
+        next: Next;
+    }[];
+    update: {
+        prev: Prev;
+        next: Next;
+    }[];
+    exit: {
+        prev: Prev;
+    }[];
+};

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;

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

@@ -1,20 +1,19 @@
 import type { IVChart } from './../../core/interface';
 import type { IImageMarkSpec } from '../visual';
 import type { LayoutCallBack } from '../../layout/interface';
-import type { IElement, srIOption3DType } from '@visactor/vgrammar-core';
 import type { DataSet, DataView, ISimplifyOptions, IFieldsOptions, IFilterOptions, IFoldOptions, IDsvParserOptions } from '@visactor/vdataset';
 import type { RegionSpec } from '../../region/interface';
-import type { IHoverSpec, ISelectSpec, IInteractionSpec } from '../../interaction/interface';
+import type { IHoverSpec, ISelectSpec, IInteractionSpec } from '../../interaction/interface/spec';
 import type { IRenderOption } from '../../compile/interface';
 import type { ISeriesTooltipSpec, ITooltipSpec } from '../../component/tooltip/interface';
 import type { ILayoutSpec } from '../../layout/interface';
-import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
+import type { ConvertToMarkStyleSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
 import type { ISeriesStyle, SeriesType } from '../../series/interface';
 import type { Datum, StringOrNumber } from '../common';
 import type { IInvalidType } from '../data';
 import type { IAnimationSpec, IMorphSeriesSpec } from '../../animation/spec';
 import type { IPlayer } from '../../component/player/interface';
-import type { IMarkProgressiveConfig, MarkTypeEnum } from '../../mark/interface';
+import type { IMark, IMarkProgressiveConfig, MarkTypeEnum } from '../../mark/interface';
 import type { IDataZoomSpec } from '../../component/data-zoom/data-zoom/interface';
 import type { IScrollBarSpec } from '../../component/data-zoom/scroll-bar/interface';
 import type { ICrosshairSpec } from '../../component/crosshair/interface';
@@ -24,7 +23,7 @@ import type { IBrushSpec } from '../../component/brush/interface';
 import type { ITotalLabelSpec } from '../../component/label/interface';
 import type { ILegendSpec } from '../../component/legend/interface';
 import type { ILayoutOrientPadding, ILayoutPaddingSpec } from '../layout';
-import type { IColor, ICustomPath2D, IRichTextCharacter } from '@visactor/vrender-core';
+import type { IColor, ICustomPath2D, IGraphic, IRichTextCharacter } from '@visactor/vrender-core';
 import type { ICommonAxisSpec } from '../../component/axis/interface';
 import type { IMediaQuerySpec } from './media-query';
 import type { IModelSpec } from '../../model/interface';
@@ -34,9 +33,7 @@ export interface IInitOption extends Omit<IRenderOption, 'pluginList'> {
     renderCanvas?: string | HTMLCanvasElement;
     dataSet?: DataSet;
     autoFit?: boolean;
-    performanceHook?: IPerformanceHook;
     animation?: boolean;
-    options3d?: srIOption3DType;
     layout?: LayoutCallBack;
     poptip?: boolean;
     onError?: (...args: any[]) => void;
@@ -109,10 +106,11 @@ export type BuildInTransformOptions = {
 export interface IFieldsMeta {
     alias?: string;
     domain?: StringOrNumber[];
-    lockStatisticsByDomain?: boolean;
+    lockStatisticsByDomain?: boolean | 'onlyFull';
     type?: 'ordinal' | 'linear';
     sortIndex?: number;
     sortReverse?: boolean;
+    sort?: 'desc' | 'asc';
 }
 export interface SheetParseOptions extends CommonParseOptions {
     type: 'csv' | 'dsv' | 'tsv';
@@ -199,8 +197,12 @@ export type IMarkStateFilter = {
     datums: Datum[];
     datumKeys: string[];
 } | {
-    items: IElement[];
-} | ((datum: Datum, options: Record<string, any>) => boolean);
+    items: IGraphic[];
+} | ((datum: Datum, options: {
+    mark?: IMark;
+    type?: string;
+    renderNode?: IGraphic;
+}) => boolean);
 export interface IMarkStateSpec<T> {
     filter?: IMarkStateFilter;
     level?: number | undefined;
@@ -224,35 +226,35 @@ export interface IPerformanceHook {
     afterCreateVChart?: (vchart?: IVChart) => void;
     beforeInitializeChart?: (vchart?: IVChart) => void;
     afterInitializeChart?: (vchart?: IVChart) => void;
-    beforeCompileToVGrammar?: () => void;
-    afterCompileToVGrammar?: () => void;
-    beforeRegionCompile?: () => void;
-    afterRegionCompile?: () => void;
-    beforeSeriesCompile?: () => void;
-    afterSeriesCompile?: () => void;
-    beforeComponentCompile?: () => void;
-    afterComponentCompile?: () => void;
-    beforeResizeWithUpdate?: () => void;
-    afterResizeWithUpdate?: () => void;
-    beforeLayoutWithSceneGraph?: () => void;
-    afterLayoutWithSceneGraph?: () => void;
-    beforeParseView?: () => void;
-    afterParseView?: () => void;
-    beforeCreateRuntime?: () => void;
-    afterCreateRuntime?: () => void;
-    beforeSrViewEvaluateAsync?: () => void;
-    afterSrViewEvaluateAsync?: () => void;
-    beforeSrViewRunAsync?: () => void;
-    afterSrViewRunAsync?: () => void;
-    beforeTransform?: (name: string) => void;
-    afterTransform?: (name: string) => void;
-    beforeCreateVRenderStage?: () => void;
-    afterCreateVRenderStage?: () => void;
-    beforeCreateVRenderMark?: () => void;
-    afterCreateVRenderMark?: () => void;
+    beforeCompileToVGrammar?: (vchart?: IVChart) => void;
+    afterCompileToVGrammar?: (vchart?: IVChart) => void;
+    beforeRegionCompile?: (vchart?: IVChart) => void;
+    afterRegionCompile?: (vchart?: IVChart) => void;
+    beforeSeriesCompile?: (vchart?: IVChart) => void;
+    afterSeriesCompile?: (vchart?: IVChart) => void;
+    beforeComponentCompile?: (vchart?: IVChart) => void;
+    afterComponentCompile?: (vchart?: IVChart) => void;
+    beforeResizeWithUpdate?: (vchart?: IVChart) => void;
+    afterResizeWithUpdate?: (vchart?: IVChart) => void;
+    beforeLayoutWithSceneGraph?: (vchart?: IVChart) => void;
+    afterLayoutWithSceneGraph?: (vchart?: IVChart) => void;
+    beforeParseView?: (vchart?: IVChart) => void;
+    afterParseView?: (vchart?: IVChart) => void;
+    beforeCreateRuntime?: (vchart?: IVChart) => void;
+    afterCreateRuntime?: (vchart?: IVChart) => void;
+    beforeSrViewEvaluateAsync?: (vchart?: IVChart) => void;
+    afterSrViewEvaluateAsync?: (vchart?: IVChart) => void;
+    beforeSrViewRunAsync?: (vchart?: IVChart) => void;
+    afterSrViewRunAsync?: (vchart?: IVChart) => void;
+    beforeTransform?: (name: string, vchart?: IVChart) => void;
+    afterTransform?: (name: string, vchart?: IVChart) => void;
+    beforeCreateVRenderStage?: (vchart?: IVChart) => void;
+    afterCreateVRenderStage?: (vchart?: IVChart) => void;
+    beforeCreateVRenderMark?: (vchart?: IVChart) => void;
+    afterCreateVRenderMark?: (vchart?: IVChart) => void;
     beforeDoRender?: (vchart?: IVChart) => void;
-    beforeVRenderDraw?: () => void;
-    afterVRenderDraw?: () => void;
+    beforeVRenderDraw?: (vchart?: IVChart) => void;
+    afterVRenderDraw?: (vchart?: IVChart) => void;
 }
 export type IBuildinMarkSpec = {
     group: IGroupMarkSpec;
@@ -261,14 +263,11 @@ export type IBuildinMarkSpec = {
     line: ILineMarkSpec;
     text: ITextMarkSpec;
     rect: IRectMarkSpec;
-    rect3d: IRect3dMarkSpec;
     image: IImageMarkSpec;
     path: IPathMarkSpec;
     area: IAreaMarkSpec;
     arc: IArcMarkSpec;
-    arc3d: IArc3dMarkSpec;
     polygon: IPolygonMarkSpec;
-    pyramid3d: IPyramid3dMarkSpec;
     boxPlot: IBoxPlotMarkSpec;
     linkPath: ILinkPathMarkSpec;
     ripple: IRippleMarkSpec;

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

@@ -6,7 +6,7 @@ export interface ITooltipPositionFixedValue {
     offset?: number;
 }
 export type TooltipPositionPatternItem = TooltipPositionValue | ITooltipPositionFixedValue;
-export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside';
+export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside' | 'insideTop' | 'insideBottom' | 'insideLeft' | 'insideRight' | 'insideTopLeft' | 'insideTopRight' | 'insideBottomLeft' | 'insideBottomRight';
 export type TooltipPositionMode = 'pointer' | 'mark' | 'crosshair';
 export interface IGlobalTooltipPositionPattern {
     left?: TooltipPositionValue;

package/types/typings/visual.d.ts

@@ -5,7 +5,7 @@ import type { InterpolateType } from './interpolate';
 import type { ScaleType } from './scale';
 import type { ShapeType } from './shape';
 import type { IPoint } from './coordinate';
-import type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark/interface';
+import type { IModelMarkAttributeContext } from '../compile/mark/interface';
 import type { Datum } from './common';
 import type { IPadding } from '@visactor/vutils';
 import type { IColorKey } from '../theme/color-scheme/interface';
@@ -18,6 +18,7 @@ export interface IVisualSpecBase<D, T> {
     specified?: {
         [key: string]: unknown;
     };
+    clamp?: boolean;
 }
 export interface IVisualSpecStyle<D, T> extends IVisualSpecBase<D, T> {
     field?: string;
@@ -36,7 +37,7 @@ export interface IVisualScale {
     field?: string;
     changeDomain?: 'none' | 'replace' | 'expand';
 }
-export type FunctionType<T> = (datum: Datum, context: IModelMarkAttributeContext, opt?: IAttributeOpt, source?: DataView) => T;
+export type FunctionType<T> = (datum: Datum, context: IModelMarkAttributeContext, source?: DataView) => T;
 export type ValueType<T> = T;
 export type VisualType<T> = ValueType<T> | FunctionType<T> | IVisual<unknown, T>;
 export type TextureType = 'circle' | 'dimond' | 'rect' | 'vertical-line' | 'horizontal-line' | 'bias-lr' | 'bias-rl' | 'grid';
@@ -56,7 +57,7 @@ export interface ICommonSpec {
     x?: number;
     y?: number;
     z?: number;
-    stroke?: string | IGradient | false | (number | boolean)[] | IColorKey;
+    stroke?: string | IGradient | false | (number | boolean)[] | IColorKey | null;
     strokeOpacity?: number;
     opacity?: number;
     lineWidth?: number;
@@ -132,10 +133,16 @@ export interface ITextMarkSpec extends IFillMarkSpec {
     ellipsis?: string;
     suffixPosition?: 'start' | 'end' | 'middle';
     underline?: boolean;
+    underlineDash?: number[];
+    underlineOffset?: number;
     lineThrough?: boolean;
     lineHeight?: number | string | ITokenKey;
     poptip?: PopTipAttributes;
     direction?: 'horizontal' | 'vertical';
+    wordBreak?: 'break-word' | 'break-all' | 'keep-all';
+    heightLimit?: number;
+    lineClamp?: number;
+    whiteSpace?: 'normal' | 'no-wrap';
 }
 export type IRichTextMarkSpec = IRichTextAttribute & IFillMarkSpec & {
     type: 'rich';
@@ -150,9 +157,6 @@ export interface IRectMarkSpec extends IFillMarkSpec {
     x1?: number;
     y1?: number;
 }
-export interface IRect3dMarkSpec extends IRectMarkSpec {
-    length?: number;
-}
 export interface IBoxPlotMarkSpec extends ICommonSpec {
     lineWidth?: number;
     boxWidth?: number;
@@ -213,9 +217,6 @@ export interface IArcMarkSpec extends IFillMarkSpec {
     cap?: boolean | [boolean, boolean];
     autoCapConical?: boolean;
 }
-export interface IArc3dMarkSpec extends IArcMarkSpec {
-    height?: number;
-}
 export interface ICellMarkSpec extends ISymbolMarkSpec {
     padding?: number | number[] | IPadding;
 }
@@ -231,9 +232,6 @@ export interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {
     scaleX?: number;
     scaleY?: number;
 }
-export interface IPyramid3dMarkSpec extends IPolygonMarkSpec {
-    points?: IPoint[];
-}
 export type RepeatType = 'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat';
 export type RepeatXYType = 'no-repeat' | 'repeat' | 'stretch';
 export type ImageOriginType = 'top' | 'bottom';
@@ -289,7 +287,7 @@ export interface IImageMarkSpec extends IFillMarkSpec {
     height?: number;
     repeatX?: IRepeatType;
     repeatY?: IRepeatType;
-    image: string | HTMLImageElement | HTMLCanvasElement;
+    image?: string | HTMLImageElement | HTMLCanvasElement;
 }
 export type TextAlign = TextAlignType;
 export type TextBaseLine = TextBaselineType;

package/types/util/array.d.ts

@@ -1,4 +1,5 @@
 import { array, last as peek, maxInArray as maxInArr, minInArray as minInArr } from '@visactor/vutils';
 export declare function shallowCompare<T, U>(arrA: T | T[], arrB: U | U[]): boolean;
 export declare function combineDomains(domains: number[][]): number[];
+export declare function moveAfterInArray<T>(array: T[], target: T, ref: T): void;
 export { array, peek, maxInArr, minInArr };