@visactor/vchart-types 1.8.8-alpha.1 → 1.8.10-alpha.0

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

@@ -39,7 +39,7 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     protected abstract axisHelper(): any;
     protected abstract getSeriesStatisticsField(s: ISeries): string[];
     protected abstract updateSeriesScale(): void;
-    protected abstract collectData(depth: number): {
+    protected abstract collectData(depth: number, rawData?: boolean): {
         min: number;
         max: number;
         values: any[];
@@ -61,6 +61,7 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     };
     protected initEvent(): void;
     protected updateScaleDomain(): void;
+    protected _clearRawDomain(): void;
     protected computeData(updateType?: 'domain' | 'range' | 'force'): void;
     protected initScales(): void;
     _compareSpec(spec: T, prevSpec: T): {

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

@@ -3,7 +3,7 @@ import type { IEffect, IModelInitOption, IModelSpecInfo } from '../../../model/i
 import type { ICartesianSeries } from '../../../series/interface';
 import type { IRegion } from '../../../region/interface';
 import type { ICartesianAxisCommonSpec, IAxisHelper } from './interface';
-import type { IOrientType } from '../../../typings/space';
+import type { IOrientType, IRect } from '../../../typings/space';
 import type { IBaseScale } from '@visactor/vscale';
 import type { StringOrNumber } from '../../../typings/common';
 import type { IPoint } from '../../../typings/coordinate';
@@ -50,6 +50,12 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
         height: number;
         _lastComputeOutBounds: IBoundsLike;
     };
+    protected _innerOffset: {
+        top: number;
+        bottom: number;
+        left: number;
+        right: number;
+    };
     constructor(spec: T, options: IComponentOption);
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     static createComponent(specInfo: IModelSpecInfo, options: IComponentOption): IAxis;
@@ -69,6 +75,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     protected updateScaleRange(): boolean;
     init(option: IModelInitOption): void;
     setAttrFromSpec(): void;
+    onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, ctx: any): void;
     protected getSeriesStatisticsField(s: ICartesianSeries): string[];
     protected _tickTransformOption(coordinateType: CoordinateType): ICartesianTickDataOpt;
     protected _initData(): void;
@@ -80,7 +87,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     update(ctx: IComponentOption): void;
     resize(ctx: IComponentOption): void;
     protected collectScale(): IBaseScale[];
