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

package/types/component/index.d.ts

@@ -27,21 +27,22 @@ import { CartesianCrossHair, PolarCrossHair, registerCartesianCrossHair, registe
 import type { IPlayerSpec, IPlayerTheme } from './player';
 import { Player, registerPlayer } from './player';
 import type { IMarkLineSpec, IStepMarkLineSpec, IMarkLineTheme } from './marker/mark-line';
-import { MarkLine, registerMarkLine } from './marker/mark-line';
+import { CartesianMarkLine, PolarMarkLine, registerMarkLine, registerPolarMarkLine } from './marker/mark-line';
 import type { IMarkAreaSpec, IMarkAreaTheme } from './marker/mark-area';
-import { MarkArea, registerMarkArea } from './marker/mark-area';
+import { CartesianMarkArea, PolarMarkArea, registerMarkArea, registerPolarMarkArea } from './marker/mark-area';
 import type { IMarkPointSpec, IMarkPointTheme } from './marker/mark-point';
-import { MarkPoint, registerMarkPoint } from './marker/mark-point';
+import { CartesianMarkPoint, PolarMarkPoint, GeoMarkPoint, registerMarkPoint, registerPolarMarkPoint, registerGeoMarkPoint } from './marker/mark-point';
 import type { ITooltipSpec, ITooltipTheme } from './tooltip';
 import { Tooltip, registerTooltip } from './tooltip';
-import type { ILabelSpec, ITotalLabelTheme } from './label';
+import type { ILabelSpec, ITotalLabelTheme, ITotalLabelSpec } from './label';
 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 { 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, MarkArea, MarkLine, MarkPoint, Tooltip, Label, TotalLabel };
-export { registerBrush, registerScrollBar, registerTitle, registerTooltip, registerCartesianBandAxis, registerCartesianCrossHair, registerCartesianLinearAxis, registerCartesianLogAxis, registerCartesianSymlogAxis, registerCartesianTimeAxis, registerContinuousLegend, registerCustomMark, registerDataZoom, registerDiscreteLegend, registerGeoCoordinate, registerIndicator, registerLabel, registerTotalLabel, registerMapLabel, registerMarkArea, registerMarkLine, registerMarkPoint, registerPlayer, registerPolarBandAxis, registerPolarCrossHair, registerPolarLinearAxis, registerPoptip };
-export type { IComponent, IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, IMapLabelSpec, IMarkAreaSpec, IMarkLineSpec, IStepMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
+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 };
+export * from './tooltip/interface';

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

@@ -1,8 +1,8 @@
+import { Datum, IFormatMethod } from '../../typings';
 import type { IPercent } from '../../typings/layout';
 import type { ConvertToMarkStyleSpec, ITextMarkSpec } from '../../typings/visual';
 import type { IComponentSpec } from '../base/interface';
 import type { IComponent } from '../interface';
-import type { IRichTextCharacter } from '@visactor/vrender-core';
 export interface IIndicatorItemSpec {
     visible?: boolean;
     field?: string;
@@ -12,8 +12,8 @@ export interface IIndicatorItemSpec {
     fitPercent?: number;
     fitStrategy?: 'default' | 'inscribed';
     style?: Omit<ConvertToMarkStyleSpec<ITextMarkSpec>, 'visible' | 'text'> & {
-        type?: 'text' | 'rich' | 'html';
-        text?: string | string[] | number | number[] | IRichTextCharacter[];
+        type?: 'text' | 'rich';
+        text?: IFormatMethod<[activeDatum: Datum]> | ITextMarkSpec['text'] | ReturnType<IFormatMethod<[activeDatum: Datum]>>;
     };
 }
 export type IIndicator = IComponent;
@@ -28,10 +28,10 @@ export interface IIndicatorSpec extends IComponentSpec {
     title?: IIndicatorItemSpec;
     content?: IIndicatorItemSpec[] | IIndicatorItemSpec;
 }
-export interface IIndicatorItemTheme extends IIndicatorItemSpec {
+export interface IIndicatorItemTheme extends Omit<IIndicatorItemSpec, 'style'> {
     style?: Omit<ITextMarkSpec, 'visible'>;
 }
-export interface IIndicatorTheme extends IIndicatorSpec {
+export interface IIndicatorTheme extends Omit<IIndicatorSpec, 'content' | 'title'> {
     title?: IIndicatorItemTheme;
     content?: IIndicatorItemTheme;
 }

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

@@ -15,6 +15,7 @@ import type { ComponentTypeEnum } from './type';
 import type { ITotalLabelTheme } from '../label';
 import type { IPoptipTheme } from '../poptip/interface';
 import type { IColorKey } from '../../theme';
+import type { Direction, IOrientType } from '../../typings';
 export interface IComponentTheme {
     axis?: IAxisCommonTheme;
     axisBand?: IAxisCommonTheme;
@@ -28,8 +29,12 @@ export interface IComponentTheme {
     [ComponentTypeEnum.colorLegend]?: IColorLegendTheme;
     [ComponentTypeEnum.sizeLegend]?: ISizeLegendTheme;
     [ComponentTypeEnum.markLine]?: IMarkLineTheme;
+    [ComponentTypeEnum.polarMarkLine]?: IMarkLineTheme;
     [ComponentTypeEnum.markArea]?: IMarkAreaTheme;
+    [ComponentTypeEnum.polarMarkArea]?: IMarkAreaTheme;
     [ComponentTypeEnum.markPoint]?: IMarkPointTheme;
+    [ComponentTypeEnum.polarMarkPoint]?: IMarkPointTheme;
+    [ComponentTypeEnum.geoMarkPoint]?: IMarkPointTheme;
     [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey>;
     [ComponentTypeEnum.crosshair]?: ICrosshairTheme;
     [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;
@@ -42,3 +47,10 @@ export interface IComponentTheme {
     [ComponentTypeEnum.poptip]?: IPoptipTheme;
     [ComponentTypeEnum.totalLabel]?: ITotalLabelTheme;
 }
+export type ComponentThemeWithDirection<T extends {
+    orient?: IOrientType;
+}> = T & {
+    orient?: IOrientType;
+    [Direction.horizontal]?: Omit<T, 'orient'>;
+    [Direction.vertical]?: Omit<T, 'orient'>;
+};

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

@@ -23,6 +23,10 @@ export declare enum ComponentTypeEnum {
     markLine = "markLine",
     markArea = "markArea",
     markPoint = "markPoint",
+    polarMarkLine = "polarMarkLine",
+    polarMarkArea = "polarMarkArea",
+    polarMarkPoint = "polarMarkPoint",
+    geoMarkPoint = "geoMarkPoint",
     tooltip = "tooltip",
     title = "title",
     player = "player",

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

@@ -4,7 +4,7 @@ import { ComponentTypeEnum } from '../interface/type';
 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 { IGraphic, IGroup } from '@visactor/vrender-core';
 export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
@@ -16,10 +16,10 @@ export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<
         hover: boolean;
         select: boolean;
         state: {
-            hover?: Partial<import("../..").ITextMarkSpec>;
-            hover_reverse?: Partial<import("../..").ITextMarkSpec>;
-            selected?: Partial<import("../..").ITextMarkSpec>;
-            selected_reverse?: Partial<import("../..").ITextMarkSpec>;
+            hover?: Partial<import("../../typings").IComposedTextMarkSpec>;
+            hover_reverse?: Partial<import("../../typings").IComposedTextMarkSpec>;
+            selected?: Partial<import("../../typings").IComposedTextMarkSpec>;
+            selected_reverse?: Partial<import("../../typings").IComposedTextMarkSpec>;
         };
     };
     _compareSpec(spec: T, prevSpec: T): {
@@ -32,4 +32,5 @@ export declare abstract class BaseLabelComponent<T = any> extends BaseComponent<
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
     protected _getNeedClearVRenderComponents(): IGraphic[];
+    protected _delegateLabelEvent(component: IGroup): void;
 }

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

@@ -1,7 +1,6 @@
 import type { BaseLabelAttrs } from '@visactor/vrender-components';
-import type { ConvertToMarkStyleSpec, Datum, ITextMarkSpec } from '../../typings';
+import type { ConvertToMarkStyleSpec, Datum, IComposedTextMarkSpec, IFormatMethod, ITextMarkSpec } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
-import type { IRichTextCharacter } from '@visactor/vrender-core';
 import type { ILabelMark } from '../../mark/label';
 import type { ISeries } from '../../series';
 export interface ILabelFormatMethodContext {
@@ -10,13 +9,13 @@ export interface ILabelFormatMethodContext {
 export interface ILabelSpec extends IComponentSpec {
     visible?: boolean;
     interactive?: boolean;
-    textType?: string;
-    formatMethod?: (text: string | string[], datum?: Datum, ctx?: ILabelFormatMethodContext) => string | string[] | IRichTextCharacter[];
-    formatter?: string;
+    textType?: 'text' | 'rich';
+    formatMethod?: IFormatMethod<[text: string | string[], datum?: Datum, ctx?: ILabelFormatMethodContext]>;
+    formatter?: string | string[];
     offset?: number;
     position?: string;
-    style?: ConvertToMarkStyleSpec<ITextMarkSpec>;
-    state?: LabelStateStyle<Partial<ITextMarkSpec>>;
+    style?: ConvertToMarkStyleSpec<IComposedTextMarkSpec>;
+    state?: LabelStateStyle<Partial<IComposedTextMarkSpec>>;
     overlap?: BaseLabelAttrs['overlap'];
     smartInvert?: BaseLabelAttrs['smartInvert'];
     animation?: BaseLabelAttrs['animation'];
@@ -24,21 +23,21 @@ export interface ILabelSpec extends IComponentSpec {
     customLayoutFunc?: BaseLabelAttrs['customLayoutFunc'];
     customOverlapFunc?: BaseLabelAttrs['customOverlapFunc'];
     labelLayout?: 'series' | 'region';
-    centerOffset?: number;
     support3d?: boolean;
     syncState?: boolean;
 }
+export type IMultiLabelSpec<T extends Omit<ILabelSpec, 'position'>> = T | T[];
 type LabelStateStyle<T> = {
     hover?: T;
     hover_reverse?: T;
     selected?: T;
     selected_reverse?: T;
 };
-export type ITotalLabelSpec = Pick<ILabelSpec, 'visible' | 'formatMethod' | 'interactive' | 'offset' | 'style' | 'state'>;
+export type ITotalLabelSpec = Pick<ILabelSpec, 'visible' | 'formatMethod' | 'interactive' | 'offset' | 'style' | 'state' | 'textType'>;
 export interface ITotalLabelTheme extends Pick<ILabelSpec, 'visible' | 'interactive' | 'offset' | 'overlap' | 'smartInvert' | 'animation'> {
     style?: ITextMarkSpec;
 }
 export type TransformedLabelSpec = ILabelSpec & {
-    getStyleHandler: (series: ISeries) => (mark?: ILabelMark) => void;
+    getStyleHandler: (series: ISeries) => (mark?: ILabelMark, spec?: any) => void;
 };
 export {};

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

@@ -7,7 +7,6 @@ import type { ILabel, IMark as IVGrammarMark } from '@visactor/vgrammar-core';
 import type { IComponentMark } from '../../mark/component';
 import { BaseLabelComponent } from './base-label';
 import type { Maybe } from '@visactor/vutils';
-import type { IGroup } from '@visactor/vrender-core';
 import type { TransformedLabelSpec } from './interface';
 import type { ILabelMark } from '../../mark/label';
 import type { ICompilableMark } from '../../compile/mark';
@@ -41,7 +40,7 @@ export declare class Label<T extends IChartSpec = any> extends BaseLabelComponen
     init(option: IModelInitOption): void;
     reInit(spec?: T): void;
     initEvent(): void;
-    protected _delegateLabelEvent(component: IGroup): void;
+    afterCompile(): void;
     protected _initTextMark(): void;
     protected _initLabelComponent(): void;
     protected _initTextMarkStyle(): void;

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

@@ -19,6 +19,7 @@ export declare class TotalLabel extends BaseLabelComponent {
     protected _initTextMark(): void;
     _initTextMarkStyle(): void;
     protected _initLabelComponent(): void;
+    afterCompile(): void;
     updateLayoutAttribute(): void;
     compileMarks(): void;
     getVRenderComponents(): any[];

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

@@ -1,3 +1,4 @@
+import type { WaterfallSeries } from './../../series/waterfall/waterfall';
 import type { Datum } from '../../typings/common';
 import type { ILabelInfo } from './label';
 import type { LabelItem, Strategy } from '@visactor/vrender-components';
@@ -14,6 +15,7 @@ export declare const labelRuleMap: {
     rect3d: typeof barLabel;
     arc3d: typeof pieLabel;
     treemap: typeof treemapLabel;
+    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;
@@ -48,7 +50,9 @@ export declare function pieLabel(labelInfo: ILabelInfo): {
     position: import("@visactor/vrender-components").Functional<string>;
     smartInvert: boolean | import("@visactor/vrender-components").SmartInvertAttrs;
 };
-export declare function stackLabel(labelInfo: ILabelInfo): {
+export declare function stackLabelX(datum2: Datum, series: WaterfallSeries, pos: string, offset: number): number;
+export declare function stackLabelY(datum2: Datum, series: WaterfallSeries, pos: string, offset: number): number;
+export declare function stackLabel(labelInfo: ILabelInfo, datumTransform?: (data: any) => any, attributeTransform?: (label: LabelItem, datum: Datum, att: any) => any): {
     customLayoutFunc: (labels: LabelItem[]) => import("@visactor/vrender-core").IText[];
     dataFilter: (labels: LabelItem[]) => LabelItem[];
     overlap: {
@@ -56,9 +60,13 @@ export declare function stackLabel(labelInfo: ILabelInfo): {
     };
 };
 export declare function treemapLabel(labelInfo: ILabelInfo): {
-    customLayoutFunc: (labels: LabelItem[]) => import("@visactor/vrender-core").IText[];
+    customLayoutFunc: (labels: LabelItem[], text: any) => any;
     overlap: boolean;
 };
+export declare function vennLabel(labelInfo: ILabelInfo): {
+    customLayoutFunc: (labels: LabelItem[], text: any) => any;
+    smartInvert: boolean;
+};
 export declare function LineLabel(labelInfo: ILabelInfo): {
     position: string;
     data: any;

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

@@ -1,4 +1,5 @@
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../../typings';
+import type { ComponentThemeWithDirection } from '../../interface';
 import type { ILegendCommonSpec, NoVisibleMarkStyle } from '../interface';
 type Text = StringOrNumber;
 export type TextAttribute = {
@@ -15,6 +16,7 @@ export type HandlerTextAttribute = {
     style?: Omit<NoVisibleMarkStyle<ITextMarkSpec>, 'text'>;
 };
 export type IContinuousLegendSpec = ILegendCommonSpec & {
+    inverse?: boolean;
     field?: string;
     scale?: string;
     defaultSelected?: [number, number];
@@ -44,16 +46,9 @@ export type ISizeLegendSpec = IContinuousLegendSpec & {
     align?: 'top' | 'bottom' | 'left' | 'right';
 };
 export type IContinuousLegendTheme = Omit<IContinuousLegendSpec, 'type' | 'field' | 'scale' | 'regionIndex' | 'regionId' | 'seriesIndex' | 'seriesId' | 'id' | 'defaultSelected'>;
-export interface IColorLegendTheme {
-    horizontal?: IContinuousLegendTheme;
-    vertical?: IContinuousLegendTheme;
-}
-export interface ISizeLegendTheme {
-    horizontal?: IContinuousLegendTheme & {
-        sizeBackground?: ISizeLegendSpec['sizeBackground'];
-    };
-    vertical?: IContinuousLegendTheme & {
-        sizeBackground?: ISizeLegendSpec['sizeBackground'];
-    };
-}
+export type ISizeLegendCommonTheme = IContinuousLegendTheme & {
+    sizeBackground?: ISizeLegendSpec['sizeBackground'];
+};
+export type IColorLegendTheme = ComponentThemeWithDirection<IContinuousLegendTheme>;
+export type ISizeLegendTheme = ComponentThemeWithDirection<ISizeLegendCommonTheme>;
 export {};

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

@@ -1,10 +1,11 @@
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec } from '../../../typings/visual';
-import type { DiscreteLegendAttrs, LegendItemDatum, LegendItem } from '@visactor/vrender-components';
+import type { DiscreteLegendAttrs, LegendItemDatum, LegendItem, LegendPagerAttributes, LegendScrollbarAttributes } from '@visactor/vrender-components';
 import type { ILegendCommonSpec, NoVisibleMarkStyle } from '../interface';
-import type { StringOrNumber } from '../../../typings';
+import type { IFormatMethod, StringOrNumber } from '../../../typings';
 import type { IBaseScale } from '@visactor/vscale';
 import type { IGlobalScale } from '../../../scale/interface';
-export type formatterCallback = (text: StringOrNumber, item: LegendItemDatum, index: number) => any;
+import type { ComponentThemeWithDirection } from '../../interface';
+export type formatterCallback = IFormatMethod<[text: StringOrNumber, item: LegendItemDatum, index: number]>;
 export type LegendItemStyleValue<T> = T | ((item: LegendItemDatum, isSelected: boolean, index: number, allItems: LegendItemDatum[]) => T);
 export type LegendItemStyle<T> = {
     style?: T;
@@ -16,6 +17,7 @@ export type LegendItemStyle<T> = {
     };
 };
 export type IItem = {
+    align?: 'left' | 'right';
     background?: {
         visible?: boolean;
     } & LegendItemStyle<LegendItemStyleValue<NoVisibleMarkStyle<IRectMarkSpec>>>;
@@ -24,18 +26,23 @@ export type IItem = {
         space?: number;
     } & LegendItemStyle<LegendItemStyleValue<Partial<NoVisibleMarkStyle<ISymbolMarkSpec>>>>;
     label?: {
+        widthRatio?: number;
         space?: number;
         formatMethod?: formatterCallback;
+        formatter?: string;
     } & LegendItemStyle<LegendItemStyleValue<NoVisibleMarkStyle<ITextMarkSpec>>>;
     value?: {
+        widthRatio?: number;
         space?: number;
         alignRight?: boolean;
         formatMethod?: formatterCallback;
+        formatter?: string | string[];
     } & LegendItemStyle<LegendItemStyleValue<NoVisibleMarkStyle<ITextMarkSpec>>>;
     focusIconStyle?: NoVisibleMarkStyle<ISymbolMarkSpec>;
     maxWidth?: number | string;
     width?: number | string;
     height?: number | string;
+    autoEllipsisStrategy?: 'labelFirst' | 'valueFirst' | 'none';
 } & Omit<LegendItem, 'background' | 'shape' | 'label' | 'value' | 'focusIconStyle' | 'width' | 'height' | 'maxWidth'>;
 export type IPager = {
     textStyle?: Partial<NoVisibleMarkStyle<ITextMarkSpec>>;
@@ -49,13 +56,21 @@ export type IPager = {
             disable?: Omit<NoVisibleMarkStyle<ISymbolMarkSpec>, 'symbolType'>;
         };
     };
-} & Omit<DiscreteLegendAttrs['pager'], 'textStyle' | 'handler'>;
+} & Omit<LegendPagerAttributes, 'textStyle' | 'handler'>;
+export type ILegendScrollbar = {
+    type: 'scrollbar';
+    railStyle?: Omit<Partial<NoVisibleMarkStyle<IRectMarkSpec>>, 'width' | 'height'>;
+    sliderStyle?: Omit<Partial<NoVisibleMarkStyle<IRectMarkSpec>>, 'width' | 'height'>;
+} & Omit<LegendScrollbarAttributes, 'railStyle' | 'sliderStyle'>;
 export type IDiscreteLegendSpec = ILegendCommonSpec & {
     type?: 'discrete';
     data?: (data: LegendItemDatum[], colorScale: IBaseScale, globalScale: IGlobalScale) => LegendItemDatum[];
     item?: IItem;
-    pager?: IPager;
+    pager?: IPager | ILegendScrollbar;
+    scale?: string;
     scaleName?: string;
     field?: string;
+    defaultSelected?: string[];
 } & Omit<DiscreteLegendAttrs, 'layout' | 'title' | 'items' | 'item' | 'pager'>;
-export type IDiscreteLegendTheme = Omit<IDiscreteLegendSpec, 'type' | 'data' | 'regionIndex' | 'regionId' | 'seriesIndex' | 'seriesId' | 'id' | 'defaultSelected'>;
+export type IDiscreteLegendCommonTheme = Omit<IDiscreteLegendSpec, 'type' | 'data' | 'regionIndex' | 'regionId' | 'seriesIndex' | 'seriesId' | 'id' | 'defaultSelected'>;
+export type IDiscreteLegendTheme = ComponentThemeWithDirection<IDiscreteLegendCommonTheme>;

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

@@ -7,21 +7,25 @@ import { ComponentTypeEnum } from '../../interface/type';
 import { DiscreteLegend as LegendComponent } from '@visactor/vrender-components';
 import { BaseLegend } from '../base-legend';
 import type { ILayoutRect } from '../../../typings/layout';
+import type { StringOrNumber } from '../../../typings';
 export declare class DiscreteLegend extends BaseLegend<IDiscreteLegendSpec> {
     static specKey: string;
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
+    protected _unselectedData: StringOrNumber[];
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     init(option: IModelInitOption): void;
     protected _initLegendData(): DataView;
     protected _getSeriesLegendField(s: ISeries): string;
     protected _initSelectedData(): void;
-    private _getLegendDefaultData;
+    getLegendDefaultData(originalData?: boolean): any;
     private _addDefaultTitleText;
     protected _getLegendAttributes(rect: ILayoutRect): any;
     protected _getLegendConstructor(): typeof LegendComponent;
+    setSelectedData(selectedData: StringOrNumber[]): void;
     protected _initEvent(): void;
     private _getLegendItems;
+    private _addLegendItemFormatMethods;
 }
 export declare const registerDiscreteLegend: () => void;

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

@@ -1,4 +1,4 @@
-import type { ILegendCommonSpec, ITitle } from './interface';
+import type { ITitle } from './interface';
 export declare function transformLegendTitleAttributes(title: ITitle): {
     textStyle?: import("./interface").NoVisibleMarkStyle<import("../..").ITextMarkSpec>;
     style?: import("./interface").NoVisibleMarkStyle<import("../..").ITextMarkSpec>;
@@ -15,18 +15,27 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
         visible?: boolean;
         style?: Omit<import("./interface").NoVisibleMarkStyle<import("../..").IRectMarkSpec>, "visible" | "width" | "height">;
     };
-    text?: string | number | string[] | number[] | {
+    text?: string | number | number[] | string[] | {
         type?: "text";
-        text: string | number | string[] | number[];
+        text: string | number | number[] | string[];
     } | {
         type: "rich";
         text: import("@visactor/vrender-core").IRichTextCharacter[];
+    } | {
+        type: "html";
+        text: {
+            dom: string | HTMLElement;
+        } & import("@visactor/vrender-core").SimpleDomStyleOptions & import("@visactor/vrender-core").CommonDomOptions;
+    } | {
+        type: "react";
+        text: {
+            element: any;
+        } & import("@visactor/vrender-core").SimpleDomStyleOptions & import("@visactor/vrender-core").CommonDomOptions;
     };
     visible?: boolean;
-    padding?: import("@visactor/vrender-components/es/core/type").Padding;
+    padding?: import("@visactor/vrender-components").Padding;
     maxWidth?: number;
     minWidth?: number;
     space?: number;
     align?: "start" | "end" | "center";
 };
-export declare function getLayout(spec: ILegendCommonSpec): "vertical" | "horizontal";

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

@@ -1,67 +1,53 @@
-import type { DataView } from '@visactor/vdataset';
-import type { IModelRenderOption } from '../../model/interface';
+import { DataView } from '@visactor/vdataset';
+import type { Maybe } from '@visactor/vutils';
+import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
-import type { ICartesianSeries } from '../../series/interface';
 import type { ILayoutRect, ILayoutType, IRect } from '../../typings';
 import { BaseComponent } from '../base/base-component';
-import type { IAggrType, IDataPos, IDataPosCallback, IMarkerSpec } from './interface';
+import type { IDataPos, IDataPosCallback, IMarkerSpec, IMarkerSupportSeries } from './interface';
 import type { IGraphic, IGroup } from '@visactor/vrender-core';
 export declare abstract class BaseMarker<T extends IMarkerSpec> extends BaseComponent<T> {
     layoutType: ILayoutType | 'none';
-    protected _startRelativeSeries: ICartesianSeries;
-    protected _endRelativeSeries: ICartesianSeries;
-    protected _relativeSeries: ICartesianSeries;
-    getRelativeSeries(): ICartesianSeries;
+    static specKey: string;
+    static type: string;
+    static coordinateType: string;
+    coordinateType: string;
+    protected _startRelativeSeries: IMarkerSupportSeries;
+    protected _endRelativeSeries: IMarkerSupportSeries;
+    protected _relativeSeries: IMarkerSupportSeries;
+    protected _specifiedDataSeries: IMarkerSupportSeries | IMarkerSupportSeries[];
+    getRelativeSeries(): IMarkerSupportSeries;
     protected _markerData: DataView;
+    getMarkerData(): DataView;
     protected _markerComponent: any;
     protected _layoutOffsetX: number;
     protected _layoutOffsetY: number;
     private _firstSeries;
+    protected abstract _initDataView(): void;
+    protected abstract _createMarkerComponent(): IGroup;
+    protected abstract _markerLayout(): void;
+    static _getMarkerCoordinateType(markerSpec: any): string;
+    static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     created(): void;
     protected _getAllRelativeSeries(): {
-        getRelativeSeries: () => ICartesianSeries;
-        getStartRelativeSeries: () => ICartesianSeries;
-        getEndRelativeSeries: () => ICartesianSeries;
+        getRelativeSeries: () => IMarkerSupportSeries;
+        getStartRelativeSeries: () => IMarkerSupportSeries;
+        getEndRelativeSeries: () => IMarkerSupportSeries;
     };
     private _getFieldInfoFromSpec;
-    protected _processSpecX(specX: IDataPos | IDataPosCallback): {
-        getRelativeSeries: () => ICartesianSeries;
-        getStartRelativeSeries: () => ICartesianSeries;
-        getEndRelativeSeries: () => ICartesianSeries;
-        x: string | number | IDataPosCallback | {
-            field: any;
-            aggrType: IAggrType;
-        };
-    };
-    protected _processSpecY(specY: IDataPos | IDataPosCallback): {
-        getRelativeSeries: () => ICartesianSeries;
-        getStartRelativeSeries: () => ICartesianSeries;
-        getEndRelativeSeries: () => ICartesianSeries;
-        y: string | number | IDataPosCallback | {
-            field: any;
-            aggrType: IAggrType;
-        };
-    };
-    protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback): {
-        getRelativeSeries: () => ICartesianSeries;
-        getStartRelativeSeries: () => ICartesianSeries;
-        getEndRelativeSeries: () => ICartesianSeries;
-        x: string | number | IDataPosCallback | {
-            field: any;
-            aggrType: IAggrType;
-        };
-        y: string | number | IDataPosCallback | {
-            field: any;
-            aggrType: IAggrType;
-        };
+    protected _processSpecByDims(dimSpec: {
+        dim: 'x' | 'y' | 'angle' | 'radius' | 'areaName';
+        specValue: IDataPos | IDataPosCallback;
+    }[]): {
+        getRelativeSeries: () => IMarkerSupportSeries;
+        getStartRelativeSeries: () => IMarkerSupportSeries;
+        getEndRelativeSeries: () => IMarkerSupportSeries;
     };
     protected _processSpecCoo(spec: any): any;
+    protected _getRelativeDataView(): DataView;
     updateLayoutAttribute(): void;
     private _getSeriesByIdOrIndex;
     protected _bindSeries(): void;
-    protected abstract _initDataView(): void;
-    protected abstract _createMarkerComponent(): IGroup;
-    protected abstract _markerLayout(): void;
     protected initEvent(): void;
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
@@ -69,4 +55,11 @@ export declare abstract class BaseMarker<T extends IMarkerSpec> extends BaseComp
     private _getFirstSeries;
     protected _getNeedClearVRenderComponents(): IGraphic[];
     onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void;
+    _compareSpec(spec: T, prevSpec: T): {
+        change: boolean;
+        reMake: boolean;
+        reRender: boolean;
+        reSize: boolean;
+        reCompile: boolean;
+    };
 }