@visactor/vrender-components 0.18.10-alpha.0 → 0.18.10

package/cjs/marker/base.js

@@ -4,45 +4,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Marker = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), base_1 = require("../core/base"), constant_1 = require("../constant"), util_1 = require("../util"), vutils_1 = require("@visactor/vutils");
+const vrender_core_1 = require("@visactor/vrender-core"), base_1 = require("../core/base");
 
 class Marker extends base_1.AbstractComponent {
     constructor() {
-        super(...arguments), this.name = "marker", this._onHover = e => {
-            const target = e.target;
-            target !== this._lastHover && target.name && !(0, vutils_1.isEmpty)(target.states) && (target.addState(constant_1.StateValue.hover, !0), 
-            (0, util_1.traverseGroup)(this._container, (node => {
-                node !== target && node.name && !(0, vutils_1.isEmpty)(node.states) && node.addState(constant_1.StateValue.hoverReverse, !0);
-            })), this._lastHover = target);
-        }, this._onUnHover = e => {
-            this._lastHover && ((0, util_1.traverseGroup)(this._container, (node => {
-                node.name && !(0, vutils_1.isEmpty)(node.states) && (node.removeState(constant_1.StateValue.hoverReverse), 
-                node.removeState(constant_1.StateValue.hover));
-            })), this._lastHover = null);
-        }, this._onClick = e => {
-            const target = e.target;
-            if (this._lastSelect === target && target.hasState(constant_1.StateValue.selected)) return this._lastSelect = null, 
-            void (0, util_1.traverseGroup)(this._container, (node => {
-                node.name && !(0, vutils_1.isEmpty)(node.states) && (node.removeState(constant_1.StateValue.selectedReverse), 
-                node.removeState(constant_1.StateValue.selected));
-            }));
-            target.name && !(0, vutils_1.isEmpty)(target.states) && (target.addState(constant_1.StateValue.selected, !0), 
-            (0, util_1.traverseGroup)(this._container, (node => {
-                node !== target && node.name && !(0, vutils_1.isEmpty)(node.states) && node.addState(constant_1.StateValue.selectedReverse, !0);
-            })), this._lastSelect = target);
-        };
+        super(...arguments), this.name = "marker";
     }
     setAttribute(key, value, forceUpdateTag) {
         super.setAttribute(key, value, forceUpdateTag), "visible" === key && this.render();
     }
-    _bindEvent() {
-        var _a, _b, _c;
-        if (!this.attribute.interactive) return;
-        const {hover: hover, select: select} = this.attribute;
-        hover && (null === (_a = this._container) || void 0 === _a || _a.addEventListener("pointermove", this._onHover), 
-        null === (_b = this._container) || void 0 === _b || _b.addEventListener("pointerout", this._onUnHover)), 
-        select && (null === (_c = this._container) || void 0 === _c || _c.addEventListener("pointerdown", this._onClick));
-    }
     _initContainer() {
         var _a, _b;
         const {limitRect: limitRect = {}, clipInRange: clipInRange} = this.attribute;
@@ -80,14 +50,7 @@ class Marker extends base_1.AbstractComponent {
         !1 === this.attribute.interactive && this.setAttribute("childrenPickable", !1), 
         markerVisible && this.isValidPoints() ? this._container ? (this._updateContainer(), 
         this.updateMarker()) : (this._initContainer(), this.initMarker(this._container)) : (this._container = null, 
-        this.removeAllChild(!0)), this._bindEvent();
-    }
-    release() {
-        var _a, _b, _c;
-        super.release(), null === (_a = this._container) || void 0 === _a || _a.removeEventListener("pointermove", this._onHover), 
-        null === (_b = this._container) || void 0 === _b || _b.removeEventListener("pointerout", this._onUnHover), 
-        null === (_c = this._container) || void 0 === _c || _c.removeEventListener("pointerdown", this._onClick), 
-        this._container = null;
+        this.removeAllChild(!0));
     }
 }
 

