@visactor/vchart-types 1.6.7 → 1.7.0-alpha.1

package/types/animation/utils.d.ts

@@ -9,9 +9,9 @@ export declare const AnimationStates: string[];
 export declare function animationConfig<Preset extends string>(defaultConfig?: MarkAnimationSpec, userConfig?: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, params?: {
     dataIndex: (datum: any) => number;
 }): MarkAnimationSpec;
-export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
+export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
 export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;
 export declare function isTimeLineAnimation(animationConfig: IAnimationConfig): boolean;
 export declare function isChannelAnimation(animationConfig: IAnimationConfig): boolean;
-export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
 export declare function isAnimationEnabledForSeries(series: ISeries): boolean;

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

@@ -1,7 +1,7 @@
 import { ChartData } from './chart-meta/data';
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues } from '../typings';
-import type { LayoutCallBack } from '../layout/interface';
-import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../typings';
+import type { ILayoutItem, LayoutCallBack } from '../layout/interface';
+import type { ILayoutModelState, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
 import type { ISeries } from '../series/interface';
 import type { IRegion } from '../region/interface';
@@ -55,34 +55,31 @@ 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;
     onLayoutStart(option: IChartLayoutOption): void;
     onLayoutEnd(option: IChartLayoutOption): void;
     onEvaluateEnd(option: IChartEvaluateOption): void;
-    getLayoutElements(): (IComponent | IRegion | ISeries)[];
+    getLayoutElements(): ILayoutItem[];
     getRegionsInIndex: (index?: number[]) => IRegion[];
     getAllRegions: () => IRegion[];
     getRegionsInIds: (ids: number[]) => IRegion[];
@@ -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

@@ -4,15 +4,14 @@ import type { IRunningConfig as IMorphConfig, IView } from '@visactor/vgrammar-c
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IComponent } from '../../component/interface';
 import type { IMark } from '../../mark/interface';
-import type { ILayoutRect, IModel, IUpdateSpecResult } from '../../model/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 } from '../../typings';
+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/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,15 @@ 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';
 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,10 +68,10 @@ 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;
