@visactor/vchart 1.5.4 → 1.6.0

package/cjs/component/tooltip/handler/utils/common.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.measureTooltipText = exports.getScale = exports.convertToColorString = exports.pickFirstValidValue = exports.getFirstDatumFromTooltipData = exports.getTooltipPatternValue = exports.getTooltipContentValue = exports.escapeHTML = void 0;
 
-const util_1 = require("../../../../util"), vrender_core_1 = require("@visactor/vrender-core");
+const vutils_1 = require("@visactor/vutils"), vrender_core_1 = require("@visactor/vrender-core");
 
 function escapeHTML(value) {
     return String(value).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\(/g, "&#40;").replace(/  /g, " &nbsp;");
@@ -12,23 +12,23 @@ function escapeHTML(value) {
 
 exports.escapeHTML = escapeHTML;
 
-const getTooltipContentValue = (field, datum, params) => (0, util_1.isNil)(field) ? field : (0, 
-util_1.isFunction)(field) ? field(datum, params) : field;
+const getTooltipContentValue = (field, datum, params) => (0, vutils_1.isNil)(field) ? field : (0, 
+vutils_1.isFunction)(field) ? field(datum, params) : field;
 
 exports.getTooltipContentValue = getTooltipContentValue;
 
 const getTooltipPatternValue = (field, data, params) => {
-    if ((0, util_1.isNil)(field)) return field;
-    if ((0, util_1.isArray)(field)) {
+    if ((0, vutils_1.isNil)(field)) return field;
+    if ((0, vutils_1.isArray)(field)) {
         const result = [];
         return field.forEach((item => {
-            if ((0, util_1.isFunction)(item)) {
+            if ((0, vutils_1.isFunction)(item)) {
                 const value = item(data, params);
-                (0, util_1.isValid)(value) && result.push(value);
+                (0, vutils_1.isValid)(value) && result.push(value);
             } else result.push(item);
         })), result;
     }
-    return (0, util_1.isFunction)(field) ? field(data, params) : field;
+    return (0, vutils_1.isFunction)(field) ? field(data, params) : field;
 };
 
 function getFirstDatumFromTooltipData(data) {
@@ -45,7 +45,7 @@ function pickFirstValidValue(isValid, ...elements) {
 }
 
 function convertToColorString(color, defaultColor = "#000") {
-    return color ? (0, util_1.isString)(color) ? color : (0, util_1.isObject)(color) && color.stops && color.stops[0] && color.stops[0].color || defaultColor : defaultColor;
+    return color ? (0, vutils_1.isString)(color) ? color : (0, vutils_1.isObject)(color) && color.stops && color.stops[0] && color.stops[0].color || defaultColor : defaultColor;
 }
 
 exports.getTooltipPatternValue = getTooltipPatternValue, exports.getFirstDatumFromTooltipData = getFirstDatumFromTooltipData, 

package/cjs/component/tooltip/handler/utils/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { Datum } from '@visactor/vgrammar-core';\nimport type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';\nimport { isFunction, isObject, isString, isNil, isArray, isValid, initTextMeasure } from '../../../../util';\nimport type { TooltipHandlerParams } from '../../interface';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension';\nimport type { IRichTextParagraphCharacter } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getRichTextBounds } from '@visactor/vrender-core';\nimport type { ITooltipTextStyle } from '../interface/style';\n\ninterface IGradientColor {\n  [key: string]: any;\n  stops: {\n    offset: number;\n    color: string;\n  }[];\n}\n\n/**\n * Escape special HTML characters.\n *\n * @param value A value to convert to string and HTML-escape.\n */\nexport function escapeHTML(value: any): string {\n  return String(value)\n    .replace(/&/g, '&amp;')\n    .replace(/</g, '&lt;')\n    .replace(/>/g, '&gt;')\n    .replace(/\\(/g, '&#40;')\n    .replace(/  /g, ' &nbsp;'); // 转义符和真空格夹杂，在转义和正常换行之间取得平衡\n}\n\nexport const getTooltipContentValue = <T>(\n  field?: TooltipContentProperty<T>,\n  datum?: any,\n  params?: TooltipHandlerParams\n): T | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isFunction(field)) {\n    return field(datum, params);\n  }\n  return field;\n};\n\nexport const getTooltipPatternValue = <T>(\n  field?: MaybeArray<TooltipPatternProperty<T>>,\n  data?: TooltipData,\n  params?: TooltipHandlerParams\n): (typeof field extends Array<TooltipPatternProperty<T>> ? MaybeArray<T> : T) | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isArray(field)) {\n    const result: T[] = [];\n    field.forEach(item => {\n      if (isFunction(item)) {\n        const value = item(data, params);\n        if (isValid(value)) {\n          result.push(value);\n        }\n      } else {\n        result.push(item);\n      }\n    });\n    return result as any;\n  }\n  if (isFunction(field)) {\n    return field(data, params);\n  }\n  return field;\n};\n\nexport function getFirstDatumFromTooltipData(data: TooltipData): Datum {\n  // 找到第一个可用的datum\n  const dimInfoList: IDimensionInfo[] = (data as IDimensionData[])[0]?.series\n    ? [{ data: data as IDimensionData[], value: '' }]\n    : (data as IDimensionInfo[]);\n  for (const { data: dataList } of dimInfoList) {\n    for (const { datum: datumList } of dataList) {\n      for (const datumItem of datumList ?? []) {\n        if (datumItem) {\n          return datumItem;\n        }\n      }\n    }\n  }\n}\n\nexport function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined {\n  for (const ele of elements) {\n    if (isValid(ele)) {\n      return ele;\n    }\n  }\n  return undefined;\n}\n\n// 针对渐变色，受底层渲染引擎影响，不一定都能绘制正确，所以这里取 colorStop 的第一个颜色作为 color\nexport function convertToColorString(color: any, defaultColor: string = '#000') {\n  if (!color) {\n    return defaultColor;\n  }\n  if (isString(color)) {\n    return color;\n  }\n\n  if (isObject(color) && (color as IGradientColor).stops && (color as IGradientColor).stops[0]) {\n    return (color as IGradientColor).stops[0].color || defaultColor;\n  }\n\n  return defaultColor;\n}\n\n/** 获取元素的绝对缩放因数（支持外部传入 boundingClientRect 提升性能） */\nexport const getScale = (element: HTMLElement, boundingClientRect?: DOMRect) => {\n  if (!element) {\n    return 1;\n  }\n  if (!boundingClientRect) {\n    boundingClientRect = element.getBoundingClientRect();\n  }\n  if (element.offsetWidth > 0) {\n    return boundingClientRect.width / element.offsetWidth;\n  }\n  return boundingClientRect.height / element.offsetHeight;\n};\n\ninterface ITooltipTextInfo {\n  width: number;\n  height: number;\n  text: MaybeArray<number> | MaybeArray<string>;\n}\n\n/** 测量 tooltip 标签文本 */\nexport const measureTooltipText = (text: string, style: ITooltipTextStyle): ITooltipTextInfo => {\n  text = (text ?? '').toString();\n  let textLines: string[];\n  if (style.multiLine) {\n    textLines = text.split('\\n');\n    textLines = textLines.map((line, i) => (i < textLines.length - 1 ? line + '\\n' : line));\n  } else {\n    textLines = [text];\n  }\n\n  const bound = getRichTextBounds({\n    wordBreak: style.wordBreak ?? 'break-word',\n    maxWidth: style.maxWidth ? style.maxWidth : undefined,\n    width: 0,\n    height: 0,\n    textConfig: textLines.map(\n      line =>\n        ({\n          ...style,\n          text: line\n        } as unknown as IRichTextParagraphCharacter)\n    )\n  });\n  return {\n    width: bound.width(),\n    height: bound.height(),\n    text: textLines\n  };\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { Datum } from '@visactor/vgrammar-core';\nimport type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';\nimport { isFunction, isObject, isString, isNil, isArray, isValid } from '@visactor/vutils';\nimport type { TooltipHandlerParams } from '../../interface';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension';\nimport type { IRichTextParagraphCharacter } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getRichTextBounds } from '@visactor/vrender-core';\nimport type { ITooltipTextStyle } from '../interface/style';\n\ninterface IGradientColor {\n  [key: string]: any;\n  stops: {\n    offset: number;\n    color: string;\n  }[];\n}\n\n/**\n * Escape special HTML characters.\n *\n * @param value A value to convert to string and HTML-escape.\n */\nexport function escapeHTML(value: any): string {\n  return String(value)\n    .replace(/&/g, '&amp;')\n    .replace(/</g, '&lt;')\n    .replace(/>/g, '&gt;')\n    .replace(/\\(/g, '&#40;')\n    .replace(/  /g, ' &nbsp;'); // 转义符和真空格夹杂，在转义和正常换行之间取得平衡\n}\n\nexport const getTooltipContentValue = <T>(\n  field?: TooltipContentProperty<T>,\n  datum?: any,\n  params?: TooltipHandlerParams\n): T | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isFunction(field)) {\n    return field(datum, params);\n  }\n  return field;\n};\n\nexport const getTooltipPatternValue = <T>(\n  field?: MaybeArray<TooltipPatternProperty<T>>,\n  data?: TooltipData,\n  params?: TooltipHandlerParams\n): (typeof field extends Array<TooltipPatternProperty<T>> ? MaybeArray<T> : T) | undefined => {\n  if (isNil(field)) {\n    return field;\n  }\n  if (isArray(field)) {\n    const result: T[] = [];\n    field.forEach(item => {\n      if (isFunction(item)) {\n        const value = item(data, params);\n        if (isValid(value)) {\n          result.push(value);\n        }\n      } else {\n        result.push(item);\n      }\n    });\n    return result as any;\n  }\n  if (isFunction(field)) {\n    return field(data, params);\n  }\n  return field;\n};\n\nexport function getFirstDatumFromTooltipData(data: TooltipData): Datum {\n  // 找到第一个可用的datum\n  const dimInfoList: IDimensionInfo[] = (data as IDimensionData[])[0]?.series\n    ? [{ data: data as IDimensionData[], value: '' }]\n    : (data as IDimensionInfo[]);\n  for (const { data: dataList } of dimInfoList) {\n    for (const { datum: datumList } of dataList) {\n      for (const datumItem of datumList ?? []) {\n        if (datumItem) {\n          return datumItem;\n        }\n      }\n    }\n  }\n}\n\nexport function pickFirstValidValue<T>(isValid: (element?: T) => any, ...elements: T[]): T | undefined {\n  for (const ele of elements) {\n    if (isValid(ele)) {\n      return ele;\n    }\n  }\n  return undefined;\n}\n\n// 针对渐变色，受底层渲染引擎影响，不一定都能绘制正确，所以这里取 colorStop 的第一个颜色作为 color\nexport function convertToColorString(color: any, defaultColor: string = '#000') {\n  if (!color) {\n    return defaultColor;\n  }\n  if (isString(color)) {\n    return color;\n  }\n\n  if (isObject(color) && (color as IGradientColor).stops && (color as IGradientColor).stops[0]) {\n    return (color as IGradientColor).stops[0].color || defaultColor;\n  }\n\n  return defaultColor;\n}\n\n/** 获取元素的绝对缩放因数（支持外部传入 boundingClientRect 提升性能） */\nexport const getScale = (element: HTMLElement, boundingClientRect?: DOMRect) => {\n  if (!element) {\n    return 1;\n  }\n  if (!boundingClientRect) {\n    boundingClientRect = element.getBoundingClientRect();\n  }\n  if (element.offsetWidth > 0) {\n    return boundingClientRect.width / element.offsetWidth;\n  }\n  return boundingClientRect.height / element.offsetHeight;\n};\n\ninterface ITooltipTextInfo {\n  width: number;\n  height: number;\n  text: MaybeArray<number> | MaybeArray<string>;\n}\n\n/** 测量 tooltip 标签文本 */\nexport const measureTooltipText = (text: string, style: ITooltipTextStyle): ITooltipTextInfo => {\n  text = (text ?? '').toString();\n  let textLines: string[];\n  if (style.multiLine) {\n    textLines = text.split('\\n');\n    textLines = textLines.map((line, i) => (i < textLines.length - 1 ? line + '\\n' : line));\n  } else {\n    textLines = [text];\n  }\n\n  const bound = getRichTextBounds({\n    wordBreak: style.wordBreak ?? 'break-word',\n    maxWidth: style.maxWidth ? style.maxWidth : undefined,\n    width: 0,\n    height: 0,\n    textConfig: textLines.map(\n      line =>\n        ({\n          ...style,\n          text: line\n        }) as unknown as IRichTextParagraphCharacter\n    )\n  });\n  return {\n    width: bound.width(),\n    height: bound.height(),\n    text: textLines\n  };\n};\n"]}

package/cjs/component/tooltip/handler/utils/compose.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getOneLineData = exports.getShowContent = void 0;
 
-const util_1 = require("../../../../util"), common_1 = require("./common"), utils_1 = require("../../utils"), constants_1 = require("../constants"), getShowContent = (pattern, data, params) => {
+const vutils_1 = require("@visactor/vutils"), common_1 = require("./common"), common_2 = require("../../utils/common"), constants_1 = require("../constants"), getShowContent = (pattern, data, params) => {
     var _a, _b, _c, _d, _e;
     if (!data || "mouseout" === (null === (_a = null == params ? void 0 : params.event) || void 0 === _a ? void 0 : _a.type)) return null;
     const patternTitle = (0, common_1.getTooltipPatternValue)(pattern.title, data, params), patternContent = (0, 
-    util_1.array)((0, common_1.getTooltipPatternValue)(pattern.content, data, params)), tooltipContent = {
+    vutils_1.array)((0, common_1.getTooltipPatternValue)(pattern.content, data, params)), tooltipContent = {
         title: {
             value: null === (_b = null == patternTitle ? void 0 : patternTitle.value) || void 0 === _b ? void 0 : _b.toString(),
             hasShape: !1,
@@ -41,9 +41,9 @@ const util_1 = require("../../../../util"), common_1 = require("./common"), util
         }
     } else if ("dimension" === pattern.activeType) for (const {data: d} of data) {
         for (const {datum: datum, series: series} of d) {
-            if (!(0, utils_1.getTooltipActualActiveType)(null === (_d = series.tooltipHelper) || void 0 === _d ? void 0 : _d.spec).includes("dimension")) continue;
+            if (!(0, common_2.getTooltipActualActiveType)(null === (_d = series.tooltipHelper) || void 0 === _d ? void 0 : _d.spec).includes("dimension")) continue;
             const contentPatterns = null !== (_e = null == patternContent ? void 0 : patternContent.filter((c => (0, 
-            util_1.isNil)(c.seriesId) || c.seriesId === series.id))) && void 0 !== _e ? _e : [];
+            vutils_1.isNil)(c.seriesId) || c.seriesId === series.id))) && void 0 !== _e ? _e : [];
             for (const datumItem of datum) {
                 for (const linePattern of contentPatterns) {
                     const oneLineData = (0, exports.getOneLineData)(datumItem, linePattern, params);
@@ -63,8 +63,8 @@ const util_1 = require("../../../../util"), common_1 = require("./common"), util
         if (tooltipContent.content.length >= maxLineCount) break;
     }
     return tooltipContent.title && (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType ? ((0, 
-    util_1.isNil)(tooltipContent.title.shapeType) && (tooltipContent.title.shapeType = tooltipContent.content[0].shapeType), 
-    (0, util_1.isNil)(tooltipContent.title.shapeColor) && (tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor)) : tooltipContent.title.hasShape = !1), 
+    vutils_1.isNil)(tooltipContent.title.shapeType) && (tooltipContent.title.shapeType = tooltipContent.content[0].shapeType), 
+    (0, vutils_1.isNil)(tooltipContent.title.shapeColor) && (tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor)) : tooltipContent.title.hasShape = !1), 
     tooltipContent;
 };
 
@@ -73,8 +73,8 @@ exports.getShowContent = getShowContent;
 const getOneLineData = (datum, config, params) => {
     const key = (0, common_1.getTooltipContentValue)(config.key, datum, params), value = (0, 
     common_1.getTooltipContentValue)(config.value, datum, params), visible = !1 !== (0, 
-    common_1.getTooltipContentValue)(config.visible, datum, params) && ((0, util_1.isValid)(key) || (0, 
-    util_1.isValid)(value)), isKeyAdaptive = (0, common_1.getTooltipContentValue)(config.isKeyAdaptive, datum, params), spaceRow = (0, 
+    common_1.getTooltipContentValue)(config.visible, datum, params) && ((0, vutils_1.isValid)(key) || (0, 
+    vutils_1.isValid)(value)), isKeyAdaptive = (0, common_1.getTooltipContentValue)(config.isKeyAdaptive, datum, params), spaceRow = (0, 
     common_1.getTooltipContentValue)(config.spaceRow, datum, params), shapeType = (0, 
     common_1.getTooltipContentValue)(config.shapeType, datum, params), shapeColor = (0, 
     common_1.getTooltipContentValue)(config.shapeColor, datum, params), shapeFill = (0, 

package/cjs/component/tooltip/handler/utils/compose.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil, array } from '../../../../util';\nimport type { TooltipActualTitleContent } from '../../tooltip';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  IToolTipLineActual\n} from '../../../../typings/tooltip';\nimport { getFirstDatumFromTooltipData, getTooltipContentValue, getTooltipPatternValue } from './common';\nimport { getTooltipActualActiveType } from '../../utils';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport type { TooltipHandlerParams } from '../../interface';\nimport { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from '../constants';\n\n/**\n * 获得tooltip的实际显示内容\n * @param pattern\n * @param data\n * @param event\n * @returns\n */\nexport const getShowContent = (\n  pattern: ITooltipPattern,\n  data: TooltipData,\n  params: TooltipHandlerParams\n): TooltipActualTitleContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    params?.event?.type === 'mouseout'\n  ) {\n    return null;\n  }\n\n  const patternTitle = getTooltipPatternValue(pattern.title, data, params);\n  const patternContent = array(getTooltipPatternValue(pattern.content, data, params));\n\n  const tooltipContent: Required<TooltipActualTitleContent> = {\n    title: {\n      value: patternTitle?.value?.toString(),\n      hasShape: false,\n      shapeType: undefined,\n      shapeHollow: undefined\n    },\n    content: []\n  };\n\n  const { maxLineCount = TOOLTIP_MAX_LINE_COUNT } = pattern;\n\n  /** title */\n  const patternTitleVisible = getTooltipContentValue(patternTitle?.visible, data, params) !== false;\n  if (!patternTitle || !patternTitleVisible) {\n    tooltipContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    // 找到第一个可用的datum\n    const datum = getFirstDatumFromTooltipData(data);\n    tooltipContent.title = {\n      value: getTooltipContentValue(patternTitle?.value, datum, params),\n      valueStyle: getTooltipContentValue(patternTitle?.valueStyle, datum, params),\n      hasShape: patternTitle.hasShape\n    };\n  }\n\n  /** content */\n  if (pattern.activeType === 'mark') {\n    for (const content of patternContent ?? []) {\n      const oneLineData = getOneLineData((data as IDimensionData[])[0]?.datum[0], content, params);\n      if (oneLineData.visible !== false) {\n        if (tooltipContent.content.length === maxLineCount - 1) {\n          tooltipContent.content.push({\n            ...oneLineData,\n            ...TOOLTIP_OTHERS_LINE\n          });\n          break;\n        } else if (tooltipContent.content.length < maxLineCount) {\n          tooltipContent.content.push(oneLineData);\n        } else {\n          break;\n        }\n      }\n    }\n  } else if (pattern.activeType === 'dimension') {\n    for (const { data: d } of data as IDimensionInfo[]) {\n      for (const { datum, series } of d) {\n        if (!getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension')) {\n          continue;\n        }\n        const contentPatterns =\n          patternContent?.filter(\n            c => isNil(c.seriesId) || c.seriesId === series.id // 匹配对应series\n          ) ?? [];\n        for (const datumItem of datum) {\n          for (const linePattern of contentPatterns) {\n            const oneLineData = getOneLineData(datumItem, linePattern, params);\n            if (oneLineData.visible === false) {\n              continue;\n            }\n            if (tooltipContent.content.length === maxLineCount - 1) {\n              tooltipContent.content.push({\n                ...oneLineData,\n                ...TOOLTIP_OTHERS_LINE\n              });\n              break;\n            } else if (tooltipContent.content.length < maxLineCount) {\n              tooltipContent.content.push(oneLineData);\n            } else {\n              break;\n            }\n          }\n          if (tooltipContent.content.length >= maxLineCount) {\n            break;\n          }\n        }\n        if (tooltipContent.content.length >= maxLineCount) {\n          break;\n        }\n      }\n      if (tooltipContent.content.length >= maxLineCount) {\n        break;\n      }\n    }\n  }\n\n  if (tooltipContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType) {\n      if (isNil(tooltipContent.title.shapeType)) {\n        tooltipContent.title.shapeType = tooltipContent.content[0].shapeType;\n      }\n      if (isNil(tooltipContent.title.shapeColor)) {\n        tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipContent;\n};\n\n/**\n * 获得tooltip的单行实际显示内容\n * @param datum\n * @param config\n * @returns\n */\nexport const getOneLineData = (\n  datum: any,\n  config: IToolTipLinePattern,\n  params: TooltipHandlerParams\n): IToolTipLineActual => {\n  const key = getTooltipContentValue(config.key, datum, params);\n  const value = getTooltipContentValue(config.value, datum, params);\n  const visible: boolean =\n    getTooltipContentValue(config.visible, datum, params) !== false && (isValid(key) || isValid(value));\n  const isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params);\n  const spaceRow = getTooltipContentValue(config.spaceRow, datum, params);\n\n  const shapeType = getTooltipContentValue(config.shapeType, datum, params);\n  const shapeColor = getTooltipContentValue(config.shapeColor, datum, params);\n  const shapeFill = getTooltipContentValue(config.shapeFill, datum, params);\n  const shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params);\n  const shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params);\n  const keyStyle = getTooltipContentValue(config.keyStyle, datum, params);\n  const valueStyle = getTooltipContentValue(config.valueStyle, datum, params);\n\n  return {\n    key,\n    value,\n    visible,\n    isKeyAdaptive,\n    hasShape: config.hasShape,\n    shapeType: shapeType as any,\n    shapeFill,\n    shapeStroke,\n    shapeLineWidth,\n    shapeHollow: config.shapeHollow,\n    shapeColor,\n    keyStyle,\n    valueStyle,\n    spaceRow,\n    datum\n  };\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/compose.ts"],"names":[],"mappings":"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","file":"compose.js","sourcesContent":["import { isValid, isNil, array } from '@visactor/vutils';\nimport type { TooltipActualTitleContent } from '../../tooltip';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  TooltipData,\n  IToolTipLineActual\n} from '../../../../typings/tooltip';\nimport { getFirstDatumFromTooltipData, getTooltipContentValue, getTooltipPatternValue } from './common';\nimport { getTooltipActualActiveType } from '../../utils/common';\nimport type { IDimensionData, IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport type { TooltipHandlerParams } from '../../interface';\nimport { TOOLTIP_MAX_LINE_COUNT, TOOLTIP_OTHERS_LINE } from '../constants';\n\n/**\n * 获得tooltip的实际显示内容\n * @param pattern\n * @param data\n * @param event\n * @returns\n */\nexport const getShowContent = (\n  pattern: ITooltipPattern,\n  data: TooltipData,\n  params: TooltipHandlerParams\n): TooltipActualTitleContent | null => {\n  if (\n    !data ||\n    // data.key === undefined ||\n    params?.event?.type === 'mouseout'\n  ) {\n    return null;\n  }\n\n  const patternTitle = getTooltipPatternValue(pattern.title, data, params);\n  const patternContent = array(getTooltipPatternValue(pattern.content, data, params));\n\n  const tooltipContent: Required<TooltipActualTitleContent> = {\n    title: {\n      value: patternTitle?.value?.toString(),\n      hasShape: false,\n      shapeType: undefined,\n      shapeHollow: undefined\n    },\n    content: []\n  };\n\n  const { maxLineCount = TOOLTIP_MAX_LINE_COUNT } = pattern;\n\n  /** title */\n  const patternTitleVisible = getTooltipContentValue(patternTitle?.visible, data, params) !== false;\n  if (!patternTitle || !patternTitleVisible) {\n    tooltipContent.title = {\n      hasShape: false,\n      visible: false\n    };\n  } else {\n    // 找到第一个可用的datum\n    const datum = getFirstDatumFromTooltipData(data);\n    tooltipContent.title = {\n      value: getTooltipContentValue(patternTitle?.value, datum, params),\n      valueStyle: getTooltipContentValue(patternTitle?.valueStyle, datum, params),\n      hasShape: patternTitle.hasShape\n    };\n  }\n\n  /** content */\n  if (pattern.activeType === 'mark') {\n    for (const content of patternContent ?? []) {\n      const oneLineData = getOneLineData((data as IDimensionData[])[0]?.datum[0], content, params);\n      if (oneLineData.visible !== false) {\n        if (tooltipContent.content.length === maxLineCount - 1) {\n          tooltipContent.content.push({\n            ...oneLineData,\n            ...TOOLTIP_OTHERS_LINE\n          });\n          break;\n        } else if (tooltipContent.content.length < maxLineCount) {\n          tooltipContent.content.push(oneLineData);\n        } else {\n          break;\n        }\n      }\n    }\n  } else if (pattern.activeType === 'dimension') {\n    for (const { data: d } of data as IDimensionInfo[]) {\n      for (const { datum, series } of d) {\n        if (!getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension')) {\n          continue;\n        }\n        const contentPatterns =\n          patternContent?.filter(\n            c => isNil(c.seriesId) || c.seriesId === series.id // 匹配对应series\n          ) ?? [];\n        for (const datumItem of datum) {\n          for (const linePattern of contentPatterns) {\n            const oneLineData = getOneLineData(datumItem, linePattern, params);\n            if (oneLineData.visible === false) {\n              continue;\n            }\n            if (tooltipContent.content.length === maxLineCount - 1) {\n              tooltipContent.content.push({\n                ...oneLineData,\n                ...TOOLTIP_OTHERS_LINE\n              });\n              break;\n            } else if (tooltipContent.content.length < maxLineCount) {\n              tooltipContent.content.push(oneLineData);\n            } else {\n              break;\n            }\n          }\n          if (tooltipContent.content.length >= maxLineCount) {\n            break;\n          }\n        }\n        if (tooltipContent.content.length >= maxLineCount) {\n          break;\n        }\n      }\n      if (tooltipContent.content.length >= maxLineCount) {\n        break;\n      }\n    }\n  }\n\n  if (tooltipContent.title) {\n    // TODO：对 title shape 的支持目前还不完整，尚没有相关需求\n    if (tooltipContent.content.length > 0 && tooltipContent.content[0].shapeType) {\n      if (isNil(tooltipContent.title.shapeType)) {\n        tooltipContent.title.shapeType = tooltipContent.content[0].shapeType;\n      }\n      if (isNil(tooltipContent.title.shapeColor)) {\n        tooltipContent.title.shapeColor = tooltipContent.content[0].shapeColor;\n      }\n    } else {\n      tooltipContent.title.hasShape = false;\n    }\n  }\n\n  return tooltipContent;\n};\n\n/**\n * 获得tooltip的单行实际显示内容\n * @param datum\n * @param config\n * @returns\n */\nexport const getOneLineData = (\n  datum: any,\n  config: IToolTipLinePattern,\n  params: TooltipHandlerParams\n): IToolTipLineActual => {\n  const key = getTooltipContentValue(config.key, datum, params);\n  const value = getTooltipContentValue(config.value, datum, params);\n  const visible: boolean =\n    getTooltipContentValue(config.visible, datum, params) !== false && (isValid(key) || isValid(value));\n  const isKeyAdaptive = getTooltipContentValue(config.isKeyAdaptive, datum, params);\n  const spaceRow = getTooltipContentValue(config.spaceRow, datum, params);\n\n  const shapeType = getTooltipContentValue(config.shapeType, datum, params);\n  const shapeColor = getTooltipContentValue(config.shapeColor, datum, params);\n  const shapeFill = getTooltipContentValue(config.shapeFill, datum, params);\n  const shapeStroke = getTooltipContentValue(config.shapeStroke, datum, params);\n  const shapeLineWidth = getTooltipContentValue(config.shapeLineWidth, datum, params);\n  const keyStyle = getTooltipContentValue(config.keyStyle, datum, params);\n  const valueStyle = getTooltipContentValue(config.valueStyle, datum, params);\n\n  return {\n    key,\n    value,\n    visible,\n    isKeyAdaptive,\n    hasShape: config.hasShape,\n    shapeType: shapeType as any,\n    shapeFill,\n    shapeStroke,\n    shapeLineWidth,\n    shapeHollow: config.shapeHollow,\n    shapeColor,\n    keyStyle,\n    valueStyle,\n    spaceRow,\n    datum\n  };\n};\n"]}

package/cjs/component/tooltip/handler/utils/get-spec.js

@@ -4,30 +4,30 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getTooltipSpecForShow = void 0;
 
-const util_1 = require("../../../../util"), pattern_1 = require("./pattern"), utils_1 = require("../../utils"), vutils_1 = require("@visactor/vutils"), getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
+const merge_spec_1 = require("../../../../util/spec/merge-spec"), pattern_1 = require("./pattern"), common_1 = require("../../utils/common"), vutils_1 = require("@visactor/vutils"), getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const finalSpec = Object.assign(Object.assign({}, globalSpec), {
         activeType: activeType
     });
     if ("mark" === activeType && series) {
         const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
-        if ((0, util_1.isValid)(seriesSpec.visible) || (0, util_1.isValid)(seriesSpec.activeType) ? finalSpec.visible = (0, 
-        utils_1.getTooltipActualActiveType)(seriesSpec).includes("mark") : (0, util_1.isValid)(globalSpec.visible) || (0, 
-        util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, utils_1.getTooltipActualActiveType)(globalSpec).includes("mark") : finalSpec.visible = !0, 
+        if ((0, vutils_1.isValid)(seriesSpec.visible) || (0, vutils_1.isValid)(seriesSpec.activeType) ? finalSpec.visible = (0, 
+        common_1.getTooltipActualActiveType)(seriesSpec).includes("mark") : (0, vutils_1.isValid)(globalSpec.visible) || (0, 
+        vutils_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, common_1.getTooltipActualActiveType)(globalSpec).includes("mark") : finalSpec.visible = !0, 
         finalSpec.handler = null !== (_d = null !== (_c = seriesSpec.handler) && void 0 !== _c ? _c : globalSpec.handler) && void 0 !== _d ? _d : void 0, 
         null === (_e = finalSpec.handler) || void 0 === _e ? void 0 : _e.showTooltip) return finalSpec;
     } else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
         if (getSeriesListFromDimensionInfo(dimensionInfo).every((series => {
             var _a;
-            return !(0, utils_1.getTooltipActualActiveType)(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension");
-        })) ? finalSpec.visible = !1 : (0, util_1.isValid)(globalSpec.visible) || (0, util_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, 
-        utils_1.getTooltipActualActiveType)(globalSpec).includes("dimension") : finalSpec.visible = !0, 
+            return !(0, common_1.getTooltipActualActiveType)(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension");
+        })) ? finalSpec.visible = !1 : (0, vutils_1.isValid)(globalSpec.visible) || (0, 
+        vutils_1.isValid)(globalSpec.activeType) ? finalSpec.visible = (0, common_1.getTooltipActualActiveType)(globalSpec).includes("dimension") : finalSpec.visible = !0, 
         finalSpec.handler = null !== (_f = globalSpec.handler) && void 0 !== _f ? _f : void 0, 
         null === (_g = finalSpec.handler) || void 0 === _g ? void 0 : _g.showTooltip) return finalSpec;
     }
     const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo), seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo), userPattern = (0, 
-    util_1.mergeSpec)({}, (0, util_1.cloneDeep)(globalSpec[activeType]), seriesPattern), defaultPatternTitle = defaultPattern.title, titleShape = getShapePattern(void 0, userPattern, void 0, defaultPatternTitle);
-    if ((0, util_1.isValid)(userPattern.title)) if ((0, util_1.isFunction)(userPattern.title)) {
+    merge_spec_1.mergeSpec)({}, (0, vutils_1.cloneDeep)(globalSpec[activeType]), seriesPattern), defaultPatternTitle = defaultPattern.title, titleShape = getShapePattern(void 0, userPattern, void 0, defaultPatternTitle);
+    if ((0, vutils_1.isValid)(userPattern.title)) if ((0, vutils_1.isFunction)(userPattern.title)) {
         const userPatternTitle = userPattern.title;
         userPattern.title = (data, params) => {
             var _a;
@@ -35,21 +35,21 @@ const util_1 = require("../../../../util"), pattern_1 = require("./pattern"), ut
             return Object.assign(Object.assign({}, titleShape), userResult);
         };
     } else userPattern.title = Object.assign(Object.assign(Object.assign({}, defaultPattern.title), titleShape), userPattern.title); else userPattern.title = Object.assign(Object.assign({}, defaultPattern.title), titleShape);
-    const defaultPatternContent = (0, util_1.array)(defaultPattern.content);
-    if ((0, util_1.isValid)(userPattern.content)) {
+    const defaultPatternContent = (0, vutils_1.array)(defaultPattern.content);
+    if ((0, vutils_1.isValid)(userPattern.content)) {
         const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
-        if ((0, util_1.isFunction)(userPattern.content)) {
+        if ((0, vutils_1.isFunction)(userPattern.content)) {
             const userPatternContent = userPattern.content;
             userPattern.content = (data, params) => {
                 var _a;
                 const newPatternContent = [];
-                return (0, util_1.array)(null !== (_a = userPatternContent(data, params)) && void 0 !== _a ? _a : []).forEach((userLine => {
+                return (0, vutils_1.array)(null !== (_a = userPatternContent(data, params)) && void 0 !== _a ? _a : []).forEach((userLine => {
                     newPatternContent.push(Object.assign(Object.assign({}, getShapePattern(userLine, userPattern, shapePatternMap)), userLine));
                 })), newPatternContent;
             };
         } else {
             const newPatternContent = [];
-            (0, util_1.array)(userPattern.content).forEach((userLine => {
+            (0, vutils_1.array)(userPattern.content).forEach((userLine => {
                 newPatternContent.push(Object.assign(Object.assign({}, getShapePattern(userLine, userPattern, shapePatternMap)), userLine));
             })), userPattern.content = newPatternContent;
         }
@@ -74,8 +74,8 @@ const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
         }));
         const defaultPatternContent = [];
         patternList.forEach((({content: content}) => {
-            (0, util_1.isFunction)(content) ? defaultPatternContent.push(content) : defaultPatternContent.push(...(0, 
-            util_1.array)(content));
+            (0, vutils_1.isFunction)(content) ? defaultPatternContent.push(content) : defaultPatternContent.push(...(0, 
+            vutils_1.array)(content));
         })), defaultPattern = Object.assign(Object.assign({}, patternList[0]), {
             content: defaultPatternContent
         });
@@ -86,25 +86,25 @@ const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
     let seriesPattern = {};
     if ("mark" === activeType && series) {
         const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
-        seriesPattern = seriesSpec.mark ? (0, util_1.cloneDeep)(seriesSpec.mark) : {};
+        seriesPattern = seriesSpec.mark ? (0, vutils_1.cloneDeep)(seriesSpec.mark) : {};
     } else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
         const seriesPatternList = getSeriesListFromDimensionInfo(dimensionInfo).filter((series => {
             var _a;
             const spec = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec;
-            return (0, util_1.isValid)(null == spec ? void 0 : spec.dimension) && (0, utils_1.getTooltipActualActiveType)(spec).includes("dimension");
+            return (0, vutils_1.isValid)(null == spec ? void 0 : spec.dimension) && (0, common_1.getTooltipActualActiveType)(spec).includes("dimension");
         })).map((series => series.tooltipHelper.spec.dimension));
         if (seriesPatternList.length) {
             let seriesPatternContent = [];
-            seriesPatternList.every((({content: content}) => (0, util_1.isNil)(content))) ? seriesPatternContent = void 0 : seriesPatternList.forEach((({content: content}) => {
-                (0, util_1.isNil)(content) || ((0, util_1.isFunction)(content) ? null == seriesPatternContent || seriesPatternContent.push(content) : null == seriesPatternContent || seriesPatternContent.push(...(0, 
-                util_1.array)(content)));
+            seriesPatternList.every((({content: content}) => (0, vutils_1.isNil)(content))) ? seriesPatternContent = void 0 : seriesPatternList.forEach((({content: content}) => {
+                (0, vutils_1.isNil)(content) || ((0, vutils_1.isFunction)(content) ? null == seriesPatternContent || seriesPatternContent.push(content) : null == seriesPatternContent || seriesPatternContent.push(...(0, 
+                vutils_1.array)(content)));
             })), seriesPattern = Object.assign(Object.assign({}, seriesPatternList[0]), {
                 content: seriesPatternContent
             });
         }
     }
     return seriesPattern;
-}, getSeriesListFromDimensionInfo = (0, vutils_1.memoize)((dimensionInfo => dimensionInfo.reduce(((list, cur) => list.concat(cur.data.map((data => data.series)).filter(util_1.isValid))), []))), getShapePatternMapOfEachSeries = content => {
+}, getSeriesListFromDimensionInfo = (0, vutils_1.memoize)((dimensionInfo => dimensionInfo.reduce(((list, cur) => list.concat(cur.data.map((data => data.series)).filter(vutils_1.isValid))), []))), getShapePatternMapOfEachSeries = content => {
     const shapePatternMap = {};
     return content.forEach((line => {
         var _a;

package/cjs/component/tooltip/handler/utils/get-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":";;;AAWA,2CAA2F;AAC3F,uCAA+C;AAE/C,uCAAyD;AACzD,6CAA2C;AAEpC,MAAM,qBAAqB,GAAG,CACnC,UAA6B,EAC7B,UAAwB,EACxB,MAAgB,EAChB,aAAgC,EAClB,EAAE;;IAEhB,MAAM,SAAS,GAAG,gCACb,UAAU,KACb,UAAU,GACK,CAAC;IAClB,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,EAAE;QAEnC,MAAM,UAAU,GAAG,CAAC,MAAA,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,mCAAI,EAAE,CAAiB,CAAC;QAGtE,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACjE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,MAAA,UAAU,CAAC,OAAO,mCAAI,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1E,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;KACF;SAAM,IAAI,UAAU,KAAK,WAAW,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE;QAE9D,MAAM,UAAU,GAAG,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAGjE,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,CAAC,IAAA,kCAA0B,EAAC,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA,EAAA,CAAC,EAAE;YAC7G,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;SAC3B;aAAM,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,OAAO,CAAC,IAAI,IAAA,cAAO,EAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,IAAA,kCAA0B,EAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;SAClF;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QACpD,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;KACF;IAGD,MAAM,cAAc,GAAG,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAEnF,MAAM,aAAa,GAAG,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAEjF,MAAM,WAAW,GAAoB,IAAA,gBAAS,EAAC,EAAE,EAAE,IAAA,gBAAS,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IAIrG,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAwC,CAAC;IACpF,MAAM,UAAU,GAAyB,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;IACjH,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QAE9B,IAAI,CAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YAClC,WAAW,CAAC,KAAK,iDACZ,cAAc,CAAC,KAAK,GACpB,UAAU,GACV,WAAW,CAAC,KAAK,CACrB,CAAC;SACH;aAAM;YACL,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC;YAC3C,WAAW,CAAC,KAAK,GAAG,CAAC,IAAkB,EAAE,MAA6B,EAAE,EAAE;;gBACxE,MAAM,UAAU,GAAG,MAAA,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;gBACxD,uCACK,UAAU,GACV,UAAU,EACb;YACJ,CAAC,CAAC;SACH;KACF;SAAM;QACL,WAAW,CAAC,KAAK,mCACZ,cAAc,CAAC,KAAK,GACpB,UAAU,CACd,CAAC;KACH;IAGD,MAAM,qBAAqB,GAAG,IAAA,YAAK,EAAC,cAAc,CAAC,OAAO,CAA0B,CAAC;IACrF,IAAI,IAAA,cAAO,EAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,eAAe,GAAG,8BAA8B,CAAC,qBAAqB,CAAC,CAAC;QAE9E,IAAI,CAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,iBAAiB,GAA0B,EAAE,CAAC;YACpD,IAAA,YAAK,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC5C,iBAAiB,CAAC,IAAI,iCACjB,eAAe,CAAC,QAA+B,EAAE,WAAW,EAAE,eAAe,CAAC,GAC9E,QAAQ,EACX,CAAC;YACL,CAAC,CAAC,CAAC;YACH,WAAW,CAAC,OAAO,GAAG,iBAAiB,CAAC;SACzC;aAAM;YACL,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC;YAC/C,WAAW,CAAC,OAAO,GAAG,CAAC,IAAkB,EAAE,MAA6B,EAAE,EAAE;;gBAC1E,MAAM,iBAAiB,GAA0B,EAAE,CAAC;gBACpD,IAAA,YAAK,EAAC,MAAA,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBAC/D,iBAAiB,CAAC,IAAI,iCACjB,eAAe,CAAC,QAA+B,EAAE,WAAW,EAAE,eAAe,CAAC,GAC9E,QAAQ,EACX,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,OAAO,iBAAiB,CAAC;YAC3B,CAAC,CAAC;SACH;KACF;SAAM;QACL,WAAW,CAAC,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCACnD,IAAI,GACJ,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,EAC3D,CAAC,CAAC;KACL;IAED,SAAS,CAAC,UAAU,CAAC,iDAChB,cAAc,GACd,WAAW,KACd,UAAU,GACX,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AA9HW,QAAA,qBAAqB,yBA8HhC;AAGF,MAAM,wBAAwB,GAAG,CAC/B,UAA6B,EAC7B,MAAgB,EAChB,aAAgC,EACf,EAAE;;IAEnB,IAAI,cAAc,GAAG,EAAqB,CAAC;IAC3C,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,EAAE;QAEnC,cAAc,GAAG,MAAA,IAAA,4BAAkB,EAAC,MAAM,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;KAC3D;SAAM,IAAI,UAAU,KAAK,WAAW,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE;QAE9D,MAAM,WAAW,GAAsB,EAAE,CAAC;QAC1C,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,iBAAiB,GAAG;gDAEnB,aAAa,CAAC,CAAC,CAAC,KACnB,IAAI,EAAE,CAAC,IAAI,CAAC;aAEK,CAAC;YACtB,MAAM,OAAO,GAAG,IAAA,4BAAkB,EAAC,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAC3E,IAAI,OAAO,EAAE;gBACX,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAmE,EAAE,CAAC;QACjG,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAClC,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE;gBACvB,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrC;iBAAM;gBACL,qBAAqB,CAAC,IAAI,CAAC,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;QACH,cAAc,mCACT,WAAW,CAAC,CAAC,CAAC,KACjB,OAAO,EAAE,qBAAqB,GAC/B,CAAC;KACH;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAGF,MAAM,uBAAuB,GAAG,CAC9B,UAA6B,EAC7B,MAAgB,EAChB,aAAgC,EACf,EAAE;;IAEnB,IAAI,aAAa,GAAG,EAAqB,CAAC;IAC1C,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,EAAE;QAEnC,MAAM,UAAU,GAAG,CAAC,MAAA,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,mCAAI,EAAE,CAAiB,CAAC;QACtE,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE;SAAM,IAAI,UAAU,KAAK,WAAW,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE;QAE9D,MAAM,UAAU,GAAG,8BAA8B,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,UAAU;aACjC,MAAM,CAAC,MAAM,CAAC,EAAE;;YACf,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC;YACxC,OAAO,IAAA,cAAO,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAC,IAAI,IAAA,kCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5F,CAAC,CAAC;aACD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAE5B,IAAI,oBAAoB,GAA+E,EAAE,CAAC;YAC1G,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,EAAE;gBAC5D,oBAAoB,GAAG,SAAS,CAAC;aAClC;iBAAM;gBACL,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;oBACxC,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE;wBAClB,OAAO;qBACR;oBACD,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE;wBACvB,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;qBACrC;yBAAM;wBACL,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC,CAAC;qBAC/C;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,aAAa,mCACR,iBAAiB,CAAC,CAAC,CAAC,KACvB,OAAO,EAAE,oBAAoB,GAC9B,CAAC;SACH;KACF;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,IAAA,gBAAO,EAAC,CAAC,aAA+B,EAAa,EAAE;IAC5F,OAAO,aAAa,CAAC,MAAM,CACzB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,cAAO,CAAC,CAAC,EAC7E,EAAe,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAGH,MAAM,8BAA8B,GAAG,CAAC,OAA8B,EAAwC,EAAE;IAC9G,MAAM,eAAe,GAAyC,EAAE,CAAC;IACjE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;;QACrB,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,QAAQ,mCAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;YACzB,eAAe,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAGF,MAAM,eAAe,GAAG,CACtB,eAAqC,EACrC,WAA6B,EAC7B,eAAsD,EACtD,mBAA0C,EACpB,EAAE;;IACxB,MAAM,mBAAmB,GAAG,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,QAAQ,mCAAI,CAAC,CAAC,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,CAAC,CAAC,CAAC;IACtG,MAAM,SAAS,GAAoC,IAAI,GAAG,CACxD,EAAE;SACC,MAAM,CACL,MAAM,CAAC,IAAI,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,EAClC,MAAM,CAAC,IAAI,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,EAC9B,MAAM,CAAC,IAAI,CAAC,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,EAAE,CAAC,EACtC,MAAM,CAAC,IAAI,CAAC,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,EAAE,CAAC,CACvC;SACA,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAU,CAC/D,CAAC;IAEF,MAAM,YAAY,GAAyB,EAAE,CAAC;IAC9C,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;;QACtB,MAAM,KAAK,GACT,MAAA,MAAA,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,GAAG,CAAC,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,GAAG,CAAC,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,GAAG,CAAC,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,GAAG,CAAC,CAAC;QAC3G,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,YAAY,CAAC,GAAU,CAAC,GAAG,KAAK,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec, TooltipHandlerParams } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipData,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { cloneDeep, isValid, mergeSpec, array, isFunction, isNil } from '../../../../util';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { getTooltipActualActiveType } from '../../utils';\nimport { memoize } from '@visactor/vutils';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes('mark');\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('mark');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n\n    // visible\n    if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {\n      finalSpec.visible = false;\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  }\n\n  // 默认的 pattern\n  const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);\n  // 来自系列的 pattern\n  const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);\n  // 来自用户配置的 pattern\n  const userPattern: ITooltipPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern);\n\n  // 对pattern进行组装\n  // 组装 title\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = getShapePattern(undefined, userPattern, undefined, defaultPatternTitle);\n  if (isValid(userPattern.title)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.title)) {\n      userPattern.title = {\n        ...defaultPattern.title,\n        ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...userPattern.title\n      };\n    } else {\n      const userPatternTitle = userPattern.title;\n      userPattern.title = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const userResult = userPatternTitle(data, params) ?? {};\n        return {\n          ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userResult\n        };\n      };\n    }\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  // 组装 content\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);\n    // 排除是回调的情况\n    if (!isFunction(userPattern.content)) {\n      const newPatternContent: IToolTipLinePattern[] = [];\n      array(userPattern.content).forEach(userLine => {\n        newPatternContent.push({\n          ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userLine\n        });\n      });\n      userPattern.content = newPatternContent;\n    } else {\n      const userPatternContent = userPattern.content;\n      userPattern.content = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const newPatternContent: IToolTipLinePattern[] = [];\n        array(userPatternContent(data, params) ?? []).forEach(userLine => {\n          newPatternContent.push({\n            ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n            ...userLine\n          });\n        });\n        return newPatternContent;\n      };\n    }\n  } else {\n    userPattern.content = defaultPatternContent.map(line => ({\n      ...line,\n      ...getShapePattern(undefined, userPattern, undefined, line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n\n/** 获取默认 tooltip pattern */\nconst getDefaultTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo[0].data.forEach(data => {\n      const { series } = data;\n      const mockDimensionInfo = [\n        {\n          ...dimensionInfo[0],\n          data: [data]\n        }\n      ] as IDimensionInfo[];\n      const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);\n      if (pattern) {\n        patternList.push(pattern);\n      }\n    });\n    // 拼接默认 tooltip content\n    const defaultPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> = [];\n    patternList.forEach(({ content }) => {\n      if (isFunction(content)) {\n        defaultPatternContent.push(content);\n      } else {\n        defaultPatternContent.push(...array(content));\n      }\n    });\n    defaultPattern = {\n      ...patternList[0],\n      content: defaultPatternContent\n    };\n  }\n  return defaultPattern;\n};\n\n/** 获取来自系列 spec 的 tooltip pattern */\nconst getSeriesTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let seriesPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n    seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n    const seriesPatternList = seriesList\n      .filter(series => {\n        const spec = series.tooltipHelper?.spec;\n        return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');\n      })\n      .map(series => series.tooltipHelper.spec.dimension);\n    if (seriesPatternList.length) {\n      // 拼接系列 tooltip content\n      let seriesPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> | undefined = [];\n      if (seriesPatternList.every(({ content }) => isNil(content))) {\n        seriesPatternContent = undefined;\n      } else {\n        seriesPatternList.forEach(({ content }) => {\n          if (isNil(content)) {\n            return;\n          }\n          if (isFunction(content)) {\n            seriesPatternContent?.push(content);\n          } else {\n            seriesPatternContent?.push(...array(content));\n          }\n        });\n      }\n      seriesPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n  }\n  return seriesPattern;\n};\n\nconst getSeriesListFromDimensionInfo = memoize((dimensionInfo: IDimensionInfo[]): ISeries[] => {\n  return dimensionInfo.reduce(\n    (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n    [] as ISeries[]\n  );\n});\n\n/** 获取每个系列对应的 shape pattern */\nconst getShapePatternMapOfEachSeries = (content: IToolTipLinePattern[]): Record<number, ITooltipShapePattern> => {\n  const shapePatternMap: Record<number, ITooltipShapePattern> = {};\n  content.forEach(line => {\n    const key = line.seriesId ?? 0;\n    if (!shapePatternMap[key]) {\n      shapePatternMap[key] = line;\n    }\n  });\n  return shapePatternMap;\n};\n\n/** 根据优先级获取形状配置 */\nconst getShapePattern = (\n  userLinePattern?: IToolTipLinePattern,\n  userPattern?: ITooltipPattern,\n  shapePatternMap?: Record<number, ITooltipShapePattern>,\n  defaultShapePattern?: ITooltipShapePattern\n): ITooltipShapePattern => {\n  const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];\n  const shapeKeys: Set<keyof ITooltipShapePattern> = new Set(\n    []\n      .concat(\n        Object.keys(userLinePattern ?? {}),\n        Object.keys(userPattern ?? {}),\n        Object.keys(shapePatternFromMap ?? {}),\n        Object.keys(defaultShapePattern ?? {})\n      )\n      .filter(key => key.toLowerCase().includes('shape')) as any[]\n  );\n\n  const shapePattern: ITooltipShapePattern = {};\n  shapeKeys.forEach(key => {\n    const value =\n      userLinePattern?.[key] ?? userPattern?.[key] ?? shapePatternFromMap?.[key] ?? defaultShapePattern?.[key];\n    if (value !== undefined) {\n      shapePattern[key as any] = value;\n    }\n  });\n  return shapePattern;\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":"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","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec, TooltipHandlerParams } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipData,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { mergeSpec } from '../../../../util/spec/merge-spec';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { getTooltipActualActiveType } from '../../utils/common';\nimport { memoize, isValid, array, isFunction, isNil, cloneDeep } from '@visactor/vutils';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes('mark');\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('mark');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n\n    // visible\n    if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {\n      finalSpec.visible = false;\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  }\n\n  // 默认的 pattern\n  const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);\n  // 来自系列的 pattern\n  const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);\n  // 来自用户配置的 pattern\n  const userPattern: ITooltipPattern = mergeSpec({}, cloneDeep(globalSpec[activeType]), seriesPattern);\n\n  // 对pattern进行组装\n  // 组装 title\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = getShapePattern(undefined, userPattern, undefined, defaultPatternTitle);\n  if (isValid(userPattern.title)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.title)) {\n      userPattern.title = {\n        ...defaultPattern.title,\n        ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...userPattern.title\n      };\n    } else {\n      const userPatternTitle = userPattern.title;\n      userPattern.title = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const userResult = userPatternTitle(data, params) ?? {};\n        return {\n          ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userResult\n        };\n      };\n    }\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  // 组装 content\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);\n    // 排除是回调的情况\n    if (!isFunction(userPattern.content)) {\n      const newPatternContent: IToolTipLinePattern[] = [];\n      array(userPattern.content).forEach(userLine => {\n        newPatternContent.push({\n          ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userLine\n        });\n      });\n      userPattern.content = newPatternContent;\n    } else {\n      const userPatternContent = userPattern.content;\n      userPattern.content = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const newPatternContent: IToolTipLinePattern[] = [];\n        array(userPatternContent(data, params) ?? []).forEach(userLine => {\n          newPatternContent.push({\n            ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n            ...userLine\n          });\n        });\n        return newPatternContent;\n      };\n    }\n  } else {\n    userPattern.content = defaultPatternContent.map(line => ({\n      ...line,\n      ...getShapePattern(undefined, userPattern, undefined, line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n\n/** 获取默认 tooltip pattern */\nconst getDefaultTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo[0].data.forEach(data => {\n      const { series } = data;\n      const mockDimensionInfo = [\n        {\n          ...dimensionInfo[0],\n          data: [data]\n        }\n      ] as IDimensionInfo[];\n      const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);\n      if (pattern) {\n        patternList.push(pattern);\n      }\n    });\n    // 拼接默认 tooltip content\n    const defaultPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> = [];\n    patternList.forEach(({ content }) => {\n      if (isFunction(content)) {\n        defaultPatternContent.push(content);\n      } else {\n        defaultPatternContent.push(...array(content));\n      }\n    });\n    defaultPattern = {\n      ...patternList[0],\n      content: defaultPatternContent\n    };\n  }\n  return defaultPattern;\n};\n\n/** 获取来自系列 spec 的 tooltip pattern */\nconst getSeriesTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let seriesPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n    seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n    const seriesPatternList = seriesList\n      .filter(series => {\n        const spec = series.tooltipHelper?.spec;\n        return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');\n      })\n      .map(series => series.tooltipHelper.spec.dimension);\n    if (seriesPatternList.length) {\n      // 拼接系列 tooltip content\n      let seriesPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> | undefined = [];\n      if (seriesPatternList.every(({ content }) => isNil(content))) {\n        seriesPatternContent = undefined;\n      } else {\n        seriesPatternList.forEach(({ content }) => {\n          if (isNil(content)) {\n            return;\n          }\n          if (isFunction(content)) {\n            seriesPatternContent?.push(content);\n          } else {\n            seriesPatternContent?.push(...array(content));\n          }\n        });\n      }\n      seriesPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n  }\n  return seriesPattern;\n};\n\nconst getSeriesListFromDimensionInfo = memoize((dimensionInfo: IDimensionInfo[]): ISeries[] => {\n  return dimensionInfo.reduce(\n    (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n    [] as ISeries[]\n  );\n});\n\n/** 获取每个系列对应的 shape pattern */\nconst getShapePatternMapOfEachSeries = (content: IToolTipLinePattern[]): Record<number, ITooltipShapePattern> => {\n  const shapePatternMap: Record<number, ITooltipShapePattern> = {};\n  content.forEach(line => {\n    const key = line.seriesId ?? 0;\n    if (!shapePatternMap[key]) {\n      shapePatternMap[key] = line;\n    }\n  });\n  return shapePatternMap;\n};\n\n/** 根据优先级获取形状配置 */\nconst getShapePattern = (\n  userLinePattern?: IToolTipLinePattern,\n  userPattern?: ITooltipPattern,\n  shapePatternMap?: Record<number, ITooltipShapePattern>,\n  defaultShapePattern?: ITooltipShapePattern\n): ITooltipShapePattern => {\n  const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];\n  const shapeKeys: Set<keyof ITooltipShapePattern> = new Set(\n    []\n      .concat(\n        Object.keys(userLinePattern ?? {}),\n        Object.keys(userPattern ?? {}),\n        Object.keys(shapePatternFromMap ?? {}),\n        Object.keys(defaultShapePattern ?? {})\n      )\n      .filter(key => key.toLowerCase().includes('shape')) as any[]\n  );\n\n  const shapePattern: ITooltipShapePattern = {};\n  shapeKeys.forEach(key => {\n    const value =\n      userLinePattern?.[key] ?? userPattern?.[key] ?? shapePatternFromMap?.[key] ?? defaultShapePattern?.[key];\n    if (value !== undefined) {\n      shapePattern[key as any] = value;\n    }\n  });\n  return shapePattern;\n};\n"]}

package/cjs/component/tooltip/handler/utils/position.d.ts

@@ -1,4 +1,4 @@
-import { TooltipFixedPosition } from '../../../../typings';
+import { 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';

package/cjs/component/tooltip/handler/utils/position.js

@@ -4,30 +4,30 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getVerticalPositionType = exports.getHorizontalPositionType = exports.positionType = exports.getActualTooltipPositionValue = void 0;
 
-const typings_1 = require("../../../../typings"), util_1 = require("../../../../util"), getActualTooltipPositionValue = (position, event) => {
+const position_1 = require("../../../../typings/tooltip/position"), vutils_1 = require("@visactor/vutils"), getActualTooltipPositionValue = (position, event) => {
     let result;
-    if ((0, util_1.isValid)(position)) if ((0, util_1.isNumber)(position)) result = position; else if ((0, 
-    util_1.isFunction)(position)) {
+    if ((0, vutils_1.isValid)(position)) if ((0, vutils_1.isNumber)(position)) result = position; else if ((0, 
+    vutils_1.isFunction)(position)) {
         const tooltipPosition = position(event);
-        (0, util_1.isNumber)(tooltipPosition) && (result = tooltipPosition);
+        (0, vutils_1.isNumber)(tooltipPosition) && (result = tooltipPosition);
     }
     return result;
 };
 
 exports.getActualTooltipPositionValue = getActualTooltipPositionValue, exports.positionType = {
-    [typings_1.TooltipFixedPosition.left]: [ "left", "middle" ],
-    [typings_1.TooltipFixedPosition.right]: [ "right", "middle" ],
-    [typings_1.TooltipFixedPosition.inside]: [ "middle", "middle" ],
-    [typings_1.TooltipFixedPosition.top]: [ "middle", "top" ],
-    [typings_1.TooltipFixedPosition.lt]: [ "left", "top" ],
-    [typings_1.TooltipFixedPosition.tl]: [ "left", "top" ],
-    [typings_1.TooltipFixedPosition.rt]: [ "right", "top" ],
-    [typings_1.TooltipFixedPosition.tr]: [ "right", "top" ],
-    [typings_1.TooltipFixedPosition.bottom]: [ "middle", "bottom" ],
-    [typings_1.TooltipFixedPosition.bl]: [ "left", "bottom" ],
-    [typings_1.TooltipFixedPosition.lb]: [ "left", "bottom" ],
-    [typings_1.TooltipFixedPosition.br]: [ "right", "bottom" ],
-    [typings_1.TooltipFixedPosition.rb]: [ "right", "bottom" ]
+    [position_1.TooltipFixedPosition.left]: [ "left", "middle" ],
+    [position_1.TooltipFixedPosition.right]: [ "right", "middle" ],
+    [position_1.TooltipFixedPosition.inside]: [ "middle", "middle" ],
+    [position_1.TooltipFixedPosition.top]: [ "middle", "top" ],
+    [position_1.TooltipFixedPosition.lt]: [ "left", "top" ],
+    [position_1.TooltipFixedPosition.tl]: [ "left", "top" ],
+    [position_1.TooltipFixedPosition.rt]: [ "right", "top" ],
+    [position_1.TooltipFixedPosition.tr]: [ "right", "top" ],
+    [position_1.TooltipFixedPosition.bottom]: [ "middle", "bottom" ],
+    [position_1.TooltipFixedPosition.bl]: [ "left", "bottom" ],
+    [position_1.TooltipFixedPosition.lb]: [ "left", "bottom" ],
+    [position_1.TooltipFixedPosition.br]: [ "right", "bottom" ],
+    [position_1.TooltipFixedPosition.rb]: [ "right", "bottom" ]
 };
 
 const getHorizontalPositionType = (position, defaultCase) => {

package/cjs/component/tooltip/handler/utils/position.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/position.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAC3D,2CAAiE;AAE1D,MAAM,6BAA6B,GAAG,CAC3C,QAAqE,EACrE,KAAiB,EACjB,EAAE;IACF,IAAI,MAAM,CAAC;IACX,IAAI,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE;QACrB,IAAI,IAAA,eAAQ,EAAC,QAAQ,CAAC,EAAE;YACtB,MAAM,GAAG,QAAQ,CAAC;SACnB;aAAM,IAAI,IAAA,iBAAU,EAAC,QAAQ,CAAC,EAAE;YAE/B,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAExC,IAAI,IAAA,eAAQ,EAAC,eAAe,CAAC,EAAE;gBAC7B,MAAM,GAAG,eAAe,CAAC;aAC1B;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,6BAA6B,iCAkBxC;AAKW,QAAA,YAAY,GACvB;IACE,CAAC,8BAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC/C,CAAC,8BAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IACjD,CAAC,8BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACnD,CAAC,8BAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC7C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IAC1C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IAC1C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IAC3C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IAC3C,CAAC,8BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACnD,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC9C,CAAC,8BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;CAC/C,CAAC;AAEG,MAAM,yBAAyB,GAAG,CACvC,QAA8B,EAC9B,WAA2C,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,oBAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC;AAHlE,QAAA,yBAAyB,6BAGyC;AAExE,MAAM,uBAAuB,GAAG,CACrC,QAA8B,EAC9B,WAAyC,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,oBAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC;AAHhE,QAAA,uBAAuB,2BAGyC","file":"position.js","sourcesContent":["import { TooltipFixedPosition } from '../../../../typings';\nimport { isFunction, isNumber, isValid } from '../../../../util';\n\nexport const getActualTooltipPositionValue = (\n  position: number | ((event: MouseEvent) => number) | null | undefined,\n  event: MouseEvent\n) => {\n  let result;\n  if (isValid(position)) {\n    if (isNumber(position)) {\n      result = position;\n    } else if (isFunction(position)) {\n      //  这里额外判断下是否合法\n      const tooltipPosition = position(event);\n\n      if (isNumber(tooltipPosition)) {\n        result = tooltipPosition;\n      }\n    }\n  }\n  return result;\n};\n\nexport type TooltipHorizontalPositionType = 'left' | 'right' | 'middle';\nexport type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle';\n\nexport const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]> =\n  {\n    [TooltipFixedPosition.left]: ['left', 'middle'],\n    [TooltipFixedPosition.right]: ['right', 'middle'],\n    [TooltipFixedPosition.inside]: ['middle', 'middle'],\n    [TooltipFixedPosition.top]: ['middle', 'top'],\n    [TooltipFixedPosition.lt]: ['left', 'top'],\n    [TooltipFixedPosition.tl]: ['left', 'top'],\n    [TooltipFixedPosition.rt]: ['right', 'top'],\n    [TooltipFixedPosition.tr]: ['right', 'top'],\n    [TooltipFixedPosition.bottom]: ['middle', 'bottom'],\n    [TooltipFixedPosition.bl]: ['left', 'bottom'],\n    [TooltipFixedPosition.lb]: ['left', 'bottom'],\n    [TooltipFixedPosition.br]: ['right', 'bottom'],\n    [TooltipFixedPosition.rb]: ['right', 'bottom']\n  };\n\nexport const getHorizontalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipHorizontalPositionType\n): TooltipHorizontalPositionType => positionType[position]?.[0] ?? defaultCase;\n\nexport const getVerticalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipVerticalPositionType\n): TooltipVerticalPositionType => positionType[position]?.[1] ?? defaultCase;\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/position.ts"],"names":[],"mappings":";;;AAAA,mEAA4E;AAC5E,6CAAiE;AAE1D,MAAM,6BAA6B,GAAG,CAC3C,QAAqE,EACrE,KAAiB,EACjB,EAAE;IACF,IAAI,MAAM,CAAC;IACX,IAAI,IAAA,gBAAO,EAAC,QAAQ,CAAC,EAAE;QACrB,IAAI,IAAA,iBAAQ,EAAC,QAAQ,CAAC,EAAE;YACtB,MAAM,GAAG,QAAQ,CAAC;SACnB;aAAM,IAAI,IAAA,mBAAU,EAAC,QAAQ,CAAC,EAAE;YAE/B,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAExC,IAAI,IAAA,iBAAQ,EAAC,eAAe,CAAC,EAAE;gBAC7B,MAAM,GAAG,eAAe,CAAC;aAC1B;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,6BAA6B,iCAkBxC;AAKW,QAAA,YAAY,GACvB;IACE,CAAC,+BAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC/C,CAAC,+BAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IACjD,CAAC,+BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACnD,CAAC,+BAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC7C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IAC1C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;IAC1C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IAC3C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;IAC3C,CAAC,+BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACnD,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC7C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC9C,CAAC,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;CAC/C,CAAC;AAEG,MAAM,yBAAyB,GAAG,CACvC,QAA8B,EAC9B,WAA2C,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,oBAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC;AAHlE,QAAA,yBAAyB,6BAGyC;AAExE,MAAM,uBAAuB,GAAG,CACrC,QAA8B,EAC9B,WAAyC,EACZ,EAAE,eAAC,OAAA,MAAA,MAAA,oBAAY,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,mCAAI,WAAW,CAAA,EAAA,CAAC;AAHhE,QAAA,uBAAuB,2BAGyC","file":"position.js","sourcesContent":["import { TooltipFixedPosition } from '../../../../typings/tooltip/position';\nimport { isFunction, isNumber, isValid } from '@visactor/vutils';\n\nexport const getActualTooltipPositionValue = (\n  position: number | ((event: MouseEvent) => number) | null | undefined,\n  event: MouseEvent\n) => {\n  let result;\n  if (isValid(position)) {\n    if (isNumber(position)) {\n      result = position;\n    } else if (isFunction(position)) {\n      //  这里额外判断下是否合法\n      const tooltipPosition = position(event);\n\n      if (isNumber(tooltipPosition)) {\n        result = tooltipPosition;\n      }\n    }\n  }\n  return result;\n};\n\nexport type TooltipHorizontalPositionType = 'left' | 'right' | 'middle';\nexport type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle';\n\nexport const positionType: Record<TooltipFixedPosition, [TooltipHorizontalPositionType, TooltipVerticalPositionType]> =\n  {\n    [TooltipFixedPosition.left]: ['left', 'middle'],\n    [TooltipFixedPosition.right]: ['right', 'middle'],\n    [TooltipFixedPosition.inside]: ['middle', 'middle'],\n    [TooltipFixedPosition.top]: ['middle', 'top'],\n    [TooltipFixedPosition.lt]: ['left', 'top'],\n    [TooltipFixedPosition.tl]: ['left', 'top'],\n    [TooltipFixedPosition.rt]: ['right', 'top'],\n    [TooltipFixedPosition.tr]: ['right', 'top'],\n    [TooltipFixedPosition.bottom]: ['middle', 'bottom'],\n    [TooltipFixedPosition.bl]: ['left', 'bottom'],\n    [TooltipFixedPosition.lb]: ['left', 'bottom'],\n    [TooltipFixedPosition.br]: ['right', 'bottom'],\n    [TooltipFixedPosition.rb]: ['right', 'bottom']\n  };\n\nexport const getHorizontalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipHorizontalPositionType\n): TooltipHorizontalPositionType => positionType[position]?.[0] ?? defaultCase;\n\nexport const getVerticalPositionType = (\n  position: TooltipFixedPosition,\n  defaultCase?: TooltipVerticalPositionType\n): TooltipVerticalPositionType => positionType[position]?.[1] ?? defaultCase;\n"]}

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

@@ -1,4 +1,4 @@
-import type { 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,6 +15,7 @@ export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipP
     enterable?: boolean;
     transitionDuration?: number;
     throttleInterval?: number;
+    updateElement?: (tooltipElement: HTMLElement, actualTooltip: IToolTipActual, params: TooltipHandlerParams) => void;
     offset?: {
         x?: number;
         y?: number;

package/cjs/component/tooltip/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { ITooltipPattern, Maybe, TooltipActiveType, TooltipData } from '../../../typings';\nimport type { ITooltipActiveTypeAsKeys, TooltipHandlerParams, TooltipResult } from './common';\nimport type { ITooltipTheme } from './theme';\n\nexport interface ITooltipSpec\n  extends Partial<\n    /* mark tooltip pattern（*支持在series上设置）\n     * & dimension tooltip pattern\n     */\n    ITooltipActiveTypeAsKeys<ITooltipPattern, ITooltipPattern>\n  > {\n  /** 是否显示（*支持在series上设置）（*会影响自定义handler） */\n  visible?: boolean;\n  /** 受支持的激活类型（*支持在series上设置）（*会影响自定义handler） */\n  activeType?: TooltipActiveType | TooltipActiveType[];\n  /** tooltip触发方式（*会影响自定义handler） */\n  trigger?: 'hover' | 'click' | 'none';\n  /** 隐藏tooltip的触发方式（目前仅支持和trigger一致的设置以及none）（*会影响自定义handler） */\n  triggerOff?: 'hover' | 'click' | 'none';\n\n  /** tooltip样式 */\n  style?: Omit<ITooltipTheme, 'offset'>;\n\n  /** 自定义handler方法 */\n  handler?: Partial<ITooltipHandlerSpec>;\n\n  /** tooltip 渲染方式，默认为 html */\n  renderMode?: 'html' | 'canvas';\n  /**\n   * 是否将 tooltip 框限制在画布区域内，renderMode 为 canvas 时，默认开启。\n   */\n  confine?: boolean;\n\n  /**\n   * tooltip dom元素的 className，仅当 renderMode: 'html' 时生效\n   */\n  className?: string;\n  /**\n   * tooltip dom 元素的挂载点，可传 id 或 dom 对象\n   */\n  parentElement?: Maybe<string | HTMLElement | HTMLCanvasElement>;\n  /**\n   * 鼠标是否可进入提示框浮层中，默认为false，如需详情内交互，如添加链接，按钮，可设置为 true。\n   * 该属性目前只对 renderMode 为 html 时生效\n   * TODO: 支持 renderMode: canvas\n   */\n  enterable?: boolean;\n\n  /**\n   * 浮层移动动画过渡时间，单位是 ms，设置为 0 的时候会紧跟着鼠标移动（目前仅影响 dom tooltip）\n   */\n  transitionDuration?: number;\n\n  /** 更新 tooltip 的防抖动时间间隔，单位是 ms */\n  throttleInterval?: number;\n\n  offset?: {\n    x?: number;\n    y?: number;\n  };\n}\n\nexport interface ITooltipHandlerSpec {\n  /** 显示 tooltip，可以选择返回是否遇到异常 */\n  showTooltip: (\n    activeType: TooltipActiveType,\n    tooltipData: TooltipData,\n    params: TooltipHandlerParams\n  ) => Maybe<TooltipResult>;\n  /** 隐藏 tooltip，可以选择返回是否遇到异常 */\n  hideTooltip: (params: TooltipHandlerParams) => Maybe<TooltipResult>;\n  /** 释放 tooltip */\n  release: () => void;\n  /** 可选，判断 tooltip 是否正在显示 */\n  isTooltipShown?: () => boolean;\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IToolTipActual, ITooltipPattern, Maybe, TooltipActiveType, TooltipData } from '../../../typings';\nimport type { ITooltipActiveTypeAsKeys, TooltipHandlerParams, TooltipResult } from './common';\nimport type { ITooltipTheme } from './theme';\n\nexport interface ITooltipSpec\n  extends Partial<\n    /**\n     * mark tooltip pattern\n     * & dimension tooltip pattern\n     * （*支持在series上设置）\n     */\n    ITooltipActiveTypeAsKeys<ITooltipPattern, ITooltipPattern>\n  > {\n  /**\n   * 是否显示\n   * （*支持在series上设置）\n   * （*会影响自定义handler）\n   */\n  visible?: boolean;\n  /**\n   * 受支持的激活类型\n   * （*支持在series上设置）\n   * （*会影响自定义handler）\n   */\n  activeType?: TooltipActiveType | TooltipActiveType[];\n  /**\n   * tooltip触发方式\n   * （*会影响自定义handler）\n   */\n  trigger?: 'hover' | 'click' | 'none';\n  /**\n   * 隐藏tooltip的触发方式（目前仅支持和trigger一致的设置以及none）\n   * （*会影响自定义handler）\n   */\n  triggerOff?: 'hover' | 'click' | 'none';\n\n  /**\n   * tooltip样式\n   */\n  style?: Omit<ITooltipTheme, 'offset'>;\n\n  /**\n   * 自定义handler方法\n   */\n  handler?: Partial<ITooltipHandlerSpec>;\n\n  /**\n   * tooltip 渲染方式，默认为 html\n   */\n  renderMode?: 'html' | 'canvas';\n  /**\n   * 是否将 tooltip 框限制在画布区域内，renderMode 为 canvas 时，默认开启。\n   */\n  confine?: boolean;\n\n  /**\n   * tooltip dom元素的 className，仅当 renderMode: 'html' 时生效\n   */\n  className?: string;\n  /**\n   * tooltip dom 元素的挂载点，可传 id 或 dom 对象\n   */\n  parentElement?: Maybe<string | HTMLElement | HTMLCanvasElement>;\n  /**\n   * 鼠标是否可进入提示框浮层中，默认为false，如需详情内交互，如添加链接，按钮，可设置为 true。\n   * 该属性目前只对 renderMode 为 html 时生效\n   * TODO: 支持 renderMode: canvas\n   */\n  enterable?: boolean;\n\n  /**\n   * 浮层移动动画过渡时间，单位是 ms，设置为 0 的时候会紧跟着鼠标移动（目前仅影响 dom tooltip）\n   */\n  transitionDuration?: number;\n\n  /**\n   * 更新 tooltip 的防抖动时间间隔，单位是 ms\n   */\n  throttleInterval?: number;\n\n  /**\n   * 更新 tooltip dom 元素，仅当 renderMode: 'html' 时生效\n   * @since 1.6.0\n   */\n  updateElement?: (tooltipElement: HTMLElement, actualTooltip: IToolTipActual, params: TooltipHandlerParams) => void;\n\n  offset?: {\n    x?: number;\n    y?: number;\n  };\n}\n\nexport interface ITooltipHandlerSpec {\n  /** 显示 tooltip，可以选择返回是否遇到异常 */\n  showTooltip: (\n    activeType: TooltipActiveType,\n    tooltipData: TooltipData,\n    params: TooltipHandlerParams\n  ) => Maybe<TooltipResult>;\n  /** 隐藏 tooltip，可以选择返回是否遇到异常 */\n  hideTooltip: (params: TooltipHandlerParams) => Maybe<TooltipResult>;\n  /** 释放 tooltip */\n  release: () => void;\n  /** 可选，判断 tooltip 是否正在显示 */\n  isTooltipShown?: () => boolean;\n}\n"]}

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

@@ -1,7 +1,7 @@
 import type { BaseEventParams } from '../../../event/interface';
 import type { TooltipActiveType, TooltipData } from '../../../typings';
 import type { TooltipHandlerParams } from '../interface';
-import { TooltipResult } from '../interface';
+import { TooltipResult } from '../interface/common';
 import type { Tooltip } from '../tooltip';
 import type { MouseEventData, TooltipInfo } from './interface';
 import type { IDimensionInfo } from '../../../event/events/dimension';

package/cjs/component/tooltip/processor/base.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseTooltipProcessor = void 0;
 
-const vutils_1 = require("@visactor/vutils"), interface_1 = require("../interface"), constant_1 = require("../../../constant"), util_1 = require("../../../event/events/dimension/util"), vscale_1 = require("@visactor/vscale");
+const vutils_1 = require("@visactor/vutils"), common_1 = require("../interface/common"), constant_1 = require("../../../constant"), polar_1 = require("../../../event/events/dimension/util/polar"), cartesian_1 = require("../../../event/events/dimension/util/cartesian"), vscale_1 = require("@visactor/vscale");
 
 class BaseTooltipProcessor {
     constructor(component) {
@@ -15,7 +15,7 @@ class BaseTooltipProcessor {
                 activeType: this.activeType,
                 tooltip: this.component
             })), (null === (_a = this.component.tooltipHandler) || void 0 === _a ? void 0 : _a.showTooltip) && (0, 
-            vutils_1.isValid)(data) ? null !== (_b = this.component.tooltipHandler.showTooltip(this.activeType, data, params)) && void 0 !== _b ? _b : interface_1.TooltipResult.success : interface_1.TooltipResult.failed;
+            vutils_1.isValid)(data) ? null !== (_b = this.component.tooltipHandler.showTooltip(this.activeType, data, params)) && void 0 !== _b ? _b : common_1.TooltipResult.success : common_1.TooltipResult.failed;
         }, this.component = component;
     }
     _preprocessDimensionInfo(dimensionInfo) {
@@ -37,8 +37,8 @@ class BaseTooltipProcessor {
             x: x,
             y: y
         };
-        if (targetDimensionInfo = [ ...null !== (_a = (0, util_1.getCartesianDimensionInfo)(chart, pos)) && void 0 !== _a ? _a : [], ...null !== (_b = (0, 
-        util_1.getPolarDimensionInfo)(chart, pos)) && void 0 !== _b ? _b : [] ], 0 === targetDimensionInfo.length) targetDimensionInfo = void 0; else if (targetDimensionInfo.length > 1) {
+        if (targetDimensionInfo = [ ...null !== (_a = (0, cartesian_1.getCartesianDimensionInfo)(chart, pos)) && void 0 !== _a ? _a : [], ...null !== (_b = (0, 
+        polar_1.getPolarDimensionInfo)(chart, pos)) && void 0 !== _b ? _b : [] ], 0 === targetDimensionInfo.length) targetDimensionInfo = void 0; else if (targetDimensionInfo.length > 1) {
             const dimensionAxisInfo = null !== (_c = targetDimensionInfo.filter((info => {
                 var _a;
                 const axis = info.axis;