package/cjs/marker/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["import type { FederatedPointerEvent, IGraphic, IGroup } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { AbstractComponent } from '../core/base';\nimport type { Tag } from '../tag';\nimport type { MarkerAttrs } from './type';\nimport { StateValue } from '../constant';\nimport { traverseGroup } from '../util';\nimport { isEmpty } from '@visactor/vutils';\n\nexport abstract class Marker<T extends MarkerAttrs> extends AbstractComponent<Required<T>> {\n  name = 'marker';\n  private _containerClip!: IGroup;\n  private _container!: IGroup;\n\n  protected _label!: Tag;\n  private _lastHover: IGraphic;\n  private _lastSelect: IGraphic;\n\n  protected abstract setLabelPos(): any;\n  protected abstract initMarker(container: IGroup): any;\n  protected abstract updateMarker(): any;\n  protected abstract isValidPoints(): any;\n\n  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void {\n    super.setAttribute(key, value, forceUpdateTag);\n    if (key === 'visible') {\n      this.render();\n    }\n  }\n\n  private _bindEvent() {\n    if (!this.attribute.interactive) {\n      return;\n    }\n    const { hover, select } = this.attribute;\n\n    if (hover) {\n      this._container?.addEventListener('pointermove', this._onHover as EventListenerOrEventListenerObject);\n      this._container?.addEventListener('pointerout', this._onUnHover as EventListenerOrEventListenerObject);\n    }\n\n    if (select) {\n      this._container?.addEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    }\n  }\n\n  private _onHover = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as IGraphic;\n    if (target !== this._lastHover && target.name && !isEmpty(target.states)) {\n      target.addState(StateValue.hover, true);\n      traverseGroup(this._container, (node: IGraphic) => {\n        if (node !== target && node.name && !isEmpty(node.states)) {\n          node.addState(StateValue.hoverReverse, true);\n        }\n      });\n      this._lastHover = target;\n    }\n  };\n\n  private _onUnHover = (e: FederatedPointerEvent) => {\n    if (this._lastHover) {\n      traverseGroup(this._container, (node: IGraphic) => {\n        if (node.name && !isEmpty(node.states)) {\n          node.removeState(StateValue.hoverReverse);\n          node.removeState(StateValue.hover);\n        }\n      });\n      this._lastHover = null;\n    }\n  };\n\n  private _onClick = (e: FederatedPointerEvent) => {\n    const target = e.target as unknown as IGraphic;\n    if (this._lastSelect === target && target.hasState(StateValue.selected)) {\n      // 取消选中\n      this._lastSelect = null;\n      traverseGroup(this._container, (node: IGraphic) => {\n        if (node.name && !isEmpty(node.states)) {\n          node.removeState(StateValue.selectedReverse);\n          node.removeState(StateValue.selected);\n        }\n      });\n      return;\n    }\n\n    if (target.name && !isEmpty(target.states)) {\n      target.addState(StateValue.selected, true);\n      traverseGroup(this._container, (node: IGraphic) => {\n        if (node !== target && node.name && !isEmpty(node.states)) {\n          node.addState(StateValue.selectedReverse, true);\n        }\n      });\n      this._lastSelect = target;\n    }\n  };\n\n  private _initContainer() {\n    const { limitRect = {} as T['limitRect'], clipInRange } = this.attribute;\n    let group;\n    if (clipInRange) {\n      // 如果用户配置了剪切\n      const groupClip = graphicCreator.group({\n        ...limitRect,\n        clip: true,\n        pickable: false\n      });\n      group = graphicCreator.group({\n        x: -(limitRect.x ?? 0),\n        y: -(limitRect.y ?? 0),\n        pickable: false\n      });\n      groupClip.add(group);\n      this._containerClip = groupClip;\n      this.add(groupClip);\n    } else {\n      group = graphicCreator.group({\n        x: 0,\n        y: 0,\n        pickable: false\n      });\n      this.add(group);\n    }\n    group.name = 'marker-container';\n    this._container = group;\n  }\n\n  private _updateContainer() {\n    const { limitRect = {} as T['limitRect'], clipInRange } = this.attribute;\n    if (this._containerClip) {\n      this._containerClip.setAttributes({\n        ...limitRect\n      });\n    }\n\n    this._container.setAttributes({\n      x: clipInRange ? -(limitRect.x ?? 0) : 0,\n      y: clipInRange ? -(limitRect.y ?? 0) : 0\n    });\n  }\n\n  protected render() {\n    // 因为标注本身不规则，所以默认将组件的 group 设置为不可拾取\n    this.setAttribute('pickable', false);\n\n    const markerVisible = this.attribute.visible ?? true;\n    if (this.attribute.interactive === false) {\n      this.setAttribute('childrenPickable', false);\n    }\n\n    if (markerVisible && this.isValidPoints()) {\n      if (!this._container) {\n        this._initContainer();\n        this.initMarker(this._container);\n      } else {\n        this._updateContainer();\n        this.updateMarker();\n      }\n    } else {\n      this._container = null;\n      this.removeAllChild(true);\n    }\n\n    this._bindEvent();\n  }\n\n  release(): void {\n    super.release();\n    this._container?.removeEventListener('pointermove', this._onHover as EventListenerOrEventListenerObject);\n    this._container?.removeEventListener('pointerout', this._onUnHover as EventListenerOrEventListenerObject);\n    this._container?.removeEventListener('pointerdown', this._onClick as EventListenerOrEventListenerObject);\n    this._container = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/marker/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["import type { IGroup } from '@visactor/vrender-core';\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { AbstractComponent } from '../core/base';\nimport type { Tag } from '../tag';\nimport type { MarkerAttrs } from './type';\n\nexport abstract class Marker<T extends MarkerAttrs> extends AbstractComponent<Required<T>> {\n  name = 'marker';\n  private _containerClip!: IGroup;\n  private _container!: IGroup;\n\n  protected _label!: Tag;\n\n  protected abstract setLabelPos(): any;\n  protected abstract initMarker(container: IGroup): any;\n  protected abstract updateMarker(): any;\n  protected abstract isValidPoints(): any;\n\n  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void {\n    super.setAttribute(key, value, forceUpdateTag);\n    if (key === 'visible') {\n      this.render();\n    }\n  }\n\n  private _initContainer() {\n    const { limitRect = {} as T['limitRect'], clipInRange } = this.attribute;\n    let group;\n    if (clipInRange) {\n      // 如果用户配置了剪切\n      const groupClip = graphicCreator.group({\n        ...limitRect,\n        clip: true,\n        pickable: false\n      });\n      group = graphicCreator.group({\n        x: -(limitRect.x ?? 0),\n        y: -(limitRect.y ?? 0),\n        pickable: false\n      });\n      groupClip.add(group);\n      this._containerClip = groupClip;\n      this.add(groupClip);\n    } else {\n      group = graphicCreator.group({\n        x: 0,\n        y: 0,\n        pickable: false\n      });\n      this.add(group);\n    }\n    group.name = 'marker-container';\n    this._container = group;\n  }\n\n  private _updateContainer() {\n    const { limitRect = {} as T['limitRect'], clipInRange } = this.attribute;\n    if (this._containerClip) {\n      this._containerClip.setAttributes({\n        ...limitRect\n      });\n    }\n\n    this._container.setAttributes({\n      x: clipInRange ? -(limitRect.x ?? 0) : 0,\n      y: clipInRange ? -(limitRect.y ?? 0) : 0\n    });\n  }\n\n  protected render() {\n    // 因为标注本身不规则，所以默认将组件的 group 设置为不可拾取\n    this.setAttribute('pickable', false);\n\n    const markerVisible = this.attribute.visible ?? true;\n    if (this.attribute.interactive === false) {\n      this.setAttribute('childrenPickable', false);\n    }\n\n    if (markerVisible && this.isValidPoints()) {\n      if (!this._container) {\n        this._initContainer();\n        this.initMarker(this._container);\n      } else {\n        this._updateContainer();\n        this.updateMarker();\n      }\n    } else {\n      this._container = null;\n      this.removeAllChild(true);\n    }\n  }\n}\n"]}

package/cjs/marker/config.d.ts

@@ -1,7 +1,6 @@
 import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';
 import { IMarkAreaLabelPosition, IMarkLineLabelPosition } from './type';
 export declare const DEFAULT_MARK_LINE_THEME: {
-    interactive: boolean;
     startSymbol: {
         visible: boolean;
         symbolType: string;
@@ -50,7 +49,6 @@ export declare const DEFAULT_MARK_LINE_TEXT_STYLE_MAP: {
     };
 };
 export declare const DEFAULT_MARK_AREA_THEME: {
-    interactive: boolean;
     label: {
         position: IMarkAreaLabelPosition;
         textStyle: {
@@ -81,7 +79,6 @@ export declare const DEFAULT_MARK_AREA_TEXT_STYLE_MAP: {
     };
 };
 export declare const DEFAULT_MARK_POINT_THEME: {
-    interactive: boolean;
     itemLine: {
         visible: boolean;
         decorativeLine: {

package/cjs/marker/config.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 const type_1 = require("./type");
 
 exports.DEFAULT_MARK_LINE_THEME = {
-    interactive: !0,
     startSymbol: {
         visible: !1,
         symbolType: "triangle",
@@ -86,7 +85,6 @@ exports.DEFAULT_MARK_LINE_THEME = {
         textBaseline: "top"
     }
 }, exports.DEFAULT_MARK_AREA_THEME = {
-    interactive: !0,
     label: {
         position: type_1.IMarkAreaLabelPosition.right,
         textStyle: {
@@ -147,7 +145,6 @@ exports.DEFAULT_MARK_LINE_THEME = {
         textBaseline: "middle"
     }
 }, exports.DEFAULT_MARK_POINT_THEME = {
-    interactive: !0,
     itemLine: {
         visible: !0,
         decorativeLine: {

package/cjs/marker/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { IMarkAreaLabelPosition, IMarkLineLabelPosition } from './type';\n\nexport const DEFAULT_MARK_LINE_THEME = {\n  interactive: true,\n  startSymbol: {\n    visible: false,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  endSymbol: {\n    visible: true,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  label: {\n    position: IMarkLineLabelPosition.end,\n    refX: 0,\n    refY: 0,\n    refAngle: 0,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  lineStyle: {\n    stroke: '#b2bacf',\n    lineWidth: 1,\n    lineDash: [2]\n  }\n};\n\nexport const DEFAULT_MARK_LINE_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  start: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideStartTop: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  insideStartBottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  },\n  insideMiddleTop: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideMiddleBottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  end: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideEndTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideEndBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  }\n};\n\nexport const DEFAULT_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: IMarkAreaLabelPosition.right,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_MARK_AREA_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  left: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideLeft: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n\n  right: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideRight: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n\n  top: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideTop: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n  insideBottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  }\n};\n\nexport const DEFAULT_MARK_POINT_THEME = {\n  interactive: true,\n  itemLine: {\n    visible: true,\n    decorativeLine: {\n      visible: false,\n      length: 30\n    },\n    startSymbol: {\n      visible: true,\n      clip: true,\n      symbolType: 'circle',\n      size: 20,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    endSymbol: {\n      visible: false,\n      clip: true,\n      symbolType: 'triangle',\n      size: 12,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    lineStyle: {\n      stroke: '#000',\n      lineWidth: 1\n    }\n  },\n  itemContent: {\n    type: 'text',\n    position: 'middle',\n    refX: 10,\n    symbolStyle: {\n      symbolType: 'star',\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8,\n      size: 20\n    },\n    textStyle: {\n      dx: 0,\n      dy: 0\n    },\n    imageStyle: {\n      width: 80,\n      height: 80\n    },\n    richTextStyle: {\n      width: 100,\n      height: 100\n    }\n  }\n};\n\nexport const DEFAULT_MARK_POINT_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  top: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  bottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n  middle: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  },\n  insideMiddle: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  }\n};\n"]}
+{"version":3,"sources":["../src/marker/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { IMarkAreaLabelPosition, IMarkLineLabelPosition } from './type';\n\nexport const DEFAULT_MARK_LINE_THEME = {\n  startSymbol: {\n    visible: false,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  endSymbol: {\n    visible: true,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  label: {\n    position: IMarkLineLabelPosition.end,\n    refX: 0,\n    refY: 0,\n    refAngle: 0,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  lineStyle: {\n    stroke: '#b2bacf',\n    lineWidth: 1,\n    lineDash: [2]\n  }\n};\n\nexport const DEFAULT_MARK_LINE_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  start: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideStartTop: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  insideStartBottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  },\n  insideMiddleTop: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideMiddleBottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  end: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideEndTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideEndBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  }\n};\n\nexport const DEFAULT_MARK_AREA_THEME = {\n  label: {\n    position: IMarkAreaLabelPosition.right,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_MARK_AREA_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  left: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideLeft: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n\n  right: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideRight: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n\n  top: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideTop: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n  insideBottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  }\n};\n\nexport const DEFAULT_MARK_POINT_THEME = {\n  itemLine: {\n    visible: true,\n    decorativeLine: {\n      visible: false,\n      length: 30\n    },\n    startSymbol: {\n      visible: true,\n      clip: true,\n      symbolType: 'circle',\n      size: 20,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    endSymbol: {\n      visible: false,\n      clip: true,\n      symbolType: 'triangle',\n      size: 12,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    lineStyle: {\n      stroke: '#000',\n      lineWidth: 1\n    }\n  },\n  itemContent: {\n    type: 'text',\n    position: 'middle',\n    refX: 10,\n    symbolStyle: {\n      symbolType: 'star',\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8,\n      size: 20\n    },\n    textStyle: {\n      dx: 0,\n      dy: 0\n    },\n    imageStyle: {\n      width: 80,\n      height: 80\n    },\n    richTextStyle: {\n      width: 100,\n      height: 100\n    }\n  }\n};\n\nexport const DEFAULT_MARK_POINT_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  top: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  bottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n  middle: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  },\n  insideMiddle: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  }\n};\n"]}

package/cjs/marker/line.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.MarkLine = void 0;
 
-const vutils_1 = require("@visactor/vutils"), segment_1 = require("../segment"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), limit_shape_1 = require("../util/limit-shape"), register_1 = require("./register"), constant_1 = require("../constant");
+const vutils_1 = require("@visactor/vutils"), segment_1 = require("../segment"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), limit_shape_1 = require("../util/limit-shape"), register_1 = require("./register");
 
 (0, register_1.loadMarkLineComponent)();
 
@@ -46,27 +46,17 @@ class MarkLine extends base_1.Marker {
         }
     }
     initMarker(container) {
-        const {points: points, startSymbol: startSymbol, endSymbol: endSymbol, label: label, lineStyle: lineStyle, mainSegmentIndex: mainSegmentIndex, multiSegment: multiSegment, state: state} = this.attribute, line = new segment_1.Segment({
+        const {points: points, startSymbol: startSymbol, endSymbol: endSymbol, label: label, lineStyle: lineStyle, mainSegmentIndex: mainSegmentIndex, multiSegment: multiSegment} = this.attribute, line = new segment_1.Segment({
             points: points,
             startSymbol: startSymbol,
             endSymbol: endSymbol,
             lineStyle: lineStyle,
             mainSegmentIndex: mainSegmentIndex,
             multiSegment: multiSegment,
-            pickable: !1,
-            state: {
-                line: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.line),
-                startSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineStartSymbol),
-                endSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineEndSymbol)
-            }
+            pickable: !1
         });
         line.name = "mark-line-line", this._line = line, container.add(line);
-        const markLabel = new tag_1.Tag(Object.assign(Object.assign({}, label), {
-            state: {
-                panel: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.labelBackground),
-                text: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.label)
-            }
-        }));
+        const markLabel = new tag_1.Tag(Object.assign({}, label));
         markLabel.name = "mark-line-label", this._label = markLabel, container.add(markLabel), 
         this.setLabelPos();
     }

package/cjs/marker/line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IGroup, INode } from '@visactor/vrender-core';\nimport { isEmpty, isFunction, isValidNumber, merge } from '@visactor/vutils';\nimport { Segment } from '../segment';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport { Marker } from './base';\nimport { DEFAULT_MARK_LINE_THEME, DEFAULT_MARK_LINE_TEXT_STYLE_MAP } from './config';\nimport type { MarkLineAttrs } from './type';\nimport { limitShapeInBounds } from '../util/limit-shape';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkLineComponent } from './register';\nimport type { Point } from '../core/type';\nimport { DEFAULT_STATES } from '../constant';\n\nloadMarkLineComponent();\nexport class MarkLine extends Marker<MarkLineAttrs> {\n  name = 'markLine';\n  static defaultAttributes: Partial<MarkLineAttrs> = DEFAULT_MARK_LINE_THEME;\n\n  private _line!: Segment;\n  getLine() {\n    return this._line;\n  }\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: MarkLineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkLine.defaultAttributes, attributes));\n  }\n\n  protected setLabelPos() {\n    const { label = {}, limitRect } = this.attribute as MarkLineAttrs;\n    const { position = 'end', refX = 0, refY = 0, confine } = label;\n    const points = this._line.getMainSegmentPoints();\n    const labelAngle = this._line.getEndAngle() ?? 0;\n    const labelOffsetX = refX * Math.cos(labelAngle) + refY * Math.cos(labelAngle - Math.PI / 2);\n    const labelOffsetY = refX * Math.sin(labelAngle) + refY * Math.sin(labelAngle - Math.PI / 2);\n    let labelPoint;\n    if (position.includes('start') || position.includes('Start')) {\n      labelPoint = {\n        x: points[0].x + labelOffsetX,\n        y: points[0].y + labelOffsetY\n      };\n    } else if (position.includes('middle') || position.includes('Middle')) {\n      labelPoint = {\n        x: (points[0].x + points[points.length - 1].x) / 2 + labelOffsetX,\n        y: (points[0].y + points[points.length - 1].y) / 2 + labelOffsetY\n      };\n    } else {\n      labelPoint = {\n        x: points[points.length - 1].x + labelOffsetX,\n        y: points[points.length - 1].y + labelOffsetY\n      };\n    }\n    this._label.setAttributes({\n      ...labelPoint,\n      angle: label.autoRotate ? labelAngle + (label.refAngle ?? 0) : 0,\n      textStyle: {\n        ...DEFAULT_MARK_LINE_TEXT_STYLE_MAP[position],\n        ...label.textStyle\n      }\n    });\n    if (limitRect && confine) {\n      const { x, y, width, height } = limitRect;\n      limitShapeInBounds(this._label, {\n        x1: x,\n        y1: y,\n        x2: x + width,\n        y2: y + height\n      });\n    }\n  }\n\n  protected initMarker(container: IGroup) {\n    const { points, startSymbol, endSymbol, label, lineStyle, mainSegmentIndex, multiSegment, state } = this\n      .attribute as MarkLineAttrs;\n    const line = new Segment({\n      points,\n      startSymbol,\n      endSymbol,\n      lineStyle,\n      mainSegmentIndex,\n      multiSegment,\n      pickable: false, // 组件容器本身不参与拾取\n      state: {\n        line: merge({}, DEFAULT_STATES, state?.line),\n        startSymbol: merge({}, DEFAULT_STATES, state?.lineStartSymbol),\n        endSymbol: merge({}, DEFAULT_STATES, state?.lineEndSymbol)\n      }\n    });\n    line.name = 'mark-line-line';\n    this._line = line;\n    container.add(line as unknown as INode);\n\n    const markLabel = new Tag({\n      ...(label as TagAttributes),\n      state: {\n        panel: merge({}, DEFAULT_STATES, state?.labelBackground),\n        text: merge({}, DEFAULT_STATES, state?.label)\n      }\n    });\n    markLabel.name = 'mark-line-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { points, startSymbol, endSymbol, label, lineStyle, mainSegmentIndex, multiSegment } = this\n      .attribute as MarkLineAttrs;\n    if (this._line) {\n      this._line.setAttributes({\n        points,\n        startSymbol,\n        endSymbol,\n        lineStyle,\n        mainSegmentIndex,\n        multiSegment\n      });\n    }\n\n    if (this._label) {\n      this._label.setAttributes({\n        dx: 0,\n        dy: 0, // 需要进行复位\n        ...(label as TagAttributes)\n      });\n    }\n\n    this.setLabelPos();\n  }\n\n  protected isValidPoints() {\n    const { points } = this.attribute as MarkLineAttrs;\n    if (!points || points.length < 2) {\n      return false;\n    }\n    let validFlag = true;\n    points.forEach((point: Point | Point[]) => {\n      if ((point as any).length) {\n        (point as Point[]).forEach((p: Point) => {\n          if (!isValidNumber((p as Point).x) || !isValidNumber((p as Point).y)) {\n            validFlag = false;\n            return;\n          }\n        });\n      } else if (!isValidNumber((point as Point).x) || !isValidNumber((point as Point).y)) {\n        validFlag = false;\n        return;\n      }\n    });\n    return validFlag;\n  }\n}\n"]}
+{"version":3,"sources":["../src/marker/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IGroup, INode } from '@visactor/vrender-core';\nimport { isValidNumber, merge } from '@visactor/vutils';\nimport { Segment } from '../segment';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport { Marker } from './base';\nimport { DEFAULT_MARK_LINE_THEME, DEFAULT_MARK_LINE_TEXT_STYLE_MAP } from './config';\nimport type { MarkLineAttrs } from './type';\nimport { limitShapeInBounds } from '../util/limit-shape';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkLineComponent } from './register';\nimport type { Point } from '../core/type';\n\nloadMarkLineComponent();\nexport class MarkLine extends Marker<MarkLineAttrs> {\n  name = 'markLine';\n  static defaultAttributes: Partial<MarkLineAttrs> = DEFAULT_MARK_LINE_THEME;\n\n  private _line!: Segment;\n  getLine() {\n    return this._line;\n  }\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: MarkLineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkLine.defaultAttributes, attributes));\n  }\n\n  protected setLabelPos() {\n    const { label = {}, limitRect } = this.attribute as MarkLineAttrs;\n    const { position = 'end', refX = 0, refY = 0, confine } = label;\n    const points = this._line.getMainSegmentPoints();\n    const labelAngle = this._line.getEndAngle() ?? 0;\n    const labelOffsetX = refX * Math.cos(labelAngle) + refY * Math.cos(labelAngle - Math.PI / 2);\n    const labelOffsetY = refX * Math.sin(labelAngle) + refY * Math.sin(labelAngle - Math.PI / 2);\n    let labelPoint;\n    if (position.includes('start') || position.includes('Start')) {\n      labelPoint = {\n        x: points[0].x + labelOffsetX,\n        y: points[0].y + labelOffsetY\n      };\n    } else if (position.includes('middle') || position.includes('Middle')) {\n      labelPoint = {\n        x: (points[0].x + points[points.length - 1].x) / 2 + labelOffsetX,\n        y: (points[0].y + points[points.length - 1].y) / 2 + labelOffsetY\n      };\n    } else {\n      labelPoint = {\n        x: points[points.length - 1].x + labelOffsetX,\n        y: points[points.length - 1].y + labelOffsetY\n      };\n    }\n    this._label.setAttributes({\n      ...labelPoint,\n      angle: label.autoRotate ? labelAngle + (label.refAngle ?? 0) : 0,\n      textStyle: {\n        ...DEFAULT_MARK_LINE_TEXT_STYLE_MAP[position],\n        ...label.textStyle\n      }\n    });\n    if (limitRect && confine) {\n      const { x, y, width, height } = limitRect;\n      limitShapeInBounds(this._label, {\n        x1: x,\n        y1: y,\n        x2: x + width,\n        y2: y + height\n      });\n    }\n  }\n\n  protected initMarker(container: IGroup) {\n    const { points, startSymbol, endSymbol, label, lineStyle, mainSegmentIndex, multiSegment } = this\n      .attribute as MarkLineAttrs;\n    const line = new Segment({\n      points,\n      startSymbol,\n      endSymbol,\n      lineStyle,\n      mainSegmentIndex,\n      multiSegment,\n      pickable: false // 组件容器本身不参与拾取\n    });\n    line.name = 'mark-line-line';\n    this._line = line;\n    container.add(line as unknown as INode);\n\n    const markLabel = new Tag({\n      ...(label as TagAttributes)\n    });\n    markLabel.name = 'mark-line-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { points, startSymbol, endSymbol, label, lineStyle, mainSegmentIndex, multiSegment } = this\n      .attribute as MarkLineAttrs;\n    if (this._line) {\n      this._line.setAttributes({\n        points,\n        startSymbol,\n        endSymbol,\n        lineStyle,\n        mainSegmentIndex,\n        multiSegment\n      });\n    }\n\n    if (this._label) {\n      this._label.setAttributes({\n        dx: 0,\n        dy: 0, // 需要进行复位\n        ...(label as TagAttributes)\n      });\n    }\n\n    this.setLabelPos();\n  }\n\n  protected isValidPoints() {\n    const { points } = this.attribute as MarkLineAttrs;\n    if (!points || points.length < 2) {\n      return false;\n    }\n    let validFlag = true;\n    points.forEach((point: Point | Point[]) => {\n      if ((point as any).length) {\n        (point as Point[]).forEach((p: Point) => {\n          if (!isValidNumber((p as Point).x) || !isValidNumber((p as Point).y)) {\n            validFlag = false;\n            return;\n          }\n        });\n      } else if (!isValidNumber((point as Point).x) || !isValidNumber((point as Point).y)) {\n        validFlag = false;\n        return;\n      }\n    });\n    return validFlag;\n  }\n}\n"]}

package/cjs/marker/point.d.ts

@@ -8,7 +8,6 @@ import type { ComponentOptions } from '../interface';
 export declare class MarkPoint extends Marker<MarkPointAttrs> {
     name: string;
     static defaultAttributes: {
-        interactive: boolean;
         itemLine: {
             visible: boolean;
             decorativeLine: {

package/cjs/marker/point.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.MarkPoint = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), segment_1 = require("../segment"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), type_1 = require("./type"), register_1 = require("./register"), limit_shape_1 = require("../util/limit-shape"), constant_1 = require("../constant");
+const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), segment_1 = require("../segment"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), type_1 = require("./type"), register_1 = require("./register"), limit_shape_1 = require("../util/limit-shape");
 
 (0, register_1.loadMarkPointComponent)();
 
@@ -43,20 +43,10 @@ class MarkPoint extends base_1.Marker {
         return position.includes("top") || position.includes("Top") ? -height : position.includes("middle") || position.includes("Middle") ? -height / 2 : 0;
     }
     initItem(itemContent, itemPosition) {
-        const {state: state} = this.attribute, {type: type = "text", symbolStyle: symbolStyle, richTextStyle: richTextStyle, imageStyle: imageStyle, renderCustomCallback: renderCustomCallback} = itemContent;
+        const {type: type = "text", symbolStyle: symbolStyle, richTextStyle: richTextStyle, imageStyle: imageStyle, renderCustomCallback: renderCustomCallback} = itemContent;
         let item;
-        return "symbol" === type ? (item = vrender_core_1.graphicCreator.symbol(Object.assign(Object.assign({}, itemPosition), symbolStyle)), 
-        item.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.symbol)) : "text" === type ? item = new tag_1.Tag(Object.assign(Object.assign({}, itemPosition), {
-            state: {
-                panel: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.textBackground),
-                text: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.text)
-            }
-        })) : "richText" === type ? (item = vrender_core_1.graphicCreator.richtext(Object.assign(Object.assign({}, itemPosition), richTextStyle)), 
-        item.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.richText)) : "image" === type ? (item = vrender_core_1.graphicCreator.image(Object.assign(Object.assign({}, itemPosition), imageStyle)), 
-        item.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.image)) : "custom" === type && renderCustomCallback && (item = renderCustomCallback(), 
-        item.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.customMark)), 
-        item.name = `mark-point-${type}`, this.setItemAttributes(item, itemContent, itemPosition, type), 
-        item;
+        return "symbol" === type ? item = vrender_core_1.graphicCreator.symbol(Object.assign(Object.assign({}, itemPosition), symbolStyle)) : "text" === type ? item = new tag_1.Tag(Object.assign({}, itemPosition)) : "richText" === type ? item = vrender_core_1.graphicCreator.richtext(Object.assign(Object.assign({}, itemPosition), richTextStyle)) : "image" === type ? item = vrender_core_1.graphicCreator.image(Object.assign(Object.assign({}, itemPosition), imageStyle)) : "custom" === type && renderCustomCallback && (item = renderCustomCallback()), 
+        this.setItemAttributes(item, itemContent, itemPosition, type), item;
     }
     getItemLineAttr(itemLine, position, itemPosition) {
         let points = [];
@@ -127,23 +117,17 @@ class MarkPoint extends base_1.Marker {
         this.setDecorativeLineAttr(itemLine, itemPosition, null === (_a = itemLine.decorativeLine) || void 0 === _a ? void 0 : _a.visible);
     }
     initMarker(container) {
-        const {position: position, itemContent: itemContent = {}, state: state} = this.attribute, itemPosition = {
+        const {position: position, itemContent: itemContent = {}} = this.attribute, itemPosition = {
             x: position.x + (itemContent.offsetX || 0),
             y: position.y + (itemContent.offsetY || 0)
         }, line = new segment_1.Segment({
             points: [],
-            pickable: !1,
-            state: {
-                line: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.line),
-                startSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineStartSymbol),
-                endSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineEndSymbol)
-            }
+            pickable: !1
         });
         line.name = "mark-point-line", this._line = line, container.add(line);
         const decorativeLine = vrender_core_1.graphicCreator.line({
             points: []
         });
-        decorativeLine.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.line), 
         decorativeLine.name = "mark-point-decorativeLine", this._decorativeLine = decorativeLine, 
         container.add(decorativeLine);
         const item = this.initItem(itemContent, itemPosition);

package/cjs/marker/point.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/point.ts"],"names":[],"mappings":"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","file":"point.js","sourcesContent":["import type {\n  IGroup,\n  IImage,\n  INode,\n  ISymbol,\n  IImageGraphicAttribute,\n  IRichText,\n  IRichTextGraphicAttribute,\n  ILine,\n  ILineGraphicAttribute\n} from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber, merge } from '@visactor/vutils';\nimport { Segment } from '../segment';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport { Marker } from './base';\nimport { DEFAULT_MARK_POINT_TEXT_STYLE_MAP, DEFAULT_MARK_POINT_THEME } from './config';\nimport type { IItemContent, IItemLine, MarkPointAttrs } from './type';\n// eslint-disable-next-line no-duplicate-imports\nimport { IMarkPointItemPosition } from './type';\nimport type { Point } from '../core/type';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkPointComponent } from './register';\nimport { computeOffsetForlimit } from '../util/limit-shape';\nimport { DEFAULT_STATES } from '../constant';\n\nloadMarkPointComponent();\nexport class MarkPoint extends Marker<MarkPointAttrs> {\n  name = 'markPoint';\n  static defaultAttributes = DEFAULT_MARK_POINT_THEME;\n\n  private _item!: ISymbol | Tag | IImage | IRichText;\n\n  private _line?: Segment;\n\n  private _decorativeLine!: ILine;\n\n  constructor(attributes: MarkPointAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkPoint.defaultAttributes, attributes));\n  }\n\n  protected setLabelPos() {\n    //do nothing\n  }\n\n  protected setItemAttributes(\n    item: ISymbol | Tag | IImage | IRichText,\n    itemContent: IItemContent,\n    itemPosition: Point,\n    itemType: 'symbol' | 'text' | 'image' | 'richText' | 'custom'\n  ) {\n    if (!item) {\n      return;\n    }\n    const {\n      autoRotate = true,\n      refX = 0,\n      refY = 0,\n      refAngle = 0,\n      textStyle = {},\n      richTextStyle = {},\n      imageStyle = {},\n      position = IMarkPointItemPosition.middle\n    } = itemContent;\n    const itemAngle = this._line?.getEndAngle() || 0;\n    const itemOffsetX = refX * Math.cos(itemAngle) + refY * Math.cos(itemAngle - Math.PI / 2);\n    const itemOffsetY = refX * Math.sin(itemAngle) + refY * Math.sin(itemAngle - Math.PI / 2);\n    if (itemType === 'text') {\n      item.setAttributes({\n        ...(textStyle as TagAttributes),\n        textStyle: {\n          ...DEFAULT_MARK_POINT_TEXT_STYLE_MAP[itemContent?.position || 'end'],\n          ...textStyle.textStyle\n        }\n      } as any);\n    } else if (itemType === 'richText') {\n      item.setAttributes({\n        dx: this.getItemDx(item, position, richTextStyle) + (richTextStyle.dx || 0),\n        dy: this.getItemDy(item, position, richTextStyle) + (richTextStyle.dy || 0)\n      });\n    } else if (itemType === 'image') {\n      item.setAttributes({\n        dx: this.getItemDx(item, position, imageStyle) + (imageStyle.dx || 0),\n        dy: this.getItemDy(item, position, imageStyle) + (imageStyle.dy || 0)\n      });\n    }\n    item.setAttributes({\n      x: itemPosition.x + (itemOffsetX || 0),\n      y: itemPosition.y + (itemOffsetY || 0),\n      angle: autoRotate && itemAngle + refAngle\n    });\n  }\n\n  protected getItemDx(\n    item: ISymbol | Tag | IImage | IRichText,\n    position: keyof typeof IMarkPointItemPosition,\n    style?: IImageGraphicAttribute | IRichTextGraphicAttribute\n  ) {\n    const width = (item as IGroup)?.AABBBounds?.width() ?? (style?.width || 0);\n    if (position.includes('inside')) {\n      return -width;\n    }\n    if (position === 'insideTop') {\n      return 0;\n    }\n    return 0;\n  }\n\n  protected getItemDy(\n    item: ISymbol | Tag | IImage | IRichText,\n    position: keyof typeof IMarkPointItemPosition,\n    style?: IImageGraphicAttribute | IRichTextGraphicAttribute\n  ) {\n    const height = (item as IGroup)?.AABBBounds?.height() ?? (style?.height || 0);\n    if (position.includes('top') || position.includes('Top')) {\n      return -height;\n    }\n    if (position.includes('middle') || position.includes('Middle')) {\n      return -height / 2;\n    }\n    return 0;\n  }\n\n  protected initItem(itemContent: IItemContent, itemPosition: Point) {\n    const { state } = this.attribute as MarkPointAttrs;\n    const { type = 'text', symbolStyle, richTextStyle, imageStyle, renderCustomCallback } = itemContent;\n    let item: ISymbol | Tag | IImage | IRichText | IGroup;\n    if (type === 'symbol') {\n      item = graphicCreator.symbol({\n        ...itemPosition,\n        ...symbolStyle\n      });\n      item.states = merge({}, DEFAULT_STATES, state?.symbol);\n    } else if (type === 'text') {\n      item = new Tag({\n        ...itemPosition,\n        state: {\n          panel: merge({}, DEFAULT_STATES, state?.textBackground),\n          text: merge({}, DEFAULT_STATES, state?.text)\n        }\n      });\n    } else if (type === 'richText') {\n      item = graphicCreator.richtext({\n        ...itemPosition,\n        ...richTextStyle\n      });\n      item.states = merge({}, DEFAULT_STATES, state?.richText);\n    } else if (type === 'image') {\n      item = graphicCreator.image({\n        ...itemPosition,\n        ...imageStyle\n      });\n      item.states = merge({}, DEFAULT_STATES, state?.image);\n    } else if (type === 'custom' && renderCustomCallback) {\n      item = renderCustomCallback();\n      item.states = merge({}, DEFAULT_STATES, state?.customMark);\n    }\n    item.name = `mark-point-${type}`;\n    this.setItemAttributes(item, itemContent, itemPosition, type);\n    return item;\n  }\n\n  protected getItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point) {\n    let points: Point[] = [];\n    const { type = 'type-s' } = itemLine;\n    if (type === 'type-do') {\n      points = [\n        position,\n        {\n          x: (position.x + itemPosition.x) / 2,\n          y: itemPosition.y\n        },\n        itemPosition\n      ];\n    } else if (type === 'type-po') {\n      points = [\n        position,\n        {\n          x: itemPosition.x,\n          y: position.y\n        },\n        itemPosition\n      ];\n    } else if (type === 'type-op') {\n      points = [\n        position,\n        {\n          x: position.x,\n          y: itemPosition.y\n        },\n        itemPosition\n      ];\n    } else {\n      points = [position, itemPosition];\n    }\n    return points;\n  }\n\n  protected setItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point, visible: boolean) {\n    if (this._line) {\n      const { startSymbol, endSymbol, lineStyle } = itemLine;\n      const points = this.getItemLineAttr(itemLine, position, itemPosition);\n      this._line.setAttributes({\n        points,\n        startSymbol,\n        endSymbol,\n        lineStyle,\n        visible\n      });\n    }\n  }\n\n  protected getDecorativeLineAttr(itemLine: IItemLine, itemPosition: Point) {\n    const decorativeLength = itemLine?.decorativeLine?.length || 10;\n    const itemAngle = this._line.getEndAngle() || 0;\n    const startPointOffsetX = (decorativeLength / 2) * Math.cos(itemAngle - Math.PI / 2);\n    const startPointOffsetY = (decorativeLength / 2) * Math.sin(itemAngle - Math.PI / 2);\n    const endPointOffsetX = (-decorativeLength / 2) * Math.cos(itemAngle - Math.PI / 2);\n    const endPointOffsetY = (-decorativeLength / 2) * Math.sin(itemAngle - Math.PI / 2);\n    return {\n      startPointOffsetX,\n      startPointOffsetY,\n      endPointOffsetX,\n      endPointOffsetY\n    };\n  }\n\n  protected setDecorativeLineAttr(itemLine: IItemLine, itemPosition: Point, visible: boolean) {\n    if (this._decorativeLine) {\n      const { lineStyle } = itemLine;\n      const { startPointOffsetX, startPointOffsetY, endPointOffsetX, endPointOffsetY } = this.getDecorativeLineAttr(\n        itemLine,\n        itemPosition\n      );\n      this._decorativeLine.setAttributes({\n        points: [\n          {\n            x: itemPosition.x + startPointOffsetX,\n            y: itemPosition.y + startPointOffsetY\n          },\n          {\n            x: itemPosition.x + endPointOffsetX,\n            y: itemPosition.y + endPointOffsetY\n          }\n        ] as IPointLike[],\n        ...(lineStyle as Partial<ILineGraphicAttribute>),\n        visible\n      });\n    }\n  }\n\n  protected setAllOfItemsAttr(itemPosition: Point) {\n    const { position, itemLine = {}, itemContent = {}, limitRect } = this.attribute as MarkPointAttrs;\n    const { type = 'text', confine } = itemContent;\n    if (limitRect && confine) {\n      const { x, y, width, height } = limitRect;\n      const { dx, dy } = computeOffsetForlimit(this._item, {\n        x1: x,\n        y1: y,\n        x2: x + width,\n        y2: y + height\n      });\n      itemPosition.x = itemPosition.x + dx;\n      itemPosition.y = itemPosition.y + dy;\n    }\n    this.setItemAttributes(this._item, itemContent, itemPosition, type);\n    this.setItemLineAttr(itemLine, position, itemPosition, itemLine.visible);\n    this.setDecorativeLineAttr(itemLine, itemPosition, itemLine.decorativeLine?.visible);\n  }\n\n  protected initMarker(container: IGroup) {\n    const { position, itemContent = {}, state } = this.attribute as MarkPointAttrs;\n    const itemPosition = {\n      x: position.x + (itemContent.offsetX || 0),\n      y: position.y + (itemContent.offsetY || 0)\n    };\n\n    const line = new Segment({\n      points: [],\n      pickable: false, // 组件容器本身不参与拾取\n      state: {\n        line: merge({}, DEFAULT_STATES, state?.line),\n        startSymbol: merge({}, DEFAULT_STATES, state?.lineStartSymbol),\n        endSymbol: merge({}, DEFAULT_STATES, state?.lineEndSymbol)\n      }\n    });\n    line.name = 'mark-point-line';\n    this._line = line;\n    container.add(line as unknown as INode);\n\n    const decorativeLine = graphicCreator.line({\n      points: []\n    });\n    decorativeLine.states = merge({}, DEFAULT_STATES, state?.line);\n    decorativeLine.name = 'mark-point-decorativeLine';\n    this._decorativeLine = decorativeLine;\n    container.add(decorativeLine as unknown as INode);\n\n    // 为了强制将itemContent限制在limitRect内, 所以需要先绘制item, 然后根据item bounds 动态调整位置\n    const item = this.initItem(itemContent as any, itemPosition);\n    this._item = item;\n\n    // 由于itemLine的指向也要变化, 所以需要对所有的内容进行渲染\n    this.setAllOfItemsAttr(itemPosition);\n    container.add(item as unknown as INode);\n  }\n\n  protected updateMarker() {\n    const { position, itemContent = {} } = this.attribute as MarkPointAttrs;\n    const { type = 'text' } = itemContent;\n\n    const itemPosition = {\n      x: position.x + (itemContent.offsetX || 0),\n      y: position.y + (itemContent.offsetY || 0)\n    };\n\n    // 为了强制将itemContent限制在limitRect内, 所以需要先绘制item, 然后根据item bounds 动态调整位置\n    this.setItemAttributes(this._item, itemContent, itemPosition, type);\n    // 由于itemLine的指向也要变化, 所以需要对所有的内容进行渲染\n    this.setAllOfItemsAttr(itemPosition);\n  }\n\n  protected isValidPoints() {\n    const { position } = this.attribute as MarkPointAttrs;\n    if (isValidNumber(position.x) && isValidNumber(position.y)) {\n      return true;\n    }\n    return false;\n  }\n}\n"]}
+{"version":3,"sources":["../src/marker/point.ts"],"names":[],"mappings":"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","file":"point.js","sourcesContent":["import type {\n  IGroup,\n  IImage,\n  INode,\n  ISymbol,\n  IImageGraphicAttribute,\n  IRichText,\n  IRichTextGraphicAttribute,\n  ILine,\n  ILineGraphicAttribute\n} from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber, merge } from '@visactor/vutils';\nimport { Segment } from '../segment';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport { Marker } from './base';\nimport { DEFAULT_MARK_POINT_TEXT_STYLE_MAP, DEFAULT_MARK_POINT_THEME } from './config';\nimport type { IItemContent, IItemLine, MarkPointAttrs } from './type';\n// eslint-disable-next-line no-duplicate-imports\nimport { IMarkPointItemPosition } from './type';\nimport type { Point } from '../core/type';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkPointComponent } from './register';\nimport { computeOffsetForlimit } from '../util/limit-shape';\n\nloadMarkPointComponent();\nexport class MarkPoint extends Marker<MarkPointAttrs> {\n  name = 'markPoint';\n  static defaultAttributes = DEFAULT_MARK_POINT_THEME;\n\n  private _item!: ISymbol | Tag | IImage | IRichText;\n\n  private _line?: Segment;\n\n  private _decorativeLine!: ILine;\n\n  constructor(attributes: MarkPointAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkPoint.defaultAttributes, attributes));\n  }\n\n  protected setLabelPos() {\n    //do nothing\n  }\n\n  protected setItemAttributes(\n    item: ISymbol | Tag | IImage | IRichText,\n    itemContent: IItemContent,\n    itemPosition: Point,\n    itemType: 'symbol' | 'text' | 'image' | 'richText' | 'custom'\n  ) {\n    if (!item) {\n      return;\n    }\n    const {\n      autoRotate = true,\n      refX = 0,\n      refY = 0,\n      refAngle = 0,\n      textStyle = {},\n      richTextStyle = {},\n      imageStyle = {},\n      position = IMarkPointItemPosition.middle\n    } = itemContent;\n    const itemAngle = this._line?.getEndAngle() || 0;\n    const itemOffsetX = refX * Math.cos(itemAngle) + refY * Math.cos(itemAngle - Math.PI / 2);\n    const itemOffsetY = refX * Math.sin(itemAngle) + refY * Math.sin(itemAngle - Math.PI / 2);\n    if (itemType === 'text') {\n      item.setAttributes({\n        ...(textStyle as TagAttributes),\n        textStyle: {\n          ...DEFAULT_MARK_POINT_TEXT_STYLE_MAP[itemContent?.position || 'end'],\n          ...textStyle.textStyle\n        }\n      } as any);\n    } else if (itemType === 'richText') {\n      item.setAttributes({\n        dx: this.getItemDx(item, position, richTextStyle) + (richTextStyle.dx || 0),\n        dy: this.getItemDy(item, position, richTextStyle) + (richTextStyle.dy || 0)\n      });\n    } else if (itemType === 'image') {\n      item.setAttributes({\n        dx: this.getItemDx(item, position, imageStyle) + (imageStyle.dx || 0),\n        dy: this.getItemDy(item, position, imageStyle) + (imageStyle.dy || 0)\n      });\n    }\n    item.setAttributes({\n      x: itemPosition.x + (itemOffsetX || 0),\n      y: itemPosition.y + (itemOffsetY || 0),\n      angle: autoRotate && itemAngle + refAngle\n    });\n  }\n\n  protected getItemDx(\n    item: ISymbol | Tag | IImage | IRichText,\n    position: keyof typeof IMarkPointItemPosition,\n    style?: IImageGraphicAttribute | IRichTextGraphicAttribute\n  ) {\n    const width = (item as IGroup)?.AABBBounds?.width() ?? (style?.width || 0);\n    if (position.includes('inside')) {\n      return -width;\n    }\n    if (position === 'insideTop') {\n      return 0;\n    }\n    return 0;\n  }\n\n  protected getItemDy(\n    item: ISymbol | Tag | IImage | IRichText,\n    position: keyof typeof IMarkPointItemPosition,\n    style?: IImageGraphicAttribute | IRichTextGraphicAttribute\n  ) {\n    const height = (item as IGroup)?.AABBBounds?.height() ?? (style?.height || 0);\n    if (position.includes('top') || position.includes('Top')) {\n      return -height;\n    }\n    if (position.includes('middle') || position.includes('Middle')) {\n      return -height / 2;\n    }\n    return 0;\n  }\n\n  protected initItem(itemContent: IItemContent, itemPosition: Point) {\n    const { type = 'text', symbolStyle, richTextStyle, imageStyle, renderCustomCallback } = itemContent;\n    let item: ISymbol | Tag | IImage | IRichText | IGroup;\n    if (type === 'symbol') {\n      item = graphicCreator.symbol({\n        ...itemPosition,\n        ...symbolStyle\n      });\n    } else if (type === 'text') {\n      item = new Tag({\n        ...itemPosition\n      });\n    } else if (type === 'richText') {\n      item = graphicCreator.richtext({\n        ...itemPosition,\n        ...richTextStyle\n      });\n    } else if (type === 'image') {\n      item = graphicCreator.image({\n        ...itemPosition,\n        ...imageStyle\n      });\n    } else if (type === 'custom' && renderCustomCallback) {\n      item = renderCustomCallback();\n    }\n    this.setItemAttributes(item, itemContent, itemPosition, type);\n    return item;\n  }\n\n  protected getItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point) {\n    let points: Point[] = [];\n    const { type = 'type-s' } = itemLine;\n    if (type === 'type-do') {\n      points = [\n        position,\n        {\n          x: (position.x + itemPosition.x) / 2,\n          y: itemPosition.y\n        },\n        itemPosition\n      ];\n    } else if (type === 'type-po') {\n      points = [\n        position,\n        {\n          x: itemPosition.x,\n          y: position.y\n        },\n        itemPosition\n      ];\n    } else if (type === 'type-op') {\n      points = [\n        position,\n        {\n          x: position.x,\n          y: itemPosition.y\n        },\n        itemPosition\n      ];\n    } else {\n      points = [position, itemPosition];\n    }\n    return points;\n  }\n\n  protected setItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point, visible: boolean) {\n    if (this._line) {\n      const { startSymbol, endSymbol, lineStyle } = itemLine;\n      const points = this.getItemLineAttr(itemLine, position, itemPosition);\n      this._line.setAttributes({\n        points,\n        startSymbol,\n        endSymbol,\n        lineStyle,\n        visible\n      });\n    }\n  }\n\n  protected getDecorativeLineAttr(itemLine: IItemLine, itemPosition: Point) {\n    const decorativeLength = itemLine?.decorativeLine?.length || 10;\n    const itemAngle = this._line.getEndAngle() || 0;\n    const startPointOffsetX = (decorativeLength / 2) * Math.cos(itemAngle - Math.PI / 2);\n    const startPointOffsetY = (decorativeLength / 2) * Math.sin(itemAngle - Math.PI / 2);\n    const endPointOffsetX = (-decorativeLength / 2) * Math.cos(itemAngle - Math.PI / 2);\n    const endPointOffsetY = (-decorativeLength / 2) * Math.sin(itemAngle - Math.PI / 2);\n    return {\n      startPointOffsetX,\n      startPointOffsetY,\n      endPointOffsetX,\n      endPointOffsetY\n    };\n  }\n\n  protected setDecorativeLineAttr(itemLine: IItemLine, itemPosition: Point, visible: boolean) {\n    if (this._decorativeLine) {\n      const { lineStyle } = itemLine;\n      const { startPointOffsetX, startPointOffsetY, endPointOffsetX, endPointOffsetY } = this.getDecorativeLineAttr(\n        itemLine,\n        itemPosition\n      );\n      this._decorativeLine.setAttributes({\n        points: [\n          {\n            x: itemPosition.x + startPointOffsetX,\n            y: itemPosition.y + startPointOffsetY\n          },\n          {\n            x: itemPosition.x + endPointOffsetX,\n            y: itemPosition.y + endPointOffsetY\n          }\n        ] as IPointLike[],\n        ...(lineStyle as Partial<ILineGraphicAttribute>),\n        visible\n      });\n    }\n  }\n\n  protected setAllOfItemsAttr(itemPosition: Point) {\n    const { position, itemLine = {}, itemContent = {}, limitRect } = this.attribute as MarkPointAttrs;\n    const { type = 'text', confine } = itemContent;\n    if (limitRect && confine) {\n      const { x, y, width, height } = limitRect;\n      const { dx, dy } = computeOffsetForlimit(this._item, {\n        x1: x,\n        y1: y,\n        x2: x + width,\n        y2: y + height\n      });\n      itemPosition.x = itemPosition.x + dx;\n      itemPosition.y = itemPosition.y + dy;\n    }\n    this.setItemAttributes(this._item, itemContent, itemPosition, type);\n    this.setItemLineAttr(itemLine, position, itemPosition, itemLine.visible);\n    this.setDecorativeLineAttr(itemLine, itemPosition, itemLine.decorativeLine?.visible);\n  }\n\n  protected initMarker(container: IGroup) {\n    const { position, itemContent = {} } = this.attribute as MarkPointAttrs;\n    const itemPosition = {\n      x: position.x + (itemContent.offsetX || 0),\n      y: position.y + (itemContent.offsetY || 0)\n    };\n\n    const line = new Segment({\n      points: [],\n      pickable: false // 组件容器本身不参与拾取\n    });\n    line.name = 'mark-point-line';\n    this._line = line;\n    container.add(line as unknown as INode);\n\n    const decorativeLine = graphicCreator.line({\n      points: []\n    });\n    decorativeLine.name = 'mark-point-decorativeLine';\n    this._decorativeLine = decorativeLine;\n    container.add(decorativeLine as unknown as INode);\n\n    // 为了强制将itemContent限制在limitRect内, 所以需要先绘制item, 然后根据item bounds 动态调整位置\n    const item = this.initItem(itemContent as any, itemPosition);\n    this._item = item;\n\n    // 由于itemLine的指向也要变化, 所以需要对所有的内容进行渲染\n    this.setAllOfItemsAttr(itemPosition);\n    container.add(item as unknown as INode);\n  }\n\n  protected updateMarker() {\n    const { position, itemContent = {} } = this.attribute as MarkPointAttrs;\n    const { type = 'text' } = itemContent;\n\n    const itemPosition = {\n      x: position.x + (itemContent.offsetX || 0),\n      y: position.y + (itemContent.offsetY || 0)\n    };\n\n    // 为了强制将itemContent限制在limitRect内, 所以需要先绘制item, 然后根据item bounds 动态调整位置\n    this.setItemAttributes(this._item, itemContent, itemPosition, type);\n    // 由于itemLine的指向也要变化, 所以需要对所有的内容进行渲染\n    this.setAllOfItemsAttr(itemPosition);\n  }\n\n  protected isValidPoints() {\n    const { position } = this.attribute as MarkPointAttrs;\n    if (isValidNumber(position.x) && isValidNumber(position.y)) {\n      return true;\n    }\n    return false;\n  }\n}\n"]}

package/cjs/marker/type.d.ts

@@ -1,7 +1,7 @@
-import type { EasingType, IGroup, IGroupGraphicAttribute, IImageGraphicAttribute, ILineGraphicAttribute, IPolygonAttribute, IPolygonGraphicAttribute, IRectGraphicAttribute, IRichTextGraphicAttribute, ISymbolGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
-import type { ILineGraphicWithCornerRadius, SegmentAttributes, SymbolAttributes } from '../segment';
+import type { IGroup, IGroupGraphicAttribute, IImageGraphicAttribute, IPolygonAttribute, IRichTextGraphicAttribute, ISymbolGraphicAttribute } from '@visactor/vrender-core';
+import type { SegmentAttributes, SymbolAttributes } from '../segment';
 import type { TagAttributes } from '../tag';
-import type { Point, State } from '../core/type';
+import type { Point } from '../core/type';
 export declare enum IMarkLineLabelPosition {
     start = "start",
     middle = "middle",
@@ -49,8 +49,6 @@ export type IMarkRef = {
 export type MarkerAttrs = IGroupGraphicAttribute & {
     type?: 'line' | 'area' | 'point';
     interactive?: boolean;
-    select?: boolean;
-    hover?: boolean;
     visible?: boolean;
     clipInRange?: boolean;
     limitRect?: {
@@ -60,56 +58,14 @@ export type MarkerAttrs = IGroupGraphicAttribute & {
         height: number;
     };
 };
-export type BaseMarkerAnimation<T> = {
-    animation?: MarkerAnimation<T> | boolean;
-    animationEnter?: MarkerUpdateAnimation<T>;
-    animationUpdate?: MarkerUpdateAnimation<T>;
-    animationExit?: MarkerExitAnimation;
-};
-export type MarkerAnimation<T> = MarkerUpdateAnimation<T> | MarkerUpdateAnimation<T>;
-export type MarkerUpdateAnimation<T> = {
-    type: T;
-} & MarkerExitAnimation;
-export type MarkLineAnimationType = 'clipIn' | 'fadeIn';
-export type MarkAreaAnimationType = 'fadeIn';
-export type MarkPointAnimationType = 'callIn' | 'fadeIn';
-export type MarkerExitAnimation = {
-    duration?: number;
-    delay?: number;
-    easing?: EasingType;
-};
-export type MarkLineState = {
-    line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[]>;
-    lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;
-    lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;
-    label?: State<Partial<ITextGraphicAttribute>>;
-    labelBackground?: State<Partial<IRectGraphicAttribute>>;
-};
-export type MarkAreaState = {
-    area?: State<Partial<IPolygonGraphicAttribute>>;
-    label?: State<Partial<ITextGraphicAttribute>>;
-    labelBackground?: State<Partial<IRectGraphicAttribute>>;
-};
-export type MarkPointState = {
-    line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[]>;
-    lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;
-    lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;
-    symbol?: State<Partial<ISymbolGraphicAttribute>>;
-    image?: State<Partial<IImageGraphicAttribute>>;
-    text?: State<Partial<ITextGraphicAttribute>>;
-    textBackground?: State<Partial<IRectGraphicAttribute>>;
-    richText?: State<Partial<IRichTextGraphicAttribute>>;
-    customMark?: State<Partial<IGroupGraphicAttribute>>;
-};
-export type MarkLineAttrs = MarkerAttrs & Omit<SegmentAttributes, 'state'> & {
+export type MarkLineAttrs = MarkerAttrs & SegmentAttributes & {
     type?: 'line';
     points: Point[] | Point[][];
     label?: {
         position?: keyof typeof IMarkLineLabelPosition;
         confine?: boolean;
     } & IMarkRef & IMarkLabel;
-    state?: MarkLineState;
-} & BaseMarkerAnimation<MarkLineAnimationType>;
+};
 export type MarkAreaAttrs = MarkerAttrs & {
     type?: 'area';
     points: Point[];
@@ -118,8 +74,7 @@ export type MarkAreaAttrs = MarkerAttrs & {
         confine?: boolean;
     } & IMarkLabel;
     areaStyle?: IPolygonAttribute;
-    state?: MarkAreaState;
-} & BaseMarkerAnimation<MarkAreaAnimationType>;
+};
 export type IItemContent = IMarkRef & {
     type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';
     position?: keyof typeof IMarkPointItemPosition;
@@ -144,5 +99,4 @@ export type MarkPointAttrs = Omit<MarkerAttrs, 'labelStyle'> & {
     position: Point;
     itemLine?: IItemLine;
     itemContent?: IItemContent;
-    state?: MarkPointState;
-} & BaseMarkerAnimation<MarkPointAnimationType>;
+};

package/cjs/marker/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/type.ts"],"names":[],"mappings":";;;AAiBA,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  EasingType,\n  IGroup,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPolygonAttribute,\n  IPolygonGraphicAttribute,\n  IRectGraphicAttribute,\n  IRichTextGraphicAttribute,\n  ISymbolGraphicAttribute,\n  ITextGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { ILineGraphicWithCornerRadius, SegmentAttributes, SymbolAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\nimport type { Point, State } from '../core/type';\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 type IMarkLabel = Omit<TagAttributes, 'x' | 'y' | 'panel'> & {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n};\n\nexport type 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 type MarkerAttrs = IGroupGraphicAttribute & {\n  type?: 'line' | 'area' | 'point';\n  /**\n   * 是否支持交互\n   * @default true\n   */\n  interactive?: boolean;\n  /**\n   * 是否开启选中交互\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 交互\n   * @default false\n   */\n  hover?: boolean;\n  /**\n   * 是否显示marker组件\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 是否将组件在绘制区域内进行剪切\n   * @default true\n   */\n  clipInRange?: boolean;\n  /**\n   * 组件绘制范围配置\n   */\n  limitRect?: {\n    x: number;\n    y: number;\n    width: number;\n    height: number;\n  };\n};\n\n/** animation type */\nexport type BaseMarkerAnimation<T> = {\n  animation?: MarkerAnimation<T> | boolean;\n  animationEnter?: MarkerUpdateAnimation<T>;\n  animationUpdate?: MarkerUpdateAnimation<T>;\n  animationExit?: MarkerExitAnimation;\n};\nexport type MarkerAnimation<T> = MarkerUpdateAnimation<T> | MarkerUpdateAnimation<T>;\n\nexport type MarkerUpdateAnimation<T> = {\n  type: T;\n} & MarkerExitAnimation;\n\nexport type MarkLineAnimationType = 'clipIn' | 'fadeIn';\n\nexport type MarkAreaAnimationType = 'fadeIn';\n\nexport type MarkPointAnimationType = 'callIn' | 'fadeIn';\n\nexport type MarkerExitAnimation = {\n  duration?: number;\n  delay?: number;\n  easing?: EasingType;\n};\n\n/** state type */\nexport type MarkLineState = {\n  line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[]>;\n  lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  label?: State<Partial<ITextGraphicAttribute>>;\n  labelBackground?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type MarkAreaState = {\n  area?: State<Partial<IPolygonGraphicAttribute>>;\n  label?: State<Partial<ITextGraphicAttribute>>;\n  labelBackground?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type MarkPointState = {\n  line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[]>;\n  lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  symbol?: State<Partial<ISymbolGraphicAttribute>>;\n  image?: State<Partial<IImageGraphicAttribute>>;\n  text?: State<Partial<ITextGraphicAttribute>>;\n  textBackground?: State<Partial<IRectGraphicAttribute>>;\n  richText?: State<Partial<IRichTextGraphicAttribute>>;\n  customMark?: State<Partial<IGroupGraphicAttribute>>;\n};\n\nexport type MarkLineAttrs = MarkerAttrs &\n  Omit<SegmentAttributes, 'state'> & {\n    type?: 'line';\n    /**\n     * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n     */\n    points: Point[] | Point[][];\n\n    /**\n     * 标签\n     */\n    label?: {\n      /**\n       * label 相对line的位置\n       */\n      position?: keyof typeof IMarkLineLabelPosition;\n      /**\n       * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n       * @default false\n       */\n      confine?: boolean;\n    } & IMarkRef &\n      IMarkLabel;\n\n    state?: MarkLineState;\n  } & BaseMarkerAnimation<MarkLineAnimationType>;\n\nexport type MarkAreaAttrs = MarkerAttrs & {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: Point[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IMarkAreaLabelPosition;\n    /**\n     * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n     * @default false\n     */\n    confine?: boolean;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n\n  state?: MarkAreaState;\n} & BaseMarkerAnimation<MarkAreaAnimationType>;\n\nexport type IItemContent = IMarkRef & {\n  /**\n   * 标注类型\n   * Tips: 保留'richText'与之前的定义做兼容\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: keyof typeof 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   * 'text'类型的ItemContent新增三种子类型：'text','rich','html'。配置在textStyle.type上，继承自TagAttributes。\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   * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n   * @default false\n   */\n  confine?: boolean;\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 type MarkPointAttrs = Omit<MarkerAttrs, 'labelStyle'> & {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: Point;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n\n  state?: MarkPointState;\n} & BaseMarkerAnimation<MarkPointAnimationType>;\n"]}
+{"version":3,"sources":["../src/marker/type.ts"],"names":[],"mappings":";;;AAYA,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-core';\nimport type { SegmentAttributes, SymbolAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\nimport type { Point } from '../core/type';\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 type IMarkLabel = Omit<TagAttributes, 'x' | 'y' | 'panel'> & {\n  /**\n   * 标签的背景面板配置\n   */\n  panel?: IMarkBackgroundAttributes;\n};\n\nexport type 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 type MarkerAttrs = 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   * 是否将组件在绘制区域内进行剪切\n   * @default true\n   */\n  clipInRange?: boolean;\n  /**\n   * 组件绘制范围配置\n   */\n  limitRect?: {\n    x: number;\n    y: number;\n    width: number;\n    height: number;\n  };\n};\n\nexport type MarkLineAttrs = MarkerAttrs &\n  SegmentAttributes & {\n    type?: 'line';\n    /**\n     * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n     */\n    points: Point[] | Point[][];\n\n    /**\n     * 标签\n     */\n    label?: {\n      /**\n       * label 相对line的位置\n       */\n      position?: keyof typeof IMarkLineLabelPosition;\n      /**\n       * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n       * @default false\n       */\n      confine?: boolean;\n    } & IMarkRef &\n      IMarkLabel;\n  };\n\nexport type MarkAreaAttrs = MarkerAttrs & {\n  type?: 'area';\n  /**\n   * 构成area的点\n   */\n  points: Point[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IMarkAreaLabelPosition;\n    /**\n     * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n     * @default false\n     */\n    confine?: boolean;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n};\n\nexport type IItemContent = IMarkRef & {\n  /**\n   * 标注类型\n   * Tips: 保留'richText'与之前的定义做兼容\n   */\n  type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';\n  position?: keyof typeof 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   * 'text'类型的ItemContent新增三种子类型：'text','rich','html'。配置在textStyle.type上，继承自TagAttributes。\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   * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n   * @default false\n   */\n  confine?: boolean;\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 type MarkPointAttrs = Omit<MarkerAttrs, 'labelStyle'> & {\n  /**\n   * markPoint的位置（也是path的起点）\n   */\n  position: Point;\n  /**\n   * 标注引导线\n   */\n  itemLine?: IItemLine;\n\n  /**\n   * 标注内容\n   */\n  itemContent?: IItemContent;\n};\n"]}

package/cjs/pager/pager.js

@@ -60,7 +60,7 @@ class Pager extends base_1.AbstractComponent {
         };
     }
     render() {
-        var _a, _b;
+        var _a, _b, _c;
         this._reset();
         const {layout: layout = "horizontal", handler: handler = DEFAULT_HANDLER_STYLE, total: total, defaultCurrent: defaultCurrent = 1, textStyle: textStyle, padding: padding = 0} = this.attribute;
         this._current = defaultCurrent;
@@ -84,7 +84,7 @@ class Pager extends base_1.AbstractComponent {
         const {width: maxTextWidth, height: maxTextHeight} = (0, util_1.measureTextSize)(this._getPageText(total), Object.assign({
             textAlign: "center",
             textBaseline: "middle"
-        }, textStyle), null === (_b = this.stage) || void 0 === _b ? void 0 : _b.getTheme().text.fontFamily), handlerSizeX = (0, 
+        }, textStyle), null === (_c = null === (_b = this.stage) || void 0 === _b ? void 0 : _b.getTheme()) || void 0 === _c ? void 0 : _c.text), handlerSizeX = (0, 
         vutils_1.isNumber)(handlerSize) ? handlerSize : handlerSize[0], handlerSizeY = (0, 
         vutils_1.isNumber)(handlerSize) ? handlerSize : handlerSize[1], text = vrender_core_1.graphicCreator.text(Object.assign({
             x: isHorizontal ? handlerSizeX / 2 + handlerSpace + maxTextWidth / 2 : 0,