@visactor/vchart-types 1.11.0-alpha.1 → 1.11.0-alpha.2

package/types/component/index.d.ts

@@ -34,7 +34,7 @@ import type { IMarkPointSpec, IMarkPointTheme } from './marker/mark-point';
 import { MarkPoint, registerMarkPoint } from './marker/mark-point';
 import type { ITooltipSpec, ITooltipTheme } from './tooltip';
 import { Tooltip, registerTooltip } from './tooltip';
-import type { ILabelSpec, ITotalLabelTheme, ITotalLabelSpec } from './label';
+import type { ILabelSpec, ITotalLabelTheme } from './label';
 import { Label, registerLabel } from './label';
 import { TotalLabel, registerTotalLabel } from './label/total-label';
 import { registerPoptip } from './poptip/index';
@@ -43,6 +43,6 @@ import type { IAxisCommonTheme, IAxisItemTheme, IBandAxisTheme } from './axis/in
 import type { IPoptipTheme } from './poptip/interface';
 export { ScrollBar, DataZoom, CustomMark, Brush, MapLabelComponent, CartesianAxis, CartesianBandAxis, CartesianLinearAxis, CartesianTimeAxis, CartesianLogAxis, CartesianSymlogAxis, PolarAxis, PolarBandAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Indicator, Title, GeoCoordinate, CartesianCrossHair, PolarCrossHair, Player, MarkArea, MarkLine, MarkPoint, Tooltip, Label, TotalLabel };
 export { registerBrush, registerScrollBar, registerTitle, registerTooltip, registerCartesianBandAxis, registerCartesianCrossHair, registerCartesianLinearAxis, registerCartesianLogAxis, registerCartesianSymlogAxis, registerCartesianTimeAxis, registerContinuousLegend, registerCustomMark, registerDataZoom, registerDiscreteLegend, registerGeoCoordinate, registerIndicator, registerLabel, registerTotalLabel, registerMapLabel, registerMarkArea, registerMarkLine, registerMarkPoint, registerPlayer, registerPolarBandAxis, registerPolarCrossHair, registerPolarLinearAxis, registerPoptip };
