@visactor/vchart-types 0.10.0-alpha.2 → 0.11.6-alpha.1

package/types/theme/interface.d.ts

@@ -5,13 +5,15 @@ import type { MarkTypeEnum } from '../mark/interface';
 import type { IColorKey, IThemeColorScheme } from './color-scheme/interface';
 import type { IGradientColor } from '@visactor/vrender-core';
 import type { IComponentTheme } from '../component/interface';
+import type { ITokenKey, TokenMap } from './token';
 export interface ITheme {
     name?: string;
     description?: string;
     type?: 'light' | 'dark';
     background?: string | IGradientColor | IColorKey;
     padding?: ILayoutPaddingSpec;
-    fontFamily?: string;
+    fontFamily?: string | ITokenKey;
+    token?: TokenMap;
     colorScheme?: IThemeColorScheme;
     mark?: IGlobalMarkThemeByType;
     markByName?: IGlobalMarkThemeByName;
@@ -36,21 +38,3 @@ export interface IGlobalMarkThemeByName {
     label?: Partial<IMarkTheme<ITextMarkSpec>>;
     [markName: string]: Partial<IMarkTheme<any>>;
 }
-export interface IThemeConstants {
-    defaultFontFamily: string;
-    defaultFontSize: number;
-    l1FontSize: number;
-    l1LineHeight: number | string;
-    l2FontSize: number;
-    l2LineHeight: number | string;
-    l3FontSize: number;
-    l3LineHeight: number | string;
-    l4FontSize: number;
-    l4LineHeight: number | string;
-    l5FontSize: number;
-    l5LineHeight: number | string;
-    l6FontSize: number;
-    l6LineHeight: number | string;
-    axisTickSize: number;
-    areaOpacity: number;
-}

package/types/theme/theme-manager.d.ts

@@ -8,6 +8,6 @@ export declare class ThemeManager {
     static themeExist(name: any): boolean;
     static getDefaultTheme(): ITheme;
     static setCurrentTheme(name: string): void;
-    static getCurrentTheme(): ITheme;
+    static getCurrentTheme(transformed?: boolean): ITheme;
     static getCurrentThemeName(): string;
 }

package/types/theme/token/builtin/default.d.ts

@@ -0,0 +1,2 @@
+import type { BuiltinTokenMap } from './interface';
+export declare const token: BuiltinTokenMap;

package/types/theme/token/builtin/index.d.ts

@@ -0,0 +1,2 @@
+export * from './default';
+export * from './interface';

package/types/theme/token/builtin/interface.d.ts

@@ -0,0 +1,17 @@
+import type { TokenMap } from '../interface';
+export type BuiltinTokenMap = TokenMap & {
+    fontFamily: string;
+    fontSize: number;
+    l1FontSize: number;
+    l1LineHeight: number | string;
+    l2FontSize: number;
+    l2LineHeight: number | string;
+    l3FontSize: number;
+    l3LineHeight: number | string;
+    l4FontSize: number;
+    l4LineHeight: number | string;
+    l5FontSize: number;
+    l5LineHeight: number | string;
+    l6FontSize: number;
+    l6LineHeight: number | string;
+};

package/types/theme/token/index.d.ts

@@ -0,0 +1,3 @@
+export * from './interface';
+export * from './util';
+export * from './builtin';

package/types/theme/token/interface.d.ts

@@ -0,0 +1,6 @@
+export interface ITokenKey<T = any> {
+    type: 'token';
+    key: string;
+    default?: T;
+}
+export type TokenMap = Record<string, any>;

package/types/theme/token/util.d.ts

@@ -0,0 +1,3 @@
+import type { ITokenKey, TokenMap } from './interface';
+export declare function queryToken<T>(tokenMap: TokenMap, tokenKey: ITokenKey<T>): T | undefined;
+export declare function isTokenKey(obj: any): obj is ITokenKey;

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

@@ -25,6 +25,7 @@ import type { IWaterfallChartSpec } from '../../chart/waterfall';
 import type { ICorrelationChartSpec } from '../../chart/correlation';
 import type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud';
 import type { IChartSpec } from './common';
+import type { ILiquidChartSpec } from '../../chart/liquid/interface';
 export interface ChartSpecMap {
     readonly common: ICommonChartSpec;
     readonly area: IAreaChartSpec;
@@ -58,5 +59,6 @@ export interface ChartSpecMap {
     readonly circlePacking: ICirclePackingChartSpec;
     readonly heatmap: IHeatmapChartSpec;
     readonly correlation: ICorrelationChartSpec;
+    readonly liquid: ILiquidChartSpec;
 }
 export type ISpec = ChartSpecMap[keyof ChartSpecMap] | IChartSpec;

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

@@ -2,17 +2,17 @@ import type { IFillMarkSpec, 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';
-import type { IRegionSpec } from '../../region/interface';
+import type { RegionSpec } from '../../region/interface';
 import type { IHoverSpec, ISelectSpec, IInteractionSpec } from '../../interaction/interface';
 import type { IRenderOption } from '../../compile/interface';
 import type { ITooltipSpec } from '../../component/tooltip/interface';
 import type { ILayoutSpec } from '../../layout/interface';
-import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IProgressArcMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
+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';
 import type { ISeriesStyle, SeriesType } from '../../series/interface';
 import type { Datum, StringOrNumber } from '../common';
 import type { IInvalidType } from '../data';
-import type { IMorphSeriesSpec } from '../../animation/spec';
+import type { IAnimationSpec, IMorphSeriesSpec } from '../../animation/spec';
 import type { IPlayer } from '../../component/player';
 import type { IMarkProgressiveConfig, MarkTypeEnum } from '../../mark/interface';
 import type { IDataZoomSpec, IScrollBarSpec } from '../../component/data-zoom';
@@ -23,9 +23,10 @@ import type { IBrushSpec } from '../../component/brush';
 import type { ITotalLabelSpec } from '../../component/label';
 import type { ILegendSpec } from '../../component/legend';
 import type { ILayoutOrientPadding, ILayoutPaddingSpec } from '../layout';
-import type { ICustomPath2D } from '@visactor/vrender-core';
+import type { ICustomPath2D, IRichTextCharacter } from '@visactor/vrender-core';
 import type { ICommonAxisSpec } from '../../component/axis';
 import type { IMediaQuerySpec } from '..';
+import type { IModelSpec } from '../../model/interface';
 export type IChartPadding = ILayoutOrientPadding | number;
 export interface IInitOption extends Omit<IRenderOption, 'pluginList'> {
     dom?: string | HTMLElement;
@@ -48,6 +49,8 @@ export declare enum RenderModeEnum {
     'worker' = "worker",
     'miniApp' = "miniApp",
     'wx' = "wx",
+    'tt' = "tt",
+    'harmony' = "harmony",
     'desktop-miniApp' = "desktop-miniApp",
     'lynx' = "lynx"
 }
@@ -65,7 +68,7 @@ export interface IChartSpec {
     animationThreshold?: number;
     hover?: boolean | IHoverSpec;
     select?: boolean | ISelectSpec;
-    region?: IRegionSpec[];
+    region?: RegionSpec[];
     title?: ITitleSpec;
     layout?: ILayoutSpec;
     legends?: ILegendSpec | ILegendSpec[];
@@ -81,6 +84,7 @@ export interface IChartSpec {
     theme?: Omit<ITheme, 'name'> | string;
     background?: IBackgroundSpec;
     stackInverse?: boolean;
+    stackSort?: boolean;
     media?: IMediaQuerySpec;
 }
 export type IBackgroundStyleSpec = ConvertToMarkStyleSpec<Omit<IFillMarkSpec, 'width' | 'height' | 'background'>> & {
@@ -159,7 +163,7 @@ export interface ISeriesSpec extends IInteractionSpec {
     animationThreshold?: number;
     support3d?: boolean;
     morph?: IMorphSeriesSpec;
-    extensionMark?: (IExtensionMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | IExtensionGroupMarkSpec)[];
+    extensionMark?: (IExtensionMarkSpec<Exclude<EnableMarkType, 'group'>> | IExtensionGroupMarkSpec)[];
 }
 export type IChartExtendsSeriesSpec<T extends ISeriesSpec> = Omit<T, 'data' | 'morph' | 'stackValue'>;
 export type AdaptiveSpec<T, K extends keyof any> = {
@@ -236,40 +240,51 @@ export interface IPerformanceHook {
     afterVRenderDraw?: () => void;
 }
 export type IBuildinMarkSpec = {
-    [MarkTypeEnum.group]: IGroupMarkSpec;
-    [MarkTypeEnum.symbol]: ISymbolMarkSpec;
-    [MarkTypeEnum.rule]: IRuleMarkSpec;
-    [MarkTypeEnum.line]: ILineMarkSpec;
-    [MarkTypeEnum.text]: ITextMarkSpec;
-    [MarkTypeEnum.rect]: IRectMarkSpec;
-    [MarkTypeEnum.rect3d]: IRect3dMarkSpec;
-    [MarkTypeEnum.image]: IImageMarkSpec;
-    [MarkTypeEnum.path]: IPathMarkSpec;
-    [MarkTypeEnum.area]: IAreaMarkSpec;
-    [MarkTypeEnum.arc]: IArcMarkSpec;
-    [MarkTypeEnum.arc3d]: IArc3dMarkSpec;
-    [MarkTypeEnum.polygon]: IPolygonMarkSpec;
-    [MarkTypeEnum.pyramid3d]: IPyramid3dMarkSpec;
-    [MarkTypeEnum.boxPlot]: IBoxPlotMarkSpec;
-    [MarkTypeEnum.linkPath]: ILinkPathMarkSpec;
-    [MarkTypeEnum.progressArc]: IProgressArcMarkSpec;
-    [MarkTypeEnum.ripple]: IRippleMarkSpec;
+    group: IGroupMarkSpec;
+    symbol: ISymbolMarkSpec;
+    rule: IRuleMarkSpec;
+    line: ILineMarkSpec;
+    text: ITextMarkSpec;
+    rect: IRectMarkSpec;
+    rect3d: IRect3dMarkSpec;
+    image: IImageMarkSpec;
+    path: IPathMarkSpec;
+    area: IAreaMarkSpec;
+    arc: IArcMarkSpec;
+    arc3d: IArc3dMarkSpec;
+    polygon: IPolygonMarkSpec;
+    pyramid3d: IPyramid3dMarkSpec;
+    boxPlot: IBoxPlotMarkSpec;
+    linkPath: ILinkPathMarkSpec;
+    ripple: IRippleMarkSpec;
 };
 export type EnableMarkType = keyof IBuildinMarkSpec;
-export interface ICustomMarkSpec<T extends EnableMarkType> extends IMarkSpec<IBuildinMarkSpec[T]> {
+export interface ICustomMarkSpec<T extends EnableMarkType> extends IModelSpec, IMarkSpec<IBuildinMarkSpec[T]>, IAnimationSpec<string, string> {
     type: T;
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
+    animation?: boolean;
 }
 export interface ICustomMarkGroupSpec extends ICustomMarkSpec<MarkTypeEnum.group> {
     children?: ICustomMarkSpec<EnableMarkType>[];
 }
-export interface IExtensionMarkSpec<T extends Exclude<EnableMarkType, MarkTypeEnum.group>> extends ICustomMarkSpec<T> {
+export interface IExtensionMarkSpec<T extends Exclude<EnableMarkType, 'group'>> extends ICustomMarkSpec<T> {
     dataIndex?: number;
+    dataKey?: string | ((datum: any) => string);
     dataId?: StringOrNumber;
     componentType?: string;
 }
 export interface IExtensionGroupMarkSpec extends ICustomMarkSpec<MarkTypeEnum.group> {
     children?: ICustomMarkSpec<EnableMarkType>[];
 }
+export type ITextFormatMethod<T extends any[]> = (...args: T) => ITextMarkSpec['text'] | {
+    type: 'text';
+    text: ITextMarkSpec['text'];
+};
+export type IRichTextFormatMethod<T extends any[]> = (...args: T) => {
+    type: 'rich';
+    text: IRichTextCharacter[];
+} | IRichTextCharacter[];
+export type IFormatMethod<T extends any[]> = (...args: T) => ReturnType<ITextFormatMethod<T>> | ReturnType<IRichTextFormatMethod<T>>;

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

@@ -1,5 +1,5 @@
 export * from './common';
 export type { IStateSpec, StateValueType } from '../../compile/mark';
 export * from './chart';
-export type { IRegionSpec, IGeoRegionSpec } from '../../region/interface';
+export type { IRegionSpec, IGeoRegionSpec, RegionSpec } from '../../region/interface';
 export * from './media-query';

package/types/typings/tooltip/handler.d.ts

@@ -5,4 +5,4 @@ export interface ITooltipHandler extends ITooltipHandlerSpec {
     reInit?: () => any;
 }
 export type TooltipData = IDimensionInfo[] | IDimensionData[];
-export type TooltipActiveType = 'mark' | 'dimension';
+export type TooltipActiveType = 'mark' | 'dimension' | 'group';

package/types/typings/tooltip/line.d.ts

@@ -2,9 +2,11 @@ import type { TooltipContentProperty } from './common';
 import type { ITooltipLabelActual, ITooltipLabelPattern } from './label';
 import type { ITooltipShapeActual, ITooltipShapePattern } from './shape';
 import type { TooltipRichTextAttrs } from '@visactor/vrender-components';
-export interface IToolTipLinePattern extends ITooltipShapePattern, ITooltipLabelPattern {
+export interface ITooltipLinePattern extends ITooltipShapePattern, ITooltipLabelPattern {
     key?: TooltipContentProperty<string>;
+    keyFormatter?: string;
     value?: TooltipContentProperty<string | TooltipRichTextAttrs>;
+    valueFormatter?: string;
     visible?: TooltipContentProperty<boolean>;
     isKeyAdaptive?: TooltipContentProperty<boolean>;
     spaceRow?: TooltipContentProperty<number>;
@@ -13,11 +15,16 @@ export interface IToolTipLinePattern extends ITooltipShapePattern, ITooltipLabel
     valueTimeFormat?: string;
     valueTimeFormatMode?: 'utc' | 'local';
 }
-export interface IToolTipLineActual extends ITooltipShapeActual, ITooltipLabelActual {
+export interface ITooltipLineActual extends ITooltipShapeActual, ITooltipLabelActual {
     key?: string;
     value?: string | TooltipRichTextAttrs;
+    valueFormatter?: string;
     visible?: boolean;
     isKeyAdaptive?: boolean;
     spaceRow?: number;
     datum?: any;
 }
+export type TooltipActualTitleContent = {
+    title?: ITooltipLineActual;
+    content?: ITooltipLineActual[];
+};

package/types/typings/tooltip/position.d.ts

@@ -1,30 +1,24 @@
-export type ITooltipPositionCallback = (event: MouseEvent) => number;
-export interface ITooltipPositionPattern {
-    left?: number | ITooltipPositionCallback;
-    right?: number | ITooltipPositionCallback;
-    top?: number | ITooltipPositionCallback;
-    bottom?: number | ITooltipPositionCallback;
+export type TooltipPositionCallback<T> = (event: MouseEvent) => T;
+export type TooltipPositionValue = number | TooltipPositionCallback<number>;
+export interface ITooltipPositionFixedValue {
+    orient: TooltipFixedPosition;
+    mode: TooltipPositionMode;
+    offset?: number;
 }
-export declare const enum TooltipFixedPosition {
-    top = "top",
-    bottom = "bottom",
-    left = "left",
-    right = "right",
-    tl = "tl",
-    lt = "lt",
-    tr = "tr",
-    rt = "rt",
-    bl = "bl",
-    lb = "lb",
-    br = "br",
-    rb = "rb",
-    inside = "inside"
+export type TooltipPositionPatternItem = TooltipPositionValue | ITooltipPositionFixedValue;
+export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside';
+export type TooltipPositionMode = 'pointer' | 'mark' | 'crosshair';
+export interface IGlobalTooltipPositionPattern {
+    left?: TooltipPositionValue;
+    right?: TooltipPositionValue;
+    top?: TooltipPositionValue;
+    bottom?: TooltipPositionValue;
 }
-export declare const enum TooltipPositionMode {
-    pointer = "pointer",
-    mark = "mark"
+export interface IFixedTooltipPositionPattern {
+    x: TooltipPositionPatternItem;
+    y: TooltipPositionPatternItem;
 }
-export type TooltipPosition = ITooltipPositionPattern | TooltipFixedPosition;
+export type TooltipPosition = IGlobalTooltipPositionPattern | IFixedTooltipPositionPattern | TooltipFixedPosition;
 export interface ITooltipPositionActual {
     x: number;
     y: number;

package/types/typings/tooltip/shape.d.ts

@@ -8,8 +8,8 @@ export interface ITooltipShapePattern {
     shapeStroke?: TooltipContentProperty<string>;
     shapeLineWidth?: TooltipContentProperty<number>;
     shapeSize?: TooltipContentProperty<number>;
+    shapeHollow?: TooltipContentProperty<boolean>;
     shapeColor?: TooltipContentProperty<string>;
-    shapeHollow?: boolean;
 }
 export interface ITooltipShapeActual {
     hasShape?: boolean;
@@ -18,6 +18,6 @@ export interface ITooltipShapeActual {
     shapeStroke?: string;
     shapeLineWidth?: number;
     shapeSize?: number;
-    shapeColor?: string;
     shapeHollow?: boolean;
+    shapeColor?: string;
 }

package/types/typings/tooltip/tooltip.d.ts

@@ -1,25 +1,30 @@
 import type { MaybeArray } from '../common';
 import type { TooltipPatternProperty, TooltipUpdateCallback } from './common';
 import type { TooltipActiveType, TooltipData } from './handler';
-import type { IToolTipLineActual, IToolTipLinePattern } from './line';
+import type { ITooltipLineActual, ITooltipLinePattern } from './line';
 import type { ITooltipPositionActual, TooltipPositionMode, TooltipPosition } from './position';
 import type { ITooltipShapePattern } from './shape';
 export interface ITooltipPattern extends ITooltipShapePattern {
     visible?: TooltipPatternProperty<boolean>;
-    title?: TooltipPatternProperty<IToolTipLinePattern>;
-    content?: MaybeArray<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>>;
+    title?: TooltipPatternProperty<ITooltipLinePattern>;
+    content?: MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
     position?: TooltipPatternProperty<TooltipPosition>;
     positionMode?: TooltipPatternProperty<TooltipPositionMode>;
-    updateTitle?: TooltipUpdateCallback<IToolTipLineActual>;
-    updateContent?: TooltipUpdateCallback<IToolTipLineActual[]>;
+    updateTitle?: TooltipUpdateCallback<ITooltipLineActual>;
+    updateContent?: TooltipUpdateCallback<ITooltipLineActual[]>;
     updatePosition?: TooltipUpdateCallback<ITooltipPositionActual>;
     maxLineCount?: number;
+    othersLine?: ITooltipLineActual;
     activeType?: TooltipActiveType;
 }
-export interface IToolTipActual {
+export type GroupTooltipTriggerMark = 'line' | 'area' | 'point' | 'bar';
+export interface IGroupTooltipPattern extends ITooltipPattern {
+    triggerMark?: MaybeArray<GroupTooltipTriggerMark>;
+}
+export interface ITooltipActual {
     visible?: boolean;
-    title?: IToolTipLineActual;
-    content?: IToolTipLineActual[];
+    title?: ITooltipLineActual;
+    content?: ITooltipLineActual[];
     activeType?: TooltipActiveType;
     position?: ITooltipPositionActual;
     data?: TooltipData;

package/types/typings/visual.d.ts

@@ -6,10 +6,11 @@ import type { ScaleType } from './scale';
 import type { ShapeType } from './shape';
 import type { IPoint } from './coordinate';
 import type { IAttributeOpt, IModelMarkAttributeContext } from '../compile/mark';
-import type { Datum, StringOrNumber } from './common';
+import type { Datum } from './common';
 import type { IPadding } from '@visactor/vutils';
 import type { IColorKey } from '../theme/color-scheme/interface';
-import type { IRepeatType, TextAlignType, TextBaselineType, IRichTextCharacter } from '@visactor/vrender-core';
+import type { ITokenKey } from '../theme/token';
+import type { IRepeatType, TextAlignType, TextBaselineType, IRichTextAttribute, IGraphicStyle } from '@visactor/vrender-core';
 export interface IVisualSpecBase<D, T> {
     type: ScaleType;
     domain: D[];
@@ -80,6 +81,7 @@ export interface ICommonSpec {
     texturePadding?: number;
     outerBorder?: IBorder;
     innerBorder?: IBorder;
+    html?: IMarkHtmlSpec;
     [key: string]: any;
 }
 export interface IFillMarkSpec extends ICommonSpec {
@@ -87,6 +89,7 @@ export interface IFillMarkSpec extends ICommonSpec {
     fillOpacity?: number;
     background?: string | HTMLImageElement | HTMLCanvasElement | null;
 }
+export type IMarkHtmlSpec = Partial<IGraphicStyle['html']>;
 export interface ISymbolMarkSpec extends IFillMarkSpec {
     dx?: number;
     dy?: number;
@@ -116,11 +119,10 @@ export interface IRuleMarkSpec extends ILineMarkSpec {
     y1?: number;
 }
 export interface ITextMarkSpec extends IFillMarkSpec {
-    type?: 'html' | 'rich' | 'text';
-    text?: StringOrNumber | string[] | IRichTextCharacter[] | Function;
+    text?: string | number | string[] | number[];
     dx?: number;
     dy?: number;
-    fontSize?: number;
+    fontSize?: number | ITokenKey;
     textAlign?: TextAlign;
     textBaseline?: TextBaseLine;
     fontFamily?: string;
@@ -129,13 +131,17 @@ export interface ITextMarkSpec extends IFillMarkSpec {
     maxLineWidth?: number;
     ellipsis?: string;
     suffixPosition?: 'start' | 'end' | 'middle';
-    lineBreak?: string;
     underline?: boolean;
     lineThrough?: boolean;
-    lineHeight?: number | string;
+    lineHeight?: number | string | ITokenKey;
     poptip?: PopTipAttributes;
     direction?: 'horizontal' | 'vertical';
 }
+export type IRichTextMarkSpec = IRichTextAttribute & IFillMarkSpec & {
+    type: 'rich';
+    text: IRichTextAttribute['textConfig'];
+};
+export type IComposedTextMarkSpec = ITextMarkSpec | IRichTextMarkSpec;
 export type IPositionedTextMarkSpec = Omit<ITextMarkSpec, 'align' | 'textAlign' | 'baseline' | 'textBaseline'>;
 export interface IRectMarkSpec extends IFillMarkSpec {
     cornerRadius?: number | number[];
@@ -201,6 +207,8 @@ export interface IArcMarkSpec extends IFillMarkSpec {
     outerRadius?: number;
     innerRadius?: number;
     cornerRadius?: number;
+    innerPadding?: number;
+    outerPadding?: number;
     centerOffset?: number;
     cap?: boolean | [boolean, boolean];
     autoCapConical?: boolean;
@@ -208,10 +216,6 @@ export interface IArcMarkSpec extends IFillMarkSpec {
 export interface IArc3dMarkSpec extends IArcMarkSpec {
     height?: number;
 }
-export interface IProgressArcMarkSpec extends IArcMarkSpec {
-    innerPadding?: number;
-    outerPadding?: number;
-}
 export interface ICellMarkSpec extends ISymbolMarkSpec {
     padding?: number | number[] | IPadding;
 }

package/types/util/data.d.ts

@@ -1,6 +1,7 @@
 import type { DataView } from '@visactor/vdataset';
 import type { StatisticOperations } from '../data/transforms/dimension-statistics';
 import type { ISeries, ISeriesStackDataMeta } from '../series/interface';
+import type { IRegion } from '../region/interface';
 export declare function mergeFields(targetFields: {
     key: string;
     operations: StatisticOperations;
@@ -18,21 +19,38 @@ export interface IStackCacheNode {
         s: ISeries;
         values: any[];
     }[];
+    sortDatums: {
+        datum: any;
+        index: number;
+        series: ISeries;
+    }[];
     nodes: {
         [key: string]: IStackCacheNode;
     };
+    key: string;
 }
 export interface IStackCacheRoot {
     nodes: {
         [key: string]: IStackCacheNode;
     };
 }
-export declare function getRegionStackGroup(region: {
-    getSeries: () => any[];
-}, setInitialValue: boolean, filter?: (s: any) => boolean): {
+export interface IStackSortCache {
+    [key: string]: {
+        lastIndex: number;
+        sort: {
+            [key: string]: number;
+        };
+    };
+}
+export declare function getRegionStackGroup(region: IRegion, setInitialValue: boolean, filter?: (s: any) => boolean): {
     [key: string]: IStackCacheRoot;
 };
+export declare function sortStackValueGroup(stackValueGroup: {
+    [key: string]: IStackCacheNode;
+}, stackSortCache: IStackSortCache): {
+    [key: string]: IStackCacheNode;
+};
 export declare function stackTotal(stackData: IStackCacheNode, valueField: string): void;
 export declare function stackOffsetSilhouette(stackCache: IStackCacheNode): void;
 export declare function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean): void;
-export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean): void;
+export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean, stackSortCache: IStackSortCache, stackKey?: string): void;

package/types/util/hierarchy.d.ts

@@ -1,3 +1,5 @@
 export declare const findHierarchyNode: <T>(hierarchyData: T[], key: string, keyField?: string, childrenField?: string) => T;
 export declare const findHierarchyNodeParent: <T>(hierarchyData: T[], key: string, keyField?: string, childrenField?: string) => T;
 export declare const findHierarchyPath: <T>(hierarchyData: T[], key: string, keyField?: string, childrenField?: string) => string[];
+export declare function isHierarchyItem(item: Object, valueField?: string, childrenField?: string): boolean;
+export declare function filterHierarchyDataByRange(data: any[], minValue: number, maxValue: number, valueField?: string, childrenField?: string): any[];

package/types/util/index.d.ts

@@ -1,5 +1,4 @@
-import { TimeUtil } from '../component/axis/cartesian/util/time';
-import { debounce, throttle, clamp } from '@visactor/vutils';
+import { debounce, throttle, clamp, TimeUtil } from '@visactor/vutils';
 export { debounce, throttle, clamp };
 export * from './array';
 export * from './color';
@@ -12,6 +11,7 @@ export * from './object';
 export * from './scale';
 export * from './space';
 export * from './type';
+export * from './theme';
 export * from './spec';
 export * from './text';
 export * from './data';

package/types/util/math.d.ts

@@ -1,10 +1,9 @@
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IPoint, IPolarPoint, Quadrant } from '../typings';
-import { isNumberClose, isGreater, isLess } from '@visactor/vutils';
-import { normalizeAngle, angleLabelOrientAttribute } from '@visactor/vutils-extension';
+import type { IPoint, Quadrant } from '../typings';
+import { isNumberClose, isGreater, isLess, normalizeAngle } from '@visactor/vutils';
+import { angleLabelOrientAttribute } from '@visactor/vrender-components';
 export declare const isClose: typeof isNumberClose;
 export { isGreater, isLess, normalizeAngle, angleLabelOrientAttribute };
-export declare function polarToCartesian(point: IPolarPoint): IPoint;
 export declare function computeQuadrant(angle: number): Quadrant;
 export declare function normalizeStartEndAngle(start: number | null, end: number | null): {
     startAngle: number;
@@ -25,4 +24,4 @@ export declare function radiusLabelOrientAttribute(angle: number): {
 };
 export declare function vectorAngle(v1: IPoint, v2: IPoint): number;
 export declare function distance(p1: IPoint, p2?: IPoint): number;
-export declare function getPercentValue(valueList: number[], idx: number, precision?: number): number;
+export declare function getPercentValue(valueList: number[], precision?: number): number[] | 0;

package/types/util/space.d.ts

@@ -5,7 +5,7 @@ import type { ILayoutNumber, ILayoutRect, IPercent, IPercentOffset, ILayoutPaddi
 export declare function isValidOrient(orient: string): boolean;
 export declare function isPercent(v: any): v is IPercent;
 export declare function isPercentOffset(v: any): v is IPercentOffset;
-export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect): number;
+export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect, defaultValue?: number): number;
 export declare function calcPadding(paddingSpec: ILayoutOrientPadding, rect: ILayoutRect, callOp: ILayoutRect): IPadding;
 export declare function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect;
 export declare function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding;

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

@@ -1,5 +1,3 @@
 import { DataView } from '@visactor/vdataset';
-import type { ITheme } from '../../theme';
 export declare function isDataView(obj: any): obj is DataView;
 export declare function isHTMLElement(obj: any): obj is Element;
-export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;

package/types/util/spec/index.d.ts

@@ -1,7 +1,2 @@
 export * from './background';
-export * from './clone-deep';
-export * from './common';
-export * from './merge-spec';
-export * from './merge-theme';
-export * from './preprocess';
 export * from './transform';

package/types/util/theme/common.d.ts

@@ -0,0 +1,2 @@
+import type { ITheme } from '../../theme';
+export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;

package/types/util/theme/index.d.ts

@@ -0,0 +1,3 @@
+export * from './common';
+export * from './merge-theme';
+export * from './preprocess';

package/types/util/theme/merge-theme.d.ts

@@ -0,0 +1,6 @@
+import type { Maybe } from '@visactor/vutils';
+import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme';
+import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
+export declare function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme>;
+export declare function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme>;
+export declare function transformSeriesThemeToMerge(seriesTheme: any, seriesType: string, markByType: IGlobalMarkThemeByType, markByName: IGlobalMarkThemeByName): any;

package/types/util/theme/preprocess.d.ts

@@ -0,0 +1,4 @@
+import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
+import type { ISeriesSpec } from '../../typings';
+import type { TokenMap } from '../../theme/token';
+export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, tokenMap?: TokenMap, seriesSpec?: ISeriesSpec): any;