@@ -95,6 +98,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,7 +7,7 @@ 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';
 export interface ICompilableMarkOption extends GrammarItemInitOption {
     key?: string | ((datum: Datum) => string);
@@ -15,6 +15,8 @@ export interface ICompilableMarkOption extends GrammarItemInitOption {
     skipBeforeLayouted?: boolean;
     support3d?: boolean;
     mode?: '2d' | '3d';
+    skipTheme?: boolean;
+    noSeparateStyle?: boolean;
 }
 export interface ICompilableMark extends IGrammarItem {
     readonly type: MarkType;
@@ -28,9 +30,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;

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,13 +6,14 @@ 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';
 import { type IComponentMark } from '../../mark/component';
 export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<string, any> = any> extends BaseComponent<T> implements IAxis {
     static specKey: string;
+    specKey: string;
     protected _orient: IPolarOrientType | IOrientType;
     getOrient(): IOrientType | IPolarOrientType;
     protected _scale: IBaseScale;
@@ -22,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[];
@@ -59,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

@@ -1,12 +1,13 @@
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IEffect, IModelInitOption, ILayoutRect } from '../../../model/interface';
+import type { IEffect, IModelInitOption } from '../../../model/interface';
 import type { ICartesianSeries } from '../../../series/interface';
 import type { IRegion } from '../../../region/interface';
 import type { ICartesianAxisCommonSpec, IAxisHelper, ICartesianAxisCommonTheme } from './interface';
 import type { IOrientType } from '../../../typings/space';
 import type { IBaseScale } from '@visactor/vscale';
-import type { LayoutItem } from '../../../model/layout-item';
-import type { IPoint, StringOrNumber } from '../../../typings';
+import type { StringOrNumber } from '../../../typings/common';
+import type { IPoint } from '../../../typings/coordinate';
+import type { ILayoutRect, ILayoutType } from '../../../typings/layout';
 import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import type { IAxis, ITick } from '../interface';
@@ -21,7 +22,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     protected readonly _defaultBandInnerPadding = 0.1;
     protected readonly _defaultBandOuterPadding = 0.3;
     directionStr?: 'l2r' | 'r2l' | 't2b' | 'b2t';
-    layoutType: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     layoutZIndex: number;
     layoutLevel: number;
     protected _dataSet: DataSet;
@@ -32,27 +33,12 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     };
     protected _orient: IOrientType;
     getOrient(): IOrientType;
-    get layoutOrient(): IOrientType;
-    set layoutOrient(v: 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;
@@ -66,6 +52,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     constructor(spec: T, options: IComponentOption);
     static createAxis(spec: any, options: IComponentOption, isHorizontal?: boolean): IAxis;
     static createComponent(spec: any, options: IComponentOption): IAxis | IAxis[];
+    initLayout(): void;
     setLayout3dBox(box3d: {
         width: number;
         height: number;
@@ -98,9 +85,12 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
         values: any[];
     }[];
     protected updateSeriesScale(): void;
-    setLayoutStartPosition(pos: Partial<IPoint>): void;
-    computeBoundsInRect(rect: ILayoutRect): ILayoutRect;
-    _boundsInRect(rect: ILayoutRect): IBoundsLike;
+    _transformLayoutPosition: (pos: Partial<IPoint>) => {
+        x: number;
+        y: number;
+    };
+    _transformLayoutRect: (result: ILayoutRect) => ILayoutRect;
+    getBoundsInRect(rect: ILayoutRect): IBoundsLike;
     updateLayoutAttribute(): void;
     private _getTitleLimit;
     private _getUpdateAttribute;

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/cartesian/interface/theme.d.ts

@@ -1,4 +1,4 @@
-import type { ILayoutPaddingSpec, ILayoutNumber } from '../../../../model/interface';
+import type { ILayoutNumber, ILayoutPaddingSpec } from '../../../../typings/layout';
 import type { ITick, IGrid } from '../../interface';
 import type { ICartesianAxisUnit, ICartesianDomainLine, ICartesianLabel, ICartesianTitle } from './common';
 import type { ICartesianAxisCommonSpec } from './spec';

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/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/axis/polar/axis.d.ts

@@ -1,10 +1,9 @@
 import type { IBaseScale } from '@visactor/vscale';
-import type { LayoutItem } from '../../../model/layout-item';
 import type { IPolarAxis, IPolarAxisCommonSpec, IPolarAxisCommonTheme } from './interface';
 import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import type { IPolarSeries } from '../../../series/interface';
-import type { IPoint, IPolarOrientType, IPolarPoint, StringOrNumber } from '../../../typings';
+import type { IPoint, IPolarOrientType, IPolarPoint, StringOrNumber, ILayoutType } from '../../../typings';
 import type { IEffect } from '../../../model/interface';
 import { AxisComponent } from '../base-axis';
 import type { ITick } from '../interface';
@@ -15,7 +14,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     protected readonly _defaultBandPosition = 0;
     protected readonly _defaultBandInnerPadding = 0;
     protected readonly _defaultBandOuterPadding = 0;
-    layoutType: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     layoutZIndex: number;
     protected _tick: ITick | undefined;
     protected _center: IPoint | null;
@@ -37,7 +36,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     static createComponent(spec: any, options: IComponentOption): IPolarAxis | IPolarAxis[];
     effect: IEffect;
     setAttrFromSpec(): void;
-    setLayoutStartPosition(pos: Partial<IPoint>): void;
+    _transformLayoutPosition: (pos: Partial<IPoint>) => Partial<IPoint>;
     onLayoutEnd(ctx: any): void;
     onRender(ctx: any): void;
     changeRegions(): void;

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

@@ -1,14 +1,15 @@
 import type { IGraphic, IGroup } from '@visactor/vrender-core';
-import { BaseModel } from '../../model/base-model';
 import type { IRegion } from '../../region/interface';
 import type { IComponent, IComponentOption } from '../interface';
 import type { BaseEventParams } from '../../event/interface';
 import type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';
+import type { IBoundsLike } from '@visactor/vutils';
 import type { IGroupMark } from '@visactor/vgrammar-core';
 import type { IAnimate } from '../../animation/interface';
-import type { Datum } from '../../typings';
+import type { Datum, ILayoutRect } from '../../typings';
 import type { IComponentSpec } from './interface';
-export declare abstract class BaseComponent<T extends IComponentSpec = IComponentSpec> extends BaseModel<T> implements IComponent {
+import { LayoutModel } from '../../model/layout-model';
+export declare abstract class BaseComponent<T extends IComponentSpec = IComponentSpec> extends LayoutModel<T> implements IComponent {
     name: string;
     readonly modelType: string;
     pluginService?: IComponentPluginService;
@@ -19,6 +20,7 @@ export declare abstract class BaseComponent<T extends IComponentSpec = IComponen
     created(): void;
     animate?: IAnimate;
     constructor(spec: T, options: IComponentOption);
+    initLayout(): void;
     abstract changeRegions(regions: IRegion[]): void;
     abstract getVRenderComponents(): IGraphic[];
     protected callPlugin(cb: (plugin: IComponentPlugin) => void): void;
@@ -41,5 +43,11 @@ export declare abstract class BaseComponent<T extends IComponentSpec = IComponen
     compile(): void;
     compileMarks(group?: string | IGroupMark): void;
     protected _delegateEvent: (component: IGraphic, event: any, type: string, item?: any, datum?: Datum) => void;
-    getGraphicBounds(): import("@visactor/vutils").IBoundsLike;
+    getGraphicBounds: () => {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+    };
+    getBoundsInRect(rect: ILayoutRect, fullRect: ILayoutRect): IBoundsLike;
 }

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

@@ -1,4 +1,3 @@
-import type { LayoutItem } from '../../model/layout-item';
 import { BaseComponent } from '../base/base-component';
 import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
@@ -10,12 +9,11 @@ import type { ISeries } from '../../series/interface';
 import type { IElement } from '@visactor/vgrammar-core';
 import type { BrushInteractiveRangeAttr, IBrush, IBrushSpec } from './interface';
 export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
-    layoutType: LayoutItem['layoutType'];
+    layoutType: 'none';
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutZIndex: LayoutItem['layoutZIndex'];
-    static speckey: string;
+    layoutZIndex: number;
     protected _brushComponents: BrushComponent[];
     protected _relativeRegions: IRegion[];
     protected _linkedSeries: ISeries[];

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

@@ -3,7 +3,6 @@ import type { IModelLayoutOption, IModelRenderOption } from '../../model/interfa
 import type { IRegion } from '../../region/interface';
 import { BaseComponent } from '../base/base-component';
 import type { IPadding, Maybe, StringOrNumber } from '../../typings';
-import type { LayoutItem } from '../../model/layout-item';
 import type { IComponentOption } from '../interface';
 import type { ICrossHair, CrossHairTrigger, ICartesianCrosshairSpec, IPolarCrosshairSpec, ICrosshairTheme, ICrosshairCategoryFieldSpec } from './interface';
 import type { IAxis } from '../axis/interface';
@@ -32,9 +31,9 @@ export interface IHair {
     };
 }
 export declare abstract class BaseCrossHair<T extends ICartesianCrosshairSpec | IPolarCrosshairSpec> extends BaseComponent<T> implements ICrossHair {
-    layoutType: LayoutItem['layoutType'];
-    gridZIndex: LayoutItem['layoutZIndex'];
-    labelZIndex: LayoutItem['layoutZIndex'];
+    layoutType: 'none';
+    gridZIndex: number;
+    labelZIndex: number;
     trigger: CrossHairTrigger;
     enable: boolean;
     showDefault: boolean;

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

@@ -7,6 +7,8 @@ import type { IGraphic } from '@visactor/vrender-core';
 import type { IAxis } from '../axis/interface';
 import type { StringOrNumber } from '../../typings';
 export declare class CartesianCrossHair<T extends ICartesianCrosshairSpec = ICartesianCrosshairSpec> extends BaseCrossHair<T> {
+    static specKey: string;
+    specKey: string;
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;

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

@@ -59,7 +59,7 @@ export interface ICrosshairLabelBackgroundSpec {
     minWidth?: number;
     maxWidth?: number;
     padding?: IPadding | number | number[];
-    style: Partial<IRectMarkSpec>;
+    style?: Partial<IRectMarkSpec>;
 }
 export interface ICrosshairDataBindSpec {
     bindingAxesIndex?: number[];

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

@@ -16,6 +16,8 @@ type IAxisInfo = Map<number, IBound & {
     axis: IPolarAxis;
 }>;
 export declare class PolarCrossHair<T extends IPolarCrosshairSpec = IPolarCrosshairSpec> extends BaseCrossHair<T> {
+    static specKey: string;
+    specKey: string;
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;

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

@@ -3,15 +3,14 @@ import { ComponentTypeEnum } from '../interface/type';
 import type { IComponentOption } from '../interface';
 import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption } from '../../model/interface';
-import type { LayoutItem } from '../../model/layout-item';
 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: LayoutItem['layoutType'];
-    layoutZIndex: LayoutItem['layoutZIndex'];
+    layoutType: 'none';
+    layoutZIndex: number;
     layoutLevel: number;
     protected _spec: (ICustomMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | ICustomMarkGroupSpec)[];
     static createComponent(spec: any, options: IComponentOption): CustomMark[];

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

@@ -1,8 +1,7 @@
 import { BaseComponent } from '../base/base-component';
-import type { IEffect, IModelInitOption, ILayoutRect } from '../../model/interface';
-import type { LayoutItem } from '../../model/layout-item';
+import type { IEffect, IModelInitOption } from '../../model/interface';
 import type { IComponent, IComponentOption } from '../interface';
-import type { AdaptiveSpec, IOrientType, StringOrNumber } from '../../typings';
+import type { AdaptiveSpec, ILayoutRect, ILayoutType, IOrientType, StringOrNumber } from '../../typings';
 import type { IBaseScale } from '@visactor/vscale';
 import type { ICartesianBandAxisSpec } from '../axis/cartesian';
 import type { IBoundsLike } from '@visactor/vutils';
@@ -10,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: LayoutItem['layoutType'];
+    layoutType: ILayoutType | 'none';
     protected _component: AbstractComponent;
     protected _orient: IOrientType;
     protected _isHorizontal: boolean;
@@ -20,8 +20,6 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _cacheRect?: ILayoutRect;
     protected _cacheVisibility?: boolean;
     get orient(): IOrientType;
-    get layoutOrient(): IOrientType;
-    set layoutOrient(v: IOrientType);
     protected _stateScale: IBaseScale;
     protected _relatedAxisComponent: IComponent;
     protected _originalStateFields: Record<number, string | number>;
@@ -68,6 +66,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     get visible(): boolean;
     constructor(spec: T, options: IComponentOption);
     created(): void;
+    initLayout(): void;
     protected _setAxisFromSpec(): void;
     protected _setRegionsFromSpec(): void;
     onDataUpdate(): void;
@@ -96,7 +95,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected update(ctx: IComponentOption): void;
     protected resize(ctx: IComponentOption): void;
     protected _parseDomainFromState(startValue: number | string, endValue: number | string): any;
-    protected _handleStateChange: (startValue: number, endValue: number) => boolean;
+    protected _handleStateChange: (startValue: number, endValue: number, tag?: string) => boolean;
     protected _handleChartZoom: (params: {
         zoomDelta: number;
         zoomX?: number;
@@ -110,7 +109,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _handleChartMove: (value: number, rate: number) => void;
     protected _initCommonEvent(): void;
     updateLayoutAttribute(): void;
-    _boundsInRect(rect: ILayoutRect): IBoundsLike;
+    getBoundsInRect(rect: ILayoutRect): IBoundsLike;
     hide(): void;
     show(): void;
     protected _getAxisBandSize(axisSpec?: ICartesianBandAxisSpec): {
@@ -119,4 +118,5 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
         minBandSize: number;
     };
     protected _autoUpdate(rect?: ILayoutRect): boolean;
+    getVRenderComponents(): IGraphic[];
 }