@visactor/vchart-types 1.12.7 → 1.12.8

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

@@ -3,7 +3,7 @@ import type { IGaugePointerSeriesSpec, IGaugeSeriesSpec } from '../../series/gau
 import type { ILinearAxisSpec } from '../../component/axis/interface';
 import type { ICircularProgressSeriesSpec } from '../../series/progress/circular/interface';
 import type { IPolarChartSpec } from '../polar';
-export interface IGaugeChartSpec extends Omit<IPolarChartSpec, 'axes'>, Omit<IGaugePointerSeriesSpec, 'data' | 'type' | 'morph'> {
+export interface IGaugeChartSpec extends Omit<IPolarChartSpec, 'axes'>, Omit<IGaugePointerSeriesSpec, 'data' | 'type' | 'morph' | 'tooltip'> {
     type: 'gauge';
     gauge?: Omit<IGaugeSeriesSpec, 'data'> | Omit<ICircularProgressSeriesSpec, 'data'>;
     axes?: (IPolarAxisSpec | ILinearAxisSpec)[];

package/types/chart/treemap/interface.d.ts

@@ -1,6 +1,6 @@
 import type { ITreemapSeriesSpec } from '../../series/treemap/interface';
 import type { IChartSpec } from '../../typings/spec/common';
-export interface ITreemapChartSpec extends Omit<IChartSpec, 'data' | 'series'>, ITreemapSeriesSpec {
+export interface ITreemapChartSpec extends Omit<IChartSpec, 'data' | 'series'>, Omit<ITreemapSeriesSpec, 'tooltip'> {
     type: 'treemap';
     series?: ITreemapSeriesSpec[];
 }

package/types/chart/venn/interface.d.ts

@@ -1,6 +1,6 @@
 import type { IVennSeriesSpec } from '../../series/venn/interface';
-import type { IChartSpec } from '../../typings/spec/common';
-export interface IVennChartSpec extends Omit<IChartSpec, 'data' | 'series'>, IVennSeriesSpec {
+import type { IChartExtendsSeriesSpec, IChartSpec } from '../../typings/spec/common';
+export interface IVennChartSpec extends IChartSpec, IChartExtendsSeriesSpec<IVennSeriesSpec> {
     type: 'venn';
     series?: IVennSeriesSpec[];
 }

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

@@ -17,6 +17,7 @@ export type ICartesianTitle = ITitle & {
 export type ICartesianLabel = ILabel & {
     flush?: boolean;
     lastVisible?: boolean | null;
+    firstVisible?: boolean | null;
     containerAlign?: 'left' | 'right' | 'center' | 'top' | 'bottom' | 'middle';
 } & AxisLabelOverlap;
 export interface ILinearAxis extends IAxis {

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

@@ -1,4 +1,3 @@
 export * from './common';
 export * from './type';
-export * from './tooltip-helper';
 export * from './theme';

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

@@ -1,5 +1,5 @@
 import type { IComponent } from '../../interface';
-import type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender-core';
+import type { ITextGraphicAttribute, IRichTextCharacter, ITextAttribute } from '@visactor/vrender-core';
 import type { IOrientType, IPadding } from '../../../typings';
 import type { IComponentSpec } from '../../base/interface';
 interface ITitleSpecWithoutText extends Omit<IComponentSpec, 'orient'> {
@@ -21,7 +21,7 @@ interface ITitleSpecWithoutText extends Omit<IComponentSpec, 'orient'> {
         height?: number;
         align?: string;
         verticalAlign?: string;
-        wordBreak?: RichTextWordBreak;
+        wordBreak?: ITextAttribute['wordBreak'];
         maxLineWidth?: number;
         heightLimit?: number;
         lineClamp?: number;
@@ -32,7 +32,7 @@ interface ITitleSpecWithoutText extends Omit<IComponentSpec, 'orient'> {
         height?: number;
         align?: string;
         verticalAlign?: string;
-        wordBreak?: RichTextWordBreak;
+        wordBreak?: ITextAttribute['wordBreak'];
         maxLineWidth?: number;
         heightLimit?: number;
         lineClamp?: number;

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

@@ -1,9 +1,10 @@
 import type { ITooltipLineActual, TooltipActiveType } from '../../typings';
-export declare class TooltipHandlerType {
-    static dom: string;
-    static canvas: string;
-}
+export declare const TooltipHandlerType: {
+    dom: string;
+    canvas: string;
+};
 export declare const TOOLTIP_EL_CLASS_NAME = "vchart-tooltip-element";
 export declare const TOOLTIP_MAX_LINE_COUNT = 20;
 export declare const TOOLTIP_OTHERS_LINE: ITooltipLineActual;
 export declare const TOOLTIP_TYPES: TooltipActiveType[];
+export declare const DEFAULT_SHOW_DELAY = 50;

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

@@ -7,7 +7,7 @@ export type TooltipHandlerParams = DimensionEventParams & {
     changePositionOnly?: boolean;
     tooltip: ITooltip;
     tooltipSpec?: ITooltipSpec;
-    tooltipActual?: ITooltipActual;
+    activeTooltipSpec?: ITooltipActual;
     groupDatum?: Datum[];
 };
 export interface ITooltipActiveTypeAsKeys<T, K, U> {

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

@@ -6,6 +6,7 @@ export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipP
     activeType?: TooltipActiveType | TooltipActiveType[];
     trigger?: MaybeArray<'hover' | 'click'> | 'none';
     triggerOff?: MaybeArray<'hover' | 'click'> | 'none';
+    showDelay?: number;
     hideTimer?: number;
     lockAfterClick?: boolean;
     style?: Omit<ITooltipTheme<string>, 'offset' | 'transitionDuration'>;
@@ -23,9 +24,16 @@ export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipP
         y?: number;
     };
 }
+type ISeriesToolipPattern = Pick<ITooltipPattern, 'visible' | 'title' | 'content' | 'hasShape' | 'shapeColor' | 'shapeFill' | 'shapeHollow' | 'shapeLineWidth' | 'shapeSize' | 'shapeStroke' | 'shapeType' | 'updateContent' | 'updateTitle' | 'updatePosition'>;
+export interface ISeriesTooltipSpec extends Pick<ITooltipSpec, 'visible' | 'activeType' | 'handler'> {
+    dimension?: ISeriesToolipPattern;
+    mark?: ISeriesToolipPattern;
+    group?: Pick<IGroupTooltipPattern, 'triggerMark'> & ISeriesToolipPattern;
+}
 export interface ITooltipHandlerSpec {
     showTooltip: (activeType: TooltipActiveType, tooltipData: TooltipData, params: TooltipHandlerParams) => Maybe<TooltipResult>;
     hideTooltip: (params: TooltipHandlerParams) => Maybe<TooltipResult>;
     release: () => void;
     isTooltipShown?: () => boolean;
 }
+export {};

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

@@ -1,4 +1,4 @@
-import type { RichTextWordBreak } from '@visactor/vrender-core';
+import type { ITextAttribute } from '@visactor/vrender-core';
 import type { ITooltipShapePattern, StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';
 import type { Padding } from '@visactor/vrender-components';
 import type { ITokenKey } from '../../../theme/token';
@@ -14,7 +14,7 @@ export interface ITooltipTextTheme<ColorType = string> {
     spacing?: number;
     multiLine?: boolean;
     maxWidth?: number;
-    wordBreak?: RichTextWordBreak;
+    wordBreak?: ITextAttribute['wordBreak'];
     autoWidth?: boolean;
 }
 export interface ITooltipTheme<ColorType = string> {

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

@@ -1,6 +1,6 @@
 import type { BaseEventParams } from '../../../event/interface';
 import type { ITooltipActual, TooltipActiveType, TooltipData } from '../../../typings';
-import type { ITooltipSpec, TooltipHandlerParams } from '../interface';
+import type { TooltipHandlerParams } from '../interface';
 import { TooltipResult } from '../interface/common';
 import type { Tooltip } from '../tooltip';
 import type { MouseEventData, TooltipInfo } from './interface';
@@ -8,15 +8,13 @@ import type { IDimensionInfo } from '../../../event/events/dimension';
 export declare abstract class BaseTooltipProcessor {
     readonly component: Tooltip;
     abstract activeType: TooltipActiveType;
-    protected _cacheViewSpec: ITooltipSpec | undefined;
-    protected _cacheActualTooltip: ITooltipActual | undefined;
+    protected _cacheActiveSpec: ITooltipActual | undefined;
     constructor(component: Tooltip);
     abstract showTooltip(info: TooltipInfo, params: BaseEventParams, changePositionOnly: boolean): TooltipResult;
     abstract getMouseEventData(params: BaseEventParams): MouseEventData;
     protected _showTooltipByHandler: (data: TooltipData | undefined, params: TooltipHandlerParams) => TooltipResult;
     protected _preprocessDimensionInfo(dimensionInfo?: IDimensionInfo[]): IDimensionInfo[] | undefined;
-    protected _updateViewSpec(params: TooltipHandlerParams): void;
-    protected _updateActualTooltip(data: TooltipData, params: TooltipHandlerParams): void;
+    protected _updateViewSpec(data: TooltipData, params: TooltipHandlerParams): void;
     shouldHandleTooltip(params: BaseEventParams, info: TooltipInfo): boolean;
     clearCache(): void;
 }

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

@@ -20,7 +20,11 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     static specKey: string;
     specKey: string;
     layoutType: 'none';
-    private _timer?;
+    private _hideTimer?;
+    private _outTimer?;
+    private _showTimer?;
+    private _needInitEventOfTooltip?;
+    private _enterable;
     protected _spec: ITooltipSpec;
     tooltipHandler?: ITooltipHandler;
     processor: ITooltipActiveTypeAsKeys<MarkTooltipProcessor, DimensionTooltipProcessor, GroupTooltipProcessor>;
@@ -28,8 +32,8 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     private _cacheInfo;
     private _cacheParams;
     private _cacheActiveType;
+    private _cacheEnterableRect;
     private _eventList;
-    protected _isTooltipShown: boolean;
     protected _clickLock: boolean;
     isTooltipShown(): boolean;
     changeRegions(regions: IRegion[]): void;
@@ -43,6 +47,7 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     release(): void;
     beforeRelease(): void;
     protected _initHandler(): void;
+    protected _initEventOfTooltipContent(): void;
     protected _initProcessor(): void;
     protected _initEvent(): void;
     protected _mountEvent: (eType: EventType, query: EventQuery, callback: EventCallback<any>) => void;
@@ -50,15 +55,15 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     protected _getMouseOutHandler: (needPointerDetection?: boolean) => (params: BaseEventParams) => void;
     protected _handleChartMouseOut: (params?: BaseEventParams) => void;
     protected _getMouseMoveHandler: (isClick: boolean) => (params: BaseEventParams) => void;
+    protected _handleChartMouseMove: (params: BaseEventParams, isClick: boolean) => void;
     protected _showTooltipByMouseEvent: (activeType: TooltipActiveType, mouseEventData: TotalMouseEventData, params: BaseEventParams, isClick: boolean, useCache?: boolean) => boolean;
     protected _getMouseEventData: (params: BaseEventParams) => TotalMouseEventData;
     protected _hideTooltipByHandler: (params: TooltipHandlerParams) => TooltipResult;
     reInit(spec?: any): void;
     showTooltip(datum: Datum, options: IShowTooltipOption): false | "none" | TooltipActiveType;
-    hideTooltip(): boolean;
+    hideTooltip: () => boolean;
     private _isSameAsCache;
     private _isPointerInChart;
-    private _isPointerOnTooltip;
     getVisible(): boolean;
 }
 export declare const registerTooltip: () => void;

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

@@ -1,7 +1,9 @@
-import type { ITooltipPattern, TooltipActiveType } from '../../../typings';
-import type { ITooltipSpec } from '../interface';
+import type { Datum, ITooltipActual, ITooltipLineActual, ITooltipLinePattern, MaybeArray, TooltipActiveType, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../typings';
+import type { ISeriesTooltipSpec, ITooltipSpec, TooltipHandlerParams } from '../interface';
 import type { BaseEventParams } from '../../../event/interface';
 export declare const getTooltipActualActiveType: (spec?: ITooltipSpec) => TooltipActiveType[];
-export declare const isActiveTypeVisible: (type: TooltipActiveType, spec?: ITooltipSpec) => boolean;
+export declare const isActiveTypeVisible: (type: TooltipActiveType, spec?: ISeriesTooltipSpec) => boolean;
 export declare function isEmptyPos(params: BaseEventParams): boolean;
-export declare function combinePattern(patternList: ITooltipPattern[]): ITooltipPattern;
+export declare function parseContent(contentSpec: MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>, defaultContent: ITooltipLinePattern, shapeAttrs: Record<string, TooltipContentProperty<any>>, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipLineActual[];
+export declare function combineContents(patternList: ITooltipActual[]): ITooltipActual;
+export declare const getTimeString: (value: any, timeFormat?: string, timeFormatMode?: 'local' | 'utc') => any;

package/types/component/tooltip/utils/get-spec.d.ts

@@ -1,5 +1,5 @@
-import type { TooltipActiveType } from '../../../typings';
+import type { ITooltipActual, TooltipActiveType, TooltipData } from '../../../typings';
 import type { ISeries } from '../../../series/interface';
-import type { IDimensionInfo } from '../../../event/events/dimension/interface';
-import type { ITooltipSpec } from '..';
-export declare const getTooltipSpecForShow: (activeType: TooltipActiveType, globalSpec: ITooltipSpec, series?: ISeries, dimensionInfo?: IDimensionInfo[]) => ITooltipSpec;
+import type { TooltipHandlerParams } from '../interface/common';
+import type { ITooltipSpec } from '../interface/spec';
+export declare const getTooltipSpecForShow: (activeType: TooltipActiveType, globalSpec: ITooltipSpec, series?: ISeries, data?: TooltipData, params?: TooltipHandlerParams) => ITooltipActual;

package/types/component/tooltip/utils/get-value.d.ts

@@ -1,6 +1,5 @@
-import type { Datum, ITooltipLinePattern, ITooltipPattern, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../typings';
+import type { Datum, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../typings';
 import type { TooltipHandlerParams } from '../interface';
 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 function getFirstDatumFromTooltipData(data: TooltipData): Datum;

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

@@ -2,4 +2,3 @@ export * from './show-tooltip';
 export * from './common';
 export * from './get-spec';
 export * from './get-value';
-export * from './compose';

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

@@ -1,4 +1,5 @@
 import type { DataView } from '@visactor/vdataset';
+import type { Datum } from '../../typings';
 export interface IPieOpt {
     angleField: () => string;
     startAngle: () => number;
@@ -13,7 +14,9 @@ export interface IPieOpt {
     asK: string;
     showAllZero: boolean;
     supportNegative: boolean;
+    showEmptyCircle: boolean;
 }
 export declare const pie: (originData: Array<DataView>, op: IPieOpt) => {
     [x: string]: any;
 }[];
+export declare const isDataEmpty: (data: Datum[], angleField: string, supportNegative: boolean) => boolean;

package/types/model/interface.d.ts

@@ -20,6 +20,8 @@ import type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';
 import type { ILayoutPoint, ILayoutRect } from '../typings/layout';
 import type { ComponentTypeEnum } from '../component/interface';
 import type { SeriesTypeEnum } from '../series';
+import type { ITooltipSpec } from '../component/tooltip/interface';
+import type { TooltipActiveType } from '../typings';
 export interface IModelInitOption {
 }
 export interface IModelLayoutOption {
@@ -152,3 +154,15 @@ export interface IBaseModelSpecTransformer {
     getTheme: (spec: any, chartSpec: any) => any;
     transformSpec: (spec: any, chartSpec: any, chartSpecInfo?: IChartSpecInfo) => IBaseModelSpecTransformerResult<any, any>;
 }
+export interface ITooltipHelper {
+    spec: ITooltipSpec | undefined;
+    activeType: TooltipActiveType[];
+    activeTriggerSet: {
+        mark?: Set<IMark>;
+        group?: Set<IMark>;
+    };
+    ignoreTriggerSet: {
+        mark?: Set<IMark>;
+    };
+    updateTooltipSpec: () => void;
+}

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

@@ -1,5 +1,5 @@
 import type { Options } from './constants';
-import type { Maybe, ILayoutPoint, RenderMode } from '../../../typings';
+import type { Maybe, RenderMode } from '../../../typings';
 import type { TooltipData, ITooltipActual, TooltipActiveType, ITooltipHandler, ITooltipPositionActual } from '../../../typings/tooltip';
 import type { IGroup } from '@visactor/vrender-core';
 import type { Compiler } from '../../../compile/compiler';
@@ -25,12 +25,6 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _attributes?: ITooltipAttributes | null;
     protected _chartContainer: Maybe<HTMLElement>;
     protected _compiler: Compiler;
-    protected _isTooltipPaused: boolean;
-    protected _isPointerEscaped: boolean;
-    protected _cachePointerTimer: number;
-    protected _cachePointerPosition: ILayoutPoint;
-    protected _cacheTooltipPosition: ILayoutPoint;
-    protected _cacheTooltipSize: IContainerSize;
     protected _container: Maybe<IGroup | HTMLElement>;
     protected _isReleased: boolean;
     onAdd(service: IComponentPluginService<any>): void;
@@ -41,18 +35,12 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _changeTooltipPosition: ChangeTooltipPositionFunc;
     hideTooltip(params: TooltipHandlerParams): TooltipResult;
     release(): void;
-    protected _clearAllCache(): void;
     protected abstract _updateTooltip(visible: boolean, params: TooltipHandlerParams): void;
     protected abstract _removeTooltip(): void;
     protected _throttle(callback: any): (...args: unknown[]) => unknown;
     protected _getDefaultOption(): Options;
     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;
-    };
-    protected _isPointerMovingToTooltip(params: TooltipHandlerParams): boolean;
     protected _getParentElement(spec: ITooltipSpec): HTMLElement;
     getTooltipContainer(): HTMLElement | IGroup;
     protected _initFromSpec(): void;

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

@@ -27,6 +27,5 @@ export declare class DomTooltipHandler extends BaseTooltipHandler {
     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/interface/style.d.ts

@@ -1,10 +1,9 @@
 import type { TooltipAttributes } from '@visactor/vrender-components';
-import type { ITextAttribute, IFillStyle, RichTextWordBreak } from '@visactor/vrender-core';
+import type { ITextAttribute, IFillStyle } from '@visactor/vrender-core';
 export interface ITooltipTextStyle extends Partial<ITextAttribute & IFillStyle> {
     spacing?: number;
     multiLine?: boolean;
     maxWidth?: number;
-    wordBreak?: RichTextWordBreak;
     autoWidth?: boolean;
 }
 export interface ITooltipAttributes extends TooltipAttributes {

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

@@ -2,11 +2,9 @@ import type { IDimensionData } from '../../../../event';
 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' | '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 type TooltipPositionType = -2 | -1 | 0 | 1 | 2;
+export declare const positionType: Record<TooltipFixedPosition, [TooltipPositionType, TooltipPositionType]>;
+export declare const getPositionType: (position: TooltipFixedPosition, dim: 'x' | 'y', defaultCase?: TooltipPositionType) => TooltipPositionType;
 export declare const getCartesianCrosshairRect: (dimensionData: IDimensionData, layoutStartPoint: ILayoutPoint) => {
     visible: boolean;
     start: {

package/types/region/interface.d.ts

@@ -53,7 +53,9 @@ export interface IRegionSpec extends ILayoutItemSpec {
 }
 export interface IGeoRegionSpec extends IRegionSpec {
     coordinate?: 'geo';
-    roam?: boolean;
+    roam?: boolean | {
+        blank?: boolean;
+    };
     longitudeField?: string;
     latitudeField?: string;
     projection?: Partial<Omit<IProjectionSpec, 'name'>>;

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

@@ -1,17 +1,25 @@
-import type { TooltipHandlerParams } from '../../component/tooltip/interface';
-import type { ITooltipPattern, ShapeType, TooltipActiveType } from '../../typings';
+import type { ISeriesTooltipSpec, ITooltipSpec, TooltipHandlerParams } from '../../component/tooltip/interface';
+import type { ITooltipActual, ITooltipLineActual, ITooltipLinePattern, ITooltipPattern, MaybeArray, ShapeType, TooltipActiveType, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../typings';
 import type { ISeries, ISeriesTooltipHelper } from '../interface';
-import { BaseTooltipHelper } from '../../model/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 import type { Datum } from '@visactor/vgrammar-core';
+import type { IMark } from '../../mark/interface/common';
 interface ISeriesCacheInfo {
     seriesFields: string[];
     dimensionFields: string[];
     measureFields: string[];
     type: string;
 }
-export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implements ISeriesTooltipHelper {
+export declare class BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
     series: ISeries;
+    spec: ISeriesTooltipSpec | undefined;
+    activeType: TooltipActiveType[];
+    activeTriggerSet: {
+        mark: Set<IMark>;
+        group: Set<IMark>;
+    };
+    ignoreTriggerSet: {
+        mark: Set<IMark>;
+    };
     protected _seriesCacheInfo: ISeriesCacheInfo;
     constructor(series: ISeries);
     updateTooltipSpec(): void;
@@ -28,6 +36,22 @@ export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implement
     dimensionTooltipTitleCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     groupTooltipTitleCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     groupTooltipKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    getHasShape: (isContent: boolean) => boolean;
+    protected getShapeAttrs(activeType: TooltipActiveType, isContent: boolean, chartTooltipSpec?: ITooltipSpec): {
+        shapeType: TooltipContentProperty<string>;
+        shapeFill: TooltipContentProperty<string>;
+        shapeStroke: TooltipContentProperty<string>;
+        shapeHollow: TooltipContentProperty<boolean>;
+        shapeLineWidth: TooltipContentProperty<number>;
+        shapeSize: any;
+        hasShape: boolean;
+    };
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultContentList(activeType: TooltipActiveType): MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
+    protected getContentList(activeType: TooltipActiveType, spec: ITooltipPattern, shapeAttrs: Record<string, TooltipContentProperty<any>>, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipLineActual[];
+    protected getTitleResult(activeType: TooltipActiveType, titleSpec: TooltipPatternProperty<ITooltipLinePattern>, shapeAttrs: Record<string, TooltipContentProperty<any>>, data?: TooltipData, params?: TooltipHandlerParams): ITooltipLineActual;
+    getTooltipData(activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipActual | null;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    protected getDefaultContentPattern(activeType: TooltipActiveType): ITooltipLinePattern;
 }
 export {};

package/types/series/box-plot/tooltip-helper.d.ts

@@ -1,9 +1,9 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { Datum, ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum, ITooltipLinePattern, TooltipActiveType } from '../../typings';
 import { BOX_PLOT_TOOLTIP_KEYS } from '../../constant/box-plot';
 export declare class BoxPlotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected getDefaultContentList(activeType: TooltipActiveType): ITooltipLinePattern[];
     getContentKey: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => string;
     getContentValue: (contentType: BOX_PLOT_TOOLTIP_KEYS) => (datum: any) => any;
     shapeColorCallback: (datum: Datum) => any;

package/types/series/cartesian/cartesian.d.ts

@@ -31,7 +31,7 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     protected _specXField: string[];
     protected _specYField: string[];
     protected _direction: DirectionType;
-    get direction(): "vertical" | "horizontal";
+    get direction(): "horizontal" | "vertical";
     protected _scaleX: IBaseScale;
     get scaleX(): IBaseScale;
     setScaleX(s: IBaseScale): void;

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

@@ -1,6 +1,12 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum, ITooltipActual, ITooltipLinePattern, MaybeArray, TooltipActiveType, TooltipData, TooltipPatternProperty } from '../../typings';
+import type { ITooltipSpec } from '../../component/tooltip/interface/spec';
+import type { TooltipHandlerParams } from '../../component/tooltip/interface/common';
 export declare class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    shapeTypeCallback: () => string;
+    protected getDefaultContentList(): MaybeArray<TooltipPatternProperty<MaybeArray<ITooltipLinePattern>>>;
+    getTooltipData(activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipActual | null;
 }

package/types/series/gauge/pointer-tooltip-helper.d.ts

@@ -1,5 +1,6 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
+import type { TooltipActiveType } from '../../typings';
 export declare class GaugePointerTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    updateTooltipSpec(): void;
+    protected enableByType(activeType: TooltipActiveType): boolean;
 }

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

@@ -1,6 +1,5 @@
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { TooltipActiveType } from '../../typings';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 export declare class HeatmapSeriesTooltipHelper extends BaseSeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
 }

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

@@ -1,10 +1,11 @@
-import type { ITooltipPattern, ShapeType, TooltipActiveType, TooltipContentCallback } from '../../typings';
+import type { Datum, ITooltipActual, ShapeType, TooltipActiveType, TooltipContentCallback, TooltipData } from '../../typings';
 import type { ISeries } from './series';
-import type { ITooltipHelper } from '../../model/tooltip-helper';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
+import type { ITooltipHelper } from '../../model/interface';
+import type { ITooltipSpec } from '../../component/tooltip/interface/spec';
+import type { TooltipHandlerParams } from '../../component/tooltip/interface/common';
 export interface ISeriesTooltipHelper extends ITooltipHelper {
     series: ISeries;
-    getDefaultTooltipPattern: (activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null;
+    getTooltipData: (activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, allData?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams) => ITooltipActual | null;
     markTooltipKeyCallback: TooltipContentCallback<string>;
     markTooltipValueCallback: TooltipContentCallback<string>;
     shapeTypeCallback: TooltipContentCallback<ShapeType>;

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

@@ -1,6 +1,9 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { ITooltipLinePattern, TooltipActiveType } from '../../typings';
 export declare class LinkSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
+    protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern;
+    shapeTypeCallback: () => string;
+    protected getDefaultContentList(): ITooltipLinePattern[];
 }

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

@@ -1,9 +1,8 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { Datum, ITooltipPattern, TooltipActiveType } from '../../typings';
+import type { Datum } from '../../typings';
 export declare class LiquidSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
-    getContentKey: () => (datum: any) => string;
-    getContentValue: () => (datum: any) => any;
-    getLiquidFillColor: (datum: Datum) => any;
+    markTooltipKeyCallback: (datum: any) => string;
+    markTooltipValueCallback: (datum: any) => any;
+    shapeStrokeCallback: (datum: Datum) => any;
 }

package/types/series/progress/linear/tooltip-helper.d.ts

@@ -1,7 +1,6 @@
 import { BaseSeriesTooltipHelper } from '../../base/tooltip-helper';
 import type { ISeriesTooltipHelper } from '../../interface';
-import type { ITooltipPattern, TooltipActiveType } from '../../../typings';
-import type { IDimensionInfo } from '../../../event/events/dimension/interface';
+import type { TooltipActiveType } from '../../../typings';
 export declare class LinearProgressSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected enableByType(activeType: TooltipActiveType): boolean;
 }

package/types/series/range-area/tooltip-helper.d.ts

@@ -1,7 +1,5 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
 export declare class RangeAreaSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected _getMeasureData: (datum: any) => string;
 }

package/types/series/range-column/tooltip-helper.d.ts

@@ -1,6 +1,5 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
 export declare class RangeColumnSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType): ITooltipPattern | null;
+    protected _getMeasureData: (datum: any) => string;
 }

package/types/series/sankey/sankey.d.ts

@@ -27,7 +27,7 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     private _colorScale;
     private _nodeList;
     private _needClear;
-    get direction(): "vertical" | "horizontal";
+    get direction(): "horizontal" | "vertical";
     getCategoryField(): string;
     setCategoryField(f: string): string;
     protected _valueField: string;

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

@@ -1,7 +1,7 @@
 import type { ISeriesTooltipHelper } from '../interface';
 import { BaseSeriesTooltipHelper } from '../base/tooltip-helper';
-import type { ITooltipPattern, TooltipActiveType } from '../../typings';
-import type { IDimensionInfo } from '../../event/events/dimension/interface';
+import type { Datum } from '@visactor/vgrammar-core';
 export declare class SankeySeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper {
-    getDefaultTooltipPattern(activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]): ITooltipPattern | null;
+    protected _getDimensionData: (datum: any) => any;
+    markTooltipValueCallback: (datum: Datum) => string | undefined;
 }