@visactor/vrender-components 0.13.9-alpha.1 → 0.13.9-alpha.10

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

@@ -1 +1 @@
-{"version":3,"sources":["label/overlap/bitmap.ts"],"names":[],"mappings":"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","file":"bitmap.js","sourcesContent":["import { IBoundsLike } from '@visactor/vutils';\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\nconst DIV = 5; // bit shift from x, y index to bit vector array index\nconst MOD = 31; // bit mask for index lookup within a bit vector\nconst SIZE = 32; // individual bit vector size\nconst RIGHT0 = new Uint32Array(SIZE + 1); // left-anchored bit vectors, full -> 0\nconst RIGHT1 = new Uint32Array(SIZE + 1); // right-anchored bit vectors, 0 -> full\n\nRIGHT1[0] = 0;\nRIGHT0[0] = ~RIGHT1[0];\nfor (let i = 1; i <= SIZE; ++i) {\n  RIGHT1[i] = (RIGHT1[i - 1] << 1) | 1;\n  RIGHT0[i] = ~RIGHT1[i];\n}\n\nexport function bitmap(w: number, h: number) {\n  const array = new Uint32Array(~~((w * h + SIZE) / SIZE));\n\n  function _set(index: number, mask: number) {\n    array[index] |= mask;\n  }\n\n  function _clear(index: number, mask: number) {\n    array[index] &= mask;\n  }\n\n  return {\n    array: array,\n\n    get: (x: number, y: number) => {\n      const index = y * w + x;\n      return array[index >>> DIV] & (1 << (index & MOD));\n    },\n\n    set: (x: number, y: number) => {\n      const index = y * w + x;\n      _set(index >>> DIV, 1 << (index & MOD));\n    },\n\n    clear: (x: number, y: number) => {\n      const index = y * w + x;\n      _clear(index >>> DIV, ~(1 << (index & MOD)));\n    },\n    /**\n     * 给定范围内是否发生碰撞\n     * @param 范围\n     * @returns boolean\n     */\n    getRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      let r = y2;\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      for (; r >= y1; --r) {\n        start = r * w + x1;\n        end = r * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          if (array[indexStart] & RIGHT0[start & MOD] & RIGHT1[(end & MOD) + 1]) {\n            return true;\n          }\n        } else {\n          if (array[indexStart] & RIGHT0[start & MOD]) {\n            return true;\n          }\n          if (array[indexEnd] & RIGHT1[(end & MOD) + 1]) {\n            return true;\n          }\n          for (let i = indexStart + 1; i < indexEnd; ++i) {\n            if (array[i]) {\n              return true;\n            }\n          }\n        }\n      }\n      return false;\n    },\n\n    setRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      let i;\n      for (; y1 <= y2; ++y1) {\n        start = y1 * w + x1;\n        end = y1 * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          _set(indexStart, RIGHT0[start & MOD] & RIGHT1[(end & MOD) + 1]);\n        } else {\n          _set(indexStart, RIGHT0[start & MOD]);\n          _set(indexEnd, RIGHT1[(end & MOD) + 1]);\n          for (i = indexStart + 1; i < indexEnd; ++i) {\n            _set(i, 0xffffffff);\n          }\n        }\n      }\n    },\n\n    clearRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      let i;\n      for (; y1 <= y2; ++y1) {\n        start = y1 * w + x1;\n        end = y1 * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          _clear(indexStart, RIGHT1[start & MOD] | RIGHT0[(end & MOD) + 1]);\n        } else {\n          _clear(indexStart, RIGHT1[start & MOD]);\n          _clear(indexEnd, RIGHT0[(end & MOD) + 1]);\n          for (i = indexStart + 1; i < indexEnd; ++i) {\n            _clear(i, 0);\n          }\n        }\n      }\n    },\n\n    outOfBounds: ({ x1, y1, x2, y2 }: IBoundsLike) => x1 < 0 || y1 < 0 || y2 >= h || x2 >= w,\n    toImageData: (ctx: CanvasRenderingContext2D) => {\n      const imageData = ctx.createImageData(w, h);\n      const data = imageData.data;\n      for (let y = 0; y < h; ++y) {\n        for (let x = 0; x < w; ++x) {\n          const index = y * w + x;\n          const offset = 4 * index;\n          const occupied = array[index >>> DIV] & (1 << (index & MOD));\n          data[offset + 0] = occupied * 0xff;\n          data[offset + 1] = occupied * 0xff;\n          data[offset + 2] = occupied * 0xff;\n          data[offset + 3] = 0x1f; // alpha\n        }\n      }\n      return imageData;\n    }\n  };\n}\n\nexport type Bitmap = ReturnType<typeof bitmap>;\n"]}
+{"version":3,"sources":["label/overlap/bitmap.ts"],"names":[],"mappings":"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","file":"bitmap.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\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\nconst DIV = 5; // bit shift from x, y index to bit vector array index\nconst MOD = 31; // bit mask for index lookup within a bit vector\nconst SIZE = 32; // individual bit vector size\nconst RIGHT0 = new Uint32Array(SIZE + 1); // left-anchored bit vectors, full -> 0\nconst RIGHT1 = new Uint32Array(SIZE + 1); // right-anchored bit vectors, 0 -> full\n\nRIGHT1[0] = 0;\nRIGHT0[0] = ~RIGHT1[0];\nfor (let i = 1; i <= SIZE; ++i) {\n  RIGHT1[i] = (RIGHT1[i - 1] << 1) | 1;\n  RIGHT0[i] = ~RIGHT1[i];\n}\n\nexport function bitmap(w: number, h: number) {\n  const array = new Uint32Array(~~((w * h + SIZE) / SIZE));\n\n  function _set(index: number, mask: number) {\n    array[index] |= mask;\n  }\n\n  function _clear(index: number, mask: number) {\n    array[index] &= mask;\n  }\n\n  return {\n    array: array,\n\n    get: (x: number, y: number) => {\n      const index = y * w + x;\n      return array[index >>> DIV] & (1 << (index & MOD));\n    },\n\n    set: (x: number, y: number) => {\n      const index = y * w + x;\n      _set(index >>> DIV, 1 << (index & MOD));\n    },\n\n    clear: (x: number, y: number) => {\n      const index = y * w + x;\n      _clear(index >>> DIV, ~(1 << (index & MOD)));\n    },\n    /**\n     * 给定范围内是否发生碰撞\n     * @param 范围\n     * @returns boolean\n     */\n    getRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      if (x2 < 0 || y2 < 0 || x1 > w || y1 > h) {\n        return true;\n      }\n      let r = y2;\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      for (; r >= y1; --r) {\n        start = r * w + x1;\n        end = r * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          if (array[indexStart] & RIGHT0[start & MOD] & RIGHT1[(end & MOD) + 1]) {\n            return true;\n          }\n        } else {\n          if (array[indexStart] & RIGHT0[start & MOD]) {\n            return true;\n          }\n          if (array[indexEnd] & RIGHT1[(end & MOD) + 1]) {\n            return true;\n          }\n          for (let i = indexStart + 1; i < indexEnd; ++i) {\n            if (array[i]) {\n              return true;\n            }\n          }\n        }\n      }\n      return false;\n    },\n\n    setRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      if (x2 < 0 || y2 < 0 || x1 > w || y1 > h) {\n        return;\n      }\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      let i;\n      for (; y1 <= y2; ++y1) {\n        start = y1 * w + x1;\n        end = y1 * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          _set(indexStart, RIGHT0[start & MOD] & RIGHT1[(end & MOD) + 1]);\n        } else {\n          _set(indexStart, RIGHT0[start & MOD]);\n          _set(indexEnd, RIGHT1[(end & MOD) + 1]);\n          for (i = indexStart + 1; i < indexEnd; ++i) {\n            _set(i, 0xffffffff);\n          }\n        }\n      }\n    },\n\n    clearRange: ({ x1, y1, x2, y2 }: IBoundsLike) => {\n      let start;\n      let end;\n      let indexStart;\n      let indexEnd;\n      let i;\n      for (; y1 <= y2; ++y1) {\n        start = y1 * w + x1;\n        end = y1 * w + x2;\n        indexStart = start >>> DIV;\n        indexEnd = end >>> DIV;\n        if (indexStart === indexEnd) {\n          _clear(indexStart, RIGHT1[start & MOD] | RIGHT0[(end & MOD) + 1]);\n        } else {\n          _clear(indexStart, RIGHT1[start & MOD]);\n          _clear(indexEnd, RIGHT0[(end & MOD) + 1]);\n          for (i = indexStart + 1; i < indexEnd; ++i) {\n            _clear(i, 0);\n          }\n        }\n      }\n    },\n\n    outOfBounds: ({ x1, y1, x2, y2 }: IBoundsLike) => x1 < 0 || y1 < 0 || y2 >= h || x2 >= w,\n    toImageData: (ctx: CanvasRenderingContext2D) => {\n      const imageData = ctx.createImageData(w, h);\n      const data = imageData.data;\n      for (let y = 0; y < h; ++y) {\n        for (let x = 0; x < w; ++x) {\n          const index = y * w + x;\n          const offset = 4 * index;\n          const occupied = array[index >>> DIV] & (1 << (index & MOD));\n          data[offset + 0] = occupied * 0xff;\n          data[offset + 1] = occupied * 0xff;\n          data[offset + 2] = occupied * 0xff;\n          data[offset + 3] = 0x1f; // alpha\n        }\n      }\n      return imageData;\n    }\n  };\n}\n\nexport type Bitmap = ReturnType<typeof bitmap>;\n"]}