-export type { IComponent, IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, ITotalLabelSpec, IMapLabelSpec, IMarkAreaSpec, IMarkLineSpec, IStepMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
+export type { IComponent, IScrollBarSpec, IBrushSpec, ICartesianAxisSpec, ICartesianBandAxisSpec, ICartesianCrosshairSpec, ICartesianLinearAxisSpec, ICartesianTimeAxisSpec, ICartesianLogAxisSpec, IContinuousLegendSpec, IDataZoomSpec, IDiscreteLegendSpec, IGeoCoordinateSpec, IIndicatorSpec, ILabelSpec, IMapLabelSpec, IMarkAreaSpec, IMarkLineSpec, IStepMarkLineSpec, IMarkPointSpec, IPlayerSpec, IPolarAxisSpec, IPolarBandAxisSpec, IPolarCrosshairSpec, IPolarLinearAxisSpec, ITitleSpec, ITooltipSpec };
 export type { IComponentTheme, ICrosshairTheme, IAxisItemTheme, IAxisCommonTheme, IBandAxisTheme, IPolarAxisCommonTheme, ICartesianAxisCommonTheme, IBrushTheme, IDataZoomTheme, IScrollBarTheme, IIndicatorTheme, IMapLabelTheme, ITotalLabelTheme, ISizeLegendTheme, IColorLegendTheme, IDiscreteLegendTheme, IContinuousLegendTheme, IMarkAreaTheme, IMarkLineTheme, IMarkPointTheme, IPlayerTheme, IPoptipTheme, ITitleTheme, ITooltipTheme };
 export * from './tooltip/interface';

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

@@ -1,5 +1,8 @@
+import type { ITooltipLineActual } from '../../typings';
 export declare class TooltipHandlerType {
     static dom: string;
     static 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;

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

@@ -1,18 +1,23 @@
 import type { DimensionEventParams } from '../../../event/events/dimension/interface';
-import type { DimensionTooltipInfo, MarkTooltipInfo } from '../processor/interface';
-import type { Datum, IShowTooltipOption } from '../../../typings';
+import type { DimensionTooltipInfo, GroupTooltipInfo, MarkTooltipInfo } from '../processor/interface';
+import type { Datum, IShowTooltipOption, ITooltipActual } from '../../../typings';
 import type { IComponent } from '../../interface';
+import type { ITooltipSpec } from './spec';
 export type TooltipHandlerParams = DimensionEventParams & {
     changePositionOnly?: boolean;
     tooltip: ITooltip;
+    tooltipSpec?: ITooltipSpec;
+    tooltipActual?: ITooltipActual;
+    groupDatum?: Datum[];
 };
-export interface ITooltipActiveTypeAsKeys<T, K> {
+export interface ITooltipActiveTypeAsKeys<T, K, U> {
     mark: T;
     dimension: K;
+    group: U;
 }
 export type TotalMouseEventData = {
-    tooltipInfo: Partial<ITooltipActiveTypeAsKeys<MarkTooltipInfo, DimensionTooltipInfo>>;
-    ignore: Partial<ITooltipActiveTypeAsKeys<boolean, boolean>>;
+    tooltipInfo: Partial<ITooltipActiveTypeAsKeys<MarkTooltipInfo, DimensionTooltipInfo, GroupTooltipInfo>>;
+    ignore: Partial<ITooltipActiveTypeAsKeys<boolean, boolean, boolean>>;
 };
 export declare const enum TooltipResult {
     success = 0,

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

@@ -1,7 +1,7 @@
-import type { ITooltipActual, ITooltipPattern, Maybe, MaybeArray, TooltipActiveType, TooltipData } from '../../../typings';
+import type { IGroupTooltipPattern, ITooltipActual, ITooltipPattern, Maybe, MaybeArray, TooltipActiveType, TooltipData } from '../../../typings';
 import type { ITooltipActiveTypeAsKeys, TooltipHandlerParams, TooltipResult } from './common';
 import type { ITooltipTheme } from './theme';
-export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipPattern, ITooltipPattern>> {
+export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipPattern, ITooltipPattern, IGroupTooltipPattern>> {
     visible?: boolean;
     activeType?: TooltipActiveType | TooltipActiveType[];
     trigger?: MaybeArray<'hover' | 'click'> | 'none';

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

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

package/types/component/tooltip/processor/group-tooltip.d.ts

@@ -0,0 +1,11 @@
+import type { BaseEventParams } from '../../../event/interface';
+import type { TooltipActiveType } from '../../../typings';
+import type { DimensionTooltipInfo, GroupTooltipInfo, MouseEventData } from './interface';
+import { BaseTooltipProcessor } from './base';
+export declare class GroupTooltipProcessor extends BaseTooltipProcessor {
+    activeType: TooltipActiveType;
+    showTooltip(info: GroupTooltipInfo, params: BaseEventParams, changePositionOnly: boolean): import("../interface").TooltipResult;
+    shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean;
+    getMouseEventData(params: BaseEventParams, dimensionInfo?: DimensionTooltipInfo): MouseEventData;
+    protected _getGroupDatum(params: BaseEventParams): any;
+}

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

@@ -1,5 +1,6 @@
 export * from './base';
 export * from './dimension-tooltip';
 export * from './mark-tooltip';
+export * from './group-tooltip';
 export * from './interface';
 export * from './util';

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

@@ -3,13 +3,14 @@ import type { IMark } from '../../../mark/interface';
 import type { ISeries } from '../../../series/interface';
 import type { IDimensionInfo } from '../../../event/events/dimension/interface';
 export type DimensionTooltipInfo = IDimensionInfo[];
-export type MarkTooltipInfo = {
-    datum: Datum;
+export type MarkTooltipInfo<T = Datum> = {
+    datum: T;
     mark: IMark;
     series: ISeries;
     dimensionInfo: DimensionTooltipInfo;
 };
-export type TooltipInfo = DimensionTooltipInfo | MarkTooltipInfo;
+export type GroupTooltipInfo = MarkTooltipInfo<Datum | Datum[]>;
+export type TooltipInfo = DimensionTooltipInfo | MarkTooltipInfo | GroupTooltipInfo;
 export type MouseEventData = {
     tooltipInfo: TooltipInfo;
     ignore: boolean;

package/types/component/tooltip/processor/mark-tooltip.d.ts

@@ -1,10 +1,10 @@
 import type { BaseEventParams } from '../../../event/interface';
 import type { TooltipActiveType } from '../../../typings';
-import type { MarkTooltipInfo, MouseEventData } from './interface';
+import type { DimensionTooltipInfo, MarkTooltipInfo, MouseEventData } from './interface';
 import { BaseTooltipProcessor } from './base';
 export declare class MarkTooltipProcessor extends BaseTooltipProcessor {
     activeType: TooltipActiveType;
     showTooltip(info: MarkTooltipInfo, params: BaseEventParams, changePositionOnly: boolean): import("../interface").TooltipResult;
     shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean;
-    getMouseEventData(params: BaseEventParams): MouseEventData;
+    getMouseEventData(params: BaseEventParams, dimensionInfo?: DimensionTooltipInfo): MouseEventData;
 }

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

@@ -1,4 +1,4 @@
 import type { Maybe } from '@visactor/vutils';
 import type { DimensionTooltipInfo, MarkTooltipInfo, TooltipInfo } from './interface';
-export declare const isMarkInfo: (info: Maybe<TooltipInfo>) => info is MarkTooltipInfo;
+export declare const isMarkInfo: (info: Maybe<TooltipInfo>) => info is MarkTooltipInfo<any>;
 export declare const isDimensionInfo: (info: Maybe<TooltipInfo>) => info is DimensionTooltipInfo;

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

@@ -7,8 +7,7 @@ import type { ITooltipHandler, ITooltipLineActual, TooltipActiveType } from '../
 import type { Datum, IShowTooltipOption } from '../../typings';
 import type { ITooltip, ITooltipActiveTypeAsKeys, ITooltipSpec, TooltipHandlerParams, TotalMouseEventData } from './interface';
 import { TooltipResult } from './interface/common';
-import { DimensionTooltipProcessor } from './processor/dimension-tooltip';
-import { MarkTooltipProcessor } from './processor/mark-tooltip';
+import { GroupTooltipProcessor, DimensionTooltipProcessor, MarkTooltipProcessor } from './processor';
 import type { Maybe } from '@visactor/vutils';
 import type { IGraphic } from '@visactor/vrender-core';
 import { TooltipSpecTransformer } from './tooltip-transformer';
@@ -32,8 +31,9 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     private _alwaysShow;
     private _cacheInfo;
     private _cacheParams;
+    private _cacheActiveType;
     private _eventList;
-    protected _processor: ITooltipActiveTypeAsKeys<MarkTooltipProcessor, DimensionTooltipProcessor>;
+    protected _processor: ITooltipActiveTypeAsKeys<MarkTooltipProcessor, DimensionTooltipProcessor, GroupTooltipProcessor>;
     protected _isTooltipShown: boolean;
     protected _clickLock: boolean;
     isTooltipShown(): boolean;

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

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

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

@@ -0,0 +1,5 @@
+import type { TooltipActiveType } 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;

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

@@ -0,0 +1,6 @@
+import type { Datum, ITooltipLinePattern, ITooltipPattern, 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

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

package/types/core/interface.d.ts

@@ -23,7 +23,6 @@ export type DataLinkAxis = {
 };
 export interface IVChartConstructor {
     new (spec: ISpec, options: IInitOption): IVChart;
-    useRegisters: (comps: (() => void)[]) => any;
 }
 export interface IVChart {
     readonly id: number;

package/types/model/tooltip-helper.d.ts

@@ -6,8 +6,8 @@ export type TooltipTrigger = IModel | IMark;
 export interface ITooltipHelper {
     spec: ITooltipSpec | undefined;
     activeType: TooltipActiveType[];
-    activeTriggerSet: ITooltipActiveTypeAsKeys<Set<TooltipTrigger>, Set<TooltipTrigger>>;
-    ignoreTriggerSet: ITooltipActiveTypeAsKeys<Set<TooltipTrigger>, Set<TooltipTrigger>>;
+    activeTriggerSet: ITooltipActiveTypeAsKeys<Set<TooltipTrigger>, Set<TooltipTrigger>, Set<TooltipTrigger>>;
+    ignoreTriggerSet: ITooltipActiveTypeAsKeys<Set<TooltipTrigger>, Set<TooltipTrigger>, Set<TooltipTrigger>>;
     updateTooltipSpec: () => void;
 }
 export declare abstract class BaseTooltipHelper implements ITooltipHelper {
@@ -16,10 +16,12 @@ export declare abstract class BaseTooltipHelper implements ITooltipHelper {
     activeTriggerSet: {
         mark: Set<TooltipTrigger>;
         dimension: Set<TooltipTrigger>;
+        group: Set<TooltipTrigger>;
     };
     ignoreTriggerSet: {
         mark: Set<TooltipTrigger>;
         dimension: Set<TooltipTrigger>;
+        group: Set<TooltipTrigger>;
     };
     abstract updateTooltipSpec(): void;
 }

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, ITooltipPositionActual } from '../../../typings/tooltip';
 import type { IGroup } from '@visactor/vrender-core';
 import type { Compiler } from '../../../compile/compiler';
 import type { IContainerSize } from '@visactor/vrender-components';
@@ -10,8 +10,8 @@ import { TooltipResult } from '../../../component/tooltip';
 import type { IComponentPlugin, IComponentPluginService } from '../interface';
 import { BasePlugin } from '../../base/base-plugin';
 import type { ITooltipAttributes } from './interface';
-type ChangeTooltipFunc = (visible: boolean, params: TooltipHandlerParams, changePositionOnly?: boolean, activeType?: TooltipActiveType, data?: TooltipData) => TooltipResult;
-type ChangeTooltipPositionFunc = (changePositionOnly: boolean, data: TooltipData, params: TooltipHandlerParams) => TooltipResult;
+type ChangeTooltipFunc = (visible: boolean, params: TooltipHandlerParams, data?: TooltipData) => TooltipResult;
+type ChangeTooltipPositionFunc = (params: TooltipHandlerParams, data: TooltipData) => TooltipResult;
 export declare abstract class BaseTooltipHandler extends BasePlugin implements ITooltipHandler, IComponentPlugin {
     static readonly pluginType: 'component';
     static readonly specKey = "tooltip";
@@ -25,8 +25,6 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _attributes?: ITooltipAttributes | null;
     protected _chartContainer: Maybe<HTMLElement>;
     protected _compiler: Compiler;
-    protected _cacheViewSpec: ITooltipSpec | undefined;
-    protected _cacheActualTooltip: ITooltipActual | undefined;
     protected _isTooltipPaused: boolean;
     protected _isPointerEscaped: boolean;
     protected _cachePointerTimer: number;
@@ -44,13 +42,10 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     hideTooltip(params: TooltipHandlerParams): TooltipResult;
     release(): void;
     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): 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 _getPointerPositionRelativeToTooltipParent(params: TooltipHandlerParams): {

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

@@ -1,4 +1,3 @@
-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 +14,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): void;
     isTooltipShown(): boolean;
     release(): void;
 }

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

@@ -1,9 +1,6 @@
-import type { ITooltipLineActual } from '../../../typings';
 import { escapeHTML } from './utils/common';
 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 DEFAULT_OPTIONS: {
     offsetX: number;
     offsetY: number;

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

@@ -21,7 +21,7 @@ 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): void;
     protected _initStyle(): void;
     protected _getParentElement(spec: ITooltipSpec): HTMLElement;
     isTooltipShown(): boolean;

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

@@ -1,13 +1,7 @@
-import type { Datum } from '@visactor/vgrammar-core';
-import type { ITooltipLinePattern, ITooltipPattern, MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';
+import type { MaybeArray } 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, 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;
 export declare function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined;
 export declare function convertToColorString(color: any, defaultColor?: string): string;
 export declare const getScale: (element: HTMLElement, boundingClientRect?: DOMRect) => number;

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

@@ -1,6 +1,4 @@
 export * from './common';
-export * from './compose';
 export * from './pattern';
-export * from './get-spec';
 export * from './position';
 export * from './attribute';

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

@@ -36,6 +36,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     protected _rootMark: IGroupMark;
     getRootMark(): IGroupMark;
     protected _seriesMark: Maybe<IMark>;
+    getSeriesMark(): IMark;
     protected _layoutLevel: number;
     protected _rawData: DataView;
     getRawData(): DataView;

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

@@ -18,6 +18,7 @@ export declare class BaseSeriesTooltipHelper extends BaseTooltipHelper implement
     protected _getSeriesCacheInfo: () => ISeriesCacheInfo;
     protected _getDimensionData: (datum: any) => any;
     protected _getMeasureData: (datum: any) => any;
+    protected _getSeriesFieldData: (datum: any) => any;
     protected _getSeriesStyle: (datum: any, styleKey: string | string[], defaultValue?: any) => any;
     contentKeyCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;
     contentValueCallback: (datum: Datum, params?: TooltipHandlerParams) => string | undefined;

package/types/series/index.d.ts

@@ -63,10 +63,8 @@ import type { IProgressLikeSeriesSpec } from './polar/progress-like';
 import { ProgressLikeSeries } from './polar/progress-like';
 import type { IRoseLikeSeriesSpec } from './polar/rose-like';
 import { RoseLikeSeries } from './polar/rose-like';
-import type { ILiquidSeriesSpec } from './liquid/interface';
-import { LiquidSeries, registerLiquidSeries } from './liquid/liquid';
 import type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries } from './interface';
-export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries };
-export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries, registerLiquidSeries };
-export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec };
+export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries };
+export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries };
+export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec };
 export * from './interface';

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

@@ -53,6 +53,7 @@ export interface ISeries extends IModel {
     getMarkInId: (id: number) => IMark | undefined;
     getRootMark: () => IGroupMark;
     getActiveMarks: () => IMark[];
+    getSeriesMark: () => IMark;
     getStackData: () => ISeriesStackData;
     getStack: () => boolean;
     getStackValue: () => StringOrNumber | undefined;

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

@@ -25,7 +25,6 @@ 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;
@@ -59,6 +58,5 @@ 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/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/tooltip.d.ts

@@ -16,6 +16,10 @@ export interface ITooltipPattern extends ITooltipShapePattern {
     maxLineCount?: number;
     activeType?: TooltipActiveType;
 }
+export type GroupTooltipTriggerMark = 'line' | 'area' | 'point' | 'bar';
+export interface IGroupTooltipPattern extends ITooltipPattern {
+    triggerMark?: MaybeArray<GroupTooltipTriggerMark>;
+}
 export interface ITooltipActual {
     visible?: boolean;
     title?: ITooltipLineActual;