@visactor/vrender-components 0.13.5-alpha.0 → 0.13.5-alpha.6

package/cjs/label/overlap/place.d.ts

@@ -1,10 +1,10 @@
-import { Text } from '@visactor/vrender';
-import { IAABBBounds, IBoundsLike } from '@visactor/vutils';
-import { PointLocationCfg } from '../../core/type';
+import type { IText, Text } from '@visactor/vrender';
+import type { IAABBBounds, IBoundsLike } from '@visactor/vutils';
+import type { PointLocationCfg } from '../../core/type';
 import type { LabelBase } from '../base';
 import type { BaseLabelAttrs, Strategy } from '../type';
 import type { Bitmap } from './bitmap';
-import { BitmapTool } from './scaler';
+import type { BitmapTool } from './scaler';
 export declare function canPlace($: BitmapTool, bitmap: Bitmap, bound: IBoundsLike, checkBound?: boolean): boolean;
 export declare function canPlaceInside(textBound: IBoundsLike, shapeBound: IAABBBounds): boolean;
 export declare function placeToCandidates($: BitmapTool, bitmap: Bitmap, text: Text, candidates?: PointLocationCfg[], clampForce?: boolean): PointLocationCfg | false;
@@ -12,3 +12,7 @@ export declare function place<T extends BaseLabelAttrs>($: BitmapTool, bitmap: B
 export declare const DefaultPositions: string[];
 export declare const DefaultRectPositions: string[];
 export declare function defaultLabelPosition(type?: string): string[];
+export declare function clampText(text: IText, width: number, height: number): {
+    dx: number;
+    dy: number;
+};

package/cjs/label/overlap/place.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.defaultLabelPosition = exports.DefaultRectPositions = exports.DefaultPositions = exports.place = exports.placeToCandidates = exports.canPlaceInside = exports.canPlace = void 0;
+}), exports.clampText = exports.defaultLabelPosition = exports.DefaultRectPositions = exports.DefaultPositions = exports.place = exports.placeToCandidates = exports.canPlaceInside = exports.canPlace = void 0;
 
 const vutils_1 = require("@visactor/vutils"), scaler_1 = require("./scaler");
 
@@ -55,7 +55,19 @@ function defaultLabelPosition(type) {
     return "rect" === type ? exports.DefaultRectPositions : exports.DefaultPositions;
 }
 
+function clampText(text, width, height) {
+    const {x1: x1, x2: x2, y1: y1, y2: y2} = text.AABBBounds, minX = Math.min(x1, x2), maxX = Math.max(x1, x2), minY = Math.min(y1, y2), maxY = Math.max(y1, y2);
+    let dx = 0, dy = 0;
+    return minX < 0 && maxX - minX <= width ? dx = -minX : maxX > width && minX - (maxX - width) >= 0 && (dx = width - maxX), 
+    minY < 0 && maxY - minY <= height ? dy = -minY : maxY > height && minY - (maxY - height) >= 0 && (dy = height - maxY), 
+    {
+        dx: dx,
+        dy: dy
+    };
+}
+
 exports.canPlace = canPlace, exports.canPlaceInside = canPlaceInside, exports.placeToCandidates = placeToCandidates, 
 exports.place = place, exports.DefaultPositions = [ "top", "bottom", "right", "left", "top-right", "bottom-right", "top-left", "bottom-left" ], 
-exports.DefaultRectPositions = [ "top", "inside-top", "inside" ], exports.defaultLabelPosition = defaultLabelPosition;
+exports.DefaultRectPositions = [ "top", "inside-top", "inside" ], exports.defaultLabelPosition = defaultLabelPosition, 
+exports.clampText = clampText;
 //# sourceMappingURL=place.js.map

package/cjs/label/overlap/place.js.map

@@ -1 +1 @@
-{"version":3,"sources":["label/overlap/place.ts"],"names":[],"mappings":"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","file":"place.js","sourcesContent":["import { Text } from '@visactor/vrender';\nimport { IAABBBounds, IBoundsLike, isFunction } from '@visactor/vutils';\nimport { PointLocationCfg } from '../../core/type';\nimport type { LabelBase } from '../base';\nimport type { BaseLabelAttrs, OverlapAttrs, Strategy } from '../type';\nimport type { Bitmap } from './bitmap';\nimport { BitmapTool, boundToRange } from './scaler';\n\n/**\n * 防重叠逻辑参考 https://github.com/vega/vega/\n * Copyright (c) 2015-2023, University of Washington Interactive Data Lab\n  All rights reserved.\n\n  Redistribution and use in source and binary forms, with or without\n  modification, are permitted provided that the following conditions are met:\n\n  1. Redistributions of source code must retain the above copyright notice, this\n    list of conditions and the following disclaimer.\n\n  2. Redistributions in binary form must reproduce the above copyright notice,\n    this list of conditions and the following disclaimer in the documentation\n    and/or other materials provided with the distribution.\n\n  3. Neither the name of the copyright holder nor the names of its contributors\n    may be used to endorse or promote products derived from this software\n    without specific prior written permission.\n\n  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\n  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n\nexport function canPlace($: BitmapTool, bitmap: Bitmap, bound: IBoundsLike, checkBound = true) {\n  const range = boundToRange($, bound);\n  const outOfBounds = checkBound && bitmap.outOfBounds(range);\n\n  if (outOfBounds) {\n    return false;\n  }\n\n  return !bitmap.getRange(range);\n}\n\n/**\n * 是否在图形内部\n * @param textBound\n * @param shapeBound\n * @returns\n */\nexport function canPlaceInside(textBound: IBoundsLike, shapeBound: IAABBBounds) {\n  if (!textBound || !shapeBound) {\n    return false;\n  }\n  return shapeBound.encloses(textBound);\n}\n\nexport function placeToCandidates(\n  $: BitmapTool,\n  bitmap: Bitmap,\n  text: Text,\n  candidates: PointLocationCfg[] = [],\n  clampForce = true\n): PointLocationCfg | false {\n  for (let i = 0; i < candidates.length; i++) {\n    const tempText = text.clone();\n    tempText.setAttributes(candidates[i]);\n    tempText.update();\n\n    if (canPlace($, bitmap, boundToRange($, tempText.AABBBounds), clampForce)) {\n      bitmap.setRange(boundToRange($, tempText.AABBBounds, true));\n      return candidates[i];\n    }\n  }\n  return false;\n}\n\nexport function place<T extends BaseLabelAttrs>(\n  $: BitmapTool,\n  bitmap: Bitmap,\n  s: Strategy,\n  attrs: T,\n  text: Text,\n  bounds: IBoundsLike,\n  labeling?: LabelBase<T>['labeling']\n): PointLocationCfg | false {\n  if (s.type === 'bound' || s.type === 'position') {\n    if (isFunction(labeling)) {\n      // TODO：这里可以 filter 掉初始位置，提升一部分性能\n      const userPosition = isFunction(s.position) ? s.position(text.attribute) : s.position;\n      const positions = (userPosition || defaultLabelPosition(attrs.type)) as string[];\n      const candidates = positions.map(p => labeling(text.AABBBounds, bounds, p, attrs.offset) as PointLocationCfg);\n      return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n    }\n    return false;\n  }\n\n  if (s.type === 'moveY') {\n    const offset = s.offset ? (isFunction(s.offset) ? s.offset(text.attribute) : s.offset) : [];\n    const candidates = offset.map(dy => {\n      return { x: text.attribute.x as number, y: (text.attribute.y as number) + dy };\n    });\n    return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n  }\n\n  if (s.type === 'moveX') {\n    const offset = s.offset ? (isFunction(s.offset) ? s.offset(text.attribute) : s.offset) : [];\n    const candidates = offset.map(dx => {\n      return { x: (text.attribute.x as number) + dx, y: text.attribute.y as number };\n    });\n    return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n  }\n  return false;\n}\n\nexport const DefaultPositions = [\n  'top',\n  'bottom',\n  'right',\n  'left',\n  'top-right',\n  'bottom-right',\n  'top-left',\n  'bottom-left'\n];\nexport const DefaultRectPositions = ['top', 'inside-top', 'inside'];\n\nexport function defaultLabelPosition(type?: string) {\n  switch (type) {\n    case 'rect':\n      return DefaultRectPositions;\n    default:\n      return DefaultPositions;\n  }\n}\n"]}
+{"version":3,"sources":["label/overlap/place.ts"],"names":[],"mappings":"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","file":"place.js","sourcesContent":["import type { IText, Text } from '@visactor/vrender';\nimport type { IAABBBounds, IBoundsLike } from '@visactor/vutils';\nimport { isFunction } from '@visactor/vutils';\nimport type { PointLocationCfg } from '../../core/type';\nimport type { LabelBase } from '../base';\nimport type { BaseLabelAttrs, OverlapAttrs, Strategy } from '../type';\nimport type { Bitmap } from './bitmap';\nimport type { BitmapTool } from './scaler';\nimport { boundToRange } from './scaler';\n\n/**\n * 防重叠逻辑参考 https://github.com/vega/vega/\n * Copyright (c) 2015-2023, University of Washington Interactive Data Lab\n  All rights reserved.\n\n  Redistribution and use in source and binary forms, with or without\n  modification, are permitted provided that the following conditions are met:\n\n  1. Redistributions of source code must retain the above copyright notice, this\n    list of conditions and the following disclaimer.\n\n  2. Redistributions in binary form must reproduce the above copyright notice,\n    this list of conditions and the following disclaimer in the documentation\n    and/or other materials provided with the distribution.\n\n  3. Neither the name of the copyright holder nor the names of its contributors\n    may be used to endorse or promote products derived from this software\n    without specific prior written permission.\n\n  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\n  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n\nexport function canPlace($: BitmapTool, bitmap: Bitmap, bound: IBoundsLike, checkBound = true) {\n  const range = boundToRange($, bound);\n  const outOfBounds = checkBound && bitmap.outOfBounds(range);\n\n  if (outOfBounds) {\n    return false;\n  }\n\n  return !bitmap.getRange(range);\n}\n\n/**\n * 是否在图形内部\n * @param textBound\n * @param shapeBound\n * @returns\n */\nexport function canPlaceInside(textBound: IBoundsLike, shapeBound: IAABBBounds) {\n  if (!textBound || !shapeBound) {\n    return false;\n  }\n  return shapeBound.encloses(textBound);\n}\n\nexport function placeToCandidates(\n  $: BitmapTool,\n  bitmap: Bitmap,\n  text: Text,\n  candidates: PointLocationCfg[] = [],\n  clampForce = true\n): PointLocationCfg | false {\n  for (let i = 0; i < candidates.length; i++) {\n    const tempText = text.clone();\n    tempText.setAttributes(candidates[i]);\n    tempText.update();\n\n    if (canPlace($, bitmap, boundToRange($, tempText.AABBBounds), clampForce)) {\n      bitmap.setRange(boundToRange($, tempText.AABBBounds, true));\n      return candidates[i];\n    }\n  }\n  return false;\n}\n\nexport function place<T extends BaseLabelAttrs>(\n  $: BitmapTool,\n  bitmap: Bitmap,\n  s: Strategy,\n  attrs: T,\n  text: Text,\n  bounds: IBoundsLike,\n  labeling?: LabelBase<T>['labeling']\n): PointLocationCfg | false {\n  if (s.type === 'bound' || s.type === 'position') {\n    if (isFunction(labeling)) {\n      // TODO：这里可以 filter 掉初始位置，提升一部分性能\n      const userPosition = isFunction(s.position) ? s.position(text.attribute) : s.position;\n      const positions = (userPosition || defaultLabelPosition(attrs.type)) as string[];\n      const candidates = positions.map(p => labeling(text.AABBBounds, bounds, p, attrs.offset) as PointLocationCfg);\n      return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n    }\n    return false;\n  }\n\n  if (s.type === 'moveY') {\n    const offset = s.offset ? (isFunction(s.offset) ? s.offset(text.attribute) : s.offset) : [];\n    const candidates = offset.map(dy => {\n      return { x: text.attribute.x as number, y: (text.attribute.y as number) + dy };\n    });\n    return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n  }\n\n  if (s.type === 'moveX') {\n    const offset = s.offset ? (isFunction(s.offset) ? s.offset(text.attribute) : s.offset) : [];\n    const candidates = offset.map(dx => {\n      return { x: (text.attribute.x as number) + dx, y: text.attribute.y as number };\n    });\n    return placeToCandidates($, bitmap, text, candidates, (attrs.overlap as OverlapAttrs)?.clampForce);\n  }\n  return false;\n}\n\nexport const DefaultPositions = [\n  'top',\n  'bottom',\n  'right',\n  'left',\n  'top-right',\n  'bottom-right',\n  'top-left',\n  'bottom-left'\n];\nexport const DefaultRectPositions = ['top', 'inside-top', 'inside'];\n\nexport function defaultLabelPosition(type?: string) {\n  switch (type) {\n    case 'rect':\n      return DefaultRectPositions;\n    default:\n      return DefaultPositions;\n  }\n}\n\nexport function clampText(text: IText, width: number, height: number) {\n  const { x1, x2, y1, y2 } = text.AABBBounds;\n  const minX = Math.min(x1, x2);\n  const maxX = Math.max(x1, x2);\n\n  const minY = Math.min(y1, y2);\n  const maxY = Math.max(y1, y2);\n\n  let dx = 0;\n  let dy = 0;\n\n  // x 方向\n  if (minX < 0 && maxX - minX <= width) {\n    dx = -minX;\n  } else if (maxX > width && minX - (maxX - width) >= 0) {\n    dx = width - maxX;\n  }\n\n  // y 方向\n  if (minY < 0 && maxY - minY <= height) {\n    dy = -minY;\n  } else if (maxY > height && minY - (maxY - height) >= 0) {\n    dy = height - maxY;\n  }\n\n  return { dx, dy };\n}\n"]}

