@visactor/vchart-types 1.9.4 → 1.9.5

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

@@ -3,5 +3,5 @@ import type { IRegionSpec, IRegionSpecInfo } from '../../region/interface';
 import type { IChartSpecInfo } from '../interface';
 import type { ISeriesSpecInfo } from '../../series/interface';
 import type { ISeriesSpec } from '../../typings';
-export declare const getRelatedRegionInfo: (modelInfo: IModelSpecInfo, currentChartSpecInfo: IChartSpecInfo) => IRegionSpecInfo<IRegionSpec> | undefined;
+export declare const getRelatedRegionInfo: (modelInfo: IModelSpecInfo, currentChartSpecInfo: IChartSpecInfo) => Array<IRegionSpecInfo<IRegionSpec>> | undefined;
 export declare const getRelatedSeriesInfo: (modelInfo: IModelSpecInfo, currentChartSpecInfo: IChartSpecInfo) => Array<ISeriesSpecInfo<ISeriesSpec>> | undefined;

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

@@ -39,11 +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, rawData?: boolean): {
-        min: number;
-        max: number;
-        values: any[];
-    }[];
+    protected abstract collectSeriesField(depth: number, series: ISeries): string | string[];
     abstract transformScaleDomain(): void;
     protected _dataFieldText: string;
     protected _axisMark: IComponentMark;
@@ -54,6 +50,11 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
     getVRenderComponents(): any[];
     created(): void;
     protected _initData(): void;
+    protected collectData(depth: number, rawData?: boolean): {
+        min: number;
+        max: number;
+        values: any[];
+    }[];
     protected isSeriesDataEnable(): boolean;
     protected setSeriesAndRegionsFromSpec(): void;
     getBindSeriesFilter(): {

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

@@ -86,11 +86,7 @@ export declare abstract class CartesianAxis<T extends ICartesianAxisCommonSpec =
     update(ctx: IComponentOption): void;
     resize(ctx: IComponentOption): void;
     protected collectScale(): IBaseScale[];
-    protected collectData(depth?: number, rawData?: boolean): {
-        min: number;
-        max: number;
-        values: any[];
-    }[];
+    protected collectSeriesField(depth: number, series: ICartesianSeries): string | string[];
     protected updateSeriesScale(): void;
     _transformLayoutPosition: (pos: Partial<IPoint>) => {
         x: number;

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

@@ -44,11 +44,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     protected _tickTransformOption(): IPolarTickDataOpt;
     afterCompile(): void;
     protected updateScaleRange(): boolean;
-    protected collectData(depth: number, rawData?: boolean): {
-        min: number;
-        max: number;
-        values: any[];
-    }[];
+    protected collectSeriesField(depth: number, series: IPolarSeries): string | string[];
     protected abstract computeDomain(data: {
         min: number;
         max: number;

package/types/interaction/interaction.d.ts

@@ -3,9 +3,12 @@ import type { IElement } from '@visactor/vgrammar-core';
 import type { BaseEventParams } from '../event/interface';
 import type { IMark } from '../mark/interface';
 import type { IInteraction } from './interface';
+import type { IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core';
 export declare class Interaction implements IInteraction {
     private _stateMarks;
     private _stateElements;
+    private _vgrammarInteractions;
+    addVgrammarInteraction(state: StateValue, i: IVGrammarInteraction): void;
     static markStateEnable(mark: IMark, state: string): boolean;
     private _disableTriggerEvent;
     setDisableActiveEffect(disable: boolean): void;
@@ -19,4 +22,6 @@ export declare class Interaction implements IInteraction {
     addEventElement(stateValue: StateValue, element: IElement): void;
     clearEventElement(stateValue: StateValue, clearReverse: boolean): void;
     reverseEventElement(stateValue: StateValue): void;
+    startInteraction(stateValue: StateValue, element: IElement): void;
+    resetInteraction(stateValue: StateValue, element: IElement): void;
 }

package/types/interaction/interface.d.ts

@@ -1,4 +1,4 @@
-import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement } from '@visactor/vgrammar-core';
+import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement, IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core';
 import type { IMark } from '../mark/interface';
 import type { RenderMode } from '../typings/spec/common';
 import type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';
@@ -17,6 +17,9 @@ export interface IInteraction {
     clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;
     reverseEventElement: (stateValue: StateValue) => void;
     setDisableActiveEffect: (disable: boolean) => void;
+    addVgrammarInteraction: (state: StateValue, i: IVGrammarInteraction) => void;
+    startInteraction: (state: StateValue, element: IElement) => void;
+    resetInteraction: (state: StateValue, element: IElement) => void;
 }
 export interface ITrigger {
     init: () => void;

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

@@ -130,6 +130,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _updateExtensionMarkSpec(lastSpec?: any): void;
     getStackData(): ISeriesStackData;
     protected _parseDefaultInteractionConfig(mainMarks?: IMark[]): ({
+        vchartState: STATE_VALUE_ENUM;
         seriesId: number;
         regionId: number;
         selector: string[];
@@ -142,6 +143,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
         state?: undefined;
         isMultiple?: undefined;
     } | {
+        vchartState: STATE_VALUE_ENUM;
         type: string;
         seriesId: number;
         regionId: number;

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

@@ -57,7 +57,7 @@ export interface ISeriesMarkInitOption {
     parent?: IGroupMark | false;
     isSeriesMark?: boolean;
     depend?: IGrammarItem | IGrammarItem[];
-    key?: string;
+    key?: string | ((datum: any) => string);
     groupKey?: string;
     morph?: boolean;
     defaultMorphElementKey?: string;

package/types/typings/spec/common.d.ts

@@ -259,6 +259,7 @@ export type EnableMarkType = keyof IBuildinMarkSpec;
 export interface ICustomMarkSpec<T extends EnableMarkType> extends IMarkSpec<IBuildinMarkSpec[T]> {
     type: T;
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
 }
@@ -267,6 +268,7 @@ export interface ICustomMarkGroupSpec extends ICustomMarkSpec<MarkTypeEnum.group
 }
 export interface IExtensionMarkSpec<T extends Exclude<EnableMarkType, 'group'>> extends ICustomMarkSpec<T> {
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
 }