@visactor/vchart-types 1.13.3 → 1.13.4

package/types/animation/spec.d.ts

@@ -1,20 +1,22 @@
 import type { IAnimationConfig, IStateAnimationConfig } from '@visactor/vgrammar-core';
 import type { EasingType } from '@visactor/vrender-core';
 export type { IRunningConfig as IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar-core';
-export type IStateAnimateSpec<Preset extends string> = {
-    preset?: Preset | false;
+export interface ICommonStateAnimateSpec {
     duration?: number;
     delay?: number;
     easing?: EasingType;
     oneByOne?: boolean;
-};
+}
+export interface IStateAnimateSpec<Preset extends string> extends ICommonStateAnimateSpec {
+    preset?: Preset | false;
+}
 export type IMarkAnimateSpec<MarkName extends string> = Partial<Record<MarkName, false | IAnimationConfig | IAnimationConfig[]>>;
 export interface IAnimationSpec<MarkName extends string, Preset extends string> {
     animationAppear?: boolean | IStateAnimateSpec<Preset> | IMarkAnimateSpec<MarkName>;
-    animationEnter?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;
-    animationUpdate?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;
-    animationExit?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;
-    animationDisappear?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;
+    animationEnter?: boolean | ICommonStateAnimateSpec | IMarkAnimateSpec<MarkName>;
+    animationUpdate?: boolean | ICommonStateAnimateSpec | IMarkAnimateSpec<MarkName>;
+    animationExit?: boolean | ICommonStateAnimateSpec | IMarkAnimateSpec<MarkName>;
+    animationDisappear?: boolean | ICommonStateAnimateSpec | IMarkAnimateSpec<MarkName>;
     animationState?: boolean | IStateAnimationConfig;
     animationNormal?: IMarkAnimateSpec<MarkName>;
 }

package/types/component/common/trigger/config.d.ts

@@ -4,7 +4,7 @@ import { MobileTrigger } from './mobile';
 export declare function getDefaultTriggerEventByMode(mode: RenderMode): {
     start: string;
     move: string;
-    end: string;
+    end: string[];
     zoom: string;
     zoomEnd: string;
     scroll: string;
@@ -13,7 +13,7 @@ export declare function getDefaultTriggerEventByMode(mode: RenderMode): {
 } | {
     start: string;
     move: string;
-    end: string;
+    end: string[];
     zoom: string;
     zoomEnd: string;
     scroll: string;

package/types/plugin/components/tooltip-handler/utils/style.d.ts

@@ -1,6 +1,7 @@
 import type { ITooltipSpec, ITooltipTextTheme, ITooltipTheme } from '../../../../component/tooltip';
 export declare const getPixelPropertyStr: (num?: number | number[], defaultStr?: string) => string;
-export declare const getTextStyle: (style?: ITooltipTextTheme) => Partial<CSSStyleDeclaration>;
+export declare const getTextStyle: (style?: ITooltipTextTheme, textStyle?: Partial<CSSStyleDeclaration>) => Partial<CSSStyleDeclaration>;
+export declare const getLineHeight: (style?: ITooltipTextTheme) => number;
 export declare const getDomStyle: (spec?: ITooltipSpec) => {
     panelPadding: number[];
     row: Partial<CSSStyleDeclaration>;

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

@@ -7,11 +7,12 @@ import type { IAnimationSpec } from '../../animation/spec';
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
 import type { IMultiLabelSpec, ILabelSpec } from '../../component/label/interface';
 import type { DirectionType } from '../../typings/space';
+type AreaMarks = 'point' | 'line' | 'area';
 export interface IAreaAnimationParams {
     direction: DirectionType;
 }
 export type AreaAppearPreset = 'clipIn' | 'fadeIn' | 'grow';
-export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
+export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<AreaMarks, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'area';
     xField?: string | string[];
     yField?: string | string[];
@@ -35,3 +36,4 @@ export interface IAreaSeriesTheme extends ILineLikeSeriesTheme {
     seriesMark?: 'point' | 'line' | 'area';
     activePoint?: boolean;
 }
+export {};

package/types/series/box-plot/interface.d.ts

@@ -3,7 +3,7 @@ import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { DirectionType, IBoxPlotMarkSpec, IOutlierMarkSpec, IMarkSpec, IMarkTheme } from '../../typings';
 import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
-export interface IBoxPlotSeriesSpec extends Omit<ICartesianSeriesSpec, 'xField' | 'yField' | 'direction'>, IAnimationSpec<string, string>, IMarkProgressiveConfig {
+export interface IBoxPlotSeriesSpec extends Omit<ICartesianSeriesSpec, 'xField' | 'yField' | 'direction'>, IAnimationSpec<SeriesMarkNameEnum.boxPlot, string>, IMarkProgressiveConfig {
     type: 'boxPlot';
     direction?: DirectionType;
     xField?: string | string[];

package/types/series/progress/linear/interface.d.ts

@@ -8,7 +8,7 @@ export interface ILinearProgressAnimationParams {
     direction: DirectionType;
 }
 export type LinearProgressAppearPreset = 'grow' | 'fadeIn';
-export interface ILinearProgressSeriesSpec extends IProgressSeriesSpec, IAnimationSpec<string, LinearProgressAppearPreset> {
+export interface ILinearProgressSeriesSpec extends IProgressSeriesSpec, IAnimationSpec<SeriesMarkNameEnum.progress | SeriesMarkNameEnum.track, LinearProgressAppearPreset> {
     type: 'linearProgress';
     xField: string | string[];
     yField: string | string[];

package/types/series/word-cloud/interface.d.ts

@@ -62,7 +62,7 @@ export type WordCloudShapeConfigType = {
     fillingDeltaFontSizeFactor?: number;
     fillingRatio?: number;
 };
-export interface IWordCloudSeriesBaseSpec extends ISeriesSpec, IAnimationSpec<string, WordcloudAppearPreset> {
+export interface IWordCloudSeriesBaseSpec extends ISeriesSpec, IAnimationSpec<SeriesMarkNameEnum.word, WordcloudAppearPreset> {
     nameField: string;
     valueField?: string;
     fontFamilyField?: string;

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

@@ -1,5 +1,5 @@
 import type { IVChart } from './../../core/interface';
-import type { IFillMarkSpec, IImageMarkSpec } from '../visual';
+import type { IImageMarkSpec } from '../visual';
 import type { LayoutCallBack } from '../../layout/interface';
 import type { IElement, srIOption3DType } from '@visactor/vgrammar-core';
 import type { DataSet, DataView, ISimplifyOptions, IFieldsOptions, IFilterOptions, IFoldOptions, IDsvParserOptions } from '@visactor/vdataset';
@@ -9,7 +9,6 @@ import type { IRenderOption } from '../../compile/interface';
 import type { ISeriesTooltipSpec, ITooltipSpec } from '../../component/tooltip/interface';
 import type { ILayoutSpec } from '../../layout/interface';
 import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
-import type { StateValue } from '../../compile/mark/interface';
 import type { ISeriesStyle, SeriesType } from '../../series/interface';
 import type { Datum, StringOrNumber } from '../common';
 import type { IInvalidType } from '../data';
@@ -90,11 +89,7 @@ export interface IChartSpec {
     stackSort?: boolean;
     media?: IMediaQuerySpec;
 }
-export type IBackgroundStyleSpec = ConvertToMarkStyleSpec<Omit<IFillMarkSpec, 'width' | 'height' | 'background'>> & {
-    image?: IRectMarkSpec['background'];
-    cornerRadius?: IRectMarkSpec['cornerRadius'];
-};
-export type IBackgroundSpec = IColor | IBackgroundStyleSpec;
+export type IBackgroundSpec = IColor | ConvertToMarkStyleSpec<IGroupMarkSpec>;
 export type IDataType = IDataValues | DataView;
 export type IData = IDataType | IDataType[];
 export type DataKeyType = string | string[] | ((data: Datum, index: number) => string);
@@ -175,13 +170,20 @@ export type AdaptiveSpec<T, K extends keyof any> = {
 } & {
     [key in K]: any;
 };
+export interface IMarkStateFullSpec<T> extends Record<string, IMarkStateSpec<T> | IMarkStateStyleSpec<T>> {
+    normal?: IMarkStateSpec<T> | IMarkStateStyleSpec<T>;
+    hover?: IMarkStateSpec<T> | IMarkStateStyleSpec<T>;
+    hover_reverse?: IMarkStateSpec<T> | IMarkStateStyleSpec<T>;
+    selected?: IMarkStateSpec<T> | IMarkStateStyleSpec<T>;
+    selected_reverse?: IMarkStateSpec<T> | IMarkStateStyleSpec<T>;
+}
 export type IMarkSpec<T extends ICommonSpec = ICommonSpec> = {
     id?: StringOrNumber;
     interactive?: boolean;
     zIndex?: number;
     visible?: boolean;
     style?: ConvertToMarkStyleSpec<T>;
-    state?: Record<StateValue, IMarkStateSpec<T> | IMarkStateStyleSpec<T>>;
+    state?: IMarkStateFullSpec<T>;
     stateSort?: (stateA: string, stateB: string) => number;
     support3d?: boolean;
     customShape?: (datum: any[], attrs: any, path: ICustomPath2D) => ICustomPath2D;
@@ -205,10 +207,17 @@ export interface IMarkStateSpec<T> {
     style: ConvertToMarkStyleSpec<T>;
 }
 export type IMarkStateStyleSpec<T> = ConvertToMarkStyleSpec<T>;
+export interface IMarkStateTheme<T> extends Record<string, T> {
+    normal?: T;
+    hover?: T;
+    hover_reverse?: T;
+    selected?: T;
+    selected_reverse?: T;
+}
 export type IMarkTheme<T> = {
     visible?: boolean;
     style?: T;
-    state?: Record<StateValue, T>;
+    state?: IMarkStateTheme<T>;
     interactive?: boolean;
 };
 export interface IPerformanceHook {