@visactor/vchart-types 1.7.2 → 1.7.4

package/types/component/marker/mark-point/interface/spec.d.ts

@@ -1,15 +1,17 @@
-import type { IPoint } from '../../../../typings';
 import type { IComponent } from '../../../interface';
-import type { IDataPointSpec, IMarkerSpec, IMarkerSymbol } from '../../interface';
+import type { IDataPointSpec, IDataPos, IDataPosCallback, IMarkerSpec, IMarkerSymbol, MarkerPositionPoint, OffsetPoint } from '../../interface';
 import type { IMarkPointTheme } from './theme';
 export type IMarkPoint = IComponent;
-export type IMarkPointSpec = IMarkerSpec & (IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme<IMarkerSymbol>;
+export type IMarkPointSpec = IMarkerSpec & (IMarkPointXYSpec | IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme<IMarkerSymbol>;
+export type IMarkPointXYSpec = {
+    y: IDataPos | IDataPosCallback;
+    x: IDataPos | IDataPosCallback;
+};
 export type IMarkPointCoordinateSpec = {
     coordinates: IDataPointSpec;
-    relativeRelativeSeriesIndex?: number;
-    relativeRelativeSeriesId?: string;
+    coordinatesOffset?: OffsetPoint;
 };
 export type IMarkPointPositionsSpec = {
-    position: IPoint;
+    position: MarkerPositionPoint;
     regionRelative?: boolean;
 };

package/types/component/marker/mark-point/mark-point.d.ts

@@ -3,7 +3,8 @@ import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import { MarkPoint as MarkPointComponent } from '@visactor/vrender-components';
 import { BaseMarker } from '../base-marker';
-export declare class MarkPoint extends BaseMarker<IMarkPointSpec & IMarkPointTheme> implements IMarkPoint {
+import type { IGroup } from '@visactor/vrender-core';
+export declare class MarkPoint extends BaseMarker<IMarkPointSpec> implements IMarkPoint {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
@@ -11,7 +12,7 @@ export declare class MarkPoint extends BaseMarker<IMarkPointSpec & IMarkPointThe
     protected _theme: IMarkPointTheme;
     protected _markerComponent: MarkPointComponent;
     static createComponent(spec: any, options: IComponentOption): MarkPoint | MarkPoint[];
-    protected _createMarkerComponent(): void;
+    protected _createMarkerComponent(): IGroup;
     protected _markerLayout(): void;
     protected _initDataView(): void;
 }

package/types/component/marker/utils.d.ts

@@ -1,5 +1,16 @@
-import type { ICartesianSeries } from '../../series/interface';
+import type { ICartesianSeries, ISeries } from '../../series/interface';
 import type { DataView } from '@visactor/vdataset';
 import type { IPoint } from '../../typings';
+import type { IDataPos, MarkerPositionPoint } from './interface';
+import type { IRegion } from '../../region/interface';
+import type { OffsetPoint } from './interface';
+export declare function isAggrSpec(spec: IDataPos): boolean;
 export declare function xyLayout(data: DataView, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries, relativeSeries: ICartesianSeries, autoRange: boolean): IPoint[][];
-export declare function coordinateLayout(data: DataView, relativeSeries: ICartesianSeries, autoRange: boolean): IPoint[];
+export declare function coordinateLayout(data: DataView, relativeSeries: ICartesianSeries, autoRange: boolean, coordinatesOffset: OffsetPoint[] | OffsetPoint): IPoint[];
+export declare function positionLayout(positions: MarkerPositionPoint[], series: ISeries, regionRelative: boolean): IPoint[];
+export declare function computeClipRange(regions: IRegion[]): {
+    minX: number;
+    maxX: number;
+    minY: number;
+    maxY: number;
+};

package/types/constant/index.d.ts

@@ -45,7 +45,8 @@ export declare enum LayoutZIndex {
     Title = 500,
     Label = 500,
     Brush = 500,
-    CustomMark = 500
+    CustomMark = 500,
+    Interaction = 700
 }
 export declare enum LayoutLevel {
     Indicator = 10,

package/types/data/transforms/aggregation.d.ts

@@ -15,7 +15,7 @@ export type IOptionSeries = {
     getStartRelativeSeries: () => ICartesianSeries;
     getEndRelativeSeries: () => ICartesianSeries;
 };
-export type IOptionCallback = (relativeSeriesData: any, startRelativeSeriesData: any, endRelativeSeriesData: any) => IOptionPos;
+export type IOptionCallback = (relativeSeriesData: any, startRelativeSeriesData: any, endRelativeSeriesData: any, relativeSeries: ICartesianSeries, startRelative: ICartesianSeries, endRelative: ICartesianSeries) => IOptionPos;
 export type IOptionAggr = {
     x?: IOptionPos | IOptionCallback;
     y?: IOptionPos | IOptionCallback;
@@ -29,6 +29,6 @@ export declare function markerVariance(_data: Array<DataView>, opt: IOption): nu
 export declare function markerStandardDeviation(_data: Array<DataView>, opt: IOption): number;
 export declare function markerMedian(_data: Array<DataView>, opt: IOption): number;
 export declare function markerAggregation(_data: Array<DataView>, options: IOptionAggr[]): {
-    x: StringOrNumber[] | StringOrNumber | null;
-    y: StringOrNumber[] | StringOrNumber | null;
+    x: StringOrNumber[] | StringOrNumber | IOptionCallback | null;
+    y: StringOrNumber[] | StringOrNumber | IOptionCallback | null;
 }[];

package/types/event/events/index.d.ts

@@ -1,4 +1,5 @@
 import { DimensionHoverEvent, DimensionClickEvent } from './dimension';
+export * from './dimension';
 export declare const ComposedEventMapper: {
     dimensionHover: typeof DimensionHoverEvent;
     dimensionClick: typeof DimensionClickEvent;

package/types/event/index.d.ts

@@ -0,0 +1,2 @@
+export * from './event';
+export * from './events';

package/types/index.d.ts

@@ -7,3 +7,4 @@ export * from './mark';
 export * from './component';
 export * from './layout';
 export * from './env';
+export * from './event';

package/types/model/interface.d.ts

@@ -89,6 +89,7 @@ export interface ILayoutModel extends IModel {
     afterSetLayoutStartPoint: (pos: ILayoutPoint) => void;
 }
 export interface IModelOption extends ICompilableInitOption {
+    type: string;
     eventDispatcher: IEventDispatcher;
     dataSet: DataSet;
     map: Map<StringOrNumber, IModel | IMark>;

package/types/region/interface.d.ts

@@ -28,6 +28,7 @@ export interface IRegion extends ILayoutModel {
     getSeriesInDataName: (dataName: string) => ISeries[];
     getMarks: () => IMark[];
     getGroupMark: () => IGroupMark;
+    getInteractionMark: () => IGroupMark;
 }
 export type ISeriesFilter = {
     name?: string;

package/types/region/region.d.ts

@@ -24,6 +24,8 @@ export declare class Region<T extends IRegionSpec = IRegionSpec> extends LayoutM
     setMaxHeight(value: number): void;
     protected _groupMark: IGroupMark;
     getGroupMark(): IGroupMark;
+    protected _interactionMark: IGroupMark;
+    getInteractionMark(): IGroupMark;
     getStackInverse(): boolean;
     protected _backgroundMark?: IRectMark;
     protected _foregroundMark?: IRectMark;
@@ -32,6 +34,7 @@ export declare class Region<T extends IRegionSpec = IRegionSpec> extends LayoutM
     protected _getClipDefaultValue(): boolean;
     _initTheme(): void;
     created(): void;
+    private _createGroupMark;
     init(option: any): void;
     initMark(): void;
     protected _initBackgroundMarkStyle(): void;

package/types/series/util/utils.d.ts

@@ -1,5 +1,10 @@
 import type { IAxisHelper as CartesianHelper } from '../../component/axis/cartesian/interface/common';
 import type { Datum } from '../../typings';
 import type { IPolarAxisHelper } from '../../component/axis';
+import type { ICartesianSeries } from '..';
 export declare function isPolarAxisSeries(type: string): boolean;
 export declare function sortDataInAxisHelper(axisHelper: CartesianHelper | IPolarAxisHelper, field: string, dataList: Datum[]): void;
+export declare function getGroupAnimationParams(series: ICartesianSeries): {
+    dataIndex: (datum: any) => any;
+    dataCount: () => any;
+};

package/types/typings/visual.d.ts

@@ -9,8 +9,7 @@ import type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark'
 import type { Datum, StringOrNumber } from './common';
 import type { IPadding } from '@visactor/vutils';
 import type { IColorKey } from '../theme/color-scheme/interface';
-import type { IRepeatType, TextAlignType, TextBaselineType } from '@visactor/vrender-core';
-import type { IRichTextCharacter } from '@visactor/vrender-core';
+import type { IRepeatType, TextAlignType, TextBaselineType, IRichTextCharacter } from '@visactor/vrender-core';
 export interface IVisualSpecBase<D, T> {
     type: ScaleType;
     domain: D[];
@@ -74,6 +73,7 @@ export interface ICommonSpec {
     anchor3d?: [number, number];
     pickMode?: 'accurate' | 'imprecise' | 'custom';
     boundsMode?: 'accurate' | 'imprecise';
+    pickStrokeBuffer?: number;
     texture?: TextureType | string;
     textureColor?: string;
     textureSize?: number;
@@ -128,6 +128,7 @@ export interface ITextMarkSpec extends IFillMarkSpec {
     fontStyle?: FontStyle;
     maxLineWidth?: number;
     ellipsis?: string;
+    suffixPosition?: 'start' | 'end' | 'middle';
     lineBreak?: string;
     underline?: boolean;
     lineThrough?: boolean;