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

package/types/component/data-zoom/interface.d.ts

@@ -1,3 +1,4 @@
+import type { BaseEventParams } from '../../event/interface';
 import type { IOrientType } from '../../typings';
 import type { IDelayType } from '../../typings/event';
 import type { IComponentSpec } from '../base/interface';
@@ -35,12 +36,22 @@ export interface IDataFilterComponentSpec extends Omit<IComponentSpec, 'width' |
 }
 export interface IRoamDragSpec extends IRoamSpec {
     reverse?: boolean;
+    filter?: (delta: [number, number], e?: BaseEventParams['event']) => boolean;
 }
 export interface IRoamScrollSpec extends IRoamSpec {
     reverse?: boolean;
+    filter?: (params: {
+        scrollX: number;
+        scrollY: number;
+    }, e?: BaseEventParams['event']) => boolean;
 }
 export interface IRoamZoomSpec extends IRoamSpec {
     focus?: boolean;
+    filter?: (params: {
+        zoomDelta: number;
+        zoomX?: number;
+        zoomY?: number;
+    }, e?: BaseEventParams['event']) => boolean;
 }
 export interface IRoamSpec {
     enable?: boolean;

package/types/component/data-zoom/scroll-bar/scroll-bar.d.ts

@@ -10,6 +10,9 @@ export declare class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extend
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
+    static readonly builtInTheme: {
+        scrollBar: import("./interface").IScrollBarTheme;
+    };
     static specKey: string;
     specKey: string;
     layoutZIndex: number;
@@ -18,7 +21,7 @@ export declare class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extend
     protected _component: ScrollBarComponent;
     constructor(spec: T, options: IComponentOption);
     setAttrFromSpec(): void;
-    onLayoutEnd(ctx: any): void;
+    onLayoutEnd(): void;
     protected _updateScaleRange(): void;
     protected _computeWidth(): number;
     protected _computeHeight(): number;
@@ -26,7 +29,6 @@ export declare class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extend
     protected _createOrUpdateComponent(): void;
     protected _handleChange(start: number, end: number, updateComponent?: boolean): void;
     protected _handleDataCollectionChange(): void;
-    protected _initCommonEvent(): void;
     protected _getComponentAttrs(): Partial<ScrollBarAttributes>;
     protected _getNeedClearVRenderComponents(): IGraphic[];
 }

package/types/component/geo/geo-coordinate.d.ts

@@ -1,6 +1,6 @@
 import type { IPoint } from '../../typings/coordinate';
 import { Projection } from './projection';
-import type { IEffect, IModelLayoutOption, IModelRenderOption, IModelSpecInfo } from '../../model/interface';
+import type { IEffect, IModelRenderOption, IModelSpecInfo } from '../../model/interface';
 import { ComponentTypeEnum } from '../interface/type';
 import { BaseComponent } from '../base/base-component';
 import type { IGeoRegionSpec, IRegion } from '../../region/interface';
@@ -42,7 +42,7 @@ export declare class GeoCoordinate extends BaseComponent<IGeoRegionSpec> impleme
     initEvent(): void;
     initProjection(): void;
     coordinateHelper(): void;
-    onLayoutEnd(ctx: IModelLayoutOption): void;
+    onLayoutEnd(): void;
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
     protected _getNeedClearVRenderComponents(): IGraphic[];

package/types/component/geo/interface.d.ts

@@ -1,6 +1,6 @@
 import type { IPoint } from '../../typings/coordinate';
-import type { ProjectionType } from '@visactor/vgrammar-core';
 import type { IComponent } from '../interface';
