@visactor/vchart-types 1.7.0-alpha.0 → 1.7.0-alpha.2

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

@@ -55,27 +55,24 @@ export declare class BaseChart extends CompilableBase implements IChart {
     constructor(spec: any, option: IChartOption);
     created(): void;
     transformSpec(spec: any): void;
-    init(options?: any): void;
+    init(): void;
     reDataFlow(): void;
     onResize(width: number, height: number): void;
     updateViewBox(viewBox: IBoundsLike, reLayout: boolean): void;
-    createBackground(bg: IChartSpec['background']): void;
-    createRegion(regionSpec: any[]): void;
-    initRegion(): void;
-    createSeries(seriesSpec: ISeriesSpec[]): void;
-    initSeries(): void;
+    private _createBackground;
+    private _createRegion;
+    protected _createSeries(seriesSpec: ISeriesSpec[]): void;
     getAllSeries: () => ISeries[];
     getSeriesById(id: number): ISeries | undefined;
     private _createComponent;
-    createComponent(spec: any): void;
-    initComponent(): void;
+    private _createComponents;
     getAllComponents(): IComponent[];
     getAllModels(): IModel[];
     getModelInFilter(filter: string | {
         type: string;
         index: number;
     } | ((model: IModel) => boolean)): IModel;
-    createLayout(): void;
+    private _createLayout;
     setLayout(layout: LayoutCallBack): void;
     private _initLayoutFunc;
     layout(params: ILayoutParams): void;
@@ -108,7 +105,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getCanvasRect(): Omit<IRect, 'x' | 'y'>;
     getSeriesData(id: StringOrNumber | undefined, index: number | undefined): DataView | undefined;
     private _transformSpecScale;
-    createGlobalScale(): void;
+    private _createGlobalScale;
     updateGlobalScaleDomain(): void;
     updateGlobalScale(result: IUpdateSpecResult): void;
     updateGlobalScaleTheme(): void;
@@ -145,10 +142,10 @@ export declare class BaseChart extends CompilableBase implements IChart {
     updateState(state: Record<string, Omit<IMarkStateSpec<unknown>, 'style'>>, filter?: (series: ISeries, mark: IMark, stateKey: string) => boolean): void;
     setSelected(datum: MaybeArray<any> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setHovered(datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
-    initEvent(): void;
+    private _initEvent;
     protected _enableMarkAnimation(states: string | string[]): void;
     protected _disableMarkAnimation(states: string | string[]): void;
     protected _setStateInDatum(stateKey: string, checkReverse: boolean, datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setDimensionIndex(value: StringOrNumber, opt: DimensionIndexOption): void;
-    getColorScheme(): import("../theme").IThemeColorScheme;
+    getColorScheme(): import("..").IThemeColorScheme;
 }

package/types/chart/interface/chart.d.ts

@@ -7,12 +7,11 @@ import type { IMark } from '../../mark/interface';
 import type { IModel, IUpdateSpecResult } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { ISeries } from '../../series/interface';
-import type { IChartEvaluateOption, IChartInitOption, IChartLayoutOption, IChartOption, IChartRenderOption, ILayoutParams } from './common';
+import type { IChartEvaluateOption, IChartLayoutOption, IChartOption, IChartRenderOption, ILayoutParams } from './common';
 import type { IBoundsLike, IPadding } from '@visactor/vutils';
 import type { ICompilable } from '../../compile/interface';
 import type { IRegionQuerier, MaybeArray, Datum, IMarkStateSpec, StringOrNumber, IShowTooltipOption, IDataValues, ILayoutRect } from '../../typings';
 import type { DataView } from '@visactor/vdataset';
-import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
 export type DimensionIndexOption = {
     filter?: (cmp: IComponent) => boolean;
     tooltip?: boolean;
@@ -38,7 +37,7 @@ export interface IChart extends ICompilable {
     updateGlobalScaleDomain: () => void;
     created: () => void;
     transformSpec: (spec: any) => void;
-    init: (option: IChartInitOption) => void;
+    init: () => void;
     onLayoutStart: (ctx: IChartLayoutOption) => void;
     onLayoutEnd: (ctx: IChartLayoutOption) => void;
     onEvaluateEnd: (ctx: IChartEvaluateOption) => void;
@@ -75,7 +74,6 @@ export interface IChart extends ICompilable {
     updateViewBox: (viewBox: IBoundsLike, reLayout: boolean) => void;
     getCanvas: () => HTMLCanvasElement | undefined;
     setCurrentTheme: (reInit?: boolean) => void;
-    getColorScheme: () => IThemeColorScheme | undefined;
     getSeriesData: (id: StringOrNumber | undefined, index: number | undefined) => DataView | undefined;
     setDimensionIndex: (value: StringOrNumber, opt: DimensionIndexOption) => void;
 }

package/types/chart/sequence/sequence.d.ts

@@ -5,7 +5,7 @@ export declare class SequenceChart extends BaseChart {
     static readonly view: string;
     readonly type: string;
     transformSpec(spec: ISequenceChartSpec): void;
-    createSeries(seriesSpec: ISequenceSeriesSpec[]): void;
+    protected _createSeries(seriesSpec: ISequenceSeriesSpec[]): void;
     addAttrToComponentSpec(componentSpec: any, attr: string, value: any): any;
     private _getSeriesDataLength;
 }

package/types/chart/util.d.ts

@@ -1,3 +1,4 @@
+import type { IChartSpec } from '../typings';
 import type { ICartesianChartSpec } from './cartesian/interface';
 import type { IChartOption } from './interface/common';
 import type { IUpdateSpecResult } from '../model/interface';
@@ -10,3 +11,10 @@ export declare function calculateChartSize(spec: {
     height: number;
 };
 export declare function mergeUpdateResult(resultA: IUpdateSpecResult, resultB: IUpdateSpecResult): IUpdateSpecResult;
+export declare function getTrimPaddingConfig(chartType: string, spec: IChartSpec): {
+    paddingInner: number;
+    paddingOuter: number;
+} | {
+    paddingOuter: number;
+    paddingInner?: undefined;
+};

package/types/compile/compiler.d.ts

@@ -38,7 +38,7 @@ export declare class Compiler {
     clear(ctx: {
         chart: IChart;
         vChart: VChart;
-    }): void;
+    }, removeGraphicItems?: boolean): void;
     renderAsync(morphConfig?: IMorphConfig): Promise<any>;
     renderSync(morphConfig?: IMorphConfig): void;
     updateViewBox(viewBox: IBoundsLike, reRender?: boolean): void;
@@ -50,7 +50,7 @@ export declare class Compiler {
     removeEventListener(source: EventSourceType, type: string, callback: (params: CompilerListenerParameters) => void): void;
     protected releaseEvent(): void;
     release(): void;
-    releaseGrammar(): void;
+    releaseGrammar(removeGraphicItems?: boolean): void;
     protected _releaseModel(): void;
     addGrammarItem(grammarItem: IGrammarItem): void;
     removeGrammarItem(grammarItem: IGrammarItem, reserveVGrammarModel?: boolean): void;

package/types/compile/mark/compilable-mark.d.ts

@@ -1,7 +1,7 @@
 import type { IGroupMark, IMark, MarkAnimationSpec, MarkFunctionCallback, Nil, TransformSpec } from '@visactor/vgrammar-core';
 import type { DataView } from '@visactor/vdataset';
 import { GrammarItem } from '../grammar-item';
-import type { Maybe, StringOrNumber } from '../../typings';
+import type { Maybe, Datum, StringOrNumber } from '../../typings';
 import type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';
 import type { IModel } from '../../model/interface';
 import { MarkStateManager } from './mark-state-manager';
@@ -9,12 +9,16 @@ import type { ICompilableMark, IMarkDataInitOption, ICompilableMarkOption, State
 import { MarkData } from './mark-data';
 import { GrammarType } from '../interface/compilable-item';
 import type { IEvent } from '../../event/interface';
-import type { ILabelSpec } from '../../component/label';
+import type { TransformedLabelSpec } from '../../component/label';
+import type { ICustomPath2D } from '@visactor/vrender-core';
 export declare abstract class CompilableMark extends GrammarItem implements ICompilableMark {
     readonly grammarType = GrammarType.mark;
     readonly type: MarkType;
     readonly name: string;
     readonly key: ICompilableMark['key'];
+    protected _skipTheme?: boolean;
+    getSkipTheme(): boolean;
+    setSkipTheme(skipTheme: boolean): void;
     protected _support3d?: boolean;
     getSupport3d(): boolean;
     setSupport3d(support3d: boolean): void;
@@ -65,13 +69,17 @@ export declare abstract class CompilableMark extends GrammarItem implements ICom
     protected _groupKey?: string;
     getGroupKey(): string;
     setGroupKey(groupKey: string): void;
-    protected _label?: ILabelSpec[];
-    getLabelSpec(): ILabelSpec[];
-    setLabelSpec(label: ILabelSpec | ILabelSpec[]): void;
-    addLabelSpec(label: ILabelSpec): void;
+    protected _label?: TransformedLabelSpec[];
+    getLabelSpec(): TransformedLabelSpec[];
+    setLabelSpec(label: TransformedLabelSpec | TransformedLabelSpec[]): void;
+    addLabelSpec(label: TransformedLabelSpec, head?: boolean): void;
     protected _progressiveConfig: IMarkProgressiveConfig;
     getProgressiveConfig(): IMarkProgressiveConfig;
     setProgressiveConfig(config: IMarkProgressiveConfig): void;
+    protected _setCustomizedShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;
+    setCustomizedShapeCallback(callback: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D): void;
+    protected _enableSegments: boolean;
+    setEnableSegments(enable: boolean): void;
     protected _option: ICompilableMarkOption;
     constructor(option: ICompilableMarkOption, name: string, model: IModel);
     protected _product: Maybe<IMark>;
@@ -95,6 +103,7 @@ export declare abstract class CompilableMark extends GrammarItem implements ICom
     compileAnimation(): void;
     compileContext(): void;
     compileSignal(): void;
+    protected _computeAttribute(key: string, state: StateValueType): (datum: Datum, opt: IAttributeOpt) => any;
     protected compileCommonAttributeCallback(key: string, state: string): MarkFunctionCallback<any>;
     protected compileTransform(): void;
     protected _lookupGrammar(id: string): IMark;

package/types/compile/mark/interface.d.ts

@@ -7,14 +7,17 @@ import type { DataView } from '@visactor/vdataset';
 import type { IAnimate, IAnimateArranger, IElement, IGroupMark, IMark, MarkAnimationSpec, Nil, TransformSpec } from '@visactor/vgrammar-core';
 import type { Maybe, Datum, StringOrNumber } from '../../typings';
 import type { MarkData } from './mark-data';
-import type { ILabelSpec } from '../../component/label';
+import type { TransformedLabelSpec } from '../../component/label';
 import type { IRegion } from '../../region/interface';
+import type { ICustomPath2D } from '@visactor/vrender-core';
 export interface ICompilableMarkOption extends GrammarItemInitOption {
     key?: string | ((datum: Datum) => string);
     groupKey?: string;
     skipBeforeLayouted?: boolean;
     support3d?: boolean;
     mode?: '2d' | '3d';
+    skipTheme?: boolean;
+    noSeparateStyle?: boolean;
 }
 export interface ICompilableMark extends IGrammarItem {
     readonly type: MarkType;
@@ -28,9 +31,9 @@ export interface ICompilableMark extends IGrammarItem {
     setDataView: (d?: DataView, productId?: string) => void;
     getFacet: () => string | undefined;
     setFacet: (facet: string) => void;
-    getLabelSpec: () => ILabelSpec[];
-    setLabelSpec: (label: ILabelSpec | ILabelSpec[]) => void;
-    addLabelSpec: (label: ILabelSpec) => void;
+    getLabelSpec: () => TransformedLabelSpec[];
+    setLabelSpec: (label: TransformedLabelSpec | TransformedLabelSpec[]) => void;
+    addLabelSpec: (label: TransformedLabelSpec, head?: boolean) => void;
     state: MarkStateManager;
     readonly stateStyle: IMarkStateStyle<any>;
     hasState: (state: string) => boolean;
@@ -67,6 +70,7 @@ export interface ICompilableMark extends IGrammarItem {
     getMarks: () => ICompilableMark[];
     setSkipBeforeLayouted: (skip: boolean) => void;
     getSkipBeforeLayouted: () => boolean;
+    setCustomizedShapeCallback: (callback: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D) => void;
     runAnimationByState: (animationState?: string) => IAnimateArranger;
     stopAnimationByState: (animationState?: string) => IAnimate;
     pauseAnimationByState: (animationState: string) => IAnimate;

package/types/compile/mark/util.d.ts

@@ -1,7 +1,5 @@
-import type { IAttrs, IMarkStateStyle, MarkType } from '../../mark/interface';
+import type { IAttrs, IMarkStateStyle } from '../../mark/interface';
 export declare function isAttrChangeable<T>(key: string, stateStyle: IMarkStateStyle<T>): boolean;
 export declare function isStateAttrChangeable<T>(key: string, stateStyle: Partial<IAttrs<T>>, facetField: string): boolean;
-export declare function needAttrTransform(type: MarkType, attr: string): boolean;
-export declare function attrTransform(type: MarkType, attr: string, value: any): any;
 export declare function stateInDefaultEnum(state: string): boolean;
 export declare function stateToReverse(state: string): any;

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

@@ -6,7 +6,7 @@ import { BaseComponent } from '../base/base-component';
 import type { IPolarAxisCommonTheme } from './polar/interface';
 import type { ICartesianAxisCommonTheme } from './cartesian/interface';
 import type { CompilableData } from '../../compile/data';
-import type { IAxis, ICommonAxisSpec, ITick, StatisticsDomain } from './interface';
+import type { IAxis, ICommonAxisSpec, ITick } from './interface';
 import type { IComponentOption } from '../interface';
 import type { ISeries } from '../../series/interface';
 import type { ITransformOptions } from '@visactor/vdataset';
@@ -23,8 +23,6 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     protected _theme: ICartesianAxisCommonTheme | IPolarAxisCommonTheme;
     protected _tickData: CompilableData;
     getTickData(): CompilableData;
-    protected _statisticsDomain: StatisticsDomain;
-    getStatisticsDomain(): StatisticsDomain;
     protected _seriesUserId?: StringOrNumber[];
     protected _seriesIndex?: number[];
     protected _regionUserId?: StringOrNumber[];
@@ -60,7 +58,6 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
         userId: StringOrNumber[];
         specIndex: number[];
     };
-    protected computeStatisticsDomain: () => void;
     protected initEvent(): void;
     protected updateScaleDomain(): void;
     protected computeData(updateType?: 'domain' | 'range' | 'force'): void;

package/types/component/axis/cartesian/axis.d.ts

@@ -33,22 +33,12 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     };
     protected _orient: IOrientType;
     getOrient(): IOrientType;
+    protected _autoIndentOnce: boolean;
+    protected _hasAutoIndent: boolean;
+    set autoIndentOnce(v: boolean);
     protected _scales: IBaseScale[];
     getScales(): IBaseScale[];
     protected _theme: ICartesianAxisCommonTheme;
-    protected _statisticsDomain: {
-        domain: any[];
-        index: {
-            [key in StringOrNumber]: number;
-        };
-    };
-    getStatisticsDomain(): {
-        domain: any[];
-        index: {
-            [x: string]: number;
-            [x: number]: number;
-        };
-    };
     protected _tick: ITick | undefined;
     private _axisStyle;
     private _latestBounds;

package/types/component/axis/cartesian/band-axis.d.ts

@@ -23,13 +23,6 @@ export declare class CartesianBandAxis<T extends ICartesianBandAxisSpec = ICarte
         dataToPosition: (values: any[]) => number;
         getScale: (depth: number) => BandScale;
         getBandwidth: (depth: number) => number;
-        getStatisticsDomain: () => {
-            domain: any[];
-            index: {
-                [x: string]: number;
-                [x: number]: number;
-            };
-        };
         getAxisType: () => ComponentTypeEnum;
         getAxisId: () => number;
         isInverse: () => boolean;

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

@@ -31,12 +31,6 @@ export interface IAxisHelper {
     getScale?: (depth: number) => IBaseScale;
     getBandwidth?: (depth: number) => number;
     setExtendDomain?: (key: string, value: number | undefined) => void;
-    getStatisticsDomain?: () => {
-        domain: any[];
-        index: {
-            [key in StringOrNumber]: number;
-        };
-    };
     getAxisType: () => string;
     getAxisId: () => number;
     isInverse: () => boolean;

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

@@ -15,7 +15,6 @@ export interface IAxis extends IComponent {
     getScales: () => IBaseScale[];
     getOrient: () => ICartesianAxisSpec['orient'] | IPolarOrientType;
     visible: boolean;
-    getStatisticsDomain: () => StatisticsDomain;
 }
 export interface IAxisItem<T> {
     visible?: boolean;

package/types/component/axis/interface/spec.d.ts

@@ -31,6 +31,7 @@ export interface ILinearAxisSpec {
     tooltipFilterRange?: number | [number, number];
 }
 export interface IBandAxisSpec {
+    trimPadding?: boolean;
     bandPadding?: number | number[];
     paddingInner?: number | number[];
     paddingOuter?: number | number[];

package/types/component/axis/mixin/band-axis-mixin.d.ts

@@ -11,7 +11,6 @@ export interface BandAxisMixin {
     _defaultBandOuterPadding: number;
     event: IEvent;
     isSeriesDataEnable: () => boolean;
-    computeStatisticsDomain: () => void;
     collectData: (depth: number) => {
         min: number;
         max: number;

package/types/component/axis/mixin/linear-axis-mixin.d.ts

@@ -20,7 +20,6 @@ export interface LinearAxisMixin {
     };
     _tick: ITick | undefined;
     isSeriesDataEnable: any;
-    computeStatisticsDomain: any;
     computeDomain: any;
     collectData: any;
     event: IEvent;

package/types/component/brush/brush.d.ts

@@ -8,9 +8,8 @@ import type { IGraphic } from '@visactor/vrender-core';
 import type { ISeries } from '../../series/interface';
 import type { IElement } from '@visactor/vgrammar-core';
 import type { BrushInteractiveRangeAttr, IBrush, IBrushSpec } from './interface';
-import type { ILayoutType } from '../../typings/layout';
 export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
-    layoutType: ILayoutType;
+    layoutType: 'none';
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;

package/types/component/crosshair/base.d.ts

@@ -2,7 +2,7 @@ import type { Dict, IBoundsLike } from '@visactor/vutils';
 import type { IModelLayoutOption, IModelRenderOption } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import { BaseComponent } from '../base/base-component';
-import type { ILayoutType, IPadding, Maybe, StringOrNumber } from '../../typings';
+import type { IPadding, Maybe, StringOrNumber } from '../../typings';
 import type { IComponentOption } from '../interface';
 import type { ICrossHair, CrossHairTrigger, ICartesianCrosshairSpec, IPolarCrosshairSpec, ICrosshairTheme, ICrosshairCategoryFieldSpec } from './interface';
 import type { IAxis } from '../axis/interface';
@@ -31,7 +31,7 @@ export interface IHair {
     };
 }
 export declare abstract class BaseCrossHair<T extends ICartesianCrosshairSpec | IPolarCrosshairSpec> extends BaseComponent<T> implements ICrossHair {
-    layoutType: ILayoutType;
+    layoutType: 'none';
     gridZIndex: number;
     labelZIndex: number;
     trigger: CrossHairTrigger;

package/types/component/custom-mark/custom-mark.d.ts

@@ -3,13 +3,13 @@ import { ComponentTypeEnum } from '../interface/type';
 import type { IComponentOption } from '../interface';
 import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption } from '../../model/interface';
-import type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutType } from '../../typings';
+import type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';
 import type { MarkTypeEnum } from '../../mark/interface';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare class CustomMark extends BaseComponent<any> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     layoutZIndex: number;
     layoutLevel: number;
     protected _spec: (ICustomMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | ICustomMarkGroupSpec)[];

package/types/component/data-zoom/data-filter-base-component.d.ts

@@ -1,7 +1,7 @@
 import { BaseComponent } from '../base/base-component';
 import type { IEffect, IModelInitOption } from '../../model/interface';
 import type { IComponent, IComponentOption } from '../interface';
-import type { AdaptiveSpec, ILayoutRect, ILayoutType, IOrientType, StringOrNumber } from '../../typings';
+import type { AdaptiveSpec, ILayoutRect, ILayoutType, IOrientType, IRect, StringOrNumber } from '../../typings';
 import type { IBaseScale } from '@visactor/vscale';
 import type { ICartesianBandAxisSpec } from '../axis/cartesian';
 import type { IBoundsLike } from '@visactor/vutils';
@@ -9,8 +9,9 @@ import { IFilterMode } from './constant';
 import type { IDataFilterComponent, IDataFilterComponentSpec, IRoamDragSpec, IRoamScrollSpec, IRoamZoomSpec } from './interface';
 import type { BaseEventParams } from '../../event/interface';
 import type { AbstractComponent } from '@visactor/vrender-components';
+import type { IGraphic } from '@visactor/vrender-core';
 export declare abstract class DataFilterBaseComponent<T extends IDataFilterComponentSpec = IDataFilterComponentSpec> extends BaseComponent<AdaptiveSpec<T, 'width' | 'height'>> implements IDataFilterComponent {
-    layoutType: ILayoutType;
+    layoutType: ILayoutType | 'none';
     protected _component: AbstractComponent;
     protected _orient: IOrientType;
     protected _isHorizontal: boolean;
@@ -60,6 +61,8 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected abstract _computeHeight(): number;
     protected abstract _handleDataCollectionChange(): void;
     protected _handleChange(start: number, end: number, updateComponent?: boolean): void;
+    protected _isReverse(): boolean;
+    protected _updateRangeFactor(tag?: string, label?: string): void;
     effect: IEffect;
     protected _visible: boolean;
     get visible(): boolean;
@@ -108,6 +111,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _handleChartMove: (value: number, rate: number) => void;
     protected _initCommonEvent(): void;
     updateLayoutAttribute(): void;
+    onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;
     getBoundsInRect(rect: ILayoutRect): IBoundsLike;
     hide(): void;
     show(): void;
@@ -117,4 +121,5 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
         minBandSize: number;
     };
     protected _autoUpdate(rect?: ILayoutRect): boolean;
+    getVRenderComponents(): IGraphic[];
 }

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

@@ -3,7 +3,7 @@ import { ComponentTypeEnum } from '../../interface/type';
 import { DataFilterBaseComponent } from '../data-filter-base-component';
 import { DataZoom as DataZoomComponent } from '@visactor/vrender-components';
 import type { IRectGraphicAttribute, ISymbolGraphicAttribute, IGraphic } from '@visactor/vrender-core';
-import type { Datum } from '../../../typings';
+import type { Datum, ILayoutType } from '../../../typings';
 import type { ILinearScale, IBaseScale } from '@visactor/vscale';
 import type { IDataZoomSpec } from './interface';
 export declare class DataZoom<T extends IDataZoomSpec = IDataZoomSpec> extends DataFilterBaseComponent<T> {
@@ -12,6 +12,7 @@ export declare class DataZoom<T extends IDataZoomSpec = IDataZoomSpec> extends D
     name: string;
     layoutZIndex: number;
     layoutLevel: number;
+    layoutType: ILayoutType;
     protected _component: DataZoomComponent;
     protected _valueScale: ILinearScale;
     protected _backgroundSize: number;
@@ -26,7 +27,7 @@ export declare class DataZoom<T extends IDataZoomSpec = IDataZoomSpec> extends D
     onLayoutEnd(ctx: any): void;
     protected _initValueScale(): void;
     protected _updateScaleRange(): void;
-    protected _computeDomainOfValueScale(): number[];
+    protected _computeDomainOfValueScale(): unknown[];
     protected _computeMiddleHandlerSize(): number;
     protected _computeWidth(): number;
     protected _computeHeight(): number;
@@ -35,6 +36,7 @@ export declare class DataZoom<T extends IDataZoomSpec = IDataZoomSpec> extends D
     protected _dataToPositionX2: (datum: Datum) => number;
     protected _dataToPositionY: (datum: Datum) => number;
     protected _dataToPositionY2: (datum: Datum) => number;
+    private _getAttrs;
     protected _createOrUpdateComponent(): void;
     protected _handleChange(start: number, end: number, updateComponent?: boolean, tag?: string): void;
     protected _handleDataCollectionChange(): void;

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

@@ -52,9 +52,13 @@ export interface IDataZoomSpec extends IDataZoomStyle, IDataFilterComponentSpec
     brushSelect?: boolean;
     ignoreBandSize?: boolean;
 }
-export type IDataZoomTheme = IComponentSpec & IDataZoomStyle & {
+export type IDataZoomCommonTheme = IComponentSpec & IDataZoomStyle & {
     orient?: IDataZoomSpec['orient'];
     width?: IDataZoomSpec['width'];
     height?: IDataZoomSpec['height'];
     brushSelect?: boolean;
 };
+export type IDataZoomTheme = IDataZoomCommonTheme & {
+    horizontal?: Omit<IDataZoomCommonTheme, 'orient'>;
+    vertical?: Omit<IDataZoomCommonTheme, 'orient'>;
+};

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

@@ -14,10 +14,14 @@ export interface IScrollBarSpec extends IDataFilterComponentSpec, IScrollBarStyl
     range?: [number, number];
     limitRange?: [number, number];
 }
-export type IScrollBarTheme = ILayoutItemSpec & IScrollBarStyle & {
+export type IScrollBarCommonTheme = ILayoutItemSpec & IScrollBarStyle & {
     orient?: IScrollBarSpec['orient'];
     width?: IScrollBarSpec['width'];
     height?: IScrollBarSpec['height'];
     round?: IScrollBarSpec['round'];
     innerPadding?: IScrollBarSpec['innerPadding'];
 };
+export type IScrollBarTheme = IScrollBarCommonTheme & {
+    horizontal?: Omit<IScrollBarCommonTheme, 'orient'>;
+    vertical?: Omit<IScrollBarCommonTheme, 'orient'>;
+};

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

@@ -5,12 +5,14 @@ import type { ScrollBarAttributes } from '@visactor/vrender-components';
 import { ScrollBar as ScrollBarComponent } from '@visactor/vrender-components';
 import type { IGraphic } from '@visactor/vrender-core';
 import type { IScrollBarSpec } from './interface';
+import type { ILayoutType } from '../../../typings/layout';
 export declare class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extends DataFilterBaseComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
     layoutZIndex: number;
     layoutLevel: number;
+    layoutType: ILayoutType;
     protected _component: ScrollBarComponent;
     static createComponent(spec: any, options: IComponentOption): ScrollBar<any> | ScrollBar<IScrollBarSpec>[];
     constructor(spec: T, options: IComponentOption);
@@ -19,6 +21,7 @@ export declare class ScrollBar<T extends IScrollBarSpec = IScrollBarSpec> extend
     protected _updateScaleRange(): void;
     protected _computeWidth(): number;
     protected _computeHeight(): number;
+    private _getAttrs;
     protected _createOrUpdateComponent(): void;
     protected _handleChange(start: number, end: number, updateComponent?: boolean): void;
     protected _handleDataCollectionChange(): void;

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

@@ -1,3 +1,6 @@
+import type { IModelOption } from '../../model/interface';
+import { type IOrientType } from '../../typings';
+import type { ComponentTypeEnum } from '../interface';
 export interface IDataFilterWithNewDomainOption {
     getNewDomain: () => any[];
     isContinuous: () => boolean;
@@ -17,3 +20,4 @@ export interface IDataFilterComputeDomainOption {
     };
 }
 export declare const dataFilterComputeDomain: (data: Array<any>, op: IDataFilterComputeDomainOption) => any[];
+export declare const getDataFilterTheme: (orient: IOrientType, type: ComponentTypeEnum, option: Partial<IModelOption>) => any;

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

@@ -6,14 +6,14 @@ import { ComponentTypeEnum } from '../interface/type';
 import { BaseComponent } from '../base/base-component';
 import type { IGeoRegionSpec, IRegion } from '../../region/interface';
 import type { IGeoCoordinate, IGeoCoordinateSpec, IProjectionSpec } from './interface';
-import type { IChartSpec, ILayoutType, StringOrNumber } from '../../typings';
+import type { IChartSpec, StringOrNumber } from '../../typings';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare function projectionName(key: string, id: number): string;
 export declare class GeoCoordinate extends BaseComponent<IGeoRegionSpec> implements IGeoCoordinate {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     protected layoutZIndex: number;
     _longitudeField?: string;
     get longitudeField(): string;

package/types/component/index.d.ts

@@ -1,3 +1,4 @@
+import type { IComponent } from './interface/common';
 import type { IScrollBarSpec, IScrollBarTheme } from './data-zoom/scroll-bar';
 import { ScrollBar, registerScrollBar } from './data-zoom/scroll-bar/scroll-bar';
 import type { IDataZoomSpec, IDataZoomTheme } from './data-zoom/data-zoom';
@@ -25,7 +26,7 @@ import type { ICartesianCrosshairSpec, ICrosshairTheme, IPolarCrosshairSpec } fr
 import { CartesianCrossHair, PolarCrossHair, registerCartesianCrossHair, registerPolarCrossHair } from './crosshair';
 import type { IPlayerSpec, IPlayerTheme } from './player';
 import { Player, registerPlayer } from './player';
-import type { IMarkLineSpec, IMarkLineTheme } from './marker/mark-line';
+import type { IMarkLineSpec, IStepMarkLineSpec, IMarkLineTheme } from './marker/mark-line';
 import { MarkLine, registerMarkLine } from './marker/mark-line';
 import type { IMarkAreaSpec, IMarkAreaTheme } from './marker/mark-area';
 import { MarkArea, registerMarkArea } from './marker/mark-area';
@@ -42,5 +43,5 @@ import type { IAxisCommonTheme, IAxisItemTheme, IBandAxisTheme } from './axis/in
 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 { IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, IMapLabelSpec, IMarkAreaSpec, IMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
+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 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 };

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

@@ -3,13 +3,13 @@ import { ComponentTypeEnum } from '../interface/type';
 import { BaseComponent } from '../base/base-component';
 import type { IRegion } from '../../region/interface';
 import type { IIndicator, IIndicatorSpec, IIndicatorTheme } from './interface';
-import type { ILayoutType, Maybe } from '../../typings';
+import type { Maybe } from '../../typings';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare class Indicator<T extends IIndicatorSpec> extends BaseComponent<T> implements IIndicator {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     layoutZIndex: number;
     layoutLevel: number;
     private _gap;

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

@@ -14,6 +14,7 @@ import type { ITooltipTheme } from '../tooltip/interface';
 import type { ComponentTypeEnum } from './type';
 import type { ITotalLabelTheme } from '../label';
 import type { IPoptipTheme } from '../poptip/interface';
+import type { IColorKey } from '../../theme';
 export interface IComponentTheme {
     axis?: IAxisCommonTheme;
     axisBand?: IAxisCommonTheme;
@@ -28,7 +29,7 @@ export interface IComponentTheme {
     [ComponentTypeEnum.markLine]?: IMarkLineTheme;
     [ComponentTypeEnum.markArea]?: IMarkAreaTheme;
     [ComponentTypeEnum.markPoint]?: IMarkPointTheme;
-    [ComponentTypeEnum.tooltip]?: ITooltipTheme;
+    [ComponentTypeEnum.tooltip]?: ITooltipTheme<string | IColorKey>;
     [ComponentTypeEnum.crosshair]?: ICrosshairTheme;
     [ComponentTypeEnum.dataZoom]?: IDataZoomTheme;
     [ComponentTypeEnum.scrollBar]?: IScrollBarTheme;