@visactor/vrender-components 0.18.10-alpha.2 → 0.18.10-alpha.4

package/{cjs/marker/cartesian → es/marker}/area.d.ts

@@ -1,14 +1,14 @@
 import type { IGroup, IPolygon } from '@visactor/vrender-core';
-import { Tag } from '../../tag';
-import { Marker } from '../base';
-import type { CartesianMarkAreaAttrs } from '../type';
-import type { ComponentOptions } from '../../interface';
-export declare class CartesianMarkArea extends Marker<CartesianMarkAreaAttrs> {
+import { Tag } from '../tag';
+import { Marker } from './base';
+import type { IMarkAreaLabelPosition, MarkAreaAttrs } from './type';
+import type { ComponentOptions } from '../interface';
+export declare class MarkArea extends Marker<MarkAreaAttrs> {
     name: string;
     static defaultAttributes: {
         interactive: boolean;
         label: {
-            position: import("../type").ICartesianMarkAreaLabelPosition;
+            position: IMarkAreaLabelPosition;
             textStyle: {
                 fill: string;
                 stroke: string;
@@ -35,8 +35,8 @@ export declare class CartesianMarkArea extends Marker<CartesianMarkAreaAttrs> {
     private _area;
     getArea(): IPolygon;
     getLabel(): Tag;
-    constructor(attributes: CartesianMarkAreaAttrs, options?: ComponentOptions);
-    protected getPositionByDirection(direction: string): {
+    constructor(attributes: MarkAreaAttrs, options?: ComponentOptions);
+    protected getPointAttrByPosition(position: IMarkAreaLabelPosition): {
         x: number;
         y: number;
     };

package/es/marker/{cartesian/area.js → area.js}

@@ -2,21 +2,21 @@ import { graphicCreator } from "@visactor/vrender-core";
 
 import { isValidNumber, merge } from "@visactor/vutils";
 
-import { Tag } from "../../tag";
+import { Tag } from "../tag";
 
-import { Marker } from "../base";
+import { Marker } from "./base";
 
-import { DEFAULT_CARTESIAN_MARK_AREA_THEME } from "../config";
+import { DEFAULT_MARK_AREA_THEME } from "./config";
 
-import { limitShapeInBounds } from "../../util/limit-shape";
+import { limitShapeInBounds } from "../util/limit-shape";
 
-import { loadCartesianMarkAreaComponent } from "../register";
+import { loadMarkAreaComponent } from "./register";
 
-import { DEFAULT_STATES } from "../../constant";
+import { DEFAULT_STATES } from "../constant";
 
-loadCartesianMarkAreaComponent();
+loadMarkAreaComponent();
 
-export class CartesianMarkArea extends Marker {
+export class MarkArea extends Marker {
     getArea() {
         return this._area;
     }
@@ -24,24 +24,24 @@ export class CartesianMarkArea extends Marker {
         return this._label;
     }
     constructor(attributes, options) {
-        super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, CartesianMarkArea.defaultAttributes, attributes)), 
-        this.name = "cartesianMarkArea";
+        super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, MarkArea.defaultAttributes, attributes)), 
+        this.name = "markArea";
     }
-    getPositionByDirection(direction) {
+    getPointAttrByPosition(position) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
         const {x1: x1, x2: x2, y1: y1, y2: y2} = this._area.AABBBounds, labelRectHeight = Math.abs((null !== (_b = null === (_a = this._label.getTextShape().AABBBounds) || void 0 === _a ? void 0 : _a.y2) && void 0 !== _b ? _b : 0) - (null !== (_d = null === (_c = this._label.getTextShape()) || void 0 === _c ? void 0 : _c.AABBBounds.y1) && void 0 !== _d ? _d : 0)), labelTextHeight = Math.abs((null !== (_f = null === (_e = this._label.getBgRect().AABBBounds) || void 0 === _e ? void 0 : _e.y2) && void 0 !== _f ? _f : 0) - (null !== (_h = null === (_g = this._label.getBgRect()) || void 0 === _g ? void 0 : _g.AABBBounds.y1) && void 0 !== _h ? _h : 0)), labelHeight = Math.max(labelRectHeight, labelTextHeight), labelRectWidth = Math.abs((null !== (_k = null === (_j = this._label.getTextShape().AABBBounds) || void 0 === _j ? void 0 : _j.x2) && void 0 !== _k ? _k : 0) - (null !== (_m = null === (_l = this._label.getTextShape()) || void 0 === _l ? void 0 : _l.AABBBounds.x1) && void 0 !== _m ? _m : 0)), labelTextWidth = Math.abs((null !== (_p = null === (_o = this._label.getBgRect().AABBBounds) || void 0 === _o ? void 0 : _o.x2) && void 0 !== _p ? _p : 0) - (null !== (_r = null === (_q = this._label.getBgRect()) || void 0 === _q ? void 0 : _q.AABBBounds.x1) && void 0 !== _r ? _r : 0)), labelWidth = Math.max(labelRectWidth, labelTextWidth);
-        return direction.includes("left") || direction.includes("Left") ? {
-            x: x1 + (direction.includes("inside") ? .5 : -.5) * labelWidth,
+        return position.includes("left") || position.includes("Left") ? {
+            x: x1 + (position.includes("inside") ? .5 : -.5) * labelWidth,
             y: (y1 + y2) / 2
-        } : direction.includes("right") || direction.includes("Right") ? {
-            x: x2 + (direction.includes("inside") ? -.5 : .5) * labelWidth,
+        } : position.includes("right") || position.includes("Right") ? {
+            x: x2 + (position.includes("inside") ? -.5 : .5) * labelWidth,
             y: (y1 + y2) / 2
-        } : direction.includes("top") || direction.includes("Top") ? {
+        } : position.includes("top") || position.includes("Top") ? {
             x: (x1 + x2) / 2,
-            y: y1 + (direction.includes("inside") ? .5 : -.5) * labelHeight
-        } : direction.includes("bottom") || direction.includes("Bottom") ? {
+            y: y1 + (position.includes("inside") ? .5 : -.5) * labelHeight
+        } : position.includes("bottom") || position.includes("Bottom") ? {
             x: (x1 + x2) / 2,
-            y: y2 + (direction.includes("inside") ? -.5 : .5) * labelHeight
+            y: y2 + (position.includes("inside") ? -.5 : .5) * labelHeight
         } : {
             x: (x1 + x2) / 2,
             y: (y1 + y2) / 2
@@ -50,7 +50,7 @@ export class CartesianMarkArea extends Marker {
     setLabelPos() {
         var _a;
         if (this._label && this._area) {
-            const {label: label = {}} = this.attribute, labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle", labelPoint = this.getPositionByDirection(labelPosition);
+            const {label: label = {}} = this.attribute, labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle", labelPoint = this.getPointAttrByPosition(labelPosition);
             if (this._label.setAttributes(Object.assign({}, labelPoint)), this.attribute.limitRect && label.confine) {
                 const {x: x, y: y, width: width, height: height} = this.attribute.limitRect;
                 limitShapeInBounds(this._label, {
@@ -66,7 +66,7 @@ export class CartesianMarkArea extends Marker {
         const {points: points, label: label, areaStyle: areaStyle, state: state} = this.attribute, area = graphicCreator.polygon(Object.assign({
             points: points
         }, areaStyle));
-        area.states = merge({}, DEFAULT_STATES, null == state ? void 0 : state.area), area.name = "mark-polygon-polygon", 
+        area.states = merge({}, DEFAULT_STATES, null == state ? void 0 : state.area), area.name = "mark-area-polygon", 
         this._area = area, container.add(area);
         const markLabel = new Tag(Object.assign(Object.assign({}, label), {
             state: {
@@ -74,7 +74,7 @@ export class CartesianMarkArea extends Marker {
                 text: merge({}, DEFAULT_STATES, null == state ? void 0 : state.label)
             }
         }));
-        markLabel.name = "mark-polygon-label", this._label = markLabel, container.add(markLabel), 
+        markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), 
         this.setLabelPos();
     }
     updateMarker() {
@@ -96,5 +96,5 @@ export class CartesianMarkArea extends Marker {
     }
 }
 
-CartesianMarkArea.defaultAttributes = DEFAULT_CARTESIAN_MARK_AREA_THEME;
+MarkArea.defaultAttributes = DEFAULT_MARK_AREA_THEME;
 //# sourceMappingURL=area.js.map

package/es/marker/area.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/marker/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { IGroup, INode, IPolygon } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { isValidNumber, merge } from '@visactor/vutils';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport { Marker } from './base';\nimport { DEFAULT_MARK_AREA_THEME } from './config';\nimport type { IMarkAreaLabelPosition, MarkAreaAttrs } from './type';\nimport { limitShapeInBounds } from '../util/limit-shape';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkAreaComponent } from './register';\nimport type { Point } from '../core/type';\nimport { DEFAULT_STATES } from '../constant';\n\nloadMarkAreaComponent();\nexport class MarkArea extends Marker<MarkAreaAttrs> {\n  name = 'markArea';\n  static defaultAttributes = DEFAULT_MARK_AREA_THEME;\n  private _area!: IPolygon;\n  getArea() {\n    return this._area;\n  }\n\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: MarkAreaAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkArea.defaultAttributes, attributes));\n  }\n\n  protected getPointAttrByPosition(position: IMarkAreaLabelPosition) {\n    const { x1, x2, y1, y2 } = this._area.AABBBounds;\n    // labelHeight\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    const labelTextHeight = Math.abs(\n      (this._label.getBgRect().AABBBounds?.y2 ?? 0) - (this._label.getBgRect()?.AABBBounds.y1 ?? 0)\n    );\n    const labelHeight = Math.max(labelRectHeight, labelTextHeight);\n\n    // labelWidth\n    const labelRectWidth = Math.abs(\n      (this._label.getTextShape().AABBBounds?.x2 ?? 0) - (this._label.getTextShape()?.AABBBounds.x1 ?? 0)\n    );\n    const labelTextWidth = Math.abs(\n      (this._label.getBgRect().AABBBounds?.x2 ?? 0) - (this._label.getBgRect()?.AABBBounds.x1 ?? 0)\n    );\n    const labelWidth = Math.max(labelRectWidth, labelTextWidth);\n\n    if (position.includes('left') || position.includes('Left')) {\n      return {\n        x: x1 + (position.includes('inside') ? 0.5 : -0.5) * labelWidth,\n        y: (y1 + y2) / 2\n      };\n    }\n    if (position.includes('right') || position.includes('Right')) {\n      return {\n        x: x2 + (position.includes('inside') ? -0.5 : 0.5) * labelWidth,\n        y: (y1 + y2) / 2\n      };\n    }\n    if (position.includes('top') || position.includes('Top')) {\n      return {\n        x: (x1 + x2) / 2,\n        y: y1 + (position.includes('inside') ? 0.5 : -0.5) * labelHeight\n      };\n    }\n    if (position.includes('bottom') || position.includes('Bottom')) {\n      return {\n        x: (x1 + x2) / 2,\n        y: y2 + (position.includes('inside') ? -0.5 : 0.5) * labelHeight\n      };\n    }\n\n    return {\n      x: (x1 + x2) / 2,\n      y: (y1 + y2) / 2\n    };\n  }\n\n  protected setLabelPos() {\n    if (this._label && this._area) {\n      const { label = {} } = this.attribute as MarkAreaAttrs;\n      const labelPosition = label.position ?? 'middle';\n      const labelPoint = this.getPointAttrByPosition(labelPosition as IMarkAreaLabelPosition);\n      this._label.setAttributes({\n        ...labelPoint\n      });\n\n      if (this.attribute.limitRect && label.confine) {\n        const { x, y, width, height } = this.attribute.limitRect;\n        limitShapeInBounds(this._label, {\n          x1: x,\n          y1: y,\n          x2: x + width,\n          y2: y + height\n        });\n      }\n    }\n  }\n\n  protected initMarker(container: IGroup) {\n    const { points, label, areaStyle, state } = this.attribute as MarkAreaAttrs;\n    const area = graphicCreator.polygon({\n      points: points,\n      ...areaStyle\n    });\n    area.states = merge({}, DEFAULT_STATES, state?.area);\n    area.name = 'mark-area-polygon';\n    this._area = area;\n    container.add(area);\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-area-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { points, label, areaStyle } = this.attribute as MarkAreaAttrs;\n    if (this._area) {\n      this._area.setAttributes({\n        points: points,\n        ...areaStyle\n      });\n    }\n    if (this._area) {\n      this._label.setAttributes({\n        dx: 0,\n        dy: 0, // 需要进行复位\n        ...(label as TagAttributes)\n      });\n    }\n    this.setLabelPos();\n  }\n\n  protected isValidPoints() {\n    const { points } = this.attribute as MarkAreaAttrs;\n    if (!points || points.length < 3) {\n      return false;\n    }\n    let validFlag = true;\n    points.forEach((point: Point) => {\n      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/es/marker/base.d.ts

@@ -15,6 +15,7 @@ export declare abstract class Marker<T extends MarkerAttrs> extends AbstractComp
     protected abstract isValidPoints(): any;
     setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void;
     private _bindEvent;
+    private _releaseEvent;
     private _onHover;
     private _onUnHover;
     private _onClick;

package/es/marker/base.js

@@ -2,36 +2,16 @@ import { graphicCreator } from "@visactor/vrender-core";
 
 import { AbstractComponent } from "../core/base";
 
-import { StateValue } from "../constant";
-
-import { traverseGroup } from "../util";
-
-import { isEmpty } from "@visactor/vutils";
+import { dispatchClickState, dispatchHoverState, dispatchUnHoverState } from "../util/interaction";
 
 export class Marker extends AbstractComponent {
     constructor() {
         super(...arguments), this.name = "marker", this._onHover = e => {
-            const target = e.target;
-            target !== this._lastHover && target.name && !isEmpty(target.states) && (target.addState(StateValue.hover, !0), 
-            traverseGroup(this._container, (node => {
-                node !== target && node.name && !isEmpty(node.states) && node.addState(StateValue.hoverReverse, !0);
-            })), this._lastHover = target);
+            this._lastHover = dispatchHoverState(e, this._container, this._lastHover);
         }, this._onUnHover = e => {
-            this._lastHover && (traverseGroup(this._container, (node => {
-                node.name && !isEmpty(node.states) && (node.removeState(StateValue.hoverReverse), 
-                node.removeState(StateValue.hover));
-            })), this._lastHover = null);
+            this._lastHover = dispatchUnHoverState(e, this._container, this._lastHover);
         }, this._onClick = e => {
-            const target = e.target;
-            if (this._lastSelect === target && target.hasState(StateValue.selected)) return this._lastSelect = null, 
-            void traverseGroup(this._container, (node => {
-                node.name && !isEmpty(node.states) && (node.removeState(StateValue.selectedReverse), 
-                node.removeState(StateValue.selected));
-            }));
-            target.name && !isEmpty(target.states) && (target.addState(StateValue.selected, !0), 
-            traverseGroup(this._container, (node => {
-                node !== target && node.name && !isEmpty(node.states) && node.addState(StateValue.selectedReverse, !0);
-            })), this._lastSelect = target);
+            this._lastSelect = dispatchClickState(e, this._container, this._lastSelect);
         };
     }
     setAttribute(key, value, forceUpdateTag) {
@@ -45,6 +25,12 @@ export class Marker extends AbstractComponent {
         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));
     }
+    _releaseEvent() {
+        var _a, _b, _c;
+        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);
+    }
     _initContainer() {
         var _a, _b;
         const {limitRect: limitRect = {}, clipInRange: clipInRange} = this.attribute;
@@ -82,14 +68,10 @@ export class Marker extends 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();
+        this.removeAllChild(!0)), this._releaseEvent(), 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;
+        super.release(), this._releaseEvent(), this._container = null;
     }
 }
 //# sourceMappingURL=base.js.map

package/es/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 { 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';\nimport { dispatchClickState, dispatchHoverState, dispatchUnHoverState } from '../util/interaction';\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 _releaseEvent() {\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  }\n\n  private _onHover = (e: FederatedPointerEvent) => {\n    this._lastHover = dispatchHoverState(e, this._container, this._lastHover);\n  };\n\n  private _onUnHover = (e: FederatedPointerEvent) => {\n    this._lastHover = dispatchUnHoverState(e, this._container, this._lastHover);\n  };\n\n  private _onClick = (e: FederatedPointerEvent) => {\n    this._lastSelect = dispatchClickState(e, this._container, this._lastSelect);\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    // 先把之前的event都release掉，否则会重复触发\n    this._releaseEvent();\n    this._bindEvent();\n  }\n\n  release(): void {\n    super.release();\n    this._releaseEvent();\n    this._container = null;\n  }\n}\n"]}

package/es/marker/{base-line.d.ts → common-line.d.ts}

@@ -3,12 +3,13 @@ import type { ArcSegment, Segment } from '../segment';
 import { Tag } from '../tag';
 import type { CommonMarkLineAttrs } from './type';
 import { Marker } from './base';
-export declare abstract class BaseMarkLine<T> extends Marker<CommonMarkLineAttrs<T>> {
+export declare abstract class MarkCommonLine<LineAttr, LabelPosition> extends Marker<CommonMarkLineAttrs<LineAttr, LabelPosition>> {
     name: string;
     protected _line: Segment | ArcSegment;
     protected abstract createSegment(): any;
     protected abstract setLineAttributes(): any;
-    protected abstract getPositionByDirection(direction: any): any;
+    protected abstract getPointAttrByPosition(position: any): any;
+    protected abstract getRotateByAngle(angle: number): number;
     getLine(): Segment | ArcSegment;
     getLabel(): Tag;
     protected setLabelPos(): void;

package/es/marker/{base-line.js → common-line.js}

@@ -8,9 +8,9 @@ import { DEFAULT_STATES } from "../constant";
 
 import { Marker } from "./base";
 
-export class BaseMarkLine extends Marker {
+export class MarkCommonLine extends Marker {
     constructor() {
-        super(...arguments), this.name = "baseMarkLine";
+        super(...arguments), this.name = "markCommonLine";
     }
     getLine() {
         return this._line;
@@ -19,8 +19,10 @@ export class BaseMarkLine extends Marker {
         return this._label;
     }
     setLabelPos() {
-        const {label: label = {}, limitRect: limitRect} = this.attribute, {position: position = "end", refX: refX = 0, refY: refY = 0, confine: confine} = label, labelPoint = this.getPositionByDirection(position);
-        if (this._label.setAttributes(Object.assign({}, labelPoint)), limitRect && confine) {
+        const {label: label = {}, limitRect: limitRect} = this.attribute, {position: position, confine: confine, autoRotate: autoRotate = !0} = label, labelPoint = this.getPointAttrByPosition(position);
+        if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint.position), {
+            angle: autoRotate ? this.getRotateByAngle(labelPoint.angle) : 0
+        })), limitRect && confine) {
             const {x: x, y: y, width: width, height: height} = limitRect;
             limitShapeInBounds(this._label, {
                 x1: x,
@@ -32,14 +34,14 @@ export class BaseMarkLine extends Marker {
     }
     initMarker(container) {
         const {label: label, state: state} = this.attribute, line = this.createSegment();
-        line.name = "cartesian-mark-line-line", this._line = line, container.add(line);
+        line.name = "mark-common-line-line", this._line = line, container.add(line);
         const markLabel = new Tag(Object.assign(Object.assign({}, label), {
             state: {
                 panel: merge({}, DEFAULT_STATES, null == state ? void 0 : state.labelBackground),
                 text: merge({}, DEFAULT_STATES, null == state ? void 0 : state.label)
             }
         }));
-        markLabel.name = "cartesian-mark-line-label", this._label = markLabel, container.add(markLabel), 
+        markLabel.name = "mark-common-line-label", this._label = markLabel, container.add(markLabel), 
         this.setLabelPos();
     }
     updateMarker() {
@@ -50,4 +52,4 @@ export class BaseMarkLine extends Marker {
         }, label)), this.setLabelPos();
     }
 }
-//# sourceMappingURL=base-line.js.map
+//# sourceMappingURL=common-line.js.map

package/es/marker/common-line.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/marker/common-line.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAgB,cAAwC,SAAQ,MAErE;IAFD;;QAGE,SAAI,GAAG,gBAAgB,CAAC;IAsE1B,CAAC;IA7DC,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAES,WAAW;QACnB,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QACjD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,aAAa,iCACpB,UAAU,CAAC,QAAQ,KACtB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAC/D,CAAC;QACH,IAAI,SAAS,IAAI,OAAO,EAAE;YACxB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC1C,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC9B,EAAE,EAAE,CAAC;gBACL,EAAE,EAAE,CAAC;gBACL,EAAE,EAAE,CAAC,GAAG,KAAK;gBACb,EAAE,EAAE,CAAC,GAAG,MAAM;aACf,CAAC,CAAC;SACJ;IACH,CAAC;IAES,UAAU,CAAC,SAAiB;QACpC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAyD,CAAC;QACxF,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,SAAS,CAAC,GAAG,CAAC,IAAwB,CAAC,CAAC;QAExC,MAAM,SAAS,GAAG,IAAI,GAAG,iCACnB,KAAuB,KAC3B,KAAK,EAAE;gBACL,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,CAAC;gBACxD,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC;aAC9C,IACD,CAAC;QACH,SAAS,CAAC,IAAI,GAAG,wBAAwB,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,SAAS,CAAC,GAAG,CAAC,SAA6B,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAES,YAAY;QACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAyD,CAAC;QAEjF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,aAAa,iBACvB,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,IACD,KAAuB,EAC3B,CAAC;SACJ;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACF","file":"common-line.js","sourcesContent":["import type { IGroup, INode } from '@visactor/vrender-core';\nimport { merge } from '@visactor/vutils';\nimport type { ArcSegment, Segment } from '../segment';\nimport type { TagAttributes } from '../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../tag';\nimport type { CommonMarkLineAttrs } from './type';\nimport { limitShapeInBounds } from '../util/limit-shape';\nimport { DEFAULT_STATES } from '../constant';\nimport { Marker } from './base';\n\nexport abstract class MarkCommonLine<LineAttr, LabelPosition> extends Marker<\n  CommonMarkLineAttrs<LineAttr, LabelPosition>\n> {\n  name = 'markCommonLine';\n\n  protected _line!: Segment | ArcSegment;\n\n  protected abstract createSegment(): any;\n  protected abstract setLineAttributes(): any;\n  protected abstract getPointAttrByPosition(position: any): any;\n  protected abstract getRotateByAngle(angle: number): number;\n\n  getLine() {\n    return this._line;\n  }\n  getLabel() {\n    return this._label;\n  }\n\n  protected setLabelPos() {\n    const { label = {}, limitRect } = this.attribute;\n    const { position, confine, autoRotate = true } = label;\n    const labelPoint = this.getPointAttrByPosition(position);\n    this._label.setAttributes({\n      ...labelPoint.position,\n      angle: autoRotate ? this.getRotateByAngle(labelPoint.angle) : 0\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 { label, state } = this.attribute as CommonMarkLineAttrs<LineAttr, LabelPosition>;\n    const line = this.createSegment();\n    line.name = 'mark-common-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-common-line-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { label } = this.attribute as CommonMarkLineAttrs<LineAttr, LabelPosition>;\n\n    this.setLineAttributes();\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"]}

package/es/marker/config.d.ts

@@ -1,6 +1,6 @@
 import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';
-import { ICartesianMarkAreaLabelPosition, ICartesianMarkLineLabelPosition, IPolarMarkLabelPosition } from './type';
-export declare const DEFAULT_CARTESIAN_MARK_LINE_THEME: {
+import { IMarkAreaLabelPosition, IMarkLineLabelPosition, IMarkCommonArcLabelPosition } from './type';
+export declare const DEFAULT_MARK_LINE_THEME: {
     interactive: boolean;
     startSymbol: {
         visible: boolean;
@@ -17,7 +17,7 @@ export declare const DEFAULT_CARTESIAN_MARK_LINE_THEME: {
         lineWidth: number;
     };
     label: {
-        position: ICartesianMarkLineLabelPosition;
+        position: IMarkLineLabelPosition;
         refX: number;
         refY: number;
         refAngle: number;
@@ -45,7 +45,7 @@ export declare const DEFAULT_CARTESIAN_MARK_LINE_THEME: {
         lineDash: number[];
     };
 };
-export declare const DEFAULT_POLAR_MARK_LINE_THEME: {
+export declare const DEFAULT_MARK_ARC_LINE_THEME: {
     interactive: boolean;
     startSymbol: {
         visible: boolean;
@@ -62,7 +62,7 @@ export declare const DEFAULT_POLAR_MARK_LINE_THEME: {
         lineWidth: number;
     };
     label: {
-        position: IPolarMarkLabelPosition;
+        position: IMarkCommonArcLabelPosition;
         refX: number;
         refY: number;
         refAngle: number;
@@ -90,10 +90,10 @@ export declare const DEFAULT_POLAR_MARK_LINE_THEME: {
         lineDash: number[];
     };
 };
-export declare const DEFAULT_CARTESIAN_MARK_AREA_THEME: {
+export declare const DEFAULT_MARK_AREA_THEME: {
     interactive: boolean;
     label: {
-        position: ICartesianMarkAreaLabelPosition;
+        position: IMarkAreaLabelPosition;
         textStyle: {
             fill: string;
             stroke: string;
@@ -117,10 +117,10 @@ export declare const DEFAULT_CARTESIAN_MARK_AREA_THEME: {
         visible: boolean;
     };
 };
-export declare const DEFAULT_POLAR_MARK_AREA_THEME: {
+export declare const DEFAULT_MARK_ARC_AREA_THEME: {
     interactive: boolean;
     label: {
-        position: IPolarMarkLabelPosition;
+        position: IMarkCommonArcLabelPosition;
         textStyle: {
             fill: string;
             stroke: string;

package/es/marker/config.js

@@ -1,6 +1,6 @@
-import { ICartesianMarkAreaLabelPosition, ICartesianMarkLineLabelPosition, IPolarMarkLabelPosition } from "./type";
+import { IMarkAreaLabelPosition, IMarkLineLabelPosition, IMarkCommonArcLabelPosition } from "./type";
 
-export const DEFAULT_CARTESIAN_MARK_LINE_THEME = {
+export const DEFAULT_MARK_LINE_THEME = {
     interactive: !0,
     startSymbol: {
         visible: !1,
@@ -17,7 +17,7 @@ export const DEFAULT_CARTESIAN_MARK_LINE_THEME = {
         lineWidth: 0
     },
     label: {
-        position: ICartesianMarkLineLabelPosition.end,
+        position: IMarkLineLabelPosition.end,
         refX: 0,
         refY: 0,
         refAngle: 0,
@@ -46,7 +46,7 @@ export const DEFAULT_CARTESIAN_MARK_LINE_THEME = {
     }
 };
 
-export const DEFAULT_POLAR_MARK_LINE_THEME = {
+export const DEFAULT_MARK_ARC_LINE_THEME = {
     interactive: !0,
     startSymbol: {
         visible: !1,
@@ -63,7 +63,7 @@ export const DEFAULT_POLAR_MARK_LINE_THEME = {
         lineWidth: 0
     },
     label: {
-        position: IPolarMarkLabelPosition.arcOuterMiddle,
+        position: IMarkCommonArcLabelPosition.arcOuterMiddle,
         refX: 0,
         refY: 0,
         refAngle: 0,
@@ -92,10 +92,10 @@ export const DEFAULT_POLAR_MARK_LINE_THEME = {
     }
 };
 
-export const DEFAULT_CARTESIAN_MARK_AREA_THEME = {
+export const DEFAULT_MARK_AREA_THEME = {
     interactive: !0,
     label: {
-        position: ICartesianMarkAreaLabelPosition.right,
+        position: IMarkAreaLabelPosition.right,
         textStyle: {
             fill: "#fff",
             stroke: "#fff",
@@ -120,10 +120,10 @@ export const DEFAULT_CARTESIAN_MARK_AREA_THEME = {
     }
 };
 
-export const DEFAULT_POLAR_MARK_AREA_THEME = {
+export const DEFAULT_MARK_ARC_AREA_THEME = {
     interactive: !0,
     label: {
-        position: IPolarMarkLabelPosition.arcOuterMiddle,
+        position: IMarkCommonArcLabelPosition.arcOuterMiddle,
         textStyle: {
             fill: "#fff",
             stroke: "#fff",

package/es/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 { ICartesianMarkAreaLabelPosition, ICartesianMarkLineLabelPosition, IPolarMarkLabelPosition } from './type';\n\nexport const DEFAULT_CARTESIAN_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: ICartesianMarkLineLabelPosition.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      textAlign: 'center',\n      textBaseline: 'middle'\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_POLAR_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: IPolarMarkLabelPosition.arcOuterMiddle,\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      textAlign: 'center',\n      textBaseline: 'middle'\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_CARTESIAN_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: ICartesianMarkAreaLabelPosition.right,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\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_POLAR_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: IPolarMarkLabelPosition.arcOuterMiddle,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\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_CARTESIAN_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, IMarkCommonArcLabelPosition } 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      textAlign: 'center',\n      textBaseline: 'middle'\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_ARC_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: IMarkCommonArcLabelPosition.arcOuterMiddle,\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      textAlign: 'center',\n      textBaseline: 'middle'\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_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      textAlign: 'center',\n      textBaseline: 'middle'\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_ARC_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: IMarkCommonArcLabelPosition.arcOuterMiddle,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\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_CARTESIAN_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"]}

package/es/marker/index.d.ts

@@ -1,6 +1,6 @@
 export * from './type';
-export * from './cartesian/line';
-export * from './cartesian/area';
-export * from './polar/arc-line';
-export * from './polar/area';
+export * from './line';
+export * from './area';
+export * from './arc-line';
+export * from './arc-area';
 export * from './point';

package/es/marker/index.js

@@ -1,12 +1,12 @@
 export * from "./type";
 
-export * from "./cartesian/line";
+export * from "./line";
 
-export * from "./cartesian/area";
+export * from "./area";
 
-export * from "./polar/arc-line";
+export * from "./arc-line";
 
-export * from "./polar/area";
+export * from "./arc-area";
 
 export * from "./point";
 //# sourceMappingURL=index.js.map

package/es/marker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC","file":"index.js","sourcesContent":["export * from './type';\nexport * from './cartesian/line';\nexport * from './cartesian/area';\nexport * from './polar/arc-line';\n// export * from './polar/line';\nexport * from './polar/area';\nexport * from './point';\n"]}
+{"version":3,"sources":["../src/marker/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAE3B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC","file":"index.js","sourcesContent":["export * from './type';\nexport * from './line';\nexport * from './area';\nexport * from './arc-line';\n// export * from './polar/line';\nexport * from './arc-area';\nexport * from './point';\n"]}

package/es/marker/line.d.ts

@@ -0,0 +1,28 @@
+import { IMarkLineLabelPosition } from './type';
+import type { MarkLineAttrs } from './type';
+import type { ComponentOptions } from '../interface';
+import { MarkCommonLine } from './common-line';
+import type { ArcSegment } from '../segment';
+import { Segment } from '../segment';
+import type { ILineGraphicAttribute } from '@visactor/vrender-core';
+export declare class MarkLine extends MarkCommonLine<ILineGraphicAttribute, IMarkLineLabelPosition> {
+    name: string;
+    static defaultAttributes: Partial<MarkLineAttrs>;
+    protected _line: Segment | ArcSegment;
+    constructor(attributes: MarkLineAttrs, options?: ComponentOptions);
+    protected getLabelOffsetByPosition(position: IMarkLineLabelPosition): {
+        offsetX: number;
+        offsetY: number;
+    };
+    protected getPointAttrByPosition(position: IMarkLineLabelPosition): {
+        position: {
+            x: number;
+            y: number;
+        };
+        angle: number;
+    };
+    protected getRotateByAngle(angle: number): number;
+    protected createSegment(): Segment;
+    protected setLineAttributes(): void;
+    protected isValidPoints(): boolean;
+}