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

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';
@@ -82,7 +82,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     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[];

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

@@ -4,13 +4,13 @@ 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 { 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 = {

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, Datum, StringOrNumber } from '../../typings';
+import type { Maybe, StringOrNumber } from '../../typings';
 import type { IMarkProgressiveConfig, IMarkStateStyle, MarkType } from '../../mark/interface';
 import type { IModel } from '../../model/interface';
 import { MarkStateManager } from './mark-state-manager';
@@ -95,7 +95,6 @@ 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/component/axis/base-axis.d.ts

@@ -13,6 +13,7 @@ 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;

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,8 +33,6 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     };
     protected _orient: IOrientType;
     getOrient(): IOrientType;
-    get layoutOrient(): IOrientType;
-    set layoutOrient(v: IOrientType);
     protected _scales: IBaseScale[];
     getScales(): IBaseScale[];
     protected _theme: ICartesianAxisCommonTheme;
@@ -63,6 +62,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;
@@ -95,9 +95,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/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/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';
@@ -9,13 +8,13 @@ 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: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     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

@@ -2,8 +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 { IPadding, Maybe, StringOrNumber } from '../../typings';
-import type { LayoutItem } from '../../model/layout-item';
+import type { ILayoutType, 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';
@@ -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: ILayoutType;
+    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 { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec, ILayoutType } 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: ILayoutType;
+    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';
@@ -11,7 +10,7 @@ import type { IDataFilterComponent, IDataFilterComponentSpec, IRoamDragSpec, IRo
 import type { BaseEventParams } from '../../event/interface';
 import type { AbstractComponent } from '@visactor/vrender-components';
 export declare abstract class DataFilterBaseComponent<T extends IDataFilterComponentSpec = IDataFilterComponentSpec> extends BaseComponent<AdaptiveSpec<T, 'width' | 'height'>> implements IDataFilterComponent {
-    layoutType: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     protected _component: AbstractComponent;
     protected _orient: IOrientType;
     protected _isHorizontal: boolean;
@@ -20,8 +19,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 +65,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 +94,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 +108,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): {

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

@@ -36,7 +36,7 @@ export declare class DataZoom<T extends IDataZoomSpec = IDataZoomSpec> extends D
     protected _dataToPositionY: (datum: Datum) => number;
     protected _dataToPositionY2: (datum: Datum) => number;
     protected _createOrUpdateComponent(): void;
-    protected _handleChange(start: number, end: number, updateComponent?: boolean): void;
+    protected _handleChange(start: number, end: number, updateComponent?: boolean, tag?: string): void;
     protected _handleDataCollectionChange(): void;
     protected _getComponentAttrs(): {
         backgroundStyle: IRectGraphicAttribute;

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

@@ -50,6 +50,7 @@ export interface IDataZoomSpec extends IDataZoomStyle, IDataFilterComponentSpec
         formatMethod?: (text: string | number) => string | string[];
     };
     brushSelect?: boolean;
+    ignoreBandSize?: boolean;
 }
 export type IDataZoomTheme = IComponentSpec & IDataZoomStyle & {
     orient?: IDataZoomSpec['orient'];

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

@@ -1,4 +1,4 @@
-import type { ILayoutItemSpec } from '../../../model/interface';
+import type { ILayoutItemSpec } from '../../../layout/interface';
 import type { IPadding } from '../../../typings';
 import type { IRectMarkSpec } from '../../../typings/visual';
 import type { IFilterMode } from '../constant';

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

@@ -1,19 +1,20 @@
 import type { IPoint } from '../../typings/coordinate';
 import { Projection } from './projection';
-import type { IEffect, IModelLayoutOption, IModelRenderOption, ILayoutItem } from '../../model/interface';
+import type { IEffect, IModelLayoutOption, IModelRenderOption } from '../../model/interface';
 import type { IComponentOption } from '../interface';
 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, StringOrNumber } from '../../typings';
+import type { IChartSpec, ILayoutType, 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: ILayoutItem['layoutType'];
+    layoutType: ILayoutType;
+    protected layoutZIndex: number;
     _longitudeField?: string;
     get longitudeField(): string;
     _latitudeField?: string;

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

@@ -1,17 +1,15 @@
 import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
-import type { LayoutItem } from '../../model/layout-item';
 import { BaseComponent } from '../base/base-component';
 import type { IRegion } from '../../region/interface';
 import type { IIndicator, IIndicatorSpec, IIndicatorTheme } from './interface';
-import type { Maybe } from '../../typings';
+import type { ILayoutType, Maybe } from '../../typings';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare class Indicator<T extends IIndicatorSpec> extends BaseComponent<T> implements IIndicator {
-    static speckey: string;
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: LayoutItem['layoutType'];
+    layoutType: ILayoutType;
     layoutZIndex: number;
     layoutLevel: number;
     private _gap;

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

@@ -1,4 +1,4 @@
-import type { IPercent } from '../../model/interface';
+import type { IPercent } from '../../typings/layout';
 import type { ConvertToMarkStyleSpec, ITextMarkSpec } from '../../typings/visual';
 import type { IComponentSpec } from '../base/interface';
 import type { IComponent } from '../interface';

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

@@ -1,6 +1,6 @@
 import type { ISeriesFilter } from '../../region/interface';
 import type { IAnimate } from '../../animation/interface';
-import type { ILayoutItem, IModel, IModelOption } from '../../model/interface';
+import type { ILayoutModel, IModelOption } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { ISeries } from '../../series/interface';
 import type { StringOrNumber } from '../../typings';
@@ -10,7 +10,6 @@ export interface IComponentOption extends IModelOption {
     getRegionsInIndex: (index?: number[]) => IRegion[];
     getRegionsInIds: (ids: number[]) => IRegion[];
     getRegionsInUserIdOrIndex: (user_ids?: StringOrNumber[], index?: number[]) => IRegion[];
-    defaultSpec?: any;
     getAllSeries: () => ISeries[];
     getSeriesInIndex: (index?: number[]) => ISeries[];
     getSeriesInIds: (ids?: number[]) => ISeries[];
@@ -20,7 +19,7 @@ export interface IComponentOption extends IModelOption {
     getComponentByUserId: (userId: StringOrNumber) => IComponent | undefined;
     getComponentsByKey: (key: string) => IComponent[];
 }
-export interface IComponent extends IModel, ILayoutItem {
+export interface IComponent extends ILayoutModel {
     readonly name: string;
     readonly animate?: IAnimate;
     getRegions: () => IRegion[];
@@ -31,6 +30,7 @@ export interface IComponent extends IModel, ILayoutItem {
 }
 export interface IComponentConstructor {
     type: string;
+    specKey?: string;
     createComponent: (spec: any, options: IComponentOption) => IComponent | IComponent[] | undefined;
     new (spec: any, options: IComponentOption): IComponent;
 }

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

@@ -3,15 +3,15 @@ import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption } from '../../model/interface';
-import type { LayoutItem } from '../../model/layout-item';
 import type { ILabelSpec } from './interface';
 import type { IGraphic } from '@visactor/vrender-core';
+import type { ILayoutType } from '../../typings/layout';
 export declare abstract class BaseLabelComponent<T extends ILabelSpec = ILabelSpec> extends BaseComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: LayoutItem['layoutType'];
-    layoutZIndex: LayoutItem['layoutZIndex'];
+    layoutType: ILayoutType;
+    layoutZIndex: number;
     constructor(spec: T, options: IComponentOption);
     protected _interactiveConfig(labelSpec: ILabelSpec): {
         hover: boolean;
@@ -26,7 +26,6 @@ export declare abstract class BaseLabelComponent<T extends ILabelSpec = ILabelSp
         hover: boolean;
         select: boolean;
     };
-    setLayoutStartPosition(): void;
     _compareSpec(): {
         change: boolean;
         reMake: boolean;

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

@@ -2,7 +2,6 @@ import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelInitOption } from '../../model/interface';
-import type { LayoutItem } from '../../model/layout-item';
 import type { ISeries } from '../../series/interface';
 import { type ILabel, type IMark } from '@visactor/vgrammar-core';
 import { type IComponentMark } from '../../mark/component';
@@ -11,6 +10,7 @@ import type { IGroup } from '@visactor/vrender-core';
 import type { ILabelSpec } from './interface';
 import { type ILabelMark } from '../../mark/label';
 import type { ICompilableMark } from '../../compile/mark';
+import type { ILayoutType } from '../../typings/layout';
 export interface ILabelInfo {
     baseMark: ICompilableMark;
     labelMark: ILabelMark;
@@ -25,8 +25,8 @@ export declare class Label<T extends ILabelSpec = ILabelSpec> extends BaseLabelC
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: LayoutItem['layoutType'];
-    layoutZIndex: LayoutItem['layoutZIndex'];
+    layoutType: ILayoutType;
+    layoutZIndex: number;
     protected _labelInfoMap: Map<IRegion, ILabelInfo[]>;
     protected _labelComponentMap: Map<IComponentMark, ILabelInfo | ILabelInfo[]>;
     protected _layoutRule: 'series' | 'region';

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

@@ -1,17 +1,17 @@
 import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
-import type { LayoutItem } from '../../model/layout-item';
 import type { MarkType } from '../../mark/interface';
 import type { ISeries } from '../../series/interface';
 import { BaseLabelComponent } from './base-label';
 import type { ITotalLabelSpec, ITotalLabelTheme } from './interface';
 import type { IModelInitOption } from '../../model/interface';
+import type { ILayoutType } from '../../typings';
 export declare class TotalLabel extends BaseLabelComponent {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: LayoutItem['layoutType'];
-    layoutZIndex: LayoutItem['layoutZIndex'];
+    layoutType: ILayoutType;
+    layoutZIndex: number;
     private _textMark?;
     private _baseMark?;
     series: ISeries;

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

@@ -1,15 +1,14 @@
 import type { DataView } from '@visactor/vdataset';
 import type { IRegion } from '../../region/interface';
 import { BaseComponent } from '../base/base-component';
-import type { IEffect, ILayoutRect } from '../../model/interface';
-import type { LayoutItem } from '../../model/layout-item';
-import type { IOrientType, IPoint, StringOrNumber } from '../../typings';
+import type { IEffect } from '../../model/interface';
+import type { ILayoutRect, ILayoutType, IOrientType, IPoint, StringOrNumber } from '../../typings';
 import { CompilableData } from '../../compile/data/compilable-data';
 import type { ILegend, ILegendCommonSpec } from './interface';
 import type { IGraphic, IGroup } from '@visactor/vrender-core';
 export declare abstract class BaseLegend<T extends ILegendCommonSpec> extends BaseComponent<T> implements ILegend {
-    layoutType: LayoutItem['layoutType'];
-    layoutZIndex: LayoutItem['layoutZIndex'];
+    layoutType: ILayoutType;
+    layoutZIndex: number;
     layoutLevel: number;
     protected _orient: IOrientType;
     get orient(): IOrientType;
@@ -17,8 +16,6 @@ export declare abstract class BaseLegend<T extends ILegendCommonSpec> extends Ba
     get visible(): boolean;
     protected _position: 'start' | 'middle' | 'end';
     get position(): "middle" | "start" | "end";
-    get layoutOrient(): IOrientType;
-    set layoutOrient(v: IOrientType);
     protected _legendData: CompilableData;
     getLegendData(): any;
     private _preSelectedData;
@@ -50,8 +47,8 @@ export declare abstract class BaseLegend<T extends ILegendCommonSpec> extends Ba
     private _bindLegendDataChange;
     protected initData(): void;
     setSelectedData(selectedData: StringOrNumber[]): void;
-    setLayoutStartPosition(pos: Partial<IPoint>): void;
-    _boundsInRect(rect: ILayoutRect, fullSpace: ILayoutRect): {
+    afterSetLayoutStartPoint(pos: IPoint): void;
+    getBoundsInRect(rect: ILayoutRect, fullSpace: ILayoutRect): {
         x1: number;
         y1: number;
         x2: number;

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

@@ -1,11 +1,14 @@
 import { DataView } from '@visactor/vdataset';
-import type { IModelInitOption, ILayoutRect } from '../../../model/interface';
+import type { IModelInitOption } from '../../../model/interface';
 import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import type { ILegend } from '../interface';
 import type { IColorLegendSpec, IColorLegendTheme, ISizeLegendSpec } from './interface';
 import { BaseLegend } from '../base-legend';
+import type { ILayoutRect } from '../../../typings/layout';
 export declare class ContinuousLegend<T extends IColorLegendSpec | ISizeLegendSpec = IColorLegendSpec | ISizeLegendSpec> extends BaseLegend<T> {
+    static specKey: string;
+    specKey: string;
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;