package/cjs/label/rect.d.ts

@@ -1,10 +1,12 @@
-import { IBoundsLike } from '@visactor/vutils';
-import type { ITextGraphicAttribute } from '@visactor/vrender';
+import type { IBoundsLike } from '@visactor/vutils';
 import type { RectLabelAttrs } from './type';
 import { LabelBase } from './base';
 export declare class RectLabel extends LabelBase<RectLabelAttrs> {
     static tag: string;
     static defaultAttributes: Partial<RectLabelAttrs>;
     constructor(attributes: RectLabelAttrs);
-    protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): Partial<ITextGraphicAttribute> | undefined;
+    protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): {
+        x: number;
+        y: number;
+    };
 }

package/cjs/label/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["label/rect.ts"],"names":[],"mappings":"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","file":"rect.js","sourcesContent":["import { merge, IBoundsLike } from '@visactor/vutils';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\nimport type { RectLabelAttrs } from './type';\nimport { LabelBase } from './base';\n\nexport class RectLabel extends LabelBase<RectLabelAttrs> {\n  static tag = 'rect-label';\n\n  static defaultAttributes: Partial<RectLabelAttrs> = {\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'center',\n      textBaseline: 'middle',\n      boundsPadding: [-1, 0, -1, 0] // to ignore the textBound buf\n    },\n    position: 'top',\n    offset: 5,\n    pickable: false\n  };\n\n  constructor(attributes: RectLabelAttrs) {\n    super(merge({}, RectLabel.defaultAttributes, attributes));\n  }\n\n  protected labeling(\n    textBounds: IBoundsLike,\n    graphicBounds: IBoundsLike,\n    position = 'top',\n    offset = 0\n  ): Partial<ITextGraphicAttribute> | undefined {\n    if (!textBounds || !graphicBounds) {\n      return;\n    }\n\n    const { x1, y1, x2, y2 } = textBounds;\n    const width = Math.abs(x2 - x1);\n    const height = Math.abs(y2 - y1);\n\n    const rectWidth = Math.abs(graphicBounds.x2 - graphicBounds.x1);\n    const rectHeight = Math.abs(graphicBounds.y2 - graphicBounds.y1);\n    let anchorX = (graphicBounds.x1 + graphicBounds.x2) / 2;\n    let anchorY = (graphicBounds.y1 + graphicBounds.y2) / 2;\n\n    let sx = 0;\n    let sy = 0;\n\n    switch (position) {\n      case 'top':\n      case 'inside-top':\n        sy = -0.5;\n        break;\n      case 'bottom':\n      case 'inside-bottom':\n        sy = 0.5;\n        break;\n      case 'left':\n      case 'inside-left':\n        sx = -0.5;\n        break;\n      case 'right':\n      case 'inside-right':\n        sx = 0.5;\n        break;\n    }\n\n    anchorX += sx * rectWidth;\n    anchorY += sy * rectHeight;\n\n    let vx = 0;\n    let vy = 0;\n\n    const isInside = position.includes('inside');\n\n    if (position.includes('top')) {\n      vy = isInside ? 1 : -1;\n    } else if (position.includes('bottom')) {\n      vy = isInside ? -1 : 1;\n    } else if (position.includes('left')) {\n      vx = isInside ? 1 : -1;\n    } else if (position.includes('right')) {\n      vx = isInside ? -1 : 1;\n    }\n\n    const x = anchorX + vx * offset + (vx * width) / 2;\n    const y = anchorY + vy * offset + (vy * height) / 2;\n\n    return { x, y };\n  }\n}\n"]}
+{"version":3,"sources":["label/rect.ts"],"names":[],"mappings":"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","file":"rect.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport { merge } from '@visactor/vutils';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\nimport type { RectLabelAttrs } from './type';\nimport { LabelBase } from './base';\n\nexport class RectLabel extends LabelBase<RectLabelAttrs> {\n  static tag = 'rect-label';\n\n  static defaultAttributes: Partial<RectLabelAttrs> = {\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'center',\n      textBaseline: 'middle',\n      boundsPadding: [-1, 0, -1, 0] // to ignore the textBound buf\n    },\n    position: 'top',\n    offset: 5,\n    pickable: false\n  };\n\n  constructor(attributes: RectLabelAttrs) {\n    super(merge({}, RectLabel.defaultAttributes, attributes));\n  }\n\n  protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position = 'top', offset = 0) {\n    if (!textBounds || !graphicBounds) {\n      return;\n    }\n\n    const { x1, y1, x2, y2 } = textBounds;\n    const width = Math.abs(x2 - x1);\n    const height = Math.abs(y2 - y1);\n\n    const rectWidth = Math.abs(graphicBounds.x2 - graphicBounds.x1);\n    const rectHeight = Math.abs(graphicBounds.y2 - graphicBounds.y1);\n    let anchorX = (graphicBounds.x1 + graphicBounds.x2) / 2;\n    let anchorY = (graphicBounds.y1 + graphicBounds.y2) / 2;\n\n    let sx = 0;\n    let sy = 0;\n\n    switch (position) {\n      case 'top':\n      case 'inside-top':\n        sy = -0.5;\n        break;\n      case 'bottom':\n      case 'inside-bottom':\n        sy = 0.5;\n        break;\n      case 'left':\n      case 'inside-left':\n        sx = -0.5;\n        break;\n      case 'right':\n      case 'inside-right':\n        sx = 0.5;\n        break;\n    }\n\n    anchorX += sx * rectWidth;\n    anchorY += sy * rectHeight;\n\n    let vx = 0;\n    let vy = 0;\n\n    const isInside = position.includes('inside');\n\n    if (position.includes('top')) {\n      vy = isInside ? 1 : -1;\n    } else if (position.includes('bottom')) {\n      vy = isInside ? -1 : 1;\n    } else if (position.includes('left')) {\n      vx = isInside ? 1 : -1;\n    } else if (position.includes('right')) {\n      vx = isInside ? -1 : 1;\n    }\n\n    const x = anchorX + vx * offset + (vx * width) / 2;\n    const y = anchorY + vy * offset + (vy * height) / 2;\n\n    return { x, y };\n  }\n}\n"]}