package/cjs/label/type.d.ts

@@ -35,7 +35,6 @@ export interface OverlapAttrs {
     hideOnHit?: boolean;
     clampForce?: boolean;
     avoidBaseMark?: boolean;
-    avoidMarks?: string[] | IGraphic[];
     strategy?: Strategy[];
 }
 export interface SmartInvertAttrs {

package/cjs/label/type.js.map

@@ -1 +1 @@
-{"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   * @default []\n   */\n  avoidMarks?: string[] | IGraphic[];\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 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 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"]}

package/cjs/tooltip/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tooltip/util.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AAIhD,MAAM,aAAa,GAAG,CAC3B,MAA8C,EAC9C,GAAG,OAAmD,EACd,EAAE;IAC1C,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC;IAEhE,OAAO,IAAA,cAAK,EAAC,MAAM,EAAE,GAAG,OAAO,EAAE;QAC/B,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,SAAS,CAAC;QACnE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,OAAO,CAAC;QAC7D,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,SAAS,CAAC;KACpE,CAA2C,CAAC;AAC/C,CAAC,CAAC;AAbW,QAAA,aAAa,iBAaxB;AAEK,MAAM,oBAAoB,GAAG,CAAC,IAAsB,EAA6B,EAAE;IACxF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxF,OAAO;QACL,KAAK;QACL,MAAM;QACN,SAAS,EAAE,SAAgB;QAC3B,SAAS,EAAE,SAAgB;QAC3B,YAAY,EAAE,YAAmB;QACjC,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,GAAG,CACzB,IAAI,CAAC,EAAE,CACL,CAAC,gCACI,IAAI,KACP,IAAI,GACG,CAAA,CACZ;KACF,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B","file":"util.js","sourcesContent":["import { array, isNil, merge } from '@visactor/vutils';\nimport type { IRichTextGraphicAttribute } from '@visactor/vrender';\nimport type { TooltipRowAttrs, TooltipRowStyleAttrs, TooltipTextAttrs } from './type';\n\nexport const mergeRowAttrs = (\n  target: TooltipRowAttrs | TooltipRowStyleAttrs,\n  ...sources: (TooltipRowAttrs | TooltipRowStyleAttrs)[]\n): TooltipRowAttrs | TooltipRowStyleAttrs => {\n  const shapeList = [target.shape, ...sources.map(s => s?.shape)];\n  const keyList = [target.key, ...sources.map(s => s?.key)];\n  const valueList = [target.value, ...sources.map(s => s?.value)];\n\n  return merge(target, ...sources, {\n    shape: shapeList.every(isNil) ? undefined : merge({}, ...shapeList),\n    key: keyList.every(isNil) ? undefined : merge({}, ...keyList),\n    value: valueList.every(isNil) ? undefined : merge({}, ...valueList)\n  }) as TooltipRowAttrs | TooltipRowStyleAttrs;\n};\n\nexport const getRichTextAttribute = (attr: TooltipTextAttrs): IRichTextGraphicAttribute => {\n  const { width, height, wordBreak = 'break-word', textAlign, textBaseline, text } = attr;\n  return {\n    width,\n    height,\n    wordBreak: wordBreak as any,\n    textAlign: textAlign as any,\n    textBaseline: textBaseline as any,\n    singleLine: false,\n    textConfig: array(text).map(\n      text =>\n        ({\n          ...attr,\n          text\n        } as any)\n    )\n  };\n};\n"]}
+{"version":3,"sources":["tooltip/util.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AAIhD,MAAM,aAAa,GAAG,CAC3B,MAA8C,EAC9C,GAAG,OAAmD,EACd,EAAE;IAC1C,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC;IAEhE,OAAO,IAAA,cAAK,EAAC,MAAM,EAAE,GAAG,OAAO,EAAE;QAC/B,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,SAAS,CAAC;QACnE,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,OAAO,CAAC;QAC7D,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,GAAG,SAAS,CAAC;KACpE,CAA2C,CAAC;AAC/C,CAAC,CAAC;AAbW,QAAA,aAAa,iBAaxB;AAEK,MAAM,oBAAoB,GAAG,CAAC,IAAsB,EAA6B,EAAE;IACxF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAG,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxF,OAAO;QACL,KAAK;QACL,MAAM;QACN,SAAS,EAAE,SAAgB;QAC3B,SAAS,EAAE,SAAgB;QAC3B,YAAY,EAAE,YAAmB;QACjC,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,GAAG,CACzB,IAAI,CAAC,EAAE,CACL,iCACK,IAAI,KACP,IAAI,IACG,CACZ;KACF,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B","file":"util.js","sourcesContent":["import { array, isNil, merge } from '@visactor/vutils';\nimport type { IRichTextGraphicAttribute } from '@visactor/vrender';\nimport type { TooltipRowAttrs, TooltipRowStyleAttrs, TooltipTextAttrs } from './type';\n\nexport const mergeRowAttrs = (\n  target: TooltipRowAttrs | TooltipRowStyleAttrs,\n  ...sources: (TooltipRowAttrs | TooltipRowStyleAttrs)[]\n): TooltipRowAttrs | TooltipRowStyleAttrs => {\n  const shapeList = [target.shape, ...sources.map(s => s?.shape)];\n  const keyList = [target.key, ...sources.map(s => s?.key)];\n  const valueList = [target.value, ...sources.map(s => s?.value)];\n\n  return merge(target, ...sources, {\n    shape: shapeList.every(isNil) ? undefined : merge({}, ...shapeList),\n    key: keyList.every(isNil) ? undefined : merge({}, ...keyList),\n    value: valueList.every(isNil) ? undefined : merge({}, ...valueList)\n  }) as TooltipRowAttrs | TooltipRowStyleAttrs;\n};\n\nexport const getRichTextAttribute = (attr: TooltipTextAttrs): IRichTextGraphicAttribute => {\n  const { width, height, wordBreak = 'break-word', textAlign, textBaseline, text } = attr;\n  return {\n    width,\n    height,\n    wordBreak: wordBreak as any,\n    textAlign: textAlign as any,\n    textBaseline: textBaseline as any,\n    singleLine: false,\n    textConfig: array(text).map(\n      text =>\n        ({\n          ...attr,\n          text\n        }) as any\n    )\n  };\n};\n"]}

package/cjs/util/common.d.ts

@@ -1,5 +1,3 @@
-import type { IGraphicAttribute, IGraphic, IGroup } from '@visactor/vrender';
+import { IGraphicAttribute, IGraphic } from '@visactor/vrender';
 export declare function traverseGroup(group: IGraphic, cb: (node: IGraphic) => boolean | void): void;
 export declare const isVisible: (obj?: Partial<IGraphicAttribute>) => boolean;
-export declare function getMarksByName(root: IGroup, name: string): IGraphic<Partial<IGraphicAttribute>>[];
-export declare function getNoneGroupMarksByName(root: IGroup, name: string): IGraphic<Partial<IGraphicAttribute>>[];

package/cjs/util/common.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getNoneGroupMarksByName = exports.getMarksByName = exports.isVisible = exports.traverseGroup = void 0;
+}), exports.isVisible = exports.traverseGroup = void 0;
 
 const vutils_1 = require("@visactor/vutils");
 