-    protected collectData(depth?: number): {
+    protected collectData(depth?: number, rawData?: boolean): {
         min: number;
         max: number;
         values: any[];

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

@@ -1,10 +1,26 @@
-import type { IOrientType, IRectMarkSpec, StringOrNumber } from '../../../../typings';
+import type { ILayoutNumber, IRectMarkSpec, StringOrNumber } from '../../../../typings';
 import type { IBandAxisSpec, ILinearAxisSpec, IGrid, ICommonAxisSpec } from '../../interface';
 import type { ICartesianDomainLine, ICartesianLabel, ITimeLayerType, ICartesianTitle, ICartesianAxisUnit } from './common';
 import type { AxisItemStateStyle } from '@visactor/vrender-components';
 export type ICartesianAxisSpec = ICartesianLinearAxisSpec | ICartesianBandAxisSpec | ICartesianTimeAxisSpec | ICartesianLogAxisSpec | ICartesianSymlogAxisSpec;
+export type ICartesianVertical = {
+    orient: 'left' | 'right';
+    innerOffset?: {
+        top?: ILayoutNumber;
+        bottom?: ILayoutNumber;
+    };
+};
+export type ICartesianHorizontal = {
+    orient: 'top' | 'bottom';
+    innerOffset?: {
+        left?: ILayoutNumber;
+        right?: ILayoutNumber;
+    };
+};
+export type ICartesianZ = {
+    orient: 'z';
+};
 export type ICartesianAxisCommonSpec = ICommonAxisSpec & {
-    orient: IOrientType;
     grid?: IGrid;
     subGrid?: IGrid;
     domainLine?: ICartesianDomainLine;
@@ -19,7 +35,7 @@ export type ICartesianAxisCommonSpec = ICommonAxisSpec & {
     mode?: '2d' | '3d';
     depth?: number;
     unit?: ICartesianAxisUnit;
-};
+} & (ICartesianVertical | ICartesianHorizontal | ICartesianZ);
 export interface ILinearAxisSync {
     axisId: StringOrNumber;
     zeroAlign?: boolean;

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

@@ -11,7 +11,7 @@ export interface BandAxisMixin {
     _defaultBandOuterPadding: number;
     event: IEvent;
     isSeriesDataEnable: () => boolean;
-    collectData: (depth: number) => {
+    collectData: (depth: number, rawData?: boolean) => {
         min: number;
         max: number;
         values: any[];
@@ -24,6 +24,9 @@ export interface BandAxisMixin {
     transformScaleDomain: () => void;
 }
 export declare class BandAxisMixin {
+    protected _rawDomainIndex: {
+        [key: string | number | symbol]: number;
+    }[];
     dataToPosition(values: any[], cfg?: IAxisLocationCfg): number;
     valueToPosition(value: any): number;
     updateGroupScaleRange(): void;
@@ -38,4 +41,6 @@ export declare class BandAxisMixin {
         values: any[];
     }[]): StringOrNumber[];
     protected updateScaleDomain(): void;
+    protected _updateRawDomain(): void;
+    protected _clearRawDomain(): void;
 }

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

@@ -1,6 +1,8 @@
 import type { LinearScale } from '@visactor/vscale';
 import type { IAxisLocationCfg, ITick } from '../interface';
 import type { IEvent } from '../../../event/interface';
+import type { IOrientType } from '../../../typings/space';
+import type { IComponentOption } from '../../interface/common';
 export declare const e10: number;
 export declare const e5: number;
 export declare const e2: number;
@@ -21,8 +23,14 @@ export interface LinearAxisMixin {
     _tick: ITick | undefined;
     isSeriesDataEnable: any;
     computeDomain: any;
-    collectData: any;
+    collectData: (depth?: number) => {
+        min: number;
+        max: number;
+        values: any[];
+    }[];
     event: IEvent;
+    _orient: IOrientType;
+    _option: IComponentOption;
 }
 export declare class LinearAxisMixin {
     protected _extend: {

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

@@ -44,7 +44,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     protected _tickTransformOption(coordinateType: CoordinateType): IPolarTickDataOpt;
     afterCompile(): void;
     protected updateScaleRange(): boolean;
-    protected collectData(depth: number): {
+    protected collectData(depth: number, rawData?: boolean): {
         min: number;
         max: number;
         values: any[];

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

@@ -106,7 +106,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _handleChartScroll: (params: {
         scrollX: number;
         scrollY: number;
-    }, e: BaseEventParams['event']) => void;
+    }, e: BaseEventParams['event']) => boolean;
     protected _handleChartDrag: (delta: [number, number], e: BaseEventParams['event']) => void;
     protected _handleChartMove: (value: number, rate: number) => void;
     protected _initCommonEvent(): void;

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

@@ -29,6 +29,7 @@ export declare class GeoCoordinate extends BaseComponent<IGeoRegionSpec> impleme
     }>;
     private _actualScale;
     getZoom(): number;
+    private _initialScale;
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     effect: IEffect;
     setAttrFromSpec(): void;

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

@@ -2,7 +2,24 @@ import type { utilFunctionCtx } from '../typings/params';
 import type { IChart } from '../chart/interface/chart';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IBaseLayout, ILayoutItem } from './interface';
-import type { IPadding, IRect } from '../typings/space';
+import type { IOrientType, IPadding, IRect } from '../typings/space';
+import type { ILayoutRect } from '../typings/layout';
+export type LayoutSideType = {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+};
+export interface IOffset {
+    offsetLeft: number;
+    offsetRight: number;
+    offsetTop: number;
+    offsetBottom: number;
+}
+type overlapInfo = {
+    items: ILayoutItem[];
+    rect: ILayoutRect;
+};
 export declare class Layout implements IBaseLayout {
     static type: string;
     leftCurrent: number;
@@ -13,10 +30,36 @@ export declare class Layout implements IBaseLayout {
     _chartViewBox: IBoundsLike;
     protected _onError: (msg: string) => void;
     constructor(_spec?: unknown, ctx?: utilFunctionCtx);
+    protected _layoutInit(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void;
+    protected _layoutNormalItems(items: ILayoutItem[]): void;
+    protected _groupItems(items: ILayoutItem[]): {
+        regionItems: ILayoutItem[];
+        relativeItems: ILayoutItem[];
+        relativeOverlapItems: ILayoutItem[];
+        allRelatives: ILayoutItem[];
+        overlapItems: {
+            left: overlapInfo;
+            top: overlapInfo;
+            right: overlapInfo;
+            bottom: overlapInfo;
+            z: overlapInfo;
+        };
+    };
     layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void;
+    protected _processAutoIndent(regionItems: ILayoutItem[], relativeItems: ILayoutItem[], relativeOverlapItems: ILayoutItem[], overlapItems: {
+        [key in IOrientType]: overlapInfo;
+    }, allRelatives: ILayoutItem[], layoutTemp: LayoutSideType): void;
     protected layoutNormalItems(normalItems: ILayoutItem[]): void;
     protected layoutNormalInlineItems(normalItems: ILayoutItem[]): void;
-    protected layoutRegionItems(regionItems: ILayoutItem[], regionRelativeItems: ILayoutItem[]): void;
+    protected _layoutRelativeOverlap(orient: IOrientType, info: overlapInfo): void;
+    protected _layoutRelativeItem(item: ILayoutItem, layoutRect: ILayoutRect): void;
+    protected _layoutRegionItem(regionItems: ILayoutItem[], regionRelativeTotalWidth: number, regionRelativeTotalHeight: number): {
+        regionHeight: number;
+        regionWidth: number;
+    };
+    protected layoutRegionItems(regionItems: ILayoutItem[], regionRelativeItems: ILayoutItem[], regionRelativeOverlapItems: ILayoutItem[], overlapItems?: {
+        [key in IOrientType]: overlapInfo;
+    }): void;
     protected layoutAbsoluteItems(absoluteItems: ILayoutItem[]): void;
     filterRegionsWithID(items: ILayoutItem[], id: number): ILayoutItem;
     getItemComputeLayoutRect(item: ILayoutItem): {
@@ -31,3 +74,4 @@ export declare class Layout implements IBaseLayout {
     }): IPadding;
     private _getOutInLayout;
 }
+export {};

package/types/layout/interface.d.ts

@@ -1,6 +1,6 @@
 import type { IBoundsLike } from '@visactor/vutils';
 import type { StringOrNumber } from '../typings/common';
-import type { IOrientType, IPadding, IRect } from '../typings/space';
+import type { IOrientType, IRect } from '../typings/space';
 import type { IPoint } from '../typings/coordinate';
 import type { ILayoutNumber, ILayoutPaddingSpec, ILayoutPoint, ILayoutRect, ILayoutType } from '../typings/layout';
 import type { ILayoutModel } from '../model/interface';
@@ -56,8 +56,6 @@ export interface ILayoutItem {
     layoutPaddingTop: number;
     layoutPaddingRight: number;
     layoutPaddingBottom: number;
-    indent: IPadding;
-    layoutExcludeIndent: IRect;
     layoutOffsetX: number;
     layoutOffsetY: number;
     layoutLevel: number;
@@ -89,7 +87,6 @@ export interface ILayoutItemSpec {
     layoutLevel?: number;
     orient?: IOrientType;
     padding?: ILayoutPaddingSpec;
-    indent?: ILayoutPaddingSpec;
     noOuterPadding?: boolean;
     width?: ILayoutNumber;
     maxWidth?: ILayoutNumber;

package/types/layout/layout-item.d.ts

@@ -1,5 +1,5 @@
 import type { ILayoutModel } from './../model/interface';
-import type { IPadding, IRect, IPoint } from '../typings';
+import type { IRect, IPoint } from '../typings';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { ILayoutItem, ILayoutItemInitOption, ILayoutItemSpec } from './interface';
 import type { IChartLayoutOption } from '../chart/interface/common';
@@ -39,10 +39,6 @@ export declare class LayoutItem implements ILayoutItem {
     layoutPaddingTop: ILayoutItem['layoutPaddingTop'];
     layoutPaddingRight: ILayoutItem['layoutPaddingRight'];
     layoutPaddingBottom: ILayoutItem['layoutPaddingBottom'];
-    protected _indent: IPadding;
-    get indent(): IPadding;
-    private _layoutExcludeIndent;
-    get layoutExcludeIndent(): IRect;
     layoutOffsetX: ILayoutItem['layoutOffsetX'];
     layoutOffsetY: ILayoutItem['layoutOffsetY'];
     layoutLevel: ILayoutItem['layoutLevel'];

package/types/layout/layout3d/index.d.ts

@@ -2,18 +2,12 @@ import type { IChart } from '../../chart/interface/chart';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IRect } from '../../typings/space';
 import type { IBaseLayout, ILayoutItem } from '../interface';
+import type { IOffset } from '../base-layout';
 import { Layout } from '../base-layout';
-interface IOffset {
-    offsetLeft: number;
-    offsetRight: number;
-    offsetTop: number;
-    offsetBottom: number;
-}
 export declare class Layout3d extends Layout implements IBaseLayout {
     static type: string;
     layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void;
     protected layoutZAxisItems(zItems: ILayoutItem[], zRect: IRect): void;
-    protected layoutRegionItems(regionItems: ILayoutItem[], regionRelativeItems: ILayoutItem[], extraOffset?: IOffset): void;
     getItemComputeLayoutRect(item: ILayoutItem, extraOffset?: IOffset): {
         width: number;
         height: number;
@@ -26,4 +20,3 @@ export declare class Layout3d extends Layout implements IBaseLayout {
     };
 }
 export declare const registerLayout3d: () => void;
-export {};

package/types/model/base-model-transformer.d.ts

@@ -14,7 +14,8 @@ export declare class BaseModelSpecTransformer<T extends IModelSpec, K> implement
         spec: T;
         theme: K;
     };
-    protected _transformSpec(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): void;
+    protected _transformSpecBeforeMergingTheme(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): void;
+    protected _transformSpecAfterMergingTheme(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): void;
     protected _mergeThemeToSpec(spec: T, chartSpec: any): {
         spec: T;
         theme: K;

package/types/model/interface.d.ts

@@ -89,8 +89,6 @@ export interface ILayoutModel extends IModel {
     setLayoutStartPosition: (pos: Partial<IPoint>) => void;
     getLayoutRect: () => ILayoutRect;
     setLayoutRect: (rect: Partial<ILayoutRect>, levelMap?: Partial<ILayoutRect>) => void;
-    getLayoutPositionExcludeIndent: () => IPoint;
-    getLayoutRectExcludeIndent: () => ILayoutRect;
     getLastComputeOutBounds: () => IBoundsLike;
     getBoundsInRect: (rect: ILayoutRect, fullRect: ILayoutRect) => IBoundsLike;
     afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;

package/types/model/layout-model.d.ts

@@ -23,14 +23,6 @@ export declare abstract class LayoutModel<T extends IModelSpec> extends BaseMode
     onLayoutEnd(ctx: any): void;
     afterSetLayoutStartPoint(_pos: ILayoutPoint): void;
     protected _forceLayout(): void;
-    getLayoutPositionExcludeIndent(): {
-        x: number;
-        y: number;
-    };
-    getLayoutRectExcludeIndent(): {
-        width: number;
-        height: number;
-    };
     getLayoutStartPoint(): IPoint;
     setLayoutStartPosition(pos: Partial<IPoint>): any;
     getLayoutRect(): ILayoutRect;

package/types/series/area/area-transformer.d.ts

@@ -1,5 +1,7 @@
+import type { IChartSpecInfo } from '../../chart/interface';
 import { LineLikeSeriesSpecTransformer } from '../mixin/line-mixin-transformer';
 import type { IAreaSeriesSpec, IAreaSeriesTheme } from './interface';
 export declare class AreaSeriesSpecTransformer<T extends IAreaSeriesSpec = IAreaSeriesSpec, K extends IAreaSeriesTheme = IAreaSeriesTheme> extends LineLikeSeriesSpecTransformer<T, K> {
     protected _transformLabelSpec(spec: T): void;
+    protected _transformSpecAfterMergingTheme(spec: T, chartSpec: any, chartSpecInfo?: IChartSpecInfo): void;
 }

package/types/series/area/area.d.ts

@@ -19,7 +19,6 @@ export declare class AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> ext
     protected _areaMark: IAreaMark;
     protected _supportStack: boolean;
     protected _sortDataByAxis: boolean;
-    setAttrFromSpec(): void;
     initMark(): void;
     initMarkStyle(): void;
     initAnimation(): void;

package/types/typings/layout.d.ts

@@ -13,7 +13,7 @@ export type IPercentOffset = {
     offset?: number;
 };
 export type ILayoutPercent = IPercent | number;
-export type ILayoutType = 'region-relative' | 'region' | 'normal' | 'absolute' | 'normal-inline';
+export type ILayoutType = 'region-relative' | 'region-relative-overlap' | 'region' | 'normal' | 'absolute' | 'normal-inline';
 export type ILayoutOrientPadding = {
     left?: ILayoutNumber;
     right?: ILayoutNumber;