package/cjs/label/symbol.d.ts

@@ -1,10 +1,12 @@
-import { IBoundsLike } from '@visactor/vutils';
-import type { ITextGraphicAttribute } from '@visactor/vrender';
+import type { IBoundsLike } from '@visactor/vutils';
 import type { SymbolLabelAttrs } from './type';
 import { LabelBase } from './base';
 export declare class SymbolLabel extends LabelBase<SymbolLabelAttrs> {
     name: string;
     static defaultAttributes: Partial<SymbolLabelAttrs>;
     constructor(attributes: SymbolLabelAttrs);
-    protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): Partial<ITextGraphicAttribute> | undefined;
+    protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): {
+        x: number;
+        y: number;
+    };
 }

package/cjs/label/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["label/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import { merge, IBoundsLike } from '@visactor/vutils';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\nimport type { SymbolLabelAttrs } from './type';\nimport { LabelBase } from './base';\n\nexport class SymbolLabel extends LabelBase<SymbolLabelAttrs> {\n  name = 'symbol-label';\n\n  static defaultAttributes: Partial<SymbolLabelAttrs> = {\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'center',\n      textBaseline: 'middle',\n      boundsPadding: [-1, 0, -1, 0] // to ignore the textBound buf\n    },\n    position: 'top',\n    offset: 5,\n    pickable: false\n  };\n\n  constructor(attributes: SymbolLabelAttrs) {\n    super(merge({}, SymbolLabel.defaultAttributes, attributes));\n  }\n\n  protected labeling(\n    textBounds: IBoundsLike,\n    graphicBounds: IBoundsLike,\n    position = 'top',\n    offset = 0\n  ): Partial<ITextGraphicAttribute> | undefined {\n    if (!textBounds) {\n      return;\n    }\n\n    const { x1, y1, x2, y2 } = textBounds;\n    const width = Math.abs(x2 - x1);\n    const height = Math.abs(y2 - y1);\n\n    const anchorX = (graphicBounds.x1 + graphicBounds.x2) / 2;\n    const anchorY = (graphicBounds.y1 + graphicBounds.y2) / 2;\n\n    let sx = 0;\n    let sy = 0;\n    let offsetX = 0;\n    let offsetY = 0;\n    if (graphicBounds) {\n      offsetX = Math.abs(graphicBounds.x1 - graphicBounds.x2) / 2;\n      offsetY = Math.abs(graphicBounds.y1 - graphicBounds.y2) / 2;\n    }\n\n    const angle = {\n      'top-right': -235,\n      'top-left': 235,\n      'bottom-right': 45,\n      'bottom-left': -45\n    };\n\n    switch (position) {\n      case 'top':\n        sy = -1;\n        break;\n      case 'bottom':\n        sy = 1;\n        break;\n      case 'left':\n        sx = -1;\n        break;\n      case 'right':\n        sx = 1;\n        break;\n      case 'bottom-left':\n      case 'bottom-right':\n      case 'top-left':\n      case 'top-right':\n        sx = Math.sin(angle[position] * (Math.PI / 180));\n        sy = Math.cos(angle[position] * (Math.PI / 180));\n        break;\n      case 'center':\n        sx = 0;\n        sy = 0;\n        break;\n    }\n\n    const x = anchorX + sx * (offset + offsetX) + Math.sign(sx) * (width / 2);\n    const y = anchorY + sy * (offset + offsetY) + Math.sign(sy) * (height / 2);\n\n    return { x, y };\n  }\n}\n"]}
+{"version":3,"sources":["label/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport { merge } from '@visactor/vutils';\nimport type { ITextGraphicAttribute } from '@visactor/vrender';\nimport type { SymbolLabelAttrs } from './type';\nimport { LabelBase } from './base';\n\nexport class SymbolLabel extends LabelBase<SymbolLabelAttrs> {\n  name = 'symbol-label';\n\n  static defaultAttributes: Partial<SymbolLabelAttrs> = {\n    textStyle: {\n      fontSize: 12,\n      fill: '#000',\n      textAlign: 'center',\n      textBaseline: 'middle',\n      boundsPadding: [-1, 0, -1, 0] // to ignore the textBound buf\n    },\n    position: 'top',\n    offset: 5,\n    pickable: false\n  };\n\n  constructor(attributes: SymbolLabelAttrs) {\n    super(merge({}, SymbolLabel.defaultAttributes, attributes));\n  }\n\n  protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position = 'top', offset = 0) {\n    if (!textBounds) {\n      return;\n    }\n\n    const { x1, y1, x2, y2 } = textBounds;\n    const width = Math.abs(x2 - x1);\n    const height = Math.abs(y2 - y1);\n\n    const anchorX = (graphicBounds.x1 + graphicBounds.x2) / 2;\n    const anchorY = (graphicBounds.y1 + graphicBounds.y2) / 2;\n\n    let sx = 0;\n    let sy = 0;\n    let offsetX = 0;\n    let offsetY = 0;\n    if (graphicBounds) {\n      offsetX = Math.abs(graphicBounds.x1 - graphicBounds.x2) / 2;\n      offsetY = Math.abs(graphicBounds.y1 - graphicBounds.y2) / 2;\n    }\n\n    const angle = {\n      'top-right': -235,\n      'top-left': 235,\n      'bottom-right': 45,\n      'bottom-left': -45\n    };\n\n    switch (position) {\n      case 'top':\n        sy = -1;\n        break;\n      case 'bottom':\n        sy = 1;\n        break;\n      case 'left':\n        sx = -1;\n        break;\n      case 'right':\n        sx = 1;\n        break;\n      case 'bottom-left':\n      case 'bottom-right':\n      case 'top-left':\n      case 'top-right':\n        sx = Math.sin(angle[position] * (Math.PI / 180));\n        sy = Math.cos(angle[position] * (Math.PI / 180));\n        break;\n      case 'center':\n        sx = 0;\n        sy = 0;\n        break;\n    }\n\n    const x = anchorX + sx * (offset + offsetX) + Math.sign(sx) * (width / 2);\n    const y = anchorY + sy * (offset + offsetY) + Math.sign(sy) * (height / 2);\n\n    return { x, y };\n  }\n}\n"]}

package/cjs/label/type.d.ts

