@visactor/vchart 1.10.0-alpha.1 → 1.10.0-alpha.5

package/esm/component/crosshair/utils/cartesian.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/crosshair/utils/cartesian.ts"],"names":[],"mappings":"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","file":"cartesian.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous, isDiscrete } from '@visactor/vscale';\nimport type { ICartesianSeries } from '../../../series';\nimport type { ILayoutPoint } from '../../../typings';\nimport type { IBound, IHair } from '../base';\nimport { LayoutType } from '../config';\nimport type { AxisCurrentValueMap, ICrosshairInfoX, ICrosshairInfoY } from '../interface';\nimport { getDatumByValue } from './common';\nimport { getAxisLabelOffset } from '../../axis/util';\nimport { isValid } from '@visactor/vutils';\nimport type { IAxis } from '../../axis';\nimport { getFormatFunction } from '../../util';\n\nexport const layoutByValue = (\n  tag: number = LayoutType.ALL,\n  series: ICartesianSeries,\n  layoutStartPoint: ILayoutPoint,\n  currValueX: AxisCurrentValueMap,\n  currValueY: AxisCurrentValueMap,\n  xHair: IHair,\n  yHair: IHair,\n  enableRemain: boolean = false,\n  cacheXCrossHairInfo?: ICrosshairInfoX,\n  cacheYCrossHairInfo?: ICrosshairInfoY\n) => {\n  const layoutX = tag & LayoutType.VERTICAL;\n  const layoutY = tag & LayoutType.HORIZONTAL;\n\n  if (!layoutStartPoint) {\n    layoutStartPoint = { x: 0, y: 0 };\n  }\n\n  // 计算x和y的坐标\n  let xAxis = null;\n  let yAxis = null;\n  let x = 0;\n  let y = 0;\n  if (currValueX.size) {\n    const item = Array.from(currValueX.values())[0];\n    x = item.axis.getScale().scale(item.value) + item.axis.getLayoutStartPoint().x - layoutStartPoint.x;\n    xAxis = item.axis;\n  }\n  if (currValueY.size) {\n    const item = Array.from(currValueY.values())[0];\n    y = item.axis.getScale().scale(item.value) + item.axis.getLayoutStartPoint().y - layoutStartPoint.y;\n    yAxis = item.axis;\n  }\n\n  const xVisible = !!currValueX.size && Number.isFinite(x);\n  const yVisible = !!currValueY.size && Number.isFinite(y);\n  const xUseCache = enableRemain && !xVisible && isValid(cacheXCrossHairInfo);\n  const yUseCache = enableRemain && !yVisible && isValid(cacheYCrossHairInfo);\n\n  let xCrossHairInfo: ICrosshairInfoX;\n  if (layoutX) {\n    xCrossHairInfo = xUseCache\n      ? cacheXCrossHairInfo\n      : {\n          height: 0,\n          leftPos: 0,\n          rightPos: 0,\n          topPos: 0,\n          x: 0,\n          bottom: { visible: false, text: '', dx: 0, dy: 0 },\n          top: { visible: false, text: '', dx: 0, dy: 0 },\n          visible: xVisible,\n          axis: xAxis\n        };\n  }\n\n  let yCrossHairInfo: ICrosshairInfoY;\n  if (layoutY) {\n    yCrossHairInfo = yUseCache\n      ? cacheYCrossHairInfo\n      : {\n          width: 0,\n          leftPos: 0,\n          topPos: 0,\n          bottomPos: 0,\n          y: 0,\n          left: { visible: false, text: '', dx: 0, dy: 0 },\n          right: { visible: false, text: '', dx: 0, dy: 0 },\n          visible: yVisible,\n          axis: yAxis\n        };\n  }\n\n  let bandWidth;\n  let offsetWidth: number = 0;\n  let bandHeight;\n  let offsetHeight: number = 0;\n\n  // 计算x轴和y轴的数据，只允许最多一对x和一对y\n  if (xHair) {\n    currValueX.forEach(({ axis, value }) => {\n      value = value ?? '';\n      const xScale = axis.getScale();\n      if (isDiscrete(xScale.type)) {\n        bandWidth = (xScale as BandScale).bandwidth();\n\n        if (bandWidth === 0 && (xScale as BandScale).step) {\n          offsetWidth = (xScale as BandScale).step();\n        }\n      } else if (isContinuous(xScale.type)) {\n        const fieldX = series.fieldX[0];\n        const fieldX2 = series.fieldX2;\n        const datum = getDatumByValue(series.getViewData().latestData, +value, fieldX, fieldX2);\n        if (datum) {\n          const startX = series.dataToPositionX(datum);\n          if (fieldX2) {\n            bandWidth = Math.abs(startX - series.dataToPositionX1(datum));\n            value = `${datum[fieldX]} ~ ${datum[fieldX2]}`;\n          } else {\n            bandWidth = 1;\n          }\n          x = startX;\n        }\n      }\n      if (xCrossHairInfo && xHair.label?.visible && !xUseCache) {\n        const labelOffset = getAxisLabelOffset(axis.getSpec());\n        if (axis.getOrient() === 'bottom') {\n          xCrossHairInfo.bottom.visible = true;\n          xCrossHairInfo.bottom.text = value;\n          xCrossHairInfo.bottom.dx = 0;\n          xCrossHairInfo.bottom.dy = labelOffset;\n        } else if (axis.getOrient() === 'top') {\n          xCrossHairInfo.top.visible = true;\n          xCrossHairInfo.top.text = value;\n          xCrossHairInfo.top.dx = 0;\n          xCrossHairInfo.top.dy = -labelOffset;\n        }\n      }\n    });\n  }\n\n  if (yHair) {\n    currValueY.forEach(({ axis, value }) => {\n      value = value ?? '';\n      const yScale = axis.getScale();\n      if (isDiscrete(yScale.type)) {\n        bandHeight = (yScale as BandScale).bandwidth();\n\n        if (bandHeight === 0 && (yScale as BandScale).step) {\n          offsetHeight = (yScale as BandScale).step();\n        }\n      } else if (isContinuous(yScale.type)) {\n        const fieldY = series.fieldY[0];\n        const fieldY2 = series.fieldY2;\n        const datum = getDatumByValue(series.getViewData().latestData, +value, fieldY, fieldY2);\n        if (datum) {\n          const startY = series.dataToPositionY(datum);\n          if (fieldY2) {\n            bandHeight = Math.abs(startY - series.dataToPositionY1(datum));\n            value = `${datum[fieldY]} ~ ${datum[fieldY2]}`;\n          } else {\n            bandHeight = 1;\n          }\n          y = startY;\n        }\n      }\n      if (yCrossHairInfo && yHair.label?.visible && !yUseCache) {\n        const labelOffset = getAxisLabelOffset(axis.getSpec());\n        if (axis.getOrient() === 'left') {\n          yCrossHairInfo.left.visible = true;\n          yCrossHairInfo.left.text = value;\n          yCrossHairInfo.left.dx = -labelOffset;\n          yCrossHairInfo.left.dy = 0;\n        } else if (axis.getOrient() === 'right') {\n          yCrossHairInfo.right.visible = true;\n          yCrossHairInfo.right.text = value;\n          yCrossHairInfo.right.dx = labelOffset;\n          yCrossHairInfo.right.dy = 0;\n        }\n      }\n    });\n  }\n\n  if (xCrossHairInfo && !xUseCache) {\n    const xRegion = { x1: Infinity, y1: Infinity, x2: -Infinity, y2: -Infinity };\n    setRegionArea(xRegion, currValueX);\n    xCrossHairInfo.leftPos = xRegion.x1;\n    xCrossHairInfo.rightPos = xRegion.x2;\n    xCrossHairInfo.topPos = xRegion.y1;\n    xCrossHairInfo.height = xRegion.y2 - xRegion.y1;\n    xCrossHairInfo.x = x + layoutStartPoint.x;\n    if (xHair?.label?.formatMethod) {\n      const { top, bottom } = xCrossHairInfo;\n      bottom.visible && (bottom.text = xHair.label.formatMethod(bottom.text, 'bottom') as string);\n      top.visible && (top.text = xHair.label.formatMethod(top.text, 'top') as string);\n    }\n\n    if (xHair && xHair.label) {\n      const { top, bottom } = xCrossHairInfo;\n      if (top.visible) {\n        setFormattedCrosshairLabel(top, 'top', xHair.label);\n      }\n      if (bottom.visible) {\n        setFormattedCrosshairLabel(bottom, 'bottom', xHair.label);\n      }\n    }\n  }\n\n  if (yCrossHairInfo && !yUseCache) {\n    const yRegion = { x1: Infinity, y1: Infinity, x2: -Infinity, y2: -Infinity };\n    setRegionArea(yRegion, currValueY);\n    yCrossHairInfo.leftPos = yRegion.x1;\n    yCrossHairInfo.topPos = yRegion.y1;\n    yCrossHairInfo.bottomPos = yRegion.y2;\n    yCrossHairInfo.width = yRegion.x2 - yRegion.x1;\n    yCrossHairInfo.y = y + layoutStartPoint.y;\n\n    if (yHair && yHair.label) {\n      const { left, right } = yCrossHairInfo;\n      if (left.visible) {\n        setFormattedCrosshairLabel(left, 'left', yHair.label);\n      }\n      if (right.visible) {\n        setFormattedCrosshairLabel(right, 'right', yHair.label);\n      }\n    }\n  }\n\n  return {\n    x: layoutX && xCrossHairInfo ? xCrossHairInfo : undefined,\n    y: layoutY && yCrossHairInfo ? yCrossHairInfo : undefined,\n    offsetWidth,\n    offsetHeight,\n    bandWidth: bandWidth ?? 0,\n    bandHeight: bandHeight ?? 0\n  };\n};\n\nconst setFormattedCrosshairLabel = (labelInfo: ICrosshairInfoX['top'], position: string, labelSpec: IHair['label']) => {\n  const { formatMethod, formatter } = labelSpec;\n  const { formatFunc, args } = getFormatFunction(formatMethod, formatter, labelInfo.text, {\n    label: labelInfo.text,\n    position\n  });\n  if (formatFunc) {\n    labelInfo.text = formatFunc(...args);\n  }\n};\n\n// 计算x轴和y轴对应的region区域\nconst setRegionArea = (outRegion: IBound, currentValue: AxisCurrentValueMap) => {\n  currentValue.forEach(({ axis }) => {\n    const regions = axis.getRegions();\n    regions.forEach(r => {\n      outRegion.x1 = Math.min(outRegion.x1, r.getLayoutStartPoint().x);\n      outRegion.y1 = Math.min(outRegion.y1, r.getLayoutStartPoint().y);\n      outRegion.x2 = Math.max(outRegion.x2, r.getLayoutStartPoint().x + r.getLayoutRect().width);\n      outRegion.y2 = Math.max(outRegion.y2, r.getLayoutStartPoint().y + r.getLayoutRect().height);\n    });\n  });\n};\n\nexport const layoutVerticalCrosshair = (\n  xHair: IHair,\n  crosshairInfo: ICrosshairInfoX,\n  bandWidth: number,\n  offsetWidth: number\n) => {\n  const { x, topPos, height } = crosshairInfo;\n\n  // 外部设置的size\n  const type = xHair.type;\n  let positionAttribute;\n  if (type === 'line') {\n    positionAttribute = {\n      start: { x: x + bandWidth / 2, y: topPos },\n      end: { x: x + bandWidth / 2, y: topPos + height }\n    };\n  } else if (type === 'rect') {\n    const extend = getRectSize(xHair, bandWidth, crosshairInfo.axis);\n    const { leftPos, rightPos } = crosshairInfo;\n\n    positionAttribute = {\n      start: { x: Math.max(x - extend / 2 - offsetWidth / 2, leftPos), y: topPos },\n      end: { x: Math.min(x + bandWidth + extend / 2 + offsetWidth / 2, rightPos), y: topPos + height }\n    };\n  }\n\n  return positionAttribute;\n};\n\nexport const layoutHorizontalCrosshair = (\n  yHair: IHair,\n  crosshairInfo: ICrosshairInfoY,\n  bandHeight: number,\n  offsetHeight: number\n) => {\n  const { leftPos, width, y } = crosshairInfo;\n\n  // 外部设置的size\n  const type = yHair.type;\n  let positionAttribute;\n  if (type === 'line') {\n    positionAttribute = {\n      start: { x: leftPos, y: y + bandHeight / 2 },\n      end: { x: leftPos + width, y: y + bandHeight / 2 }\n    };\n  } else if (type === 'rect') {\n    const extend = getRectSize(yHair, bandHeight, crosshairInfo.axis);\n    const { topPos, bottomPos } = crosshairInfo;\n\n    positionAttribute = {\n      start: { x: leftPos, y: Math.max(y - extend / 2 - offsetHeight / 2, topPos) },\n      end: { x: leftPos + width, y: Math.min(y + bandHeight + extend / 2 + offsetHeight / 2, bottomPos) }\n    };\n  }\n\n  return positionAttribute;\n};\n\nconst getRectSize = (hair: IHair, bandSize: number, axis: IAxis) => {\n  // 外部设置的size\n  let extend = 0;\n  if (hair.style?.sizePercent) {\n    extend = (hair.style.sizePercent - 1) * bandSize;\n  } else if (typeof hair.style?.size === 'number') {\n    extend = hair.style.size - bandSize;\n  } else if (typeof hair.style?.size === 'function') {\n    const axisRect = axis.getLayoutRect();\n    extend = hair.style.size(axisRect, axis) - bandSize;\n  }\n\n  return extend;\n};\n"]}

package/{cjs/component/crosshair/util.d.ts → esm/component/crosshair/utils/common.d.ts}

@@ -1,8 +1,8 @@
 import type { Tag } from '@visactor/vrender-components';
 import type { IBoundsLike } from '@visactor/vutils';
-import type { Datum } from '../../typings';
-import type { ICrosshairTheme } from './interface';
-import type { ITheme } from '../../theme';
+import type { Datum } from '../../../typings';
+import type { ICrosshairTheme } from '../interface';
+import type { ITheme } from '../../../theme';
 export declare function limitTagInBounds(shape: Tag, bounds: IBoundsLike): void;
 export declare function getDatumByValue(data: Datum[], value: number, startField: string, endField?: string): Datum | null;
 export declare const getCartesianCrosshairTheme: (chartTheme: ITheme, chartSpec: any) => ICrosshairTheme;

package/esm/component/crosshair/{util.js → utils/common.js}

@@ -1,16 +1,16 @@
 import { array, isValid } from "@visactor/vutils";
 
-import { mergeSpec } from "../../util/spec/merge-spec";
+import { mergeSpec } from "../../../util/spec/merge-spec";
 
-import { isXAxis, isYAxis } from "../axis/cartesian/util/common";
+import { isXAxis, isYAxis } from "../../axis/cartesian/util/common";
 
 import { isDiscrete } from "@visactor/vscale";
 
-import { getComponentThemeFromOption } from "../util";
+import { getComponentThemeFromOption } from "../../util";
 
-import { ComponentTypeEnum } from "../interface/type";
+import { ComponentTypeEnum } from "../../interface/type";
 
-import { isDiscreteAxis } from "../axis/util";
+import { isDiscreteAxis } from "../../axis/util";
 
 export function limitTagInBounds(shape, bounds) {
     const {x1: regionMinX, y1: regionMinY, x2: regionMaxX, y2: regionMaxY} = bounds, {x1: x1, y1: y1, x2: x2, y2: y2} = shape.AABBBounds, {dx: originDx = 0, dy: originDy = 0} = shape.attribute;
@@ -57,4 +57,4 @@ export const getPolarCrosshairTheme = (chartTheme, chartSpec) => {
         valueField: newRadiusField
     };
 };
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=common.js.map

package/esm/component/crosshair/utils/common.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/crosshair/utils/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { Tag } from '@visactor/vrender-components';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport type { Datum } from '../../../typings';\nimport type { ICrosshairTheme } from '../interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { array, isValid } from '@visactor/vutils';\nimport { mergeSpec } from '../../../util/spec/merge-spec';\nimport { isXAxis, isYAxis } from '../../axis/cartesian/util/common';\nimport { isDiscrete } from '@visactor/vscale';\nimport type { ICartesianAxisCommonSpec, IPolarAxisCommonSpec } from '../../axis';\nimport { getComponentThemeFromOption } from '../../util';\nimport { ComponentTypeEnum } from '../../interface/type';\nimport type { ITheme } from '../../../theme';\nimport { isDiscreteAxis } from '../../axis/util';\n\nexport function limitTagInBounds(shape: Tag, bounds: IBoundsLike) {\n  const { x1: regionMinX, y1: regionMinY, x2: regionMaxX, y2: regionMaxY } = bounds;\n  const { x1, y1, x2, y2 } = shape.AABBBounds;\n  const { dx: originDx = 0, dy: originDy = 0 } = shape.attribute;\n\n  let dx = 0;\n  let dy = 0;\n  if (x1 < regionMinX) {\n    // 超出左侧\n    dx = regionMinX - x1;\n  }\n  if (y1 < regionMinY) {\n    // 超出顶部\n    dy = regionMinY - y1;\n  }\n\n  if (x2 > regionMaxX) {\n    // 超出右侧\n    dx = regionMaxX - x2;\n  }\n\n  if (y2 > regionMaxY) {\n    // 整体超出顶部\n    dy = regionMaxY - y2;\n  }\n  if (dx) {\n    shape.setAttribute('dx', dx + originDx);\n  }\n  if (dy) {\n    shape.setAttribute('dy', dy + originDy);\n  }\n}\n\n// 二分查找数据\nexport function getDatumByValue(data: Datum[], value: number, startField: string, endField?: string): Datum | null {\n  let left = 0;\n  let right = data.length - 1;\n\n  while (left <= right) {\n    const mid = Math.floor((left + right) / 2);\n    const record = data[mid];\n\n    if (record[startField] <= value && record[endField || startField] >= value) {\n      return record;\n    }\n\n    if (record[startField] > value) {\n      right = mid - 1;\n    } else {\n      left = mid + 1;\n    }\n  }\n\n  return null;\n}\n\nexport const getCartesianCrosshairTheme = (chartTheme: ITheme, chartSpec: any): ICrosshairTheme => {\n  const axes: ICartesianAxisCommonSpec[] = array(chartSpec.axes ?? []);\n  const { bandField, linearField, xField, yField } =\n    getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme) ?? {};\n\n  const xAxis = axes.find(axis => isXAxis(axis.orient));\n  let newXField;\n  if (isValid(xAxis)) {\n    newXField = mergeSpec({}, isDiscreteAxis(xAxis.type) ? bandField : linearField, xField);\n  } else {\n    newXField = xField;\n  }\n\n  const yAxis = axes.find(axis => isYAxis(axis.orient));\n  let newYField;\n  if (isValid(yAxis)) {\n    newYField = mergeSpec({}, isDiscrete(yAxis.type) ? bandField : linearField, yField);\n  } else {\n    newYField = yField;\n  }\n\n  return {\n    xField: newXField,\n    yField: newYField\n  };\n};\n\nexport const getPolarCrosshairTheme = (chartTheme: ITheme, chartSpec: any): ICrosshairTheme => {\n  const axes: IPolarAxisCommonSpec[] = array(chartSpec.axes ?? []);\n  const { bandField, linearField, categoryField, valueField } =\n    getComponentThemeFromOption(ComponentTypeEnum.crosshair, chartTheme) ?? {};\n\n  const angleAxis = axes.find(axis => axis.orient === 'angle');\n  let newAngleField;\n  if (isValid(angleAxis)) {\n    newAngleField = mergeSpec({}, isDiscreteAxis(angleAxis.type) ? bandField : linearField, categoryField);\n  } else {\n    newAngleField = categoryField;\n  }\n\n  const radiusAxis = axes.find(axis => axis.orient === 'radius');\n  let newRadiusField;\n  if (isValid(radiusAxis)) {\n    newRadiusField = mergeSpec({}, isDiscrete(radiusAxis.type) ? bandField : linearField, valueField);\n  } else {\n    newRadiusField = valueField;\n  }\n\n  return {\n    categoryField: newAngleField,\n    valueField: newRadiusField\n  };\n};\n"]}

package/esm/component/crosshair/utils/index.d.ts

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

package/esm/component/crosshair/utils/index.js

@@ -0,0 +1,2 @@
+export * from "./common";
+//# sourceMappingURL=index.js.map

package/esm/component/crosshair/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/crosshair/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC","file":"index.js","sourcesContent":["export * from './common';\n"]}

package/esm/component/crosshair/utils/polar.d.ts

@@ -0,0 +1,37 @@
+import type { IPolarSeries } from '../../../series';
+import type { IHair, IHairRadius } from '../base';
+import type { AxisCurrentValueMap, IPolarCrosshairInfo } from '../interface';
+export declare const layoutByValue: (series: IPolarSeries, currValueAngle: AxisCurrentValueMap, currValueRadius: AxisCurrentValueMap, angleHair: IHair, radiusHair: IHair, enableRemain?: boolean, cacheAngleCrossHairInfo?: IPolarCrosshairInfo, cacheRadiusCrossHairInfo?: IPolarCrosshairInfo) => {
+    angle: IPolarCrosshairInfo;
+    radius: IPolarCrosshairInfo;
+};
+export declare const layoutAngleCrosshair: (angleHair: IHair, crosshairInfo: IPolarCrosshairInfo) => {
+    center: import("../../../typings").IPoint;
+    innerRadius: number;
+    radius: number;
+    startAngle: number;
+    endAngle: number;
+    start?: undefined;
+    end?: undefined;
+} | {
+    start: {
+        x: number;
+        y: number;
+    };
+    end: {
+        x: number;
+        y: number;
+    };
+    center?: undefined;
+    innerRadius?: undefined;
+    radius?: undefined;
+    startAngle?: undefined;
+    endAngle?: undefined;
+};
+export declare const layoutRadiusCrosshair: (radiusHair: IHairRadius, crosshairInfo: IPolarCrosshairInfo) => {
+    center: import("../../../typings").IPoint;
+    startAngle: number;
+    endAngle: number;
+    radius: number;
+    sides: number;
+};

package/esm/component/crosshair/utils/polar.js

@@ -0,0 +1,125 @@
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+};
+
+import { getAxisLabelOffset } from "../../axis/util";
+
+import { PointService, clamp, getAngleByPoint, getIntersectPoint, isValid, polarToCartesian } from "@visactor/vutils";
+
+import { mergeSpec } from "../../../util";
+
+import { getFormatFunction } from "../../util";
+
+export const layoutByValue = (series, currValueAngle, currValueRadius, angleHair, radiusHair, enableRemain = !1, cacheAngleCrossHairInfo, cacheRadiusCrossHairInfo) => {
+    let angleCrossHairInfo = {
+        x: 0,
+        y: 0,
+        center: {
+            x: 0,
+            y: 0
+        },
+        radius: 0,
+        distance: 0,
+        startAngle: 0,
+        endAngle: 0,
+        innerRadius: 0,
+        visible: !1,
+        label: {
+            visible: !1,
+            text: "",
+            offset: 0
+        }
+    }, radiusCrossHairInfo = {
+        x: 0,
+        y: 0,
+        center: {
+            x: 0,
+            y: 0
+        },
+        radius: 0,
+        distance: 0,
+        startAngle: 0,
+        endAngle: 0,
+        innerRadius: 0,
+        visible: !1,
+        sides: series.angleAxisHelper.getScale(0).domain().length,
+        label: {
+            visible: !1,
+            text: "",
+            offset: 0
+        }
+    };
+    if (angleHair) {
+        angleCrossHairInfo.visible = !!currValueAngle.size;
+        const bandWidth = series.angleAxisHelper.getBandwidth(0);
+        currValueAngle.forEach((_a => {
+            var _b, {axis: axis, value: value, coord: coord} = _a, rest = __rest(_a, [ "axis", "value", "coord" ]);
+            value = null != value ? value : "", mergeSpec(angleCrossHairInfo, rest);
+            const angle = series.angleAxisHelper.dataToPosition([ value ]);
+            angleCrossHairInfo.angle = angle, (null === (_b = angleHair.label) || void 0 === _b ? void 0 : _b.visible) && (angleCrossHairInfo.label.visible = !0, 
+            angleCrossHairInfo.label.text = value, angleCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec())), 
+            angleCrossHairInfo.startAngle = angle - bandWidth / 2, angleCrossHairInfo.endAngle = angle + bandWidth / 2;
+        }));
+    }
+    if (radiusHair && (radiusCrossHairInfo.visible = !!currValueRadius.size, currValueRadius.forEach((_a => {
+        var _b, {axis: axis, value: value, coord: coord} = _a, rest = __rest(_a, [ "axis", "value", "coord" ]);
+        value = null != value ? value : "", (null === (_b = radiusHair.label) || void 0 === _b ? void 0 : _b.visible) && (radiusCrossHairInfo.label.visible = !0, 
+        radiusCrossHairInfo.label.text = value, radiusCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec())), 
+        radiusCrossHairInfo.angle = coord.angle, radiusCrossHairInfo.axis = axis, mergeSpec(radiusCrossHairInfo, rest);
+    }))), enableRemain && !angleCrossHairInfo.visible && isValid(cacheAngleCrossHairInfo)) angleCrossHairInfo = cacheAngleCrossHairInfo; else if (angleCrossHairInfo.label.visible && angleHair && angleHair.label) {
+        const {label: label} = angleCrossHairInfo, {formatMethod: formatMethod, formatter: formatter} = angleHair.label, {formatFunc: formatFunc, args: args} = getFormatFunction(formatMethod, formatter, label.text, {
+            label: label.text,
+            orient: "angle"
+        });
+        formatFunc && (label.text = formatFunc(...args));
+    }
+    if (enableRemain && !radiusCrossHairInfo.visible && isValid(cacheRadiusCrossHairInfo)) radiusCrossHairInfo = cacheRadiusCrossHairInfo; else if (radiusCrossHairInfo.label.visible && radiusHair && radiusHair.label) {
+        const {label: label} = radiusCrossHairInfo, {formatMethod: formatMethod, formatter: formatter} = radiusHair.label, {formatFunc: formatFunc, args: args} = getFormatFunction(formatMethod, formatter, label.text, {
+            label: label.text,
+            orient: "radius"
+        });
+        formatFunc && (label.text = formatFunc(...args));
+    }
+    return {
+        angle: angleCrossHairInfo,
+        radius: radiusCrossHairInfo
+    };
+};
+
+export const layoutAngleCrosshair = (angleHair, crosshairInfo) => {
+    const {angle: angle, innerRadius: innerRadius, radius: radius, startAngle: startAngle, endAngle: endAngle, center: center} = crosshairInfo;
+    let positionAttrs;
+    return positionAttrs = "sector" === ("rect" === angleHair.type ? "sector" : "line") ? {
+        center: center,
+        innerRadius: innerRadius,
+        radius: radius,
+        startAngle: startAngle,
+        endAngle: endAngle
+    } : {
+        start: polarToCartesian(center, innerRadius, angle),
+        end: polarToCartesian(center, radius, angle)
+    }, positionAttrs;
+};
+
+export const layoutRadiusCrosshair = (radiusHair, crosshairInfo) => {
+    const {center: center, startAngle: startAngle, endAngle: endAngle, distance: distance, sides: sides, axis: axis, point: point, radius: radius, innerRadius: innerRadius} = crosshairInfo;
+    let polygonRadius = distance;
+    if ("polygon" === (radiusHair.smooth ? "circle" : "polygon")) {
+        const axisCenter = axis.getCenter(), curAngle = getAngleByPoint(axisCenter, point), stepAngle = (endAngle - startAngle) / sides, index = Math.floor((curAngle - startAngle) / stepAngle), preAngle = index * stepAngle + startAngle, nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle), prePoint = polarToCartesian(axisCenter, distance, preAngle), nextPoint = polarToCartesian(axisCenter, distance, nextAngle), insertPoint = getIntersectPoint([ nextPoint.x, nextPoint.y ], [ prePoint.x, prePoint.y ], [ axisCenter.x, axisCenter.y ], [ point.x, point.y ]);
+        insertPoint && (polygonRadius = clamp(PointService.distancePN(point, insertPoint[0], insertPoint[1]) + distance, innerRadius, radius));
+    }
+    return {
+        center: center,
+        startAngle: startAngle,
+        endAngle: endAngle,
+        radius: polygonRadius,
+        sides: sides
+    };
+};
+//# sourceMappingURL=polar.js.map

