@visactor/vchart-types 1.10.0-alpha.4 → 1.10.0-alpha.6

package/types/component/player/interface/theme.d.ts

@@ -1,6 +1,6 @@
 import type { ControllerLayout, OrientType } from '@visactor/vrender-components';
 import type { ISymbolMarkSpec, IRectMarkSpec } from '../../../typings';
-import type { BaseGraphicAttributes } from '@visactor/vrender-components/es/core/type';
+import type { BaseGraphicAttributes } from '@visactor/vrender-components';
 import type { ILayoutItemSpec } from '../../../layout/interface';
 export interface IPlayerTheme extends ILayoutItemSpec {
     visible?: boolean;

package/types/component/tooltip/interface/common.d.ts

@@ -1,10 +1,10 @@
 import type { DimensionEventParams } from '../../../event/events/dimension/interface';
-import type { BaseEventParams } from '../../../event/interface';
 import type { DimensionTooltipInfo, MarkTooltipInfo } from '../processor/interface';
 import type { Datum, IShowTooltipOption } from '../../../typings';
 import type { IComponent } from '../../interface';
-export type TooltipHandlerParams = (BaseEventParams | DimensionEventParams) & {
+export type TooltipHandlerParams = DimensionEventParams & {
     changePositionOnly?: boolean;
+    tooltip: ITooltip;
 };
 export interface ITooltipActiveTypeAsKeys<T, K> {
     mark: T;

package/types/component/tooltip/interface/event.d.ts

@@ -1,8 +1,6 @@
 import type { TooltipActiveType, TooltipData } from '../../../typings';
-import type { IComponent } from '../../interface/common';
 import type { TooltipHandlerParams } from './common';
 export type TooltipEventParams = TooltipHandlerParams & {
     activeType?: TooltipActiveType;
     tooltipData?: TooltipData;
-    tooltip: IComponent;
 };

package/types/component/tooltip/interface/index.d.ts

@@ -1,3 +1,4 @@
 export * from './common';
 export * from './spec';
 export * from './theme';
+export * from './event';

package/types/component/tooltip/interface/spec.d.ts

@@ -1,4 +1,4 @@
-import type { IToolTipActual, ITooltipPattern, Maybe, TooltipActiveType, TooltipData } from '../../../typings';
+import type { ITooltipActual, ITooltipPattern, Maybe, TooltipActiveType, TooltipData } from '../../../typings';
 import type { ITooltipActiveTypeAsKeys, TooltipHandlerParams, TooltipResult } from './common';
 import type { ITooltipTheme } from './theme';
 export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipPattern, ITooltipPattern>> {
@@ -15,7 +15,7 @@ export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipP
     enterable?: boolean;
     transitionDuration?: number;
     throttleInterval?: number;
-    updateElement?: (tooltipElement: HTMLElement, actualTooltip: IToolTipActual, params: TooltipHandlerParams) => void;
+    updateElement?: (tooltipElement: HTMLElement, actualTooltip: ITooltipActual, params: TooltipHandlerParams) => void;
     offset?: {
         x?: number;
         y?: number;

package/types/component/tooltip/interface/theme.d.ts

@@ -1,6 +1,6 @@
 import type { RichTextWordBreak } from '@visactor/vrender-core';
-import type { StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';
-import type { Padding } from '@visactor/vrender-components/es/core/type';
+import type { ITooltipShapeActual, StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';
+import type { Padding } from '@visactor/vrender-components';
 import type { ITokenKey } from '../../../theme/token';
 export interface ITooltipTextTheme<ColorType = string> {
     fontFamily?: string;
@@ -37,7 +37,7 @@ export interface ITooltipTheme<ColorType = string> {
     shape?: {
         size?: number;
         spacing?: number;
-    };
+    } & ITooltipShapeActual;
     titleLabel?: ITooltipTextTheme<ColorType>;
     keyLabel?: Omit<ITooltipTextTheme<ColorType>, 'autoWidth'>;
     valueLabel?: ITooltipTextTheme<ColorType>;

package/types/component/tooltip/tooltip.d.ts

@@ -3,7 +3,7 @@ import type { IModelLayoutOption, IModelRenderOption, IModelSpecInfo } from '../
 import type { IRegion } from '../../region/interface';
 import { BaseComponent } from '../base/base-component';
 import type { BaseEventParams, EventCallback, EventQuery, EventType } from '../../event/interface';
-import type { ITooltipHandler, IToolTipLineActual, TooltipActiveType } from '../../typings/tooltip';
+import type { ITooltipHandler, ITooltipLineActual, TooltipActiveType } from '../../typings/tooltip';
 import type { Datum, IShowTooltipOption } from '../../typings';
 import type { ITooltip, ITooltipActiveTypeAsKeys, ITooltipSpec, TooltipHandlerParams, TotalMouseEventData } from './interface';
 import { TooltipResult } from './interface/common';
@@ -13,8 +13,8 @@ import type { Maybe } from '@visactor/vutils';
 import type { IGraphic } from '@visactor/vrender-core';
 import { TooltipSpecTransformer } from './tooltip-transformer';
 export type TooltipActualTitleContent = {
-    title?: IToolTipLineActual;
-    content?: IToolTipLineActual[];
+    title?: ITooltipLineActual;
+    content?: ITooltipLineActual[];
 };
 export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     protected layoutZIndex: number;

package/types/component/util.d.ts

@@ -1,2 +1,10 @@
 import type { ITheme } from '../theme';
+import type { Datum } from '../typings';
 export declare function getComponentThemeFromOption(type: string, chartTheme: ITheme): any;
+export declare function getFormatFunction(formatMethod?: any, formatter?: string | string[], text?: string | number, datum?: Datum): {
+    formatFunc: any;
+    args: (string | number | Datum)[];
+} | {
+    formatFunc?: undefined;
+    args?: undefined;
+};

package/types/core/factory.d.ts

@@ -19,6 +19,7 @@ export declare class Factory {
     private static _implements;
     private static _chartPlugin;
     private static _componentPlugin;
+    private static _formatter;
     static transforms: {
         [key: string]: Transform;
     };
@@ -62,4 +63,6 @@ export declare class Factory {
     static getChartPlugins(): IChartPluginConstructor[];
     static getComponentPlugins(): IComponentPluginConstructor[];
     static getComponentPluginInType(type: string): IComponentPluginConstructor;
+    static registerFormatter(func: typeof Factory['_formatter']): void;
+    static getFormatter(): (text: string | number | string[] | number[], datum: any, formatter: string | string[]) => any;
 }

package/types/core/index.d.ts

@@ -10,6 +10,7 @@ export * from '../theme/interface';
 export * from '../constant';
 export * from './interface';
 export * from '../typings/spec/index';
+export * from '../typings/tooltip';
 export * from '../theme/index';
 export { vglobal } from '@visactor/vrender-core';
 export * from '../plugin';

package/types/core/interface.d.ts

@@ -1,5 +1,5 @@
 import type { DataSet } from '@visactor/vdataset';
-import type { IParserOptions } from '@visactor/vdataset/es/parser';
+import type { IParserOptions } from '@visactor/vdataset';
 import type { Datum, IInitOption, IMarkStateSpec, IPoint, IRegionQuerier, IShowTooltipOption, ISpec, ITooltipHandler, Maybe, MaybeArray, StringOrNumber } from '../typings';
 import type { IMorphConfig } from '../animation/spec';
 import type { IBoundsLike } from '@visactor/vutils';

package/types/core/vchart.d.ts

@@ -5,7 +5,7 @@ import type { ISeriesConstructor } from '../series/interface';
 import type { DimensionIndexOption, IChart, IChartConstructor, IChartSpecInfo } from '../chart/interface';
 import type { IComponentConstructor } from '../component/interface';
 import type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';
-import type { IParserOptions } from '@visactor/vdataset/es/parser';
+import type { IParserOptions } from '@visactor/vdataset';
 import type { Transform, DataView } from '@visactor/vdataset';
 import { DataSet } from '@visactor/vdataset';
 import type { Stage } from '@visactor/vrender-core';
@@ -46,6 +46,7 @@ export declare class VChart implements IVChart {
     static readonly Utils: {
         measureText: (text: string, textSpec?: Partial<import("@visactor/vrender-core").ITextGraphicAttribute>, option?: Partial<import("@visactor/vutils").ITextMeasureOption>, useNaiveCanvas?: boolean) => import("@visactor/vutils").ITextSize;
     };
+    static readonly vglobal: import("@visactor/vrender-core").IGlobal;
     protected _originalSpec: any;
     protected _spec: any;
     getSpec(): any;

package/types/event/events/dimension/interface.d.ts

@@ -1,7 +1,7 @@
 import type { BaseEventParams } from '../../interface';
 import type { ISeries } from '../../../series/interface';
 import type { Datum } from '../../../typings';
-import type { AxisComponent } from '../../../component/axis/base-axis';
+import type { IAxis } from '../../../component/axis';
 export declare enum DimensionEventEnum {
     dimensionHover = "dimensionHover",
     dimensionClick = "dimensionClick"
@@ -9,7 +9,8 @@ export declare enum DimensionEventEnum {
 export interface IDimensionInfo {
     index?: number;
     value: string | number;
-    axis?: AxisComponent;
+    position?: number;
+    axis?: IAxis;
     data: IDimensionData[];
 }
 export interface IDimensionData {

package/types/index.d.ts

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

package/types/interaction/dimension-trigger.d.ts

@@ -10,7 +10,6 @@ export declare class DimensionTrigger implements ITrigger {
     protected _option: ITriggerOption;
     protected _marks: MarkSet;
     protected _markReverse: MarkSet;
-    protected _lastDimensionEvent: DimensionEventParams;
     private _hover;
     get hover(): IHoverSpec;
     private _select;
@@ -23,10 +22,6 @@ export declare class DimensionTrigger implements ITrigger {
     protected initEvent(): void;
     protected releaseEvent(): void;
     private initConfig;
-    protected getEventElement(params: DimensionEventParams, reverse?: boolean): {
-        el: IElement;
-        mark: IMark;
-    }[];
-    protected dimensionDataEqual(params: DimensionEventParams): boolean;
+    protected getEventElement(params: DimensionEventParams, reverse?: boolean): IElement[];
     private onHover;
 }

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

@@ -1,5 +1,5 @@
 import type { IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';
-import type { Datum, IMarkSpec, ICommonSpec } from '../../typings';
+import type { Datum, IMarkSpec, ICommonSpec, ValueType } from '../../typings';
 import type { IMarkRaw, IMarkStateStyle, IMarkStyle, IMarkOption, StyleConvert, MarkInputStyle } from '../interface';
 import { CompilableMark } from '../../compile/mark/compilable-mark';
 import type { StateValueType } from '../../compile/mark';
@@ -17,11 +17,11 @@ export declare class BaseMark<T extends ICommonSpec> extends CompilableMark impl
     constructor(name: string, option: IMarkOption);
     created(): void;
     initStyleWithSpec(spec: IMarkSpec<T>, key?: string): void;
-    convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any>;
+    protected _transformStyleValue<T>(styleConverter: StyleConvert<T>, transform: (value: ValueType<T>) => ValueType<T>): StyleConvert<any>;
+    convertAngleToRadian(styleConverter: StyleConvert<number>): any;
     isUserLevel(level: number): boolean;
     setStyle<U extends keyof T>(style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number, stateStyle?: IMarkStateStyle<T>): void;
     getStyle(key: string, state?: StateValueType): any;
-    protected _filterStyle(style: Partial<IMarkStyle<T>>, state: StateValueType, level: number, stateStyle?: IMarkStateStyle<T>): Partial<IMarkStyle<T>>;
     protected _filterAttribute<U extends keyof T>(attr: U, style: MarkInputStyle<T[U]>, state: StateValueType, level: number, isUserLevel: boolean, stateStyle?: IMarkStateStyle<T>): StyleConvert<T[U]>;
     setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle?: IMarkStateStyle<T>): void;
     setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state?: StateValueType): void;

package/types/mark/index.d.ts

@@ -13,10 +13,9 @@ import { Arc3dMark } from './arc-3d';
 import { ComponentMark } from './component';
 import { LinkPathMark } from './link-path';
 import { RippleMark } from './ripple';
-import { ProgressArcMark } from './progress-arc';
 import { CellMark } from './cell';
 import { BaseMark } from './base';
 import { PolygonMark } from './polygon/polygon';
 import { Pyramid3dMark } from './polygon/pyramid-3d';
-export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, IArc3dMarkSpec, ICommonSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, IProgressArcMarkSpec, ConvertToMarkStyleSpec, ICellMarkSpec } from '../typings/visual';
-export { BoxPlotMark, LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, Rect3dMark, RectMark, PathMark, Arc3dMark, ArcMark, ComponentMark, PolygonMark, Pyramid3dMark, LinkPathMark, RippleMark, ProgressArcMark, CellMark, BaseMark };
+export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, IArc3dMarkSpec, ICommonSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, ConvertToMarkStyleSpec, ICellMarkSpec } from '../typings/visual';
+export { BoxPlotMark, LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, Rect3dMark, RectMark, PathMark, Arc3dMark, ArcMark, ComponentMark, PolygonMark, Pyramid3dMark, LinkPathMark, RippleMark, CellMark, BaseMark };

package/types/mark/interface/type.d.ts

@@ -16,7 +16,6 @@ export declare const enum MarkTypeEnum {
     pyramid3d = "pyramid3d",
     boxPlot = "boxPlot",
     linkPath = "linkPath",
-    progressArc = "progressArc",
     cell = "cell",
     ripple = "ripple",
     liquid = "liquid",

package/types/plugin/chart/formatter/formatter.d.ts

@@ -0,0 +1,28 @@
+import { BasePlugin } from '../../base/base-plugin';
+import { IChartPlugin, IChartPluginService } from '../interface';
+export declare class FormatterPlugin extends BasePlugin implements IChartPlugin {
+    static readonly pluginType: 'chart';
+    static readonly specKey = "formatter";
+    static readonly type: string;
+    readonly type: string;
+    private readonly _timeModeFormat;
+    protected _spec: {
+        timeMode: 'utc' | 'local';
+        customFormatter: (specifier: string, text: string | number | string[] | number[], datum: any) => string | string[];
+        numericFormatter: (specifier: string, text: string | number | string[] | number[]) => string;
+        timeFormatter: (specifier: string, text: string | number | string[] | number[]) => string;
+    };
+    protected _formatter: (text: string | number | string[] | number[], datum: any, formatter: string | string[]) => string | number | (string | number)[];
+    private _timeFormatter;
+    private _numericFormatter;
+    private _numericSpecifier;
+    private _numericFormatterCache;
+    private _isNumericFormatterCache;
+    constructor();
+    onInit(service: IChartPluginService, chartSpec: any): void;
+    protected _format(text: string | number | string[] | number[], datum: any, formatter: string | string[]): string | number | (string | number)[];
+    protected _formatSingleLine(text: string | number, datum: any, formatter: string): string | number;
+    protected _formatSingleText(text: string | number, formatter: string): string | number;
+    dispose(): void;
+}
+export declare const registerFormatPlugin: () => void;

package/types/plugin/chart/formatter/index.d.ts

@@ -0,0 +1 @@
+export * from './formatter';

package/types/plugin/components/index.d.ts

@@ -1,5 +1,2 @@
-import { AxisSyncPlugin } from './axis-sync';
-declare const _default: {
-    AxisSyncPlugin: typeof AxisSyncPlugin;
-};
-export default _default;
+export * from './axis-sync';
+export * from './tooltip-handler';

package/types/plugin/components/tooltip-handler/base.d.ts

@@ -1,6 +1,6 @@
 import type { Options } from './constants';
 import type { Maybe, ILayoutPoint, RenderMode } from '../../../typings';
-import type { TooltipData, IToolTipActual, TooltipActiveType, ITooltipHandler, ITooltipPattern, ITooltipPositionActual } from '../../../typings/tooltip';
+import type { TooltipData, ITooltipActual, TooltipActiveType, ITooltipHandler, ITooltipPattern, ITooltipPositionActual } from '../../../typings/tooltip';
 import type { IGroup } from '@visactor/vrender-core';
 import type { Compiler } from '../../../compile/compiler';
 import type { IContainerSize } from '@visactor/vrender-components';
@@ -26,7 +26,7 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _chartContainer: Maybe<HTMLElement>;
     protected _compiler: Compiler;
     protected _cacheViewSpec: ITooltipSpec | undefined;
-    protected _cacheActualTooltip: IToolTipActual | undefined;
+    protected _cacheActualTooltip: ITooltipActual | undefined;
     protected _isTooltipPaused: boolean;
     protected _isPointerEscaped: boolean;
     protected _cachePointerTimer: number;
@@ -46,13 +46,13 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _clearAllCache(): void;
     protected _clearCacheOfContent(): void;
     protected _clearCacheOfPosition(): void;
-    protected abstract _updateTooltip(visible: boolean, params: TooltipHandlerParams, domData?: IToolTipActual): void;
+    protected abstract _updateTooltip(visible: boolean, params: TooltipHandlerParams, domData?: ITooltipActual): void;
     protected abstract _removeTooltip(): void;
     protected _throttle(callback: any): (...args: unknown[]) => unknown;
     protected _getDefaultOption(): Options;
-    protected _getActualTooltipContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => IToolTipActual;
-    protected _getActualTooltipPosition: (actualTooltip: IToolTipActual, params: TooltipHandlerParams, tooltipBoxSize: IContainerSize | undefined) => ITooltipPositionActual;
-    protected _getTooltipBoxSize(actualTooltip: IToolTipActual, changePositionOnly: boolean): IContainerSize | undefined;
+    protected _getActualTooltipContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => ITooltipActual;
+    protected _getActualTooltipPosition: (actualTooltip: ITooltipActual, params: TooltipHandlerParams, tooltipBoxSize: IContainerSize | undefined) => ITooltipPositionActual;
+    protected _getTooltipBoxSize(actualTooltip: ITooltipActual, changePositionOnly: boolean): IContainerSize | undefined;
     protected _getPointerPositionRelativeToTooltipParent(params: TooltipHandlerParams): {
         x: any;
         y: any;

package/types/plugin/components/tooltip-handler/canvas/canvas-tooltip-handler.d.ts

@@ -1,4 +1,4 @@
-import type { IToolTipActual } from '../../../../typings/tooltip';
+import type { ITooltipActual } from '../../../../typings/tooltip';
 import { BaseTooltipHandler } from '../base';
 import { Tooltip as TooltipComponent } from '@visactor/vrender-components';
 import type { TooltipHandlerParams } from '../../../../component/tooltip';
@@ -15,7 +15,7 @@ export declare class CanvasTooltipHandler extends BaseTooltipHandler {
     private _initTooltipComponent;
     private _getLayer;
     protected _removeTooltip(): void;
-    protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: IToolTipActual): void;
+    protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: ITooltipActual): void;
     isTooltipShown(): boolean;
     release(): void;
 }

package/types/plugin/components/tooltip-handler/constants.d.ts

@@ -1,10 +1,10 @@
-import type { IToolTipLineActual } from '../../../typings';
+import type { ITooltipLineActual } from '../../../typings';
 import { escapeHTML } from './utils/common';
 export declare const TOOLTIP_EL_CLASS_NAME = "vchart-tooltip-element";
 export declare const TOOLTIP_CONTAINER_EL_CLASS_NAME = "vchart-tooltip-container";
 export declare const TOOLTIP_MAX_LINE_COUNT = 20;
 export declare const TOOLTIP_EMPTY_STRING = "";
-export declare const TOOLTIP_OTHERS_LINE: IToolTipLineActual;
+export declare const TOOLTIP_OTHERS_LINE: ITooltipLineActual;
 export declare const DEFAULT_OPTIONS: {
     offsetX: number;
     offsetY: number;

package/types/plugin/components/tooltip-handler/dom/dom-tooltip-handler.d.ts

@@ -1,17 +1,19 @@
-import type { IToolTipActual } from '../../../../typings/tooltip';
+import type { ITooltipActual, ITooltipPositionActual } from '../../../../typings/tooltip';
 import { BaseTooltipHandler } from '../base';
 import type { IDomTooltipStyle } from './interface';
 import { TooltipModel } from './model/tooltip-model';
-import type { Maybe } from '@visactor/vutils';
+import { type Maybe } from '@visactor/vutils';
 import type { ITooltipSpec, TooltipHandlerParams } from '../../../../component/tooltip';
 import type { IComponentPluginService } from '../../interface';
+import type { ILayoutPoint } from '../../../../typings';
 export declare class DomTooltipHandler extends BaseTooltipHandler {
     static readonly type: string;
     readonly type: string;
     protected _tooltipContainer: HTMLElement;
     protected _domStyle: IDomTooltipStyle;
-    protected _tooltipActual?: IToolTipActual;
+    protected _tooltipActual?: ITooltipActual;
     protected _container: Maybe<HTMLDivElement>;
+    protected _cacheCustomTooltipPosition: ILayoutPoint;
     protected model: TooltipModel;
     getVisibility(): boolean;
     setVisibility(_value: boolean): void;
@@ -19,10 +21,12 @@ export declare class DomTooltipHandler extends BaseTooltipHandler {
     onAdd(service: IComponentPluginService<any>): void;
     initEl(): void;
     protected _removeTooltip(): void;
-    protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: IToolTipActual): void;
+    protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: ITooltipActual): void;
     protected _initStyle(): void;
     protected _getParentElement(spec: ITooltipSpec): HTMLElement;
     isTooltipShown(): boolean;
     reInit(): void;
+    protected _updatePosition({ x, y }: ITooltipPositionActual): void;
+    protected _initEvent(el: HTMLElement): void;
 }
 export declare const registerDomTooltipHandler: () => void;

package/types/plugin/components/tooltip-handler/dom/model/base-tooltip-model.d.ts

@@ -1,5 +1,5 @@
 import type { Maybe } from '@visactor/vutils';
-import type { IToolTipLineActual } from '../../../../../typings';
+import type { ITooltipLineActual } from '../../../../../typings';
 import type { ITooltipModelOption } from './interface';
 export declare class BaseTooltipModel {
     static type: string;
@@ -9,7 +9,7 @@ export declare class BaseTooltipModel {
     readonly childIndex: number;
     protected _option: ITooltipModelOption;
     setOption(option: ITooltipModelOption): void;
-    protected _renderContentCache: IToolTipLineActual[] | null;
+    protected _renderContentCache: ITooltipLineActual[] | null;
     children: Record<number, BaseTooltipModel>;
     product: Maybe<HTMLElement>;
     getParentEl(): HTMLElement;

package/types/plugin/components/tooltip-handler/dom/model/content-column-model.d.ts

@@ -1,7 +1,7 @@
 import { BaseTooltipModel } from './base-tooltip-model';
 import type { ITooltipModelOption } from './interface';
 import type { IShapeSvgOption } from './shape-model';
-import type { IToolTipLineActual } from '../../../../../typings';
+import type { ITooltipLineActual } from '../../../../../typings';
 export type ContentColumnType = 'shape-box' | 'key-box' | 'value-box';
 export declare class ContentColumnModel extends BaseTooltipModel {
     readonly className: ContentColumnType;
@@ -19,5 +19,5 @@ export declare class ContentColumnModel extends BaseTooltipModel {
         common?: import("../interface").IShapeStyle;
         items?: import("../interface").IShapeStyle[];
     };
-    protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption;
+    protected _getShapeSvgOption(line: ITooltipLineActual, index: number): IShapeSvgOption;
 }

package/types/plugin/components/tooltip-handler/dom/model/interface.d.ts

@@ -1,10 +1,10 @@
-import type { IToolTipActual, Maybe } from '../../../../../typings';
+import type { ITooltipActual, Maybe } from '../../../../../typings';
 import type { IDomTooltipStyle } from '../interface';
 import type { ITooltipAttributes } from '../../interface';
 export interface ITooltipModelOption {
     valueToHtml: (value: any) => string;
     getTooltipStyle: () => IDomTooltipStyle;
-    getTooltipActual: () => Maybe<IToolTipActual>;
+    getTooltipActual: () => Maybe<ITooltipActual>;
     getTooltipAttributes: () => Maybe<ITooltipAttributes>;
     getContainer: () => HTMLElement;
 }

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

@@ -1,8 +1,8 @@
 import type { TooltipPanelAttrs } from '@visactor/vrender-components';
-import type { IToolTipActual } from '../../../../typings';
+import type { ITooltipActual } from '../../../../typings';
 import type { ITooltipAttributes, ITooltipTextStyle } from '../interface';
 import type { ITheme } from '../../../../theme';
 import type { ITooltipSpec, ITooltipTextTheme, ITooltipTheme } from '../../../../component/tooltip';
 export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme, defaultAttributes?: Partial<ITooltipTextStyle>): ITooltipTextStyle;
 export declare const getPanelAttributes: (style: ITooltipTheme['panel']) => TooltipPanelAttrs;
-export declare const getTooltipAttributes: (actualTooltip: IToolTipActual, spec: ITooltipSpec, globalTheme: ITheme) => ITooltipAttributes;
+export declare const getTooltipAttributes: (actualTooltip: ITooltipActual, spec: ITooltipSpec, globalTheme: ITheme) => ITooltipAttributes;

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

@@ -1,12 +1,12 @@
 import type { Datum } from '@visactor/vgrammar-core';
-import type { IToolTipLinePattern, ITooltipPattern, MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';
+import type { ITooltipLinePattern, ITooltipPattern, MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';
 import type { ITooltipTextStyle } from '../interface/style';
 import type { TooltipRichTextAttrs } from '@visactor/vrender-components';
 import type { TooltipHandlerParams } from '../../../../component/tooltip';
 export declare function escapeHTML(value: any): string;
-export declare const getTooltipContentValue: <T>(field?: TooltipContentProperty<T>, datum?: any, params?: TooltipHandlerParams) => T;
+export declare const getTooltipContentValue: <T>(field?: TooltipContentProperty<T>, datum?: any, params?: TooltipHandlerParams, formatter?: string) => T;
 export declare const getTooltipPatternValue: <T>(field?: TooltipPatternProperty<T>, data?: TooltipData, params?: TooltipHandlerParams) => T;
-export declare const getTooltipContentPattern: (field?: ITooltipPattern['content'], data?: TooltipData, params?: TooltipHandlerParams) => Array<IToolTipLinePattern> | undefined;
+export declare const getTooltipContentPattern: (field?: ITooltipPattern['content'], data?: TooltipData, params?: TooltipHandlerParams) => Array<ITooltipLinePattern> | undefined;
 export declare function getFirstDatumFromTooltipData(data: TooltipData): Datum;
 export declare function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined;
 export declare function convertToColorString(color: any, defaultColor?: string): string;

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

@@ -1,4 +1,4 @@
-import type { IToolTipLinePattern, ITooltipPattern, TooltipData, IToolTipLineActual } from '../../../../typings/tooltip';
+import type { ITooltipLinePattern, ITooltipPattern, TooltipData, ITooltipLineActual } from '../../../../typings/tooltip';
 import type { TooltipActualTitleContent, TooltipHandlerParams } from '../../../../component/tooltip';
 export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => TooltipActualTitleContent | null;
-export declare const getOneLineData: (datum: any, config: IToolTipLinePattern, params: TooltipHandlerParams) => IToolTipLineActual;
+export declare const getOneLineData: (datum: any, config: ITooltipLinePattern, params: TooltipHandlerParams) => ITooltipLineActual;

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

@@ -1,7 +1,22 @@
-import type { TooltipFixedPosition } from '../../../../typings/tooltip/position';
+import type { IDimensionInfo } from '../../../../event';
+import type { ICartesianSeries } from '../../../../series';
+import type { ILayoutPoint } from '../../../../typings';
+import type { IFixedTooltipPositionPattern, IGlobalTooltipPositionPattern, TooltipFixedPosition } from '../../../../typings/tooltip/position';
 export declare const getActualTooltipPositionValue: (position: number | ((event: MouseEvent) => number), event: MouseEvent) => number;
-export type TooltipHorizontalPositionType = 'left' | 'right' | 'middle';
-export type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle';
+export type TooltipHorizontalPositionType = 'left' | 'right' | 'center' | 'centerLeft' | 'centerRight';
+export type TooltipVerticalPositionType = 'top' | 'bottom' | 'center' | 'centerTop' | 'centerBottom';
 export declare const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]>;
 export declare const getHorizontalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipHorizontalPositionType) => TooltipHorizontalPositionType;
 export declare const getVerticalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipVerticalPositionType) => TooltipVerticalPositionType;
+export declare const getCartesianCrosshairRect: (dimensionInfo: IDimensionInfo[], series: ICartesianSeries, layoutStartPoint: ILayoutPoint) => {
+    start: {
+        x: number;
+        y: number;
+    };
+    end: {
+        x: number;
+        y: number;
+    };
+};
+export declare const isGlobalTooltipPositionPattern: (obj: any) => obj is IGlobalTooltipPositionPattern;
+export declare const isFixedTooltipPositionPattern: (obj: any) => obj is IFixedTooltipPositionPattern;

package/types/plugin/index.d.ts

@@ -1 +1,2 @@
 export * from './chart';
+export * from './components';

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

@@ -1,5 +1,5 @@
 import type { TooltipHandlerParams } from '../../component/tooltip/interface';
-import type { IToolTipLinePattern, ITooltipPattern, ShapeType, TooltipActiveType } from '../../typings';
+import type { ITooltipLinePattern, ITooltipPattern, ShapeType, TooltipActiveType } from '../../typings';
 import type { ISeries, ISeriesTooltipHelper } from '../interface';
 import { BaseTooltipHelper } from '../../model/tooltip-helper';
 import type { IDimensionInfo } from '../../event/events/dimension/interface';
@@ -26,6 +26,6 @@ export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implement
     titleValueCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
 }
-export declare const addExtraInfoToTooltipTitlePattern: <T>(pattern: ITooltipPattern['title'], extraInfo: T | ((line: IToolTipLinePattern) => T), overwrite?: boolean) => ITooltipPattern['title'] | undefined;
-export declare const addExtraInfoToTooltipContentPattern: <T>(pattern: ITooltipPattern['content'], extraInfo: T | ((line: IToolTipLinePattern) => T), overwrite?: boolean) => ITooltipPattern['content'] | undefined;
+export declare const addExtraInfoToTooltipTitlePattern: <T>(pattern: ITooltipPattern['title'], extraInfo: T | ((line: ITooltipLinePattern) => T), overwrite?: boolean) => ITooltipPattern['title'] | undefined;
+export declare const addExtraInfoToTooltipContentPattern: <T>(pattern: ITooltipPattern['content'], extraInfo: T | ((line: ITooltipLinePattern) => T), overwrite?: boolean) => ITooltipPattern['content'] | undefined;
 export {};

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

@@ -1,5 +1,5 @@
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec';
-import type { IArcMarkSpec, IPathMarkSpec, IProgressArcMarkSpec, IRectMarkSpec } from '../../typings/visual';
+import type { IArcMarkSpec, IPathMarkSpec, IRectMarkSpec } from '../../typings/visual';
 import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { ProgressLikeAppearPreset } from '../polar/progress-like';
@@ -37,13 +37,13 @@ export type GaugeMarks = 'segment' | 'track';
 export interface IGaugeSeriesSpec extends IProgressLikeSeriesSpec, IAnimationSpec<GaugeMarks, ProgressLikeAppearPreset> {
     type: 'gauge';
     padAngle?: number;
-    [SeriesMarkNameEnum.segment]?: IMarkSpec<IProgressArcMarkSpec>;
+    [SeriesMarkNameEnum.segment]?: IMarkSpec<IArcMarkSpec>;
     [SeriesMarkNameEnum.track]?: IMarkSpec<IArcMarkSpec>;
     [SeriesMarkNameEnum.label]?: IGaugeLabelSpec;
 }
 export interface IGaugeSeriesTheme extends IProgressLikeSeriesTheme {
     padAngle?: number;
-    [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IProgressArcMarkSpec>>;
+    [SeriesMarkNameEnum.segment]?: Partial<IMarkTheme<IArcMarkSpec>>;
     [SeriesMarkNameEnum.track]?: Partial<IMarkTheme<IArcMarkSpec>>;
     [SeriesMarkNameEnum.label]?: IGaugeLabelSpec;
 }

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

@@ -58,7 +58,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;