@@ -1,17 +1,21 @@
-import type { EasingType, IGroupGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender';
+import type { EasingType, IGraphic, IGroupGraphicAttribute, ITextGraphicAttribute, Text } from '@visactor/vrender';
 export type LabelItemStateStyle<T> = {
     hover?: T;
     hover_reverse?: T;
     selected?: T;
     selected_reverse?: T;
 };
+export type LabelItem = {
+    id?: string;
+    data?: any;
+    [key: string]: any;
+} & ITextGraphicAttribute;
 export interface BaseLabelAttrs extends IGroupGraphicAttribute {
     type: string;
+    baseMarkGroupName: string;
     select?: boolean;
     hover?: boolean;
-    data: Functional<(ITextGraphicAttribute & Record<string, any>)[]>;
-    sort?: (graphicA: any, graphicB: any) => number;
-    baseMarkGroupName?: string;
+    data: LabelItem[];
     textStyle?: Partial<ITextGraphicAttribute>;
     state?: LabelItemStateStyle<ITextGraphicAttribute>;
     position?: Functional<string>;
@@ -19,6 +23,9 @@ export interface BaseLabelAttrs extends IGroupGraphicAttribute {
     overlap?: OverlapAttrs | false;
     smartInvert?: SmartInvertAttrs | false;
     animation?: ILabelAnimation | false;
+    dataFilter?: (data: LabelItem[]) => LabelItem[];
+    customLayoutFunc?: (data: LabelItem[], getRelatedGraphic: (data: LabelItem) => IGraphic) => Text[];
+    customOverlapFunc?: (label: Text[], getRelatedGraphic: (data: LabelItem) => IGraphic) => Text[];
 }
 export interface OverlapAttrs {
     size?: {
@@ -67,6 +74,33 @@ export interface LineLabelAttrs extends BaseLabelAttrs {
     baseMarkGroupName: string;
     position?: Functional<'start' | 'end'>;
 }
+export interface ArcLabelAttrs extends BaseLabelAttrs {
+    type: 'arc';
+    baseMarkGroupName: string;
+    position?: Functional<'inside' | 'outside'>;
+    width?: number;
+    height?: number;
+    coverEnable?: boolean;
+    rotate?: boolean;
+    spaceWidth?: number;
+    layoutArcGap?: number;
+    line?: IArcLabelLineSpec;
+    layout?: IArcLabelLayoutSpec;
+}
+export interface IArcLabelLineSpec {
+    stroke?: string;
+    visible?: boolean;
+    line1MinLength?: number;
+    line2MinLength?: number;
+}
+export type ArcLabelAlignType = 'arc' | 'labelLine' | 'edge';
+export type ArcLabelStrategyType = 'priority' | 'vertical' | 'none';
+export interface IArcLabelLayoutSpec {
+    textAlign?: ArcLabelAlignType;
+    align?: ArcLabelAlignType;
+    strategy?: ArcLabelStrategyType;
+    tangentConstraint?: boolean;
+}
 export interface DataLabelAttrs extends IGroupGraphicAttribute {
     dataLabels: (RectLabelAttrs | SymbolLabelAttrs)[];
     size: {
@@ -75,9 +109,6 @@ export interface DataLabelAttrs extends IGroupGraphicAttribute {
     };
 }
 export type Functional<T> = T | ((data: any) => T);
-export interface ILabelGraphicAttribute extends ITextGraphicAttribute {
-    _relatedIndex?: number;
-}
 export interface ILabelAnimation {
     mode?: 'same-time' | 'after' | 'after-all';
     duration?: number;
@@ -85,3 +116,13 @@ export interface ILabelAnimation {
     easing?: EasingType;
     increaseEffect?: boolean;
 }
+export interface IPoint {
+    x: number;
+    y: number;
+}
+export interface IPolarPoint {
+    radius: number;
+    angle: number;
+}
+export type Quadrant = 1 | 2 | 3 | 4;
+export type TextAlign = 'left' | 'right' | 'center';

package/cjs/label/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["label/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { EasingType, IGroupGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender';\nimport type { Bounds } from '@visactor/vutils';\n\nexport type LabelItemStateStyle<T> = {\n  hover?: T;\n  hover_reverse?: T;\n  selected?: T;\n  selected_reverse?: T;\n};\n\nexport interface BaseLabelAttrs extends IGroupGraphicAttribute {\n  type: string;\n  /**\n   * 是否开启选中交互\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 交互\n   * @default false\n   */\n  hover?: boolean;\n  /**\n   * 标签数据\n   */\n  data: Functional<(ITextGraphicAttribute & Record<string, any>)[]>;\n\n  sort?: (graphicA: any, graphicB: any) => number;\n\n  /**\n   *  图元 group 名称\n   *  如果不配置，需要在 data 里指定标签定位 x/y\n   */\n  baseMarkGroupName?: string;\n\n  /** 文本样式，优先级低于 data */\n  textStyle?: Partial<ITextGraphicAttribute>;\n\n  /** 文本交互样式 */\n  state?: LabelItemStateStyle<ITextGraphicAttribute>;\n\n  /** 标签默认位置 */\n  position?: Functional<string>;\n\n  /** 偏移量 */\n  offset?: number;\n\n  /** 是否开启防重叠\n   * @default true\n   */\n  overlap?: OverlapAttrs | false;\n\n  /** 智能反色 */\n  smartInvert?: SmartInvertAttrs | false;\n\n  /** 动画配置 */\n  animation?: ILabelAnimation | false;\n}\n\nexport interface OverlapAttrs {\n  /**\n   * 防重叠的区域大小\n   */\n  size?: { width: number; height: number };\n\n  /**\n   * 发生重叠后，是否隐藏标签\n   * @default true\n   */\n  hideOnHit?: boolean;\n\n  /**\n   * 是否约束标签在指定 size 的范围内。开启后若标签被区域裁剪，会向内收缩。\n   * @default true\n   */\n  clampForce?: boolean;\n\n  /**\n   * 是否躲避基础图元\n   * @default false\n   */\n  avoidBaseMark?: boolean;\n\n  /**\n   * 发生重叠后的躲避策略\n   */\n  strategy?: Strategy[];\n}\n\nexport interface SmartInvertAttrs {\n  /**\n   * 文本类型\n   * 包含普通文本和大文本，对应不同的对比度标准，label默认为普通文本\n   * 'normalText' ｜ 'largeText'\n   * @default 'normalText'\n   */\n  textType?: string;\n  /**\n   * 自定义对比度阈值\n   */\n  contrastRatiosThreshold?: number;\n  /**\n   * 自定义备选label颜色\n   */\n  alternativeColors?: string | string[];\n}\n\nexport type PositionStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则考虑 position 内的备选位置。\n   */\n  type: 'position';\n  position?: Functional<LabelPosition[]>;\n};\n\nexport type BoundStrategy = {\n  /**\n   * 标签配置在图形内部时使用。\n   * 当图形大小不足以放下标签，则考虑 position 内的备选位置。\n   */\n  type: 'bound';\n  position?: Functional<LabelPosition[]>;\n};\n\nexport type MoveYStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则根据 offset 在Y方向上寻找位置。\n   */\n  type: 'moveY';\n  /**\n   * Y方向上的尝试的位置偏移量\n   */\n  offset: Functional<number[]>;\n};\n\nexport type MoveXStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则根据 offset 在X方向上寻找位置。\n   */\n  type: 'moveX';\n  /**\n   * X方向上的尝试的位置偏移量\n   */\n  offset: Functional<number[]>;\n};\n\nexport type Strategy = PositionStrategy | BoundStrategy | MoveYStrategy | MoveXStrategy;\n\nexport type LabelPosition = SymbolLabelAttrs['position'] | RectLabelAttrs['position'];\n\nexport interface SymbolLabelAttrs extends BaseLabelAttrs {\n  type: 'symbol';\n\n  /**\n   * 标签位置\n   * @default 'top'\n   */\n  position?: Functional<\n    'top' | 'bottom' | 'left' | 'right' | 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' | 'center'\n  >;\n}\n\nexport interface RectLabelAttrs extends BaseLabelAttrs {\n  type: 'rect';\n\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n\n  /**\n   * 标签位置\n   * @default 'top'\n   */\n  position?: Functional<\n    'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left'\n  >;\n}\n\nexport interface LineLabelAttrs extends BaseLabelAttrs {\n  type: 'line';\n\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n\n  /**\n   * 标签位置\n   * @default 'end'\n   */\n  position?: Functional<'start' | 'end'>;\n}\n\nexport interface DataLabelAttrs extends IGroupGraphicAttribute {\n  dataLabels: (RectLabelAttrs | SymbolLabelAttrs)[];\n  /**\n   * 防重叠的区域大小\n   */\n  size: { width: number; height: number };\n}\n\nexport type Functional<T> = T | ((data: any) => T);\n\nexport interface ILabelGraphicAttribute extends ITextGraphicAttribute {\n  _relatedIndex?: number;\n}\n\nexport interface ILabelAnimation {\n  mode?: 'same-time' | 'after' | 'after-all';\n  duration?: number;\n  delay?: number;\n  easing?: EasingType;\n  /** 是否开启 increaseCount 动画\n   * @default true\n   */\n  increaseEffect?: boolean;\n}\n"]}
+{"version":3,"sources":["label/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { EasingType, IGraphic, IGroupGraphicAttribute, ITextGraphicAttribute, Text } from '@visactor/vrender';\n\nexport type LabelItemStateStyle<T> = {\n  hover?: T;\n  hover_reverse?: T;\n  selected?: T;\n  selected_reverse?: T;\n};\n\nexport type LabelItem = {\n  // 用于动画\n  id?: string;\n  // 原始数据\n  data?: any;\n  [key: string]: any;\n} & ITextGraphicAttribute;\n\nexport interface BaseLabelAttrs extends IGroupGraphicAttribute {\n  type: string;\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n  /**\n   * 是否开启选中交互\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 交互\n   * @default false\n   */\n  hover?: boolean;\n  /**\n   * 标签数据\n   */\n  data: LabelItem[];\n\n  /** 文本样式，优先级低于 data */\n  textStyle?: Partial<ITextGraphicAttribute>;\n\n  /** 文本交互样式 */\n  state?: LabelItemStateStyle<ITextGraphicAttribute>;\n\n  /** 标签默认位置 */\n  position?: Functional<string>;\n\n  /** 偏移量 */\n  offset?: number;\n\n  /** 是否开启防重叠\n   * @default true\n   */\n  overlap?: OverlapAttrs | false;\n\n  /** 智能反色 */\n  smartInvert?: SmartInvertAttrs | false;\n\n  /** 动画配置 */\n  animation?: ILabelAnimation | false;\n\n  // 排序 or 删减\n  dataFilter?: (data: LabelItem[]) => LabelItem[];\n\n  /** 自定义布局函数\n   * @description 当配置了 customLayoutFunc 后，默认布局和防重叠逻辑将不再生效。（overlap/position/offset不生效）\n   */\n  customLayoutFunc?: (data: LabelItem[], getRelatedGraphic: (data: LabelItem) => IGraphic) => Text[];\n\n  /** 自定义标签躲避函数\n   * @description 当配置了 customOverlapFunc 后，会根据 position 和 offset 进行初始布局。配置的防重叠逻辑(overlap)不生效。\n   */\n  customOverlapFunc?: (label: Text[], getRelatedGraphic: (data: LabelItem) => IGraphic) => Text[];\n}\n\nexport interface OverlapAttrs {\n  /**\n   * 防重叠的区域大小\n   */\n  size?: { width: number; height: number };\n\n  /**\n   * 发生重叠后，是否隐藏标签\n   * @default true\n   */\n  hideOnHit?: boolean;\n\n  /**\n   * 是否约束标签在指定 size 的范围内。开启后若标签被区域裁剪，会向内收缩。\n   * @default true\n   */\n  clampForce?: boolean;\n\n  /**\n   * 是否躲避基础图元\n   * @default false\n   */\n  avoidBaseMark?: boolean;\n\n  /**\n   * 发生重叠后的躲避策略\n   */\n  strategy?: Strategy[];\n}\n\nexport interface SmartInvertAttrs {\n  /**\n   * 文本类型\n   * 包含普通文本和大文本，对应不同的对比度标准，label默认为普通文本\n   * 'normalText' ｜ 'largeText'\n   * @default 'normalText'\n   */\n  textType?: string;\n  /**\n   * 自定义对比度阈值\n   */\n  contrastRatiosThreshold?: number;\n  /**\n   * 自定义备选label颜色\n   */\n  alternativeColors?: string | string[];\n}\n\nexport type PositionStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则考虑 position 内的备选位置。\n   */\n  type: 'position';\n  position?: Functional<LabelPosition[]>;\n};\n\nexport type BoundStrategy = {\n  /**\n   * 标签配置在图形内部时使用。\n   * 当图形大小不足以放下标签，则考虑 position 内的备选位置。\n   */\n  type: 'bound';\n  position?: Functional<LabelPosition[]>;\n};\n\nexport type MoveYStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则根据 offset 在Y方向上寻找位置。\n   */\n  type: 'moveY';\n  /**\n   * Y方向上的尝试的位置偏移量\n   */\n  offset: Functional<number[]>;\n};\n\nexport type MoveXStrategy = {\n  /**\n   * 可选位置策略。\n   * 若默认位置没有足够的空间放置标签，则根据 offset 在X方向上寻找位置。\n   */\n  type: 'moveX';\n  /**\n   * X方向上的尝试的位置偏移量\n   */\n  offset: Functional<number[]>;\n};\n\nexport type Strategy = PositionStrategy | BoundStrategy | MoveYStrategy | MoveXStrategy;\n\nexport type LabelPosition = SymbolLabelAttrs['position'] | RectLabelAttrs['position'];\n\nexport interface SymbolLabelAttrs extends BaseLabelAttrs {\n  type: 'symbol';\n\n  /**\n   * 标签位置\n   * @default 'top'\n   */\n  position?: Functional<\n    'top' | 'bottom' | 'left' | 'right' | 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left' | 'center'\n  >;\n}\n\nexport interface RectLabelAttrs extends BaseLabelAttrs {\n  type: 'rect';\n\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n\n  /**\n   * 标签位置\n   * @default 'top'\n   */\n  position?: Functional<\n    'top' | 'bottom' | 'left' | 'right' | 'inside' | 'inside-top' | 'inside-bottom' | 'inside-right' | 'inside-left'\n  >;\n}\n\nexport interface LineLabelAttrs extends BaseLabelAttrs {\n  type: 'line';\n\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n\n  /**\n   * 标签位置\n   * @default 'end'\n   */\n  position?: Functional<'start' | 'end'>;\n}\n\nexport interface ArcLabelAttrs extends BaseLabelAttrs {\n  type: 'arc';\n\n  /**\n   *  图元 group 名称\n   */\n  baseMarkGroupName: string;\n\n  /**\n   * 标签位置\n   * @default 'outside'\n   */\n  position?: Functional<'inside' | 'outside'>;\n\n  // 画布宽度\n  width?: number;\n  // 画布高度\n  height?: number;\n\n  /**\n   * 是否允许标签重叠\n   * @default false\n   */\n  coverEnable?: boolean;\n  /**\n   * 是否允许标签旋转\n   * @default true\n   */\n  rotate?: boolean;\n\n  /**\n   * 文字与引导线间隔宽度\n   * @default 5\n   */\n  spaceWidth?: number;\n  /**\n   * 扇区间标签的间隔\n   * @default 6\n   */\n  layoutArcGap?: number;\n  /** 标签引导线样式 */\n  line?: IArcLabelLineSpec;\n  /** 标签布局配置 */\n  layout?: IArcLabelLayoutSpec;\n}\n\nexport interface IArcLabelLineSpec {\n  stroke?: string;\n  /**\n   * 是否显示引导线\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 引导线 line1 部分最小长度\n   * @default 20\n   */\n  line1MinLength?: number;\n  /**\n   * 引导线 line2 部分最小长度\n   * @default 10\n   */\n  line2MinLength?: number;\n}\n\nexport type ArcLabelAlignType = 'arc' | 'labelLine' | 'edge';\n\nexport type ArcLabelStrategyType = 'priority' | 'vertical' | 'none';\n\nexport interface IArcLabelLayoutSpec {\n  /**\n   * 标签对齐方式\n   * @default 'arc'\n   */\n  textAlign?: ArcLabelAlignType;\n  /** @deprecate 建议统一使用textAlign，后续将废除 */\n  align?: ArcLabelAlignType;\n  /**\n   * 标签布局策略\n   * @default 'priority'\n   */\n  strategy?: ArcLabelStrategyType;\n  /**\n   * 是否启用切线约束\n   * @default true\n   */\n  tangentConstraint?: boolean;\n}\n\nexport interface DataLabelAttrs extends IGroupGraphicAttribute {\n  dataLabels: (RectLabelAttrs | SymbolLabelAttrs)[];\n  /**\n   * 防重叠的区域大小\n   */\n  size: { width: number; height: number };\n}\n\nexport type Functional<T> = T | ((data: any) => T);\n\nexport interface ILabelAnimation {\n  mode?: 'same-time' | 'after' | 'after-all';\n  duration?: number;\n  delay?: number;\n  easing?: EasingType;\n  /** 是否开启 increaseCount 动画\n   * @default true\n   */\n  increaseEffect?: boolean;\n}\n\nexport interface IPoint {\n  x: number;\n  y: number;\n}\n\nexport interface IPolarPoint {\n  radius: number;\n  angle: number;\n}\n\nexport type Quadrant = 1 | 2 | 3 | 4;\n\nexport type TextAlign = 'left' | 'right' | 'center';\n"]}

package/cjs/label/util.d.ts

@@ -0,0 +1,10 @@
+import type { IPolarPoint, IPoint, Quadrant } from './type';
+import type { IBoundsLike } from '@visactor/vutils';
+export declare function polarToCartesian(point: IPolarPoint): IPoint;
+export declare function circlePoint(x0: number, y0: number, radius: number, radian: number): IPoint;
+export declare function isQuadrantLeft(quadrant: Quadrant): boolean;
+export declare function isQuadrantRight(quadrant: Quadrant): boolean;
+export declare function lineCirclePoints(a: number, b: number, c: number, x0: number, y0: number, r: number): IPoint[];
+export declare function connectLineRadian(radius: number, length: number): number;
+export declare function checkBoundsOverlap(boundsA: IBoundsLike, boundsB: IBoundsLike): boolean;
+export declare const degrees: (angle?: number) => number;

package/cjs/label/util.js

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.degrees = exports.checkBoundsOverlap = exports.connectLineRadian = exports.lineCirclePoints = exports.isQuadrantRight = exports.isQuadrantLeft = exports.circlePoint = exports.polarToCartesian = void 0;
+
+const vutils_1 = require("@visactor/vutils");
+
+function polarToCartesian(point) {
+    return point.radius ? {
+        x: Math.cos(point.angle) * point.radius,
+        y: Math.sin(point.angle) * point.radius
+    } : {
+        x: 0,
+        y: 0
+    };
+}
+
+function circlePoint(x0, y0, radius, radian) {
+    const offset = polarToCartesian({
+        radius: radius,
+        angle: radian
+    });
+    return {
+        x: x0 + offset.x,
+        y: y0 + offset.y
+    };
+}
+
+function isQuadrantLeft(quadrant) {
+    return 3 === quadrant || 4 === quadrant;
+}
+
+function isQuadrantRight(quadrant) {
+    return 1 === quadrant || 2 === quadrant;
+}
+
+function lineCirclePoints(a, b, c, x0, y0, r) {
+    if (0 === a && 0 === b || r <= 0) return [];
+    if (0 === a) {
+        const y1 = -c / b, fd = r ** 2 - (y1 - y0) ** 2;
+        if (fd < 0) return [];
+        if (0 === fd) return [ {
+            x: x0,
+            y: y1
+        } ];
+        return [ {
+            x: Math.sqrt(fd) + x0,
+            y: y1
+        }, {
+            x: -Math.sqrt(fd) + x0,
+            y: y1
+        } ];
+    }
+    if (0 === b) {
+        const x1 = -c / a, fd = r ** 2 - (x1 - x0) ** 2;
+        if (fd < 0) return [];
+        if (0 === fd) return [ {
+            x: x1,
+            y: y0
+        } ];
+        return [ {
+            x: x1,
+            y: Math.sqrt(fd) + y0
+        }, {
+            x: x1,
+            y: -Math.sqrt(fd) + y0
+        } ];
+    }
+    const fa = (b / a) ** 2 + 1, fb = 2 * ((c / a + x0) * (b / a) - y0), fd = fb ** 2 - 4 * fa * ((c / a + x0) ** 2 + y0 ** 2 - r ** 2);
+    if (fd < 0) return [];
+    const y1 = (-fb + Math.sqrt(fd)) / (2 * fa), y2 = (-fb - Math.sqrt(fd)) / (2 * fa), x1 = -(b * y1 + c) / a;
+    return 0 === fd ? [ {
+        x: x1,
+        y: y1
+    } ] : [ {
+        x: x1,
+        y: y1
+    }, {
+        x: -(b * y2 + c) / a,
+        y: y2
+    } ];
+}
+
+function connectLineRadian(radius, length) {
+    return length > 2 * radius ? NaN : 2 * Math.asin(length / 2 / radius);
+}
+
+function checkBoundsOverlap(boundsA, boundsB) {
+    const {x1: ax1, y1: ay1, x2: ax2, y2: ay2} = boundsA, {x1: bx1, y1: by1, x2: bx2, y2: by2} = boundsB;
+    return !(ax1 <= bx1 && ax2 <= bx1 || ax1 >= bx2 && ax2 >= bx2 || ay1 <= by1 && ay2 <= by1 || ay1 >= by2 && ay2 >= by2);
+}
+
+exports.polarToCartesian = polarToCartesian, exports.circlePoint = circlePoint, 
+exports.isQuadrantLeft = isQuadrantLeft, exports.isQuadrantRight = isQuadrantRight, 
+exports.lineCirclePoints = lineCirclePoints, exports.connectLineRadian = connectLineRadian, 
+exports.checkBoundsOverlap = checkBoundsOverlap;
+
+const degrees = angle => (0, vutils_1.isValidNumber)(angle) ? (0, vutils_1.radianToDegree)(angle) : null;
+
+exports.degrees = degrees;
+//# sourceMappingURL=util.js.map

package/cjs/label/util.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["label/util.ts"],"names":[],"mappings":";;;AAEA,6CAAiE;AAOjE,SAAgB,gBAAgB,CAAC,KAAkB;IACjD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;KACvB;IACD,OAAO;QACL,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM;QACvC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM;KACxC,CAAC;AACJ,CAAC;AARD,4CAQC;AASD,SAAgB,WAAW,CAAC,EAAU,EAAE,EAAU,EAAE,MAAc,EAAE,MAAc;IAChF,MAAM,MAAM,GAAG,gBAAgB,CAAC;QAC9B,MAAM;QACN,KAAK,EAAE,MAAM;KACd,CAAC,CAAC;IACH,OAAO;QACL,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;QAChB,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC;KACjB,CAAC;AACJ,CAAC;AATD,kCASC;AAED,SAAgB,cAAc,CAAC,QAAkB;IAC/C,OAAO,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC;AAC1C,CAAC;AAFD,wCAEC;AAED,SAAgB,eAAe,CAAC,QAAkB;IAChD,OAAO,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC;AAC1C,CAAC;AAFD,0CAEC;AAOD,SAAgB,gBAAgB,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,EAAU,EAAE,EAAU,EAAE,CAAS;IACjG,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAClC,OAAO,EAAE,CAAC;KACX;IACD,IAAI,CAAC,KAAK,CAAC,EAAE;QACX,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClB,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,EAAE,GAAG,CAAC,EAAE;YACV,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,EAAE,KAAK,CAAC,EAAE;YACnB,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC3B;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QAC/B,OAAO;YACL,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;YAChB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;SACjB,CAAC;KACH;SAAM,IAAI,CAAC,KAAK,CAAC,EAAE;QAClB,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClB,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,EAAE,GAAG,CAAC,EAAE;YACV,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,EAAE,KAAK,CAAC,EAAE;YACnB,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC3B;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QAC/B,OAAO;YACL,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;YAChB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;SACjB,CAAC;KACH;IACD,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IACjC,IAAI,EAAE,GAAG,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IACD,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,KAAK,CAAC,EAAE;QACZ,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;KAC3B;IACD,OAAO;QACL,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;QAChB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;KACjB,CAAC;AACJ,CAAC;AArDD,4CAqDC;AAOD,SAAgB,iBAAiB,CAAC,MAAc,EAAE,MAAc;IAC9D,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AALD,8CAKC;AAED,SAAgB,kBAAkB,CAAC,OAAoB,EAAE,OAAoB;IAC3E,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACvD,OAAO,CAAC,CACN,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC;QAC1B,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC;QAC1B,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC;QAC1B,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,CAC3B,CAAC;AACJ,CAAC;AATD,gDASC;AAEM,MAAM,OAAO,GAAG,CAAC,KAAc,EAAE,EAAE;IACxC,IAAI,CAAC,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAA,uBAAc,EAAC,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AALW,QAAA,OAAO,WAKlB","file":"util.js","sourcesContent":["import type { IPolarPoint, IPoint, Quadrant } from './type';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { radianToDegree, isValidNumber } from '@visactor/vutils';\n\n/**\n * 极坐标系 -> 直角坐标系\n * @param point\n * @returns\n */\nexport function polarToCartesian(point: IPolarPoint): IPoint {\n  if (!point.radius) {\n    return { x: 0, y: 0 };\n  }\n  return {\n    x: Math.cos(point.angle) * point.radius,\n    y: Math.sin(point.angle) * point.radius\n  };\n}\n\n/**\n * 计算圆弧上的点坐标\n * @param x0 圆心 x 坐标\n * @param y0 圆心 y 坐标\n * @param radius 圆弧半径\n * @param radian 点所在弧度\n */\nexport function circlePoint(x0: number, y0: number, radius: number, radian: number): IPoint {\n  const offset = polarToCartesian({\n    radius,\n    angle: radian\n  });\n  return {\n    x: x0 + offset.x,\n    y: y0 + offset.y\n  };\n}\n\nexport function isQuadrantLeft(quadrant: Quadrant): boolean {\n  return quadrant === 3 || quadrant === 4;\n}\n\nexport function isQuadrantRight(quadrant: Quadrant): boolean {\n  return quadrant === 1 || quadrant === 2;\n}\n\n/**\n * 计算直线与圆交点\n * 直线方程：ax + by + c = 0\n * 圆方程：(x - x0)^2 + (y - y0)^2 = r^2\n */\nexport function lineCirclePoints(a: number, b: number, c: number, x0: number, y0: number, r: number): IPoint[] {\n  if ((a === 0 && b === 0) || r <= 0) {\n    return [];\n  }\n  if (a === 0) {\n    const y1 = -c / b;\n    const fy = (y1 - y0) ** 2;\n    const fd = r ** 2 - fy;\n    if (fd < 0) {\n      return [];\n    } else if (fd === 0) {\n      return [{ x: x0, y: y1 }];\n    }\n    const x1 = Math.sqrt(fd) + x0;\n    const x2 = -Math.sqrt(fd) + x0;\n    return [\n      { x: x1, y: y1 },\n      { x: x2, y: y1 }\n    ];\n  } else if (b === 0) {\n    const x1 = -c / a;\n    const fx = (x1 - x0) ** 2;\n    const fd = r ** 2 - fx;\n    if (fd < 0) {\n      return [];\n    } else if (fd === 0) {\n      return [{ x: x1, y: y0 }];\n    }\n    const y1 = Math.sqrt(fd) + y0;\n    const y2 = -Math.sqrt(fd) + y0;\n    return [\n      { x: x1, y: y1 },\n      { x: x1, y: y2 }\n    ];\n  }\n  const fa = (b / a) ** 2 + 1;\n  const fb = 2 * ((c / a + x0) * (b / a) - y0);\n  const fc = (c / a + x0) ** 2 + y0 ** 2 - r ** 2;\n  const fd = fb ** 2 - 4 * fa * fc;\n  if (fd < 0) {\n    return [];\n  }\n  const y1 = (-fb + Math.sqrt(fd)) / (2 * fa);\n  const y2 = (-fb - Math.sqrt(fd)) / (2 * fa);\n  const x1 = -(b * y1 + c) / a;\n  const x2 = -(b * y2 + c) / a;\n  if (fd === 0) {\n    return [{ x: x1, y: y1 }];\n  }\n  return [\n    { x: x1, y: y1 },\n    { x: x2, y: y2 }\n  ];\n}\n\n/**\n * 根据圆弧两点连接线长度计算弧度\n * @param radius 圆弧半径\n * @param length 连接线长度\n */\nexport function connectLineRadian(radius: number, length: number) {\n  if (length > radius * 2) {\n    return NaN;\n  }\n  return Math.asin(length / 2 / radius) * 2;\n}\n\nexport function checkBoundsOverlap(boundsA: IBoundsLike, boundsB: IBoundsLike): boolean {\n  const { x1: ax1, y1: ay1, x2: ax2, y2: ay2 } = boundsA;\n  const { x1: bx1, y1: by1, x2: bx2, y2: by2 } = boundsB;\n  return !(\n    (ax1 <= bx1 && ax2 <= bx1) ||\n    (ax1 >= bx2 && ax2 >= bx2) ||\n    (ay1 <= by1 && ay2 <= by1) ||\n    (ay1 >= by2 && ay2 >= by2)\n  );\n}\n\nexport const degrees = (angle?: number) => {\n  if (!isValidNumber(angle)) {\n    return null;\n  }\n  return radianToDegree(angle);\n};\n"]}

package/cjs/link-path/link-path.js

@@ -61,5 +61,4 @@ class LinkPath extends base_1.AbstractComponent {
 exports.LinkPath = LinkPath, LinkPath.defaultAttributes = {
     direction: "horizontal",
     align: "start"
-};
-//# sourceMappingURL=link-path.js.map
+};

package/cjs/marker/base.js

@@ -18,4 +18,5 @@ class Marker extends base_1.AbstractComponent {
     }
 }
 
-exports.Marker = Marker;
+exports.Marker = Marker;
+//# sourceMappingURL=base.js.map

package/cjs/marker/type.d.ts

@@ -1,7 +1,7 @@
-import type { IGroup, IGroupGraphicAttribute, IImageGraphicAttribute, IPolygonAttribute, IRichTextGraphicAttribute, ISymbolGraphicAttribute } from '@visactor/vrender';
-import type { IPointLike } from '@visactor/vutils';
-import type { SegmentAttributes, SymbolAttributes } from '../segment';
-import type { TagAttributes } from '../tag';
+import { IGroup, IGroupGraphicAttribute, IImageGraphicAttribute, IPolygonAttribute, IRichTextGraphicAttribute, ISymbolGraphicAttribute } from '@visactor/vrender';
+import { IPointLike } from '@visactor/vutils';
+import { SegmentAttributes, SymbolAttributes } from '../segment';
+import { TagAttributes } from '../tag';
 export declare enum IMarkLineLabelPosition {
     start = "start",
     middle = "middle",
@@ -39,7 +39,7 @@ export type IMarkBackgroundAttributes = {
 } & Partial<SymbolAttributes>;
 export interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {
     panel?: IMarkBackgroundAttributes;
-    formatMethod?: (text: string | number | string[] | number[]) => string;
+    formatMethod?: (text: string | string[], datum?: any) => string | string[];
 }
 export interface IMarkRef {
     autoRotate?: boolean;

package/cjs/marker/type.js

@@ -23,4 +23,4 @@ function(IMarkPointItemPosition) {
     IMarkPointItemPosition.insideTop = "insideTop", IMarkPointItemPosition.insideBottom = "insideBottom", 
     IMarkPointItemPosition.insideMiddle = "insideMiddle";
 }(IMarkPointItemPosition = exports.IMarkPointItemPosition || (exports.IMarkPointItemPosition = {}));
-//# sourceMappingURL=type.js.map
+//# sourceMappingURL=type.js.map

package/cjs/marker/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["marker/type.ts"],"names":[],"mappings":";;;AAaA,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;IACX,2DAAiC,CAAA;IACjC,iEAAuC,CAAA;IACvC,6DAAmC,CAAA;IACnC,mEAAyC,CAAA;IACzC,uDAA6B,CAAA;IAC7B,6DAAmC,CAAA;AACrC,CAAC,EAVW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAUjC;AAED,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,mDAAyB,CAAA;IACzB,qDAA2B,CAAA;IAC3B,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;AAC/B,CAAC,EAVW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAUjC;AAED,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;IAC7B,uDAA6B,CAAA;AAC/B,CAAC,EAPW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAOjC","file":"type.js","sourcesContent":["import type {\n  IGroup,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  IPolygonAttribute,\n  IRichTextGraphicAttribute,\n  ISymbolGraphicAttribute\n} from '@visactor/vrender';\nimport { IGraphic } from '@visactor/vrender';\nimport type { Dict, IPointLike } from '@visactor/vutils';\nimport type { SegmentAttributes, SymbolAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\n\nexport enum IMarkLineLabelPosition {\n  start = 'start',\n  middle = 'middle',\n  end = 'end',\n  insideStartTop = 'insideStartTop',\n  insideStartBottom = 'insideStartBottom',\n  insideMiddleTop = 'insideMiddleTop',\n  insideMiddleBottom = 'insideMiddleBottom',\n  insideEndTop = 'insideEndTop',\n  insideEndBottom = 'insideEndBottom'\n}\n\nexport enum IMarkAreaLabelPosition {\n  left = 'left',\n  right = 'right',\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideLeft = 'insideLeft',\n  insideRight = 'insideRight',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom'\n}\n\nexport enum IMarkPointItemPosition {\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom',\n  insideMiddle = 'insideMiddle'\n}\n\nexport type IMarkBackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * TODO: 根据文字宽度进行背景 panel size自适应\n   */\n  autoHeight?: boolean;\n  /**\n   * TODO: 根据文高度度进行背景 panel size自适应\n   */\n  autoWidth?: boolean;\n} & Partial<SymbolAttributes>;\n\nexport interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n  /**\n   * 标签自定义格式\n   */\n  formatMethod?: (text: string | number | string[] | number[]) => string;\n}\n\nexport interface IMarkRef {\n  /**\n   * 自动旋转，沿着线的方向，默认 true\n   */\n  autoRotate?: boolean;\n  /**\n   * label 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface MarkerAttrs extends IGroupGraphicAttribute {\n  type?: 'line' | 'area' | 'point';\n  /**\n   * 是否支持交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * 是否显示marker组件\n   * @default true\n   */\n  visible?: boolean;\n}\n\nexport interface MarkLineAttrs extends MarkerAttrs, SegmentAttributes {\n  type?: 'line';\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: IPointLike[];\n  /**\n   * 标签\n   */\n  label?: {\n    /**\n     * label 相对line的位置\n     */\n    position?: keyof typeof IMarkLineLabelPosition;\n  } & IMarkRef &\n    IMarkLabel;\n}\n\nexport interface MarkAreaAttrs extends MarkerAttrs {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: IPointLike[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: IMarkAreaLabelPosition;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n}\n\nexport interface IItemContent extends IMarkRef {\n  /**\n   * 标注类型\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbolStyle?: ISymbolGraphicAttribute;\n  /**\n   * type为image时, image的样式\n   */\n  imageStyle?: IImageGraphicAttribute;\n  /**\n   * type为text时, text的配置\n   */\n  textStyle?: IMarkLabel;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richTextStyle?: IRichTextGraphicAttribute;\n  /**\n   * type为custom时，允许以callback的方式传入需要render的item\n   */\n  renderCustomCallback?: () => IGroup;\n}\n\nexport type IItemLine = {\n  /** TODO：'type-opo' */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    visible?: boolean;\n    length?: number;\n  };\n} & Omit<SegmentAttributes, 'points'>;\n\nexport interface MarkPointAttrs extends Omit<MarkerAttrs, 'labelStyle'> {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: IPointLike;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n}\n"]}
+{"version":3,"sources":["marker/type.ts"],"names":[],"mappings":";;;AAaA,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;IACX,2DAAiC,CAAA;IACjC,iEAAuC,CAAA;IACvC,6DAAmC,CAAA;IACnC,mEAAyC,CAAA;IACzC,uDAA6B,CAAA;IAC7B,6DAAmC,CAAA;AACrC,CAAC,EAVW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAUjC;AAED,IAAY,sBAUX;AAVD,WAAY,sBAAsB;IAChC,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,mDAAyB,CAAA;IACzB,qDAA2B,CAAA;IAC3B,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;AAC/B,CAAC,EAVW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAUjC;AAED,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAChC,qCAAW,CAAA;IACX,2CAAiB,CAAA;IACjB,2CAAiB,CAAA;IACjB,iDAAuB,CAAA;IACvB,uDAA6B,CAAA;IAC7B,uDAA6B,CAAA;AAC/B,CAAC,EAPW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAOjC","file":"type.js","sourcesContent":["import {\n  IGraphic,\n  IGroup,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  IPolygonAttribute,\n  IRichTextGraphicAttribute,\n  ISymbolGraphicAttribute\n} from '@visactor/vrender';\nimport { IPointLike } from '@visactor/vutils';\nimport { SegmentAttributes, SymbolAttributes } from '../segment';\nimport { TagAttributes } from '../tag';\n\nexport enum IMarkLineLabelPosition {\n  start = 'start',\n  middle = 'middle',\n  end = 'end',\n  insideStartTop = 'insideStartTop',\n  insideStartBottom = 'insideStartBottom',\n  insideMiddleTop = 'insideMiddleTop',\n  insideMiddleBottom = 'insideMiddleBottom',\n  insideEndTop = 'insideEndTop',\n  insideEndBottom = 'insideEndBottom'\n}\n\nexport enum IMarkAreaLabelPosition {\n  left = 'left',\n  right = 'right',\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideLeft = 'insideLeft',\n  insideRight = 'insideRight',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom'\n}\n\nexport enum IMarkPointItemPosition {\n  top = 'top',\n  bottom = 'bottom',\n  middle = 'middle',\n  insideTop = 'insideTop',\n  insideBottom = 'insideBottom',\n  insideMiddle = 'insideMiddle'\n}\n\nexport type IMarkBackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * TODO: 根据文字宽度进行背景 panel size自适应\n   */\n  autoHeight?: boolean;\n  /**\n   * TODO: 根据文高度度进行背景 panel size自适应\n   */\n  autoWidth?: boolean;\n} & Partial<SymbolAttributes>;\n\nexport interface IMarkLabel extends Omit<TagAttributes, 'x' | 'y' | 'panel'> {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n  /**\n   * 标签自定义格式\n   */\n  formatMethod?: (text: string | string[], datum?: any) => string | string[];\n}\n\nexport interface IMarkRef {\n  /**\n   * 自动旋转，沿着线的方向，默认 true\n   */\n  autoRotate?: boolean;\n  /**\n   * label 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface MarkerAttrs extends IGroupGraphicAttribute {\n  type?: 'line' | 'area' | 'point';\n  /**\n   * 是否支持交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * 是否显示marker组件\n   * @default true\n   */\n  visible?: boolean;\n}\n\nexport interface MarkLineAttrs extends MarkerAttrs, SegmentAttributes {\n  type?: 'line';\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: IPointLike[];\n  /**\n   * 标签\n   */\n  label?: {\n    /**\n     * label 相对line的位置\n     */\n    position?: keyof typeof IMarkLineLabelPosition;\n  } & IMarkRef &\n    IMarkLabel;\n}\n\nexport interface MarkAreaAttrs extends MarkerAttrs {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: IPointLike[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: IMarkAreaLabelPosition;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n}\n\nexport interface IItemContent extends IMarkRef {\n  /**\n   * 标注类型\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: IMarkPointItemPosition;\n  /**\n   * x 方向偏移量\n   */\n  offsetX?: number;\n  /**\n   * y 方向偏移量\n   */\n  offsetY?: number;\n  /**\n   * type为symbol时, symbol的样式\n   */\n  symbolStyle?: ISymbolGraphicAttribute;\n  /**\n   * type为image时, image的样式\n   */\n  imageStyle?: IImageGraphicAttribute;\n  /**\n   * type为text时, text的配置\n   */\n  textStyle?: IMarkLabel;\n  /**\n   * type为rich text时, rich text的样式\n   */\n  richTextStyle?: IRichTextGraphicAttribute;\n  /**\n   * type为custom时，允许以callback的方式传入需要render的item\n   */\n  renderCustomCallback?: () => IGroup;\n}\n\nexport type IItemLine = {\n  /** TODO：'type-opo' */\n  type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';\n  visible?: boolean;\n  /**\n   * 垂直于引导线的装饰线，参考案例: https://observablehq.com/@mikelotis/edmonton-population-history-line-chart\n   */\n  decorativeLine?: {\n    visible?: boolean;\n    length?: number;\n  };\n} & Omit<SegmentAttributes, 'points'>;\n\nexport interface MarkPointAttrs extends Omit<MarkerAttrs, 'labelStyle'> {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: IPointLike;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n}\n"]}

package/cjs/pager/index.js

@@ -18,4 +18,4 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./type"), exports), __exportStar(require("./pager"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/pager/pager.js

@@ -131,4 +131,4 @@ exports.Pager = Pager, Pager.defaultAttributes = {
         fontSize: 12
     }
 };
-//# sourceMappingURL=pager.js.map
+//# sourceMappingURL=pager.js.map

package/cjs/poptip/contribution.js

@@ -36,7 +36,7 @@ let PopTipRenderContribution = class {
             }, poptip), {
                 x: matrix.e,
                 y: matrix.f
-            }));
+            })), drawContext.stage.tryInitInteractiveLayer();
             const interactiveLayer = drawContext.stage.getLayer("_builtin_interactive");
             interactiveLayer && interactiveLayer.add(this.poptipComponent);
         } else 2 === graphic._showPoptip && (graphic._showPoptip = 0, this.poptipComponent && this.poptipComponent.setAttributes({

package/cjs/poptip/contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["poptip/contribution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AASvC,qCAAkC;AAClC,6CAAyC;AACzC,mCAAgC;AAEhC,SAAS,UAAU,CAAC,MAA2B,EAAE,MAA2B;IAC1E,IAAA,cAAK,EAAC,MAAM,EAAE,aAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC;AAChB,CAAC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEnC,MAAM,CACJ,OAA6C,EAC7C,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,gBAA6C,EAC7C,WAAyB,EACzB,MAAiH,EACjH,QAAmH,EACnH,OAAa;;QAEb,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YAC7B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACvE,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE;gBACpE,OAAO;aACR;YACD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAM,CAAE,OAAO,CAAC,SAAiB,CAAC,MAAM,CAAC,CAAC;aACtE;YAED,IAAI,MAAM,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACrD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;gBAC7E,MAAM,GAAG,GAAG,EAAE,CAAC;gBACf,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAG,CAAC;gBACb,MAAM,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAK,OAAO,CAAC,SAAiB,CAAC,IAAI,CAAC;aACpE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,aAAa,+BAChC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,KAAK,EACf,gBAAgB,EAAE,KAAK,IACpB,MAAM,KACT,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,CAAC,EAAE,MAAM,CAAC,CAAC,IACX,CAAC;YAEH,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;YAC5E,IAAI,gBAAgB,EAAE;gBACpB,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC5C;SACF;aAAM,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YACpC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,eAAe;gBAClB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;oBACjC,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAC;SACN;IACH,CAAC;CACF,CAAA;AAvDY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAuDpC;AAvDY,4DAAwB","file":"contribution.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IContext2d,\n  IGraphic,\n  IGraphicAttribute,\n  IInteractiveSubRenderContribution,\n  IThemeAttribute,\n  IDrawContext\n} from '@visactor/vrender';\nimport { PopTip } from './poptip';\nimport { merge } from '@visactor/vutils';\nimport { theme } from './theme';\n\nfunction wrapPoptip(target: Record<string, any>, source: Record<string, any>) {\n  merge(target, theme.poptip, source);\n  return target;\n}\n\n@injectable()\nexport class PopTipRenderContribution implements IInteractiveSubRenderContribution {\n  declare poptipComponent: PopTip;\n  render(\n    graphic: IGraphic<Partial<IGraphicAttribute>>,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    graphicAttribute: Required<IGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    options?: any\n  ): void {\n    if (graphic._showPoptip === 1) {\n      const { visible, visibleCb } = (graphic.attribute as any).poptip || {};\n      if (visible === false || (visibleCb && visibleCb(graphic) === false)) {\n        return;\n      }\n      if (!this.poptipComponent) {\n        this.poptipComponent = new PopTip((graphic.attribute as any).poptip);\n      }\n      // 如果text图元没有配置title和content的话\n      let poptip = (graphic.attribute as any).poptip || {};\n      if (graphic.type === 'text' && poptip.title == null && poptip.content == null) {\n        const out = {};\n        wrapPoptip(out, poptip);\n        poptip = out;\n        poptip.content = poptip.content ?? (graphic.attribute as any).text;\n      }\n      const matrix = graphic.globalTransMatrix;\n      this.poptipComponent.setAttributes({\n        visibleAll: true,\n        pickable: false,\n        childrenPickable: false,\n        ...poptip,\n        x: matrix.e,\n        y: matrix.f\n      });\n      // 添加到交互层中\n      const interactiveLayer = drawContext.stage.getLayer('_builtin_interactive');\n      if (interactiveLayer) {\n        interactiveLayer.add(this.poptipComponent);\n      }\n    } else if (graphic._showPoptip === 2) {\n      graphic._showPoptip = 0;\n      this.poptipComponent &&\n        this.poptipComponent.setAttributes({\n          visibleAll: false\n        });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["poptip/contribution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAuC;AASvC,qCAAkC;AAClC,6CAAyC;AACzC,mCAAgC;AAEhC,SAAS,UAAU,CAAC,MAA2B,EAAE,MAA2B;IAC1E,IAAA,cAAK,EAAC,MAAM,EAAE,aAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC;AAChB,CAAC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEnC,MAAM,CACJ,OAA6C,EAC7C,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,gBAA6C,EAC7C,WAAyB,EACzB,MAAiH,EACjH,QAAmH,EACnH,OAAa;;QAEb,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YAC7B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACvE,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE;gBACpE,OAAO;aACR;YACD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAM,CAAE,OAAO,CAAC,SAAiB,CAAC,MAAM,CAAC,CAAC;aACtE;YAED,IAAI,MAAM,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACrD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;gBAC7E,MAAM,GAAG,GAAG,EAAE,CAAC;gBACf,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAG,CAAC;gBACb,MAAM,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAK,OAAO,CAAC,SAAiB,CAAC,IAAI,CAAC;aACpE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,aAAa,+BAChC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,KAAK,EACf,gBAAgB,EAAE,KAAK,IACpB,MAAM,KACT,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,CAAC,EAAE,MAAM,CAAC,CAAC,IACX,CAAC;YAEH,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC5C,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;YAC5E,IAAI,gBAAgB,EAAE;gBACpB,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC5C;SACF;aAAM,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YACpC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,eAAe;gBAClB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;oBACjC,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAC;SACN;IACH,CAAC;CACF,CAAA;AAxDY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAwDpC;AAxDY,4DAAwB","file":"contribution.js","sourcesContent":["import { injectable } from 'inversify';\nimport type {\n  IContext2d,\n  IGraphic,\n  IGraphicAttribute,\n  IInteractiveSubRenderContribution,\n  IThemeAttribute,\n  IDrawContext\n} from '@visactor/vrender';\nimport { PopTip } from './poptip';\nimport { merge } from '@visactor/vutils';\nimport { theme } from './theme';\n\nfunction wrapPoptip(target: Record<string, any>, source: Record<string, any>) {\n  merge(target, theme.poptip, source);\n  return target;\n}\n\n@injectable()\nexport class PopTipRenderContribution implements IInteractiveSubRenderContribution {\n  declare poptipComponent: PopTip;\n  render(\n    graphic: IGraphic<Partial<IGraphicAttribute>>,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    graphicAttribute: Required<IGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    options?: any\n  ): void {\n    if (graphic._showPoptip === 1) {\n      const { visible, visibleCb } = (graphic.attribute as any).poptip || {};\n      if (visible === false || (visibleCb && visibleCb(graphic) === false)) {\n        return;\n      }\n      if (!this.poptipComponent) {\n        this.poptipComponent = new PopTip((graphic.attribute as any).poptip);\n      }\n      // 如果text图元没有配置title和content的话\n      let poptip = (graphic.attribute as any).poptip || {};\n      if (graphic.type === 'text' && poptip.title == null && poptip.content == null) {\n        const out = {};\n        wrapPoptip(out, poptip);\n        poptip = out;\n        poptip.content = poptip.content ?? (graphic.attribute as any).text;\n      }\n      const matrix = graphic.globalTransMatrix;\n      this.poptipComponent.setAttributes({\n        visibleAll: true,\n        pickable: false,\n        childrenPickable: false,\n        ...poptip,\n        x: matrix.e,\n        y: matrix.f\n      });\n      // 添加到交互层中\n      drawContext.stage.tryInitInteractiveLayer();\n      const interactiveLayer = drawContext.stage.getLayer('_builtin_interactive');\n      if (interactiveLayer) {\n        interactiveLayer.add(this.poptipComponent);\n      }\n    } else if (graphic._showPoptip === 2) {\n      graphic._showPoptip = 0;\n      this.poptipComponent &&\n        this.poptipComponent.setAttributes({\n          visibleAll: false\n        });\n    }\n  }\n}\n"]}

package/cjs/tag/tag.js

@@ -22,7 +22,7 @@ class Tag extends base_1.AbstractComponent {
     }
     render() {
         var _a;
-        const {text: text = "", textStyle: textStyle = {}, shape: shape = {}, panel: panel = {}, space: space = 4, minWidth: minWidth, maxWidth: maxWidth, padding: padding = 4, visible: visible, state: state, formatMethod: formatMethod} = this.attribute, parsedPadding = (0, 
+        const {text: text = "", textStyle: textStyle = {}, shape: shape = {}, panel: panel = {}, space: space = 4, minWidth: minWidth, maxWidth: maxWidth, padding: padding = 4, visible: visible, state: state} = this.attribute, parsedPadding = (0, 
         vutils_1.normalizePadding)(padding), group = this.createOrUpdateChild("tag-content", {
             x: 0,
             y: 0,
@@ -46,7 +46,7 @@ class Tag extends base_1.AbstractComponent {
         }
         tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth;
         const textAttrs = Object.assign(Object.assign({
-            text: formatMethod ? formatMethod(text) : text,
+            text: text,
             visible: (0, vutils_1.isValid)(text) && !1 !== visible,
             lineHeight: null == textStyle ? void 0 : textStyle.fontSize
         }, textStyle), {