package/esm/component/crosshair/utils/polar.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/crosshair/utils/polar.ts"],"names":[],"mappings":"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","file":"polar.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport type { IPolarSeries } from '../../../series';\nimport type { IHair, IHairRadius } from '../base';\nimport type { AxisCurrentValueMap, IPolarCrosshairInfo } from '../interface';\nimport { getAxisLabelOffset } from '../../axis/util';\nimport { PointService, clamp, getAngleByPoint, getIntersectPoint, isValid, polarToCartesian } from '@visactor/vutils';\nimport type { IPolarAxis } from '../../axis';\nimport { mergeSpec } from '../../../util';\nimport { getFormatFunction } from '../../util';\n\nexport const layoutByValue = (\n  series: IPolarSeries,\n  currValueAngle: AxisCurrentValueMap,\n  currValueRadius: AxisCurrentValueMap,\n  angleHair: IHair,\n  radiusHair: IHair,\n  enableRemain: boolean = false,\n  cacheAngleCrossHairInfo?: IPolarCrosshairInfo,\n  cacheRadiusCrossHairInfo?: IPolarCrosshairInfo\n) => {\n  let angleCrossHairInfo = {\n    x: 0,\n    y: 0,\n    center: { x: 0, y: 0 },\n    radius: 0,\n    distance: 0,\n    startAngle: 0,\n    endAngle: 0,\n    innerRadius: 0,\n    visible: false,\n    label: { visible: false, text: '', offset: 0 }\n  } as IPolarCrosshairInfo;\n  let radiusCrossHairInfo = {\n    x: 0,\n    y: 0,\n    center: { x: 0, y: 0 },\n    radius: 0,\n    distance: 0,\n    startAngle: 0,\n    endAngle: 0,\n    innerRadius: 0,\n    visible: false,\n    sides: (series.angleAxisHelper.getScale(0) as BandScale).domain().length,\n    label: { visible: false, text: '', offset: 0 }\n  } as IPolarCrosshairInfo;\n\n  // 计算x轴和y轴的数据，只允许最多一对x和一对y\n  if (angleHair) {\n    angleCrossHairInfo.visible = !!currValueAngle.size;\n    const bandWidth = series.angleAxisHelper.getBandwidth(0);\n    currValueAngle.forEach(({ axis, value, coord, ...rest }) => {\n      value = value ?? '';\n      mergeSpec(angleCrossHairInfo, rest);\n      const angle = series.angleAxisHelper.dataToPosition([value]);\n      angleCrossHairInfo.angle = angle;\n      if (angleHair.label?.visible) {\n        angleCrossHairInfo.label.visible = true;\n        angleCrossHairInfo.label.text = value;\n        angleCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec());\n      }\n\n      angleCrossHairInfo.startAngle = angle - bandWidth / 2;\n      angleCrossHairInfo.endAngle = angle + bandWidth / 2;\n    });\n  }\n\n  if (radiusHair) {\n    radiusCrossHairInfo.visible = !!currValueRadius.size;\n    currValueRadius.forEach(({ axis, value, coord, ...rest }) => {\n      value = value ?? '';\n      if (radiusHair.label?.visible) {\n        radiusCrossHairInfo.label.visible = true;\n        radiusCrossHairInfo.label.text = value;\n        radiusCrossHairInfo.label.offset = getAxisLabelOffset(axis.getSpec());\n      }\n      radiusCrossHairInfo.angle = coord.angle;\n      radiusCrossHairInfo.axis = axis as IPolarAxis;\n      mergeSpec(radiusCrossHairInfo, rest);\n    });\n  }\n\n  if (enableRemain && !angleCrossHairInfo.visible && isValid(cacheAngleCrossHairInfo)) {\n    angleCrossHairInfo = cacheAngleCrossHairInfo;\n  } else {\n    if (angleCrossHairInfo.label.visible) {\n      if (angleHair && angleHair.label) {\n        const { label } = angleCrossHairInfo;\n        const { formatMethod, formatter } = angleHair.label;\n        const { formatFunc, args } = getFormatFunction(formatMethod, formatter, label.text, {\n          label: label.text,\n          orient: 'angle'\n        });\n        if (formatFunc) {\n          label.text = formatFunc(...args);\n        }\n      }\n    }\n  }\n\n  if (enableRemain && !radiusCrossHairInfo.visible && isValid(cacheRadiusCrossHairInfo)) {\n    radiusCrossHairInfo = cacheRadiusCrossHairInfo;\n  } else {\n    if (radiusCrossHairInfo.label.visible) {\n      if (radiusHair && radiusHair.label) {\n        const { label } = radiusCrossHairInfo;\n        const { formatMethod, formatter } = radiusHair.label;\n        const { formatFunc, args } = getFormatFunction(formatMethod, formatter, label.text, {\n          label: label.text,\n          orient: 'radius'\n        });\n        if (formatFunc) {\n          label.text = formatFunc(...args);\n        }\n      }\n    }\n  }\n\n  return {\n    angle: angleCrossHairInfo,\n    radius: radiusCrossHairInfo\n  };\n};\n\nexport const layoutAngleCrosshair = (angleHair: IHair, crosshairInfo: IPolarCrosshairInfo) => {\n  const { angle, innerRadius, radius, startAngle, endAngle, center } = crosshairInfo;\n\n  const crosshairType = angleHair.type === 'rect' ? 'sector' : 'line';\n  let positionAttrs;\n  if (crosshairType === 'sector') {\n    positionAttrs = {\n      center,\n      innerRadius,\n      radius,\n      startAngle: startAngle,\n      endAngle: endAngle\n    };\n  } else {\n    positionAttrs = {\n      start: polarToCartesian(center, innerRadius, angle),\n      end: polarToCartesian(center, radius, angle)\n    };\n  }\n\n  return positionAttrs;\n};\n\nexport const layoutRadiusCrosshair = (radiusHair: IHairRadius, crosshairInfo: IPolarCrosshairInfo) => {\n  const { center, startAngle, endAngle, distance, sides, axis, point, radius, innerRadius } = crosshairInfo;\n\n  const crosshairType = radiusHair.smooth ? 'circle' : 'polygon';\n\n  let polygonRadius = distance;\n  if (crosshairType === 'polygon') {\n    const axisCenter = axis.getCenter();\n    // 需要计算半径\n    // 获取当前点的角度\n    const curAngle = getAngleByPoint(axisCenter, point);\n    const stepAngle = (endAngle - startAngle) / sides;\n    const index = Math.floor((curAngle - startAngle) / stepAngle);\n    const preAngle = index * stepAngle + startAngle;\n    const nextAngle = Math.min((index + 1) * stepAngle + startAngle, endAngle);\n\n    const prePoint = polarToCartesian(axisCenter, distance, preAngle);\n    const nextPoint = polarToCartesian(axisCenter, distance, nextAngle);\n    // 求交点\n    const insertPoint = getIntersectPoint(\n      [nextPoint.x, nextPoint.y],\n      [prePoint.x, prePoint.y],\n      [axisCenter.x, axisCenter.y],\n      [point.x, point.y]\n    );\n    if (insertPoint) {\n      polygonRadius = clamp(\n        PointService.distancePN(point, insertPoint[0], insertPoint[1]) + distance,\n        innerRadius,\n        radius\n      );\n    }\n  }\n  const positionAttrs = {\n    center,\n    startAngle: startAngle,\n    endAngle: endAngle,\n    radius: polygonRadius,\n    sides\n  };\n\n  return positionAttrs;\n};\n"]}

package/esm/component/custom-mark/custom-mark.d.ts

@@ -3,7 +3,6 @@ import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';
 import type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';
-import type { MarkTypeEnum } from '../../mark/interface';
 import type { Maybe } from '@visactor/vutils';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare class CustomMark<T = any> extends BaseComponent<any> {
@@ -14,7 +13,7 @@ export declare class CustomMark<T = any> extends BaseComponent<any> {
     layoutType: 'none';
     layoutZIndex: number;
     layoutLevel: number;
-    protected _spec: (ICustomMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | ICustomMarkGroupSpec)[];
+    protected _spec: (ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec)[];
     static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     created(): void;
     protected initMarks(): void;

package/esm/component/custom-mark/custom-mark.js

@@ -49,7 +49,8 @@ export class CustomMark extends BaseComponent {
         }, {
             skipBeforeLayouted: !0,
             attributeContext: this._getMarkAttributeContext(),
-            componentType: spec.componentType
+            componentType: spec.componentType,
+            key: spec.dataKey
         });
         if (mark && (options.depend && options.depend.length && mark.setDepend(...options.depend), 
         isNil(parentMark) ? this._marks.addMark(mark) : parentMark && parentMark.addMark(mark), 

package/esm/component/custom-mark/custom-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/custom-mark/custom-mark.ts"],"names":[],"mappings":"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","file":"custom-mark.js","sourcesContent":["import { BaseComponent } from '../base/base-component';\nimport { ComponentTypeEnum } from '../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IComponentOption } from '../interface';\nimport type { IRegion } from '../../region/interface';\nimport type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex, PREFIX } from '../../constant';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IMark, MarkTypeEnum } from '../../mark/interface';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport { registerImageMark } from '../../mark/image';\nimport type { IGraphic } from '@visactor/vrender-core';\n\n// TODO: 规范范型\nexport class CustomMark<T = any> extends BaseComponent<any> {\n  static type = ComponentTypeEnum.customMark;\n  type = ComponentTypeEnum.customMark;\n\n  static specKey = 'customMark';\n  specKey = 'customMark';\n\n  layoutType: 'none' = 'none';\n  layoutZIndex: number = LayoutZIndex.CustomMark;\n  layoutLevel: number = LayoutLevel.CustomMark;\n\n  protected declare _spec: (ICustomMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | ICustomMarkGroupSpec)[];\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const spec = chartSpec[this.specKey];\n    if (!spec) {\n      return null;\n    }\n    return [\n      {\n        spec,\n        specPath: [this.specKey],\n        specInfoPath: ['component', this.specKey, 0],\n        type: ComponentTypeEnum.customMark\n      }\n    ];\n  }\n\n  created() {\n    super.created();\n    this.initMarks();\n    this.initEvent();\n  }\n\n  protected initMarks() {\n    if (!this._spec) {\n      return;\n    }\n    const series = this._option && this._option.getAllSeries();\n    const depend: IMark[] = [];\n\n    if (series && series.length) {\n      series.forEach(s => {\n        const marks = s && s.getMarksWithoutRoot();\n\n        if (marks && marks.length) {\n          marks.forEach(mark => {\n            depend.push(mark);\n          });\n        }\n      });\n    }\n\n    this._spec.forEach((m, i) => {\n      this._createExtensionMark(m, null, `${PREFIX}_series_${this.id}_extensionMark`, i, { depend });\n    });\n  }\n\n  private _createExtensionMark(\n    spec: ICustomMarkSpec<Exclude<EnableMarkType, MarkTypeEnum.group>> | ICustomMarkGroupSpec,\n    parentMark: null | IGroupMark,\n    namePrefix: string,\n    index: number,\n    options: { hasAnimation?: boolean; depend?: IMark[] }\n  ) {\n    const mark = this._createMark(\n      {\n        type: spec.type,\n        name: `${PREFIX}_${index}`\n      },\n      {\n        // 避免二次dataflow\n        skipBeforeLayouted: true,\n        attributeContext: this._getMarkAttributeContext(),\n        componentType: spec.componentType\n      }\n    ) as IGroupMark;\n    if (!mark) {\n      return;\n    }\n\n    if (options.depend && options.depend.length) {\n      mark.setDepend(...options.depend);\n    }\n    if (isNil(parentMark)) {\n      this._marks.addMark(mark);\n    } else if (parentMark) {\n      parentMark.addMark(mark);\n    }\n    // set style\n    this.initMarkStyleWithSpec(mark, spec);\n    if (spec.type === 'group') {\n      namePrefix = `${namePrefix}_${index}`;\n      spec.children?.forEach((s, i) => {\n        this._createExtensionMark(s as any, mark, namePrefix, i, options);\n      });\n    }\n\n    if (isValid(spec.dataId) || isValidNumber(spec.dataIndex)) {\n      const dataview = this.getChart().getSeriesData(spec.dataId, spec.dataIndex);\n      if (dataview) {\n        dataview.target.addListener('change', () => {\n          mark.getData().updateData();\n        });\n        mark.setDataView(dataview);\n      }\n    }\n  }\n\n  initEvent() {\n    // do nothing\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec(spec: T, prevSpec: T) {\n    const result = super._compareSpec(spec, prevSpec);\n    if (!isEqual(prevSpec, spec)) {\n      result.reMake = true;\n    }\n\n    result.change = true;\n    result.reRender = true;\n    return result;\n  }\n\n  changeRegions(regions: IRegion[]): void {\n    // do nothing;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [];\n  }\n\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing;\n  }\n  private _getMarkAttributeContext() {\n    return {\n      vchart: this._option.globalInstance,\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      }\n    };\n  }\n}\n\nexport const registerCustomMark = () => {\n  registerImageMark();\n  Factory.registerComponent(CustomMark.type, CustomMark);\n};\n"]}
+{"version":3,"sources":["../src/component/custom-mark/custom-mark.ts"],"names":[],"mappings":"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","file":"custom-mark.js","sourcesContent":["import { BaseComponent } from '../base/base-component';\nimport { ComponentTypeEnum } from '../interface/type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IComponentOption } from '../interface';\nimport type { IRegion } from '../../region/interface';\nimport type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';\nimport { LayoutLevel, LayoutZIndex, PREFIX } from '../../constant';\nimport type { EnableMarkType, ICustomMarkGroupSpec, ICustomMarkSpec } from '../../typings';\nimport type { IGroupMark } from '../../mark/group';\nimport type { IMark, MarkTypeEnum } from '../../mark/interface';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEqual, isNil, isValid, isValidNumber } from '@visactor/vutils';\nimport { Factory } from '../../core/factory';\nimport { registerImageMark } from '../../mark/image';\nimport type { IGraphic } from '@visactor/vrender-core';\n\n// TODO: 规范范型\nexport class CustomMark<T = any> extends BaseComponent<any> {\n  static type = ComponentTypeEnum.customMark;\n  type = ComponentTypeEnum.customMark;\n\n  static specKey = 'customMark';\n  specKey = 'customMark';\n\n  layoutType: 'none' = 'none';\n  layoutZIndex: number = LayoutZIndex.CustomMark;\n  layoutLevel: number = LayoutLevel.CustomMark;\n\n  protected declare _spec: (ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec)[];\n\n  static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]> {\n    const spec = chartSpec[this.specKey];\n    if (!spec) {\n      return null;\n    }\n    return [\n      {\n        spec,\n        specPath: [this.specKey],\n        specInfoPath: ['component', this.specKey, 0],\n        type: ComponentTypeEnum.customMark\n      }\n    ];\n  }\n\n  created() {\n    super.created();\n    this.initMarks();\n    this.initEvent();\n  }\n\n  protected initMarks() {\n    if (!this._spec) {\n      return;\n    }\n    const series = this._option && this._option.getAllSeries();\n    const depend: IMark[] = [];\n\n    if (series && series.length) {\n      series.forEach(s => {\n        const marks = s && s.getMarksWithoutRoot();\n\n        if (marks && marks.length) {\n          marks.forEach(mark => {\n            depend.push(mark);\n          });\n        }\n      });\n    }\n\n    this._spec.forEach((m, i) => {\n      this._createExtensionMark(m, null, `${PREFIX}_series_${this.id}_extensionMark`, i, { depend });\n    });\n  }\n\n  private _createExtensionMark(\n    spec: ICustomMarkSpec<Exclude<EnableMarkType, 'group'>> | ICustomMarkGroupSpec,\n    parentMark: null | IGroupMark,\n    namePrefix: string,\n    index: number,\n    options: { hasAnimation?: boolean; depend?: IMark[] }\n  ) {\n    const mark = this._createMark(\n      {\n        type: spec.type,\n        name: `${PREFIX}_${index}`\n      },\n      {\n        // 避免二次dataflow\n        skipBeforeLayouted: true,\n        attributeContext: this._getMarkAttributeContext(),\n        componentType: spec.componentType,\n        key: spec.dataKey\n      }\n    ) as IGroupMark;\n    if (!mark) {\n      return;\n    }\n\n    if (options.depend && options.depend.length) {\n      mark.setDepend(...options.depend);\n    }\n    if (isNil(parentMark)) {\n      this._marks.addMark(mark);\n    } else if (parentMark) {\n      parentMark.addMark(mark);\n    }\n    // set style\n    this.initMarkStyleWithSpec(mark, spec);\n    if (spec.type === 'group') {\n      namePrefix = `${namePrefix}_${index}`;\n      spec.children?.forEach((s, i) => {\n        this._createExtensionMark(s as any, mark, namePrefix, i, options);\n      });\n    }\n\n    if (isValid(spec.dataId) || isValidNumber(spec.dataIndex)) {\n      const dataview = this.getChart().getSeriesData(spec.dataId, spec.dataIndex);\n      if (dataview) {\n        dataview.target.addListener('change', () => {\n          mark.getData().updateData();\n        });\n        mark.setDataView(dataview);\n      }\n    }\n  }\n\n  initEvent() {\n    // do nothing\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec(spec: T, prevSpec: T) {\n    const result = super._compareSpec(spec, prevSpec);\n    if (!isEqual(prevSpec, spec)) {\n      result.reMake = true;\n    }\n\n    result.change = true;\n    result.reRender = true;\n    return result;\n  }\n\n  changeRegions(regions: IRegion[]): void {\n    // do nothing;\n  }\n\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    return [];\n  }\n\n  onRender(ctx: IModelRenderOption): void {\n    // do nothing;\n  }\n  private _getMarkAttributeContext() {\n    return {\n      vchart: this._option.globalInstance,\n      globalScale: (key: string, value: string | number) => {\n        return this._option.globalScale.getScale(key)?.scale(value);\n      }\n    };\n  }\n}\n\nexport const registerCustomMark = () => {\n  registerImageMark();\n  Factory.registerComponent(CustomMark.type, CustomMark);\n};\n"]}

package/esm/component/data-zoom/data-filter-base-component.d.ts

@@ -1,6 +1,6 @@
 import { BaseComponent } from '../base/base-component';
 import type { IEffect, IModelInitOption } from '../../model/interface';
-import type { IComponent, IComponentOption } from '../interface';
+import { type IComponent, type IComponentOption } from '../interface';
 import type { AdaptiveSpec, ILayoutRect, ILayoutType, IOrientType, IRect, StringOrNumber } from '../../typings';
 import type { IBaseScale } from '@visactor/vscale';
 import type { ICartesianBandAxisSpec } from '../axis/cartesian';
@@ -19,6 +19,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _fixedBandSize?: number;
     protected _cacheRect?: ILayoutRect;
     protected _cacheVisibility?: boolean;
+    get orient(): IOrientType;
     protected _stateScale: IBaseScale;
     protected _relatedAxisComponent: IComponent;
     protected _originalStateFields: Record<number, string | number>;
@@ -44,10 +45,6 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _zoomAttr: IRoamZoomSpec;
     protected _dragAttr: IRoamDragSpec;
     protected _scrollAttr: IRoamScrollSpec;
-    get orient(): IOrientType;
-    get isHorizontal(): boolean;
-    get stateScale(): IBaseScale;
-    get relatedAxisComponent(): IComponent;
     setStartAndEnd(start: number | string, end: number | string, rangeMode?: ['percent' | 'value', 'percent' | 'value']): void;
     enableInteraction(): void;
     disableInteraction(): void;
@@ -66,7 +63,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected abstract _handleDataCollectionChange(): void;
     protected _handleChange(start: number, end: number, updateComponent?: boolean): void;
     protected _isReverse(): boolean;
-    protected _updateRangeFactor(tag?: string, label?: string): void;
+    protected _updateRangeFactor(tag?: 'startHandler' | 'endHandler'): void;
     effect: IEffect;
     protected _visible: boolean;
     get visible(): boolean;

package/esm/component/data-zoom/data-filter-base-component.js

@@ -2,6 +2,8 @@ import { eachSeries } from "../../util/model";
 
 import { BaseComponent } from "../base/base-component";
 
+import { ComponentTypeEnum } from "../interface";
+
 import { dataFilterComputeDomain, dataFilterWithNewDomain } from "./util";
 
 import { registerDataSetInstanceParser, registerDataSetInstanceTransform } from "../../data/register";
@@ -26,15 +28,6 @@ export class DataFilterBaseComponent extends BaseComponent {
     get orient() {
         return this._orient;
     }
-    get isHorizontal() {
-        return this._isHorizontal;
-    }
-    get stateScale() {
-        return this._stateScale;
-    }
-    get relatedAxisComponent() {
-        return this._relatedAxisComponent;
-    }
     setStartAndEnd(start, end, rangeMode = [ "percent", "percent" ]) {
         const [startMode = "percent", endMode = "percent"] = rangeMode, startPercent = "percent" === startMode ? start : this._dataToStatePoint(start), endPercent = "percent" === endMode ? end : this._dataToStatePoint(end);
         this._handleChange(startPercent, endPercent, !0);
@@ -61,7 +54,7 @@ export class DataFilterBaseComponent extends BaseComponent {
     }
     _handleChange(start, end, updateComponent) {
         var _a, _b;
-        null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.zoomLock) && void 0 !== _b && _b && (this._shouldChange = !1);
+        (null !== (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.zoomLock) && void 0 !== _b && _b || end - start < this._minSpan || end - start > this._maxSpan) && (this._shouldChange = !1);
     }
     _isReverse() {
         const axis = this._relatedAxisComponent;
@@ -69,7 +62,7 @@ export class DataFilterBaseComponent extends BaseComponent {
         const axisScale = axis.getScale();
         return axisScale.range()[0] > axisScale.range()[1] && (!axis.getInverse() || this._isHorizontal);
     }
-    _updateRangeFactor(tag, label) {
+    _updateRangeFactor(tag) {
         const axisScale = this._relatedAxisComponent.getScale(), reverse = this._isReverse(), newRangeFactor = reverse ? [ 1 - this._end, 1 - this._start ] : [ this._start, this._end ];
         if (reverse) switch (tag) {
           case "startHandler":
@@ -122,7 +115,7 @@ export class DataFilterBaseComponent extends BaseComponent {
                 if (axis && "axis" === this._filterMode) {
                     const axisScale = axis.getScale(), axisSpec = axis.getSpec();
                     this._auto && this._getAxisBandSize(axisSpec) && this._spec.ignoreBandSize && (axisScale.bandwidth("auto"), 
-                    axisScale.maxBandwidth("auto"), axisScale.minBandwidth("auto")), this._updateRangeFactor(tag, "zoomChange"), 
+                    axisScale.maxBandwidth("auto"), axisScale.minBandwidth("auto")), this._updateRangeFactor(tag), 
                     null === (_b = null === (_a = this._component) || void 0 === _a ? void 0 : _a.setStartAndEnd) || void 0 === _b || _b.call(_a, this._start, this._end), 
                     axis.effect.scaleUpdate();
                 } else eachSeries(this._regions, (s => {
@@ -228,7 +221,6 @@ export class DataFilterBaseComponent extends BaseComponent {
         this._stateScale.domain(domain, !0), this._handleChange(this._start, this._end, !0);
     }
     _computeDomainOfStateScale(isContinuous) {
-        if (this._spec.customDomain) return this._spec.customDomain;
         const domain = this._data.getLatestData().map((d => d[this._stateField]));
         if (isContinuous) {
             const domainNum = domain.map((n => 1 * n));
@@ -296,12 +288,11 @@ export class DataFilterBaseComponent extends BaseComponent {
         this._visible = null === (_a = this._spec.visible) || void 0 === _a || _a;
     }
     _statePointToData(state) {
-        const scale = this._stateScale, domain = scale.domain();
-        if (isContinuous(scale.type)) return domain[0] + (domain[1] - domain[0]) * state;
+        const scale = this._stateScale;
         let range = scale.range();
         this._isReverse() && (range = range.slice().reverse());
-        const posInRange = range[0] + (range[1] - range[0]) * state, bandSize = scale.bandwidth();
-        return domain[Math.min(Math.max(0, Math.floor(posInRange / bandSize)), domain.length - 1)];
+        const posInRange = range[0] + (range[1] - range[0]) * state;
+        return scale.invert(posInRange);
     }
     _dataToStatePoint(data) {
         const scale = this._stateScale, pos = scale.scale(data);
@@ -339,8 +330,8 @@ export class DataFilterBaseComponent extends BaseComponent {
             if (this._stateScale = scale.clone(), isContinuousScale) {
                 const domainNum = domain.map((n => 1 * n));
                 this._stateScale.domain(domain.length ? [ minInArray(domainNum), maxInArray(domainNum) ] : [ 0, 1 ], !0).range(defaultRange);
-            } else this._stateScale.domain(domain, !0).range(defaultRange).padding(0);
-        } else this._stateScale = (new BandScale).padding(0), this._stateScale.domain(this._computeDomainOfStateScale(), !0).range(defaultRange);
+            } else this._stateScale.domain(domain, !0).range(defaultRange);
+        } else this._stateScale = new BandScale, this._stateScale.domain(this._computeDomainOfStateScale(), !0).range(defaultRange);
     }
     init(option) {
         super.init(option), this._addTransformToSeries(), 0 === this._start && 1 === this._end || this.effect.onZoomChange();
@@ -447,7 +438,8 @@ export class DataFilterBaseComponent extends BaseComponent {
             height: null == rect ? void 0 : rect.height
         }, this._fixedBandSize = null == bandSizeResult ? void 0 : bandSizeResult.bandSize, 
         isDiscrete(axisScale.type)) {
-            bandSizeResult && (this._start || this._end) && this._updateRangeFactor(null, "auto");
+            bandSizeResult && (this._start || this._end) && (this.type === ComponentTypeEnum.scrollBar && (this._start = 0, 
+            this._end = 1), this._updateRangeFactor());
             const [start, end] = null !== (_e = axisScale.rangeFactor()) && void 0 !== _e ? _e : [];
             isShown = (!isNil(start) || !isNil(end)) && !(0 === start && 1 === end);
         } else {