+export type ProjectionType = 'albers' | 'albersUsa' | 'azimuthalEqualArea' | 'azimuthalEquidistant' | 'conicConformal' | 'conicEqualArea' | 'conicEquidistant' | 'equalEarth' | 'equirectangular' | 'gnomonic' | 'identity' | 'mercator' | 'naturalEarth1' | 'orthographic' | 'stereographic' | 'transverseMercator';
 export interface IProjectionSpec {
     name: string;
     type: ProjectionType;

package/types/component/index.d.ts

@@ -6,9 +6,7 @@ import { DataZoom, registerDataZoom } from './data-zoom/data-zoom/data-zoom';
 import { CustomMark, registerCustomMark } from './custom-mark/custom-mark';
 import type { IBrushSpec, IBrushTheme } from './brush';
 import { Brush, registerBrush } from './brush/brush';
-import type { IMapLabelSpec, IMapLabelTheme } from './map-label';
-import { MapLabelComponent, registerMapLabel } from './map-label/component';
-import type { ICartesianLinearAxisSpec, ICartesianBandAxisSpec, ICartesianTimeAxisSpec, ICartesianAxisSpec, ICartesianLogAxisSpec, ICartesianAxisCommonTheme } from './axis/cartesian/index';
+import type { ICartesianLinearAxisSpec, ICartesianBandAxisSpec, ICartesianTimeAxisSpec, ICartesianAxisSpec, ICartesianLogAxisSpec, ICartesianAxisCommonTheme, ICartesianSymlogAxisSpec } from './axis/cartesian/index';
 import { CartesianAxis, CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, CartesianLogAxis, CartesianSymlogAxis, registerCartesianBandAxis, registerCartesianLinearAxis, registerCartesianLogAxis, registerCartesianSymlogAxis, registerCartesianTimeAxis } from './axis/cartesian/index';
 import type { IPolarAxisCommonTheme, IPolarAxisSpec, IPolarBandAxisSpec, IPolarLinearAxisSpec } from './axis/polar';
 import { PolarAxis, PolarBandAxis, PolarLinearAxis, registerPolarBandAxis, registerPolarLinearAxis } from './axis/polar';
@@ -39,10 +37,18 @@ import { Label, registerLabel } from './label';
 import { TotalLabel, registerTotalLabel } from './label/total-label';
 import { registerPoptip } from './poptip/index';
 import type { IComponentTheme } from './interface';
-import type { IAxisCommonTheme, IAxisItemTheme, IBandAxisTheme } from './axis/interface';
+import type { IAxis, IAxisCommonTheme, IAxisItemTheme, IBandAxisTheme } from './axis/interface';
 import type { IPoptipTheme } from './poptip/interface';
-export { ScrollBar, DataZoom, CustomMark, Brush, MapLabelComponent, CartesianAxis, CartesianBandAxis, CartesianLinearAxis, CartesianTimeAxis, CartesianLogAxis, CartesianSymlogAxis, PolarAxis, PolarBandAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Indicator, Title, GeoCoordinate, CartesianCrossHair, PolarCrossHair, Player, CartesianMarkLine, CartesianMarkArea, CartesianMarkPoint, PolarMarkLine, PolarMarkArea, PolarMarkPoint, GeoMarkPoint, Tooltip, Label, TotalLabel };
-export { registerBrush, registerScrollBar, registerTitle, registerTooltip, registerCartesianBandAxis, registerCartesianCrossHair, registerCartesianLinearAxis, registerCartesianLogAxis, registerCartesianSymlogAxis, registerCartesianTimeAxis, registerContinuousLegend, registerCustomMark, registerDataZoom, registerDiscreteLegend, registerGeoCoordinate, registerIndicator, registerLabel, registerTotalLabel, registerMapLabel, registerMarkLine, registerMarkArea, registerMarkPoint, registerPolarMarkLine, registerPolarMarkArea, registerPolarMarkPoint, registerGeoMarkPoint, registerPlayer, registerPolarBandAxis, registerPolarCrossHair, registerPolarLinearAxis, registerPoptip };
-export type { IComponent, IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, ITotalLabelSpec, IMapLabelSpec, IMarkAreaSpec, IMarkLineSpec, IStepMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
-export type { IComponentTheme, ICrosshairTheme, IAxisItemTheme, IAxisCommonTheme, IBandAxisTheme, IPolarAxisCommonTheme, ICartesianAxisCommonTheme, IBrushTheme, IDataZoomTheme, IScrollBarTheme, IIndicatorTheme, IMapLabelTheme, ITotalLabelTheme, ISizeLegendTheme, IColorLegendTheme, IDiscreteLegendTheme, IContinuousLegendTheme, IMarkAreaTheme, IMarkLineTheme, IMarkPointTheme, IPlayerTheme, IPoptipTheme, ITitleTheme, ITooltipTheme };
+import { registerDimensionTooltipProcessor } from './tooltip/processor/dimension-tooltip';
+import { registerMarkTooltipProcessor } from './tooltip/processor/mark-tooltip';
+import { getCartesianCrosshairRect } from './crosshair/utils/cartesian';
+import { registerGroupTooltipProcessor } from './tooltip/processor/group-tooltip';
+import { BandAxisMixin } from './axis/mixin/band-axis-mixin';
+import { LinearAxisMixin } from './axis/mixin/linear-axis-mixin';
+export { ScrollBar, DataZoom, CustomMark, Brush, BandAxisMixin, LinearAxisMixin, CartesianAxis, CartesianBandAxis, CartesianLinearAxis, CartesianTimeAxis, CartesianLogAxis, CartesianSymlogAxis, PolarAxis, PolarBandAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Indicator, Title, GeoCoordinate, CartesianCrossHair, PolarCrossHair, Player, CartesianMarkLine, CartesianMarkArea, CartesianMarkPoint, PolarMarkLine, PolarMarkArea, PolarMarkPoint, GeoMarkPoint, Tooltip, Label, TotalLabel };
+export { getCartesianCrosshairRect };
+export { registerBrush, registerScrollBar, registerTitle, registerMarkTooltipProcessor, registerDimensionTooltipProcessor, registerGroupTooltipProcessor, registerTooltip, registerCartesianBandAxis, registerCartesianCrossHair, registerCartesianLinearAxis, registerCartesianLogAxis, registerCartesianSymlogAxis, registerCartesianTimeAxis, registerContinuousLegend, registerCustomMark, registerDataZoom, registerDiscreteLegend, registerGeoCoordinate, registerIndicator, registerLabel, registerTotalLabel, registerMarkLine, registerMarkArea, registerMarkPoint, registerPolarMarkLine, registerPolarMarkArea, registerPolarMarkPoint, registerGeoMarkPoint, registerPlayer, registerPolarBandAxis, registerPolarCrossHair, registerPolarLinearAxis, registerPoptip };
+export type { IAxis, IComponent, IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, ICartesianSymlogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, ITotalLabelSpec, IMarkAreaSpec, IMarkLineSpec, IStepMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
+export type { IComponentTheme, ICrosshairTheme, IAxisItemTheme, IAxisCommonTheme, IBandAxisTheme, IPolarAxisCommonTheme, ICartesianAxisCommonTheme, IBrushTheme, IDataZoomTheme, IScrollBarTheme, IIndicatorTheme, ITotalLabelTheme, ISizeLegendTheme, IColorLegendTheme, IDiscreteLegendTheme, IContinuousLegendTheme, IMarkAreaTheme, IMarkLineTheme, IMarkPointTheme, IPlayerTheme, IPoptipTheme, ITitleTheme, ITooltipTheme };
 export * from './tooltip/interface';
+export { isXAxis, isYAxis, isZAxis } from './axis/cartesian/util';

package/types/component/indicator/indicator.d.ts

@@ -10,6 +10,9 @@ export declare class Indicator<T extends IIndicatorSpec> extends BaseComponent<T
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
+    static readonly builtInTheme: {
+        indicator: import("./interface").IIndicatorTheme;
+    };
     static specKey: string;
     specKey: string;
     layoutType: 'none';

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

@@ -1,5 +1,4 @@
 import type { ISeriesFilter } from '../../region/interface';
-import type { IAnimate } from '../../animation/interface';
 import type { ILayoutModel, IModelConstructor, IModelOption, IModelSpecInfo } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { ISeries } from '../../series/interface';
@@ -23,7 +22,6 @@ export interface IComponentOption extends IModelOption {
 }
 export interface IComponent extends ILayoutModel {
     readonly name: string;
-    readonly animate?: IAnimate;
     getRegions: () => IRegion[];
     getBindSeriesFilter?: () => ISeriesFilter;
     changeRegions: (regions: IRegion[]) => void;

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

@@ -6,7 +6,6 @@ import type { IScrollBarTheme } from '../data-zoom/scroll-bar/interface';
 import type { IIndicatorTheme } from '../indicator/interface';
 import type { IDiscreteLegendTheme } from '../legend/discrete/interface';
 import type { IColorLegendTheme, ISizeLegendTheme } from '../legend/continuous/interface';
-import type { IMapLabelTheme } from '../map-label/interface';
 import type { IMarkAreaTheme } from '../marker/mark-area/interface';
 import type { IMarkLineTheme } from '../marker/mark-line/interface';
 import type { IMarkPointTheme } from '../marker/mark-point/interface';
@@ -26,7 +25,6 @@ export interface IComponentTheme {
     axisLinear?: IAxisCommonTheme;
     axisX?: ICartesianAxisCommonTheme;
     axisY?: ICartesianAxisCommonTheme;
-    axisZ?: ICartesianAxisCommonTheme;
     axisRadius?: IPolarAxisCommonTheme;
     axisAngle?: IPolarAxisCommonTheme;
     [ComponentTypeEnum.discreteLegend]?: IDiscreteLegendTheme;
@@ -47,9 +45,9 @@ export interface IComponentTheme {
     [ComponentTypeEnum.player]?: IPlayerTheme;
     [ComponentTypeEnum.brush]?: IBrushTheme;
     [ComponentTypeEnum.title]?: ITitleTheme;
-    [ComponentTypeEnum.mapLabel]?: IMapLabelTheme;
     [ComponentTypeEnum.poptip]?: IPoptipTheme;
     [ComponentTypeEnum.totalLabel]?: ITotalLabelTheme;
+    [key: string]: any;
 }
 export type ComponentThemeWithDirection<T extends {
     orient?: IOrientType;

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

@@ -19,7 +19,6 @@ export declare enum ComponentTypeEnum {
     continuousLegend = "continuousLegend",
     colorLegend = "colorLegend",
     sizeLegend = "sizeLegend",
-    mapLabel = "mapLabel",
     markLine = "markLine",
     markArea = "markArea",
     markPoint = "markPoint",

package/types/component/label/base-label.d.ts

@@ -5,6 +5,9 @@ import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption } from '../../model/interface';
 import type { ILabelSpec } from './interface';
 import type { IGraphic } from '@visactor/vrender-core';
+import type { IComponentMark } from '../../mark/interface/mark';
+import type { ICompilableMark } from '../../compile/mark/interface';
+import type { IMark } from '../../mark/interface/common';
 export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
@@ -16,10 +19,10 @@ export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<
         hover: boolean;
         select: boolean;
         state: {
-            hover?: Partial<import("../../typings").IComposedTextMarkSpec>;
-            hover_reverse?: Partial<import("../../typings").IComposedTextMarkSpec>;
-            selected?: Partial<import("../../typings").IComposedTextMarkSpec>;
-            selected_reverse?: Partial<import("../../typings").IComposedTextMarkSpec>;
+            hover?: Partial<import("../../core").IComposedTextMarkSpec>;
+            hover_reverse?: Partial<import("../../core").IComposedTextMarkSpec>;
+            selected?: Partial<import("../../core").IComposedTextMarkSpec>;
+            selected_reverse?: Partial<import("../../core").IComposedTextMarkSpec>;
         };
     };
     _compareSpec(spec: T, prevSpec: T): {
@@ -29,6 +32,8 @@ export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<
         reSize: boolean;
         reCompile: boolean;
     };
+    _getDataLabelType(baseMark: ICompilableMark, type?: string): string;
+    _setTransformOfComponent(labelComponent: IComponentMark, baseMark: IMark | IMark[]): void;
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
     protected _getNeedClearVRenderComponents(): IGraphic[];

package/types/component/label/interface.d.ts

@@ -1,12 +1,10 @@
-import type { BaseLabelAttrs } from '@visactor/vrender-components';
+import type { BaseLabelAttrs, DataLabelAttrs } from '@visactor/vrender-components';
 import type { ConvertToMarkStyleSpec, Datum, IComposedTextMarkSpec, IFormatMethod, ITextMarkSpec } from '../../typings';
-import type { IComponentSpec } from '../base/interface';
-import type { ILabelMark } from '../../mark/interface';
+import type { ILabelMark, IMark } from '../../mark/interface';
 import type { ISeries } from '../../series/interface';
-import type { ICompilableMark } from '../../compile/mark/interface';
 import type { IRegion } from '../../region/interface';
 export interface ILabelInfo {
-    baseMark: ICompilableMark;
+    baseMark: IMark;
     labelMark: ILabelMark;
     series: ISeries;
     labelSpec: TransformedLabelSpec;
@@ -18,7 +16,8 @@ export interface ILabelComponentContext {
 export interface ILabelFormatMethodContext {
     series?: ISeries;
 }
-export interface ILabelSpec extends IComponentSpec, ILabelAnimationSpec {
+export interface ILabelSpec extends ILabelAnimationSpec {
+    zIndex?: number;
     visible?: boolean;
     interactive?: boolean;
     textType?: 'text' | 'rich';
@@ -28,15 +27,19 @@ export interface ILabelSpec extends IComponentSpec, ILabelAnimationSpec {
     position?: string;
     style?: ConvertToMarkStyleSpec<IComposedTextMarkSpec>;
     state?: LabelStateStyle<Partial<IComposedTextMarkSpec>>;
-    overlap?: BaseLabelAttrs['overlap'];
+    overlap?: BaseLabelAttrs['overlap'] & {
+        padding?: DataLabelAttrs['size']['padding'];
+    };
     smartInvert?: BaseLabelAttrs['smartInvert'];
     stackDataFilterType?: 'min' | 'max';
     dataFilter?: BaseLabelAttrs['dataFilter'];
     customLayoutFunc?: BaseLabelAttrs['customLayoutFunc'];
     customOverlapFunc?: BaseLabelAttrs['customOverlapFunc'];
+    onAfterOverlapping?: BaseLabelAttrs['onAfterOverlapping'];
     labelLayout?: 'series' | 'region';
     support3d?: boolean;
     syncState?: boolean;
+    showRelatedMarkTooltip?: boolean;
 }
 export type ILabelAnimationSpec = Pick<BaseLabelAttrs, 'animation' | 'animationEnter' | 'animationUpdate' | 'animationExit'>;
 export type IMultiLabelSpec<T extends Omit<ILabelSpec, 'position'>> = T | T[];
@@ -46,7 +49,10 @@ type LabelStateStyle<T> = {
     selected?: T;
     selected_reverse?: T;
 };
-export type ITotalLabelSpec = Pick<ILabelSpec, 'visible' | 'formatMethod' | 'interactive' | 'offset' | 'style' | 'state' | 'textType' | 'overlap'>;
+export type ITotalLabelSpec = Pick<ILabelSpec, 'visible' | 'formatMethod' | 'interactive' | 'offset' | 'style' | 'state' | 'textType' | 'overlap'> & {
+    position?: 'top' | 'bottom';
+    alwayCalculateTotal?: boolean;
+};
 export interface ITotalLabelTheme extends Pick<ILabelSpec, 'visible' | 'interactive' | 'offset' | 'overlap' | 'smartInvert' | 'animation'> {
     style?: ITextMarkSpec;
 }

package/types/component/label/label.d.ts

@@ -2,14 +2,15 @@ import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelInitOption, IModelSpecInfo } from '../../model/interface';
-import type { IComponentMark } from '../../mark/interface';
-import type { ILabel, IMark as IVGrammarMark } from '@visactor/vgrammar-core';
+import type { IMark } from '../../mark/interface';
+import { type IComponentMark } from '../../mark/interface';
 import { BaseLabelComponent } from './base-label';
 import type { Maybe } from '@visactor/vutils';
 import type { ILabelInfo } from './interface';
 import type { IChartSpecInfo } from '../../chart/interface';
 import type { IChartSpec } from '../../typings';
 import { LabelSpecTransformer } from './label-transformer';
+import type { IGraphic } from '@visactor/vrender-core';
 export declare class Label<T extends IChartSpec = any> extends BaseLabelComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
@@ -33,8 +34,9 @@ export declare class Label<T extends IChartSpec = any> extends BaseLabelComponen
     updateLayoutAttribute(): void;
     protected _updateMultiLabelAttribute(labelInfo: ILabelInfo[], labelComponent: IComponentMark): void;
     protected _updateSingleLabelAttribute(labelInfo: ILabelInfo, labelComponent: IComponentMark): void;
-    protected _updateLabelComponentAttribute(component: ILabel, target: IVGrammarMark | IVGrammarMark[], labelInfos: ILabelInfo[]): void;
+    protected _updateLabelComponentAttribute(labelComponent: IComponentMark, baseMark: IMark | IMark[], labelInfos: ILabelInfo[]): void;
     compileMarks(): void;
     getVRenderComponents(): any[];
+    getLabelInfoByTextGraphic(text: IGraphic): ILabelInfo;
 }
 export declare const registerLabel: () => void;

package/types/component/label/total-label.d.ts

@@ -9,6 +9,9 @@ export declare class TotalLabel extends BaseLabelComponent {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
+    static readonly builtInTheme: {
+        totalLabel: import("./interface").ITotalLabelTheme;
+    };
     static specKey: string;
     specKey: string;
     layoutZIndex: number;
@@ -25,5 +28,5 @@ export declare class TotalLabel extends BaseLabelComponent {
     getVRenderComponents(): any[];
     protected _getSeries(): ISeries;
 }
-export declare function totalLabelPosition(series: ISeries, type: MarkType): string;
+export declare function totalLabelPosition(series: ISeries, type: MarkType, position?: 'top' | 'bottom'): string;
 export declare const registerTotalLabel: () => void;

package/types/component/label/util.d.ts

@@ -1,6 +1,6 @@
 import type { WaterfallSeries } from './../../series/waterfall/waterfall';
 import type { Datum } from '../../typings/common';
-import type { LabelItem, Strategy } from '@visactor/vrender-components';
+import type { LabelItem, OverlapAttrs, Strategy } from '@visactor/vrender-components';
 import type { ILabelInfo, ILabelSpec } from './interface';
 export declare const labelRuleMap: {
     rect: typeof barLabel;
@@ -17,20 +17,14 @@ export declare const labelRuleMap: {
     venn: typeof vennLabel;
 };
 export declare function defaultLabelConfig(rule: string, labelInfo: ILabelInfo): any;
-export declare function textAttribute(labelInfo: ILabelInfo, datum: Datum, formatMethod?: ILabelSpec['formatMethod'], formatter?: ILabelSpec['formatter']): any;
+export declare function textAttribute(labelInfo: ILabelInfo, datum: Datum, formatMethod?: ILabelSpec['formatMethod'], formatter?: ILabelSpec['formatter']): Partial<import("../../core").IComposedTextMarkSpec>;
 export declare function symbolLabel(labelInfo: ILabelInfo): {
     position: string | ((datum: Datum) => any);
-    overlap: boolean | {
-        strategy: Strategy[] | import("@visactor/vrender-components").ShiftYStrategy;
-        avoidBaseMark: boolean;
-    };
+    overlap: boolean | OverlapAttrs;
 };
 export declare function lineDataLabel(labelInfo: ILabelInfo): {
     position: string | ((datum: Datum) => any);
-    overlap: boolean | {
-        strategy: Strategy[] | import("@visactor/vrender-components").ShiftYStrategy;
-        avoidBaseMark: boolean;
-    };
+    overlap: boolean | OverlapAttrs;
 };
 export declare function barLabel(labelInfo: ILabelInfo): {
     position: (data: any) => string;
@@ -42,6 +36,7 @@ export declare function barLabel(labelInfo: ILabelInfo): {
 export declare function pointLabel(labelInfo: ILabelInfo): {
     position: string;
     overlap: boolean | {
+        clampForce: boolean;
         avoidBaseMark: boolean;
     };
 };
@@ -69,6 +64,10 @@ export declare function vennLabel(labelInfo: ILabelInfo): {
 export declare function LineLabel(labelInfo: ILabelInfo): {
     position: string;
     data: any;
+    overlap: {
+        avoidBaseMark: boolean;
+        clampForce: boolean;
+    };
 };
 export declare function sankeyLabel(labelInfo: ILabelInfo): {
     position: import("@visactor/vrender-components").Functional<string>;

package/types/component/legend/continuous/legend.d.ts

@@ -8,6 +8,10 @@ import { BaseLegend } from '../base-legend';
 import type { ILayoutRect } from '../../../typings/layout';
 export declare class ContinuousLegend<T extends IColorLegendSpec | ISizeLegendSpec = IColorLegendSpec | ISizeLegendSpec> extends BaseLegend<T> {
     static specKey: string;
+    static readonly builtInTheme: {
+        colorLegend: import("./interface").IColorLegendTheme;
+        sizeLegend: import("./interface").ISizeLegendTheme;
+    };
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;

package/types/component/legend/discrete/legend.d.ts

@@ -10,6 +10,9 @@ import type { ILayoutRect } from '../../../typings/layout';
 import type { StringOrNumber } from '../../../typings';
 export declare class DiscreteLegend extends BaseLegend<IDiscreteLegendSpec> {
     static specKey: string;
+    static readonly builtInTheme: {
+        discreteLegend: import("./interface").IDiscreteLegendTheme;
+    };
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;

package/types/component/legend/util.d.ts

@@ -13,7 +13,7 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
     };
     background?: {
         visible?: boolean;
-        style?: Omit<import("./interface").NoVisibleMarkStyle<import("../..").IRectMarkSpec>, "width" | "height" | "visible">;
+        style?: Omit<import("./interface").NoVisibleMarkStyle<import("../..").IRectMarkSpec>, "visible" | "width" | "height">;
     };
     text?: string | number | string[] | number[] | {
         type?: "text";
@@ -32,10 +32,10 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
             element: any;
         } & import("@visactor/vrender-core").SimpleDomStyleOptions & import("@visactor/vrender-core").CommonDomOptions;
     };
+    visible?: boolean;
     padding?: import("@visactor/vrender-components").Padding;
     maxWidth?: number;
     minWidth?: number;
-    visible?: boolean;
     space?: number;
     align?: "start" | "end" | "center";
 };

package/types/component/marker/base-marker.d.ts

@@ -59,7 +59,7 @@ export declare abstract class BaseMarker<T extends IMarkerSpec> extends BaseComp
     clear(): void;
     private _getFirstSeries;
     protected _getNeedClearVRenderComponents(): IGraphic[];
-    onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void;
+    onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect): void;
     _compareSpec(spec: T, prevSpec: T): {
         change: boolean;
         reMake: boolean;

package/types/component/marker/mark-area/cartesian-mark-area.d.ts

@@ -10,6 +10,9 @@ export declare class CartesianMarkArea extends BaseMarkArea {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        markArea: import("./interface").IMarkAreaTheme;
+    };
     protected _newMarkAreaComponent(attr: MarkAreaAttrs): MarkAreaComponent;
     protected _computePointsAttr(): {
         points: IPoint[];

package/types/component/marker/mark-area/interface/theme.d.ts

@@ -1,9 +1,10 @@
 import type { IMarkAreaLabelPosition, IMarkCommonArcLabelPosition } from '@visactor/vrender-components';
 import type { IArcMarkSpec, IPolygonMarkSpec } from '../../../../typings';
 import type { IMarkerLabelWithoutRefSpec, IMarkerState } from '../../interface';
+export type IMarkAreaLabel = {
+    position?: keyof typeof IMarkAreaLabelPosition | IMarkCommonArcLabelPosition;
+} & IMarkerLabelWithoutRefSpec;
 export interface IMarkAreaTheme {
     area?: Partial<IMarkerState<IPolygonMarkSpec | IArcMarkSpec>>;
-    label?: {
-        position?: keyof typeof IMarkAreaLabelPosition | IMarkCommonArcLabelPosition;
-    } & IMarkerLabelWithoutRefSpec;
+    label?: IMarkAreaLabel | IMarkAreaLabel[];
 }

package/types/component/marker/mark-area/polar-mark-area.d.ts

@@ -10,6 +10,9 @@ export declare class PolarMarkArea extends BaseMarkArea {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        polarMarkArea: import("./interface").IMarkAreaTheme;
+    };
     protected _markerComponent: MarkArcAreaComponent;
     protected _newMarkAreaComponent(attr: MarkArcAreaAttrs | MarkAreaAttrs): MarkArcAreaComponent | MarkAreaComponent;
     protected _computePointsAttr(): {

package/types/component/marker/mark-line/cartesian-mark-line.d.ts

@@ -9,6 +9,9 @@ export declare class CartesianMarkLine extends BaseMarkLine {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        markLine: import("./interface").IMarkLineTheme;
+    };
     protected _markerComponent: MarkLineComponent;
     protected _newMarkLineComponent(attr: MarkLineAttrs): MarkLineComponent;
     protected _computePointsAttr(): {

package/types/component/marker/mark-line/interface/theme.d.ts

@@ -1,11 +1,12 @@
 import type { IMarkCommonArcLabelPosition, IMarkLineLabelPosition } from '@visactor/vrender-components';
 import type { IArcMarkSpec, ILineMarkSpec } from '../../../../typings';
 import type { IMarkerLabelSpec, IMarkerState, IMarkerSymbol } from '../../interface';
+export type IMarkLineLabel = {
+    position?: keyof typeof IMarkLineLabelPosition | IMarkCommonArcLabelPosition;
+} & IMarkerLabelSpec;
 export interface IMarkLineTheme {
     line?: Partial<IMarkerState<ILineMarkSpec | IArcMarkSpec>>;
-    label?: {
-        position?: keyof typeof IMarkLineLabelPosition | IMarkCommonArcLabelPosition;
-    } & IMarkerLabelSpec;
+    label?: IMarkLineLabel | IMarkLineLabel[];
     startSymbol?: IMarkerSymbol;
     endSymbol?: IMarkerSymbol;
 }

package/types/component/marker/mark-line/polar-mark-line.d.ts

@@ -9,6 +9,9 @@ export declare class PolarMarkLine extends BaseMarkLine {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        polarMarkLine: import("./interface").IMarkLineTheme;
+    };
     protected _markerComponent: MarkArcLineComponent;
     protected _newMarkLineComponent(attr: MarkArcLineAttrs | MarkLineAttrs): MarkArcLineComponent | MarkLineComponent;
     protected _computePointsAttr(): {

package/types/component/marker/mark-point/cartesian-mark-point.d.ts

@@ -8,6 +8,9 @@ export declare class CartesianMarkPoint extends BaseMarkPoint {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        markPoint: import("./interface").IMarkPointTheme<Partial<import("../interface").IMarkerSymbol>>;
+    };
     protected _computePointsAttr(): {
         point: IPoint;
     };

package/types/component/marker/mark-point/geo-mark-point.d.ts

@@ -7,6 +7,9 @@ export declare class GeoMarkPoint extends BaseMarkPoint {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        geoMarkPoint: import("./interface").IMarkPointTheme<Partial<import("../interface").IMarkerSymbol>>;
+    };
     protected _computePointsAttr(): {
         point: import("../../../typings").IPoint;
     };

package/types/component/marker/mark-point/interface/theme.d.ts

@@ -1,15 +1,18 @@
 import type { IImageGraphicAttribute, IRichTextGraphicAttribute, IGroupGraphicAttribute } from '@visactor/vrender-core';
 import type { IMarkPointItemPosition } from '@visactor/vrender-components';
 import type { ILineMarkSpec, ISymbolMarkSpec } from '../../../../typings';
-import type { IMarkerLabelSpec, IMarkerRef, IMarkerState, IMarkerSymbol } from '../../interface';
+import type { IMarkerLabelSpec, IMarkerRef, IMarkerState, IMarkerSymbol, MarkerStateCallback, MarkerStateValue, MarkerStyleCallback } from '../../interface';
 import type { IRegion } from '../../../../region/interface';
 export type IOffsetCallback = (region: IRegion) => number;
+export type IItemContentStyle = ISymbolMarkSpec | IImageGraphicAttribute | IGroupGraphicAttribute;
 export interface IItemContent extends IMarkerRef {
-    type?: 'symbol' | 'text' | 'image' | 'richText';
     position?: keyof typeof IMarkPointItemPosition;
     offsetX?: number | 'regionRight' | 'regionLeft' | IOffsetCallback;
     offsetY?: number | 'regionTop' | 'regionBottom' | IOffsetCallback;
     confine?: boolean;
+    type?: 'symbol' | 'text' | 'image' | 'custom';
+    style?: IItemContentStyle | MarkerStyleCallback<IItemContentStyle> | IMarkerLabelSpec;
+    state?: Record<MarkerStateValue, IItemContentStyle | MarkerStateCallback<IItemContentStyle>>;
     symbol?: Partial<IMarkerState<ISymbolMarkSpec>>;
     image?: Partial<IMarkerState<IImageGraphicAttribute>>;
     text?: IMarkerLabelSpec;

package/types/component/marker/mark-point/polar-mark-point.d.ts

@@ -8,6 +8,9 @@ export declare class PolarMarkPoint extends BaseMarkPoint {
     name: string;
     static coordinateType: string;
     coordinateType: CoordinateType;
+    static readonly builtInTheme: {
+        polarMarkPoint: import("./interface").IMarkPointTheme<Partial<import("../interface").IMarkerSymbol>>;
+    };
     protected _computePointsAttr(): {
         point: {
             x: number;

package/types/component/marker/utils.d.ts

@@ -22,6 +22,18 @@ export declare function transformState(state: {} | Record<MarkerStateValue, any
 export declare function transformStyle(style: any, markerData: DataView, markerAttributeContext: IMarkerAttributeContext): any;
 export declare function transformOffset(offset: string | number | Function, region: IRegion): any;
 export declare function computeOffsetFromRegion(point: IPointLike, offset: string | number, region: IRegion): number;
+export declare function getProcessInfo(spec: any): {
+    isXProcess: boolean;
+    isYProcess: boolean;
+    isX1Process: boolean;
+    isY1Process: boolean;
+    isAngleProcess: boolean;
+    isRadiusProcess: boolean;
+    isAngle1Process: boolean;
+    isRadius1Process: boolean;
+    isCoordinatesProcess: boolean;
+    isValidProcess: boolean;
+};
 export declare function getMarkLineProcessInfo(spec: any): {
     doXProcess: boolean;
     doXYY1Process: boolean;

package/types/component/player/player.d.ts

@@ -9,6 +9,9 @@ import { BaseComponent } from '../base/base-component';
 export declare class Player extends BaseComponent<IPlayer> implements IComponent {
     layoutZIndex: number;
     layoutLevel: number;
+    static readonly builtinThemes: {
+        player: import("./interface").IPlayerTheme;
+    };
     static specKey: string;
     specKey: string;
     static type: ComponentTypeEnum;

package/types/component/title/title.d.ts

@@ -15,6 +15,9 @@ export declare class Title<T extends ITitleSpec = ITitleSpec> extends BaseCompon
     layoutType: ILayoutType;
     layoutZIndex: number;
     layoutLevel: number;
+    static readonly builtInTheme: {
+        title: import("./interface").ITitleTheme;
+    };
     protected _orient: IOrientType;
     private _titleComponent;
     private _cacheAttrs;

package/types/component/tooltip/constant.d.ts

@@ -1,4 +1,4 @@
-import type { ITooltipLineActual, TooltipActiveType } from '../../typings';
+import type { ITooltipLineActual } from '../../typings';
 export declare const TooltipHandlerType: {
     dom: string;
     canvas: string;
@@ -6,5 +6,9 @@ export declare const TooltipHandlerType: {
 export declare const TOOLTIP_EL_CLASS_NAME = "vchart-tooltip-element";
 export declare const TOOLTIP_MAX_LINE_COUNT = 20;
 export declare const TOOLTIP_OTHERS_LINE: ITooltipLineActual;
-export declare const TOOLTIP_TYPES: TooltipActiveType[];
+export declare const enum TooltipType {
+    group = "group",
+    mark = "mark",
+    dimension = "dimension"
+}
 export declare const DEFAULT_SHOW_DELAY = 50;