@@ -17,17 +17,5 @@ exports.traverseGroup = traverseGroup;
 
 const isVisible = obj => !(0, vutils_1.isNil)(obj) && !1 !== obj.visible;
 
-function getMarksByName(root, name) {
-    if (!name) return [];
-    const group = root.find((node => node.name === name), !0);
-    return group ? group.getChildren() : [];
-}
-
-function getNoneGroupMarksByName(root, name) {
-    if (!name) return [];
-    const group = root.find((node => node.name === name), !0);
-    return group ? group.findAll((node => "group" !== node.type), !0) : [];
-}
-
-exports.isVisible = isVisible, exports.getMarksByName = getMarksByName, exports.getNoneGroupMarksByName = getNoneGroupMarksByName;
+exports.isVisible = isVisible;
 //# sourceMappingURL=common.js.map

package/cjs/util/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["util/common.ts"],"names":[],"mappings":";;;AAIA,6CAAyC;AAEzC,SAAgB,aAAa,CAAC,KAAe,EAAE,EAAsC;IACnF,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,EAAE,CAAC,IAAgB,CAAC,CAAC;QACrC,IAAK,IAAe,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE;YAC5C,aAAa,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,sCAOC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAgC,EAAW,EAAE;IACrE,IAAI,IAAA,cAAK,EAAC,GAAG,CAAC,EAAE;QACd,OAAO,KAAK,CAAC;KACd;IACD,OAAO,GAAG,CAAC,OAAO,KAAK,KAAK,CAAC;AAC/B,CAAC,CAAC;AALW,QAAA,SAAS,aAKpB;AAEF,SAAgB,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,CAAW,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IACD,OAAO,KAAK,CAAC,WAAW,EAAgB,CAAC;AAC3C,CAAC;AATD,wCASC;AAED,SAAgB,uBAAuB,CAAC,IAAY,EAAE,IAAY;IAChE,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,CAAW,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,IAAI,CAA0B,CAAC;AACrF,CAAC;AATD,0DASC","file":"common.js","sourcesContent":["/**\n * @description 存放工具函数\n */\nimport type { IGraphicAttribute, IGraphic, IGroup } from '@visactor/vrender';\nimport { isNil } from '@visactor/vutils';\n\nexport function traverseGroup(group: IGraphic, cb: (node: IGraphic) => boolean | void) {\n  group.forEachChildren(node => {\n    const stopped = cb(node as IGraphic);\n    if ((node as IGroup).isContainer && !stopped) {\n      traverseGroup(node as IGraphic, cb);\n    }\n  });\n}\n\nexport const isVisible = (obj?: Partial<IGraphicAttribute>): boolean => {\n  if (isNil(obj)) {\n    return false;\n  }\n  return obj.visible !== false;\n};\n\nexport function getMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.getChildren() as IGraphic[];\n}\n\nexport function getNoneGroupMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.findAll(node => node.type !== 'group', true) as unknown as IGraphic[];\n}\n"]}
+{"version":3,"sources":["util/common.ts"],"names":[],"mappings":";;;AAIA,6CAAyC;AAEzC,SAAgB,aAAa,CAAC,KAAe,EAAE,EAAsC;IACnF,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,EAAE,CAAC,IAAgB,CAAC,CAAC;QACrC,IAAK,IAAe,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE;YAC5C,aAAa,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,sCAOC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAgC,EAAW,EAAE;IACrE,IAAI,IAAA,cAAK,EAAC,GAAG,CAAC,EAAE;QACd,OAAO,KAAK,CAAC;KACd;IACD,OAAO,GAAG,CAAC,OAAO,KAAK,KAAK,CAAC;AAC/B,CAAC,CAAC;AALW,QAAA,SAAS,aAKpB","file":"common.js","sourcesContent":["/**\n * @description 存放工具函数\n */\nimport { IGraphicAttribute, IGraphic, IGroup } from '@visactor/vrender';\nimport { isNil } from '@visactor/vutils';\n\nexport function traverseGroup(group: IGraphic, cb: (node: IGraphic) => boolean | void) {\n  group.forEachChildren(node => {\n    const stopped = cb(node as IGraphic);\n    if ((node as IGroup).isContainer && !stopped) {\n      traverseGroup(node as IGraphic, cb);\n    }\n  });\n}\n\nexport const isVisible = (obj?: Partial<IGraphicAttribute>): boolean => {\n  if (isNil(obj)) {\n    return false;\n  }\n  return obj.visible !== false;\n};\n"]}

package/dist/index.js

@@ -341,26 +341,6 @@
         }
         return obj.visible !== false;
     };
-    function getMarksByName(root, name) {
-        if (!name) {
-            return [];
-        }
-        const group = root.find(node => node.name === name, true);
-        if (!group) {
-            return [];
-        }
-        return group.getChildren();
-    }
-    function getNoneGroupMarksByName(root, name) {
-        if (!name) {
-            return [];
-        }
-        const group = root.find(node => node.name === name, true);
-        if (!group) {
-            return [];
-        }
-        return group.findAll(node => node.type !== 'group', true);
-    }
 
     const defaultAlternativeColors = ['#ffffff', '#000000'];
     function labelSmartInvert(foregroundColorOrigin, backgroundColorOrogin, textType, contrastRatiosThreshold, alternativeColors) {
@@ -1331,6 +1311,9 @@
                 _clear(index >>> DIV, ~(1 << (index & MOD)));
             },
             getRange: ({ x1, y1, x2, y2 }) => {
+                if (x2 < 0 || y2 < 0 || x1 > w || y1 > h) {
+                    return true;
+                }
                 let r = y2;
                 let start;
                 let end;
@@ -1363,6 +1346,9 @@
                 return false;
             },
             setRange: ({ x1, y1, x2, y2 }) => {
+                if (x2 < 0 || y2 < 0 || x1 > w || y1 > h) {
+                    return;
+                }
                 let start;
                 let end;
                 let indexStart;
@@ -1714,7 +1700,7 @@
             return text;
         }
         _prepare() {
-            const baseMarks = getMarksByName(this.getRootNode(), this.attribute.baseMarkGroupName);
+            const baseMarks = this.getBaseMarks();
             const currentBaseMarks = [];
             baseMarks.forEach(mark => {
                 if (mark.releaseStatus !== 'willRelease') {
@@ -1782,7 +1768,7 @@
             if (size.width === 0 || size.height === 0) {
                 return labels;
             }
-            const { avoidBaseMark, strategy = [], hideOnHit = true, clampForce = true, avoidMarks = [] } = option;
+            const { avoidBaseMark, strategy = [], hideOnHit = true, clampForce = true } = option;
             const bmpTool = this._bmpTool || bitmapTool(size.width, size.height);
             const bitmap = this._bitmap || bmpTool.bitmap();
             const checkBounds = strategy.some(s => s.type === 'bound');
@@ -1791,18 +1777,6 @@
                     mark.AABBBounds && bitmap.setRange(boundToRange(bmpTool, mark.AABBBounds, true));
                 });
             }
-            if (avoidMarks.length > 0) {
-                avoidMarks.forEach(avoid => {
-                    if (vutils.isString(avoid)) {
-                        getNoneGroupMarksByName(this.getRootNode(), avoid).forEach(avoidMark => {
-                            avoidMark.AABBBounds && bitmap.setRange(boundToRange(bmpTool, avoidMark.AABBBounds, true));
-                        });
-                    }
-                    else if (avoid.AABBBounds) {
-                        bitmap.setRange(boundToRange(bmpTool, avoid.AABBBounds, true));
-                    }
-                });
-            }
             for (let i = 0; i < labels.length; i++) {
                 if (labels[i].visible === false) {
                     continue;
@@ -1831,7 +1805,7 @@
                         break;
                     }
                 }
-                if (!hasPlace && clampForce) {
+                if (clampForce) {
                     const { dx = 0, dy = 0 } = clampText(text, bmpTool.width, bmpTool.height);
                     if (!(dx === 0 && dy === 0) &&
                         canPlace(bmpTool, bitmap, {
@@ -1853,6 +1827,13 @@
             }
             return result;
         }
+        getBaseMarks() {
+            const baseMarkGroup = this.getBaseMarkGroup();
+            if (!baseMarkGroup) {
+                return;
+            }
+            return baseMarkGroup.getChildren();
+        }
         getBaseMarkGroup() {
             const { baseMarkGroupName } = this.attribute;
             if (!baseMarkGroupName) {
@@ -8915,6 +8896,17 @@
         }
     }
 
+    exports.IOperateType = void 0;
+    (function (IOperateType) {
+        IOperateType["drawStart"] = "drawStart";
+        IOperateType["drawEnd"] = "drawEnd";
+        IOperateType["drawing"] = "drawing";
+        IOperateType["moving"] = "moving";
+        IOperateType["moveStart"] = "moveStart";
+        IOperateType["moveEnd"] = "moveEnd";
+        IOperateType["brushClear"] = "brushClear";
+    })(exports.IOperateType || (exports.IOperateType = {}));
+
     const DEFAULT_BRUSH_ATTRIBUTES = {
         brushMode: 'single',
         brushType: 'rect',
@@ -8935,6 +8927,7 @@
             x2: Infinity
         }
     };
+    const SIZE_THRESHOLD = 5;
 
     const delayMap = {
         debounce: vutils.debounce,
@@ -8946,6 +8939,8 @@
         _container;
         _activeDrawState = false;
         _cacheDrawPoints = [];
+        _cacheStartTime;
+        _isDrawedBeforeEnd = false;
         _activeMoveState = false;
         _operatingMaskMoveDx = 0;
         _operatingMaskMoveDy = 0;
@@ -9001,36 +8996,41 @@
             this._activeMoveState && this._moving(e);
         };
         _onBrushEnd = (e) => {
-            if (this._outOfInteractiveRange(e)) {
-                return;
+            const { removeOnClick = true } = this.attribute;
+            if (this._activeDrawState && !this._isDrawedBeforeEnd && removeOnClick) {
+                this._container.incrementalClearChild();
+                this._updateDragMaskCallback &&
+                    this._updateDragMaskCallback({
+                        operateType: exports.IOperateType.brushClear,
+                        operateMask: this._operatingMask,
+                        operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
+                    });
+            }
+            else if (!this._outOfInteractiveRange(e)) {
+                this._updateDragMaskCallback &&
+                    this._updateDragMaskCallback({
+                        operateType: this._activeDrawState ? exports.IOperateType.drawEnd : exports.IOperateType.moveEnd,
+                        operateMask: this._operatingMask,
+                        operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
+                    });
             }
-            this._updateDragMaskCallback &&
-                this._updateDragMaskCallback({
-                    operateType: this._activeDrawState ? 'brushEnd' : 'brushMaskUp',
-                    operateMask: this._operatingMask,
-                    operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
-                });
             this._activeDrawState = false;
             this._activeMoveState = false;
-            this._operatingMask.setAttribute('pickable', false);
+            this._isDrawedBeforeEnd = false;
+            this._operatingMask?.setAttribute('pickable', false);
         };
         _initDraw(e) {
-            const { brushMode, removeOnClick } = this.attribute;
+            const { brushMode } = this.attribute;
             const pos = this.eventPosToStagePos(e);
             this._cacheDrawPoints = [pos];
-            if (!this._operatingMask) {
-                this._addBrushMask();
-            }
-            if (brushMode === 'single' && removeOnClick) {
+            this._isDrawedBeforeEnd = false;
+            if (brushMode === 'single') {
                 this._container.incrementalClearChild();
-                this._addBrushMask();
-            }
-            else if (brushMode === 'multiple') {
-                this._addBrushMask();
             }
+            this._addBrushMask();
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushStart',
+                    operateType: exports.IOperateType.drawStart,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -9051,13 +9051,15 @@
             this._operatingMask.setAttribute('pickable', true);
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushMaskDown',
+                    operateType: exports.IOperateType.moveStart,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
         }
         _drawing(e) {
             const pos = this.eventPosToStagePos(e);
+            const { x1 = 0, x2 = 0, y1 = 0, y2 = 0 } = this._operatingMask?._AABBBounds;
+            this._isDrawedBeforeEnd = !!(Math.abs(x2 - x1) > SIZE_THRESHOLD || Math.abs(y1 - y2) > SIZE_THRESHOLD);
             if (this._cacheDrawPoints.length > 0) {
                 const lastPos = this._cacheDrawPoints[this._cacheDrawPoints.length - 1];
                 if (pos.x === lastPos?.x && pos.y === lastPos?.y) {
@@ -9070,7 +9072,7 @@
             this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds;
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushing',
+                    operateType: exports.IOperateType.drawing,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -9094,7 +9096,7 @@
             this._brushMaskAABBBoundsDict[this._operatingMask.name] = this._operatingMask.AABBBounds;
             this._updateDragMaskCallback &&
                 this._updateDragMaskCallback({
-                    operateType: 'brushMaskMove',
+                    operateType: exports.IOperateType.moving,
                     operateMask: this._operatingMask,
                     operatedMaskAABBBounds: this._brushMaskAABBBoundsDict
                 });
@@ -9621,7 +9623,7 @@
         }
     }
 
-    const version = "0.13.9-alpha.1";
+    const version = "0.13.9-alpha.10";
 
     exports.AbstractComponent = AbstractComponent;
     exports.BasePlayer = BasePlayer;