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

package/cjs/marker/{cartesian/line.js → line.js}

@@ -2,80 +2,70 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.CartesianMarkLine = void 0;
+}), exports.MarkLine = void 0;
 
-const vutils_1 = require("@visactor/vutils"), type_1 = require("../type"), register_1 = require("../register"), base_line_1 = require("../base-line"), segment_1 = require("../../segment"), constant_1 = require("../../constant"), config_1 = require("../config");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("./type"), register_1 = require("./register"), common_line_1 = require("./common-line"), segment_1 = require("../segment"), constant_1 = require("../constant"), config_1 = require("./config");
 
-(0, register_1.loadCartesianMarkLineComponent)();
+(0, register_1.loadMarkLineComponent)();
 
-class CartesianMarkLine extends base_line_1.BaseMarkLine {
+class MarkLine extends common_line_1.MarkCommonLine {
     constructor(attributes, options) {
-        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, CartesianMarkLine.defaultAttributes, attributes)), 
-        this.name = "cartesianMarkLine";
+        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, MarkLine.defaultAttributes, attributes)), 
+        this.name = "markLine";
     }
-    isValidPoints() {
-        const {points: points} = this.attribute;
-        if (!points || points.length < 2) return !1;
-        let validFlag = !0;
-        return points.forEach((point => {
-            if (point.length) point.forEach((p => {
-                (0, vutils_1.isValidNumber)(p.x) && (0, vutils_1.isValidNumber)(p.y) || (validFlag = !1);
-            })); else if (!(0, vutils_1.isValidNumber)(point.x) || !(0, vutils_1.isValidNumber)(point.y)) return void (validFlag = !1);
-        })), validFlag;
-    }
-    getLabelOffsetByDirection(direction) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        const 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);
-        switch (direction) {
-          case type_1.ICartesianMarkLineLabelPosition.start:
+    getLabelOffsetByPosition(position) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        const labelRectHeight = Math.abs((null !== (_c = null === (_b = null === (_a = this._label.getTextShape()) || void 0 === _a ? void 0 : _a.AABBBounds) || void 0 === _b ? void 0 : _b.y2) && void 0 !== _c ? _c : 0) - (null !== (_e = null === (_d = this._label.getTextShape()) || void 0 === _d ? void 0 : _d.AABBBounds.y1) && void 0 !== _e ? _e : 0)), labelTextHeight = Math.abs((null !== (_h = null === (_g = null === (_f = this._label.getBgRect()) || void 0 === _f ? void 0 : _f.AABBBounds) || void 0 === _g ? void 0 : _g.y2) && void 0 !== _h ? _h : 0) - (null !== (_k = null === (_j = this._label.getBgRect()) || void 0 === _j ? void 0 : _j.AABBBounds.y1) && void 0 !== _k ? _k : 0)), labelHeight = Math.max(labelRectHeight, labelTextHeight), labelRectWidth = Math.abs((null !== (_o = null === (_m = null === (_l = this._label.getTextShape()) || void 0 === _l ? void 0 : _l.AABBBounds) || void 0 === _m ? void 0 : _m.x2) && void 0 !== _o ? _o : 0) - (null !== (_q = null === (_p = this._label.getTextShape()) || void 0 === _p ? void 0 : _p.AABBBounds.x1) && void 0 !== _q ? _q : 0)), labelTextWidth = Math.abs((null !== (_t = null === (_s = null === (_r = this._label.getBgRect()) || void 0 === _r ? void 0 : _r.AABBBounds) || void 0 === _s ? void 0 : _s.x2) && void 0 !== _t ? _t : 0) - (null !== (_v = null === (_u = this._label.getBgRect()) || void 0 === _u ? void 0 : _u.AABBBounds.x1) && void 0 !== _v ? _v : 0)), labelWidth = Math.max(labelRectWidth, labelTextWidth);
+        switch (position) {
+          case type_1.IMarkLineLabelPosition.start:
             return {
                 offsetX: -labelWidth / 2,
                 offsetY: 0
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideStartTop:
+          case type_1.IMarkLineLabelPosition.insideStartTop:
             return {
                 offsetX: labelWidth / 2,
                 offsetY: labelHeight / 2
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideStartBottom:
+          case type_1.IMarkLineLabelPosition.insideStartBottom:
             return {
                 offsetX: labelWidth / 2,
                 offsetY: -labelHeight / 2
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.middle:
+          case type_1.IMarkLineLabelPosition.middle:
             return {
                 offsetX: 0,
                 offsetY: 0
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideMiddleTop:
+          case type_1.IMarkLineLabelPosition.insideMiddleTop:
             return {
                 offsetX: 0,
                 offsetY: labelHeight / 2
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideMiddleBottom:
+          case type_1.IMarkLineLabelPosition.insideMiddleBottom:
             return {
                 offsetX: 0,
                 offsetY: -labelHeight / 2
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.end:
+          case type_1.IMarkLineLabelPosition.end:
             return {
                 offsetX: labelWidth / 2,
                 offsetY: 0
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideEndTop:
+          case type_1.IMarkLineLabelPosition.insideEndTop:
             return {
                 offsetX: -labelWidth / 2,
                 offsetY: labelHeight / 2
             };
 
-          case type_1.ICartesianMarkLineLabelPosition.insideEndBottom:
+          case type_1.IMarkLineLabelPosition.insideEndBottom:
             return {
                 offsetX: -labelWidth / 2,
                 offsetY: -labelHeight / 2
@@ -88,16 +78,16 @@ class CartesianMarkLine extends base_line_1.BaseMarkLine {
             };
         }
     }
-    getPositionByDirection(direction) {
+    getPointAttrByPosition(position) {
         var _a;
-        const {label: label = {}} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, points = this._line.getMainSegmentPoints(), labelAngle = null !== (_a = this._line.getEndAngle()) && void 0 !== _a ? _a : 0, totalRefX = refX + this.getLabelOffsetByDirection(direction).offsetX, totalRefY = refY + this.getLabelOffsetByDirection(direction).offsetY, labelOffsetX = totalRefX * Math.cos(labelAngle) + totalRefY * Math.cos(labelAngle - Math.PI / 2), labelOffsetY = totalRefX * Math.sin(labelAngle) + totalRefY * Math.sin(labelAngle - Math.PI / 2);
-        return direction.includes("start") || direction.includes("Start") ? {
+        const {label: label = {}} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, points = this._line.getMainSegmentPoints(), labelAngle = null !== (_a = this._line.getEndAngle()) && void 0 !== _a ? _a : 0, totalRefX = refX + this.getLabelOffsetByPosition(position).offsetX, totalRefY = refY + this.getLabelOffsetByPosition(position).offsetY, labelOffsetX = totalRefX * Math.cos(labelAngle) + totalRefY * Math.cos(labelAngle - Math.PI / 2), labelOffsetY = totalRefX * Math.sin(labelAngle) + totalRefY * Math.sin(labelAngle - Math.PI / 2);
+        return position.includes("start") || position.includes("Start") ? {
             position: {
                 x: points[0].x + labelOffsetX,
                 y: points[0].y + labelOffsetY
             },
             angle: labelAngle
-        } : direction.includes("middle") || direction.includes("Middle") ? {
+        } : position.includes("middle") || position.includes("Middle") ? {
             position: {
                 x: (points[0].x + points[points.length - 1].x) / 2 + labelOffsetX,
                 y: (points[0].y + points[points.length - 1].y) / 2 + labelOffsetY
@@ -111,13 +101,9 @@ class CartesianMarkLine extends base_line_1.BaseMarkLine {
             angle: labelAngle
         };
     }
-    setLabelPos() {
+    getRotateByAngle(angle) {
         var _a;
-        super.setLabelPos();
-        const {label: label = {}} = this.attribute, {position: position = "end", autoRotate: autoRotate = !0} = label, labelAttr = this.getPositionByDirection(position);
-        this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
-            angle: autoRotate ? labelAttr.angle + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0
-        }));
+        return angle + (null !== (_a = this.attribute.label.refAngle) && void 0 !== _a ? _a : 0);
     }
     createSegment() {
         const {points: points, startSymbol: startSymbol, endSymbol: endSymbol, lineStyle: lineStyle, mainSegmentIndex: mainSegmentIndex, multiSegment: multiSegment, state: state} = this.attribute;
@@ -147,7 +133,17 @@ class CartesianMarkLine extends base_line_1.BaseMarkLine {
             multiSegment: multiSegment
         });
     }
+    isValidPoints() {
+        const {points: points} = this.attribute;
+        if (!points || points.length < 2) return !1;
+        let validFlag = !0;
+        return points.forEach((point => {
+            if (point.length) point.forEach((p => {
+                (0, vutils_1.isValidNumber)(p.x) && (0, vutils_1.isValidNumber)(p.y) || (validFlag = !1);
+            })); else if (!(0, vutils_1.isValidNumber)(point.x) || !(0, vutils_1.isValidNumber)(point.y)) return void (validFlag = !1);
+        })), validFlag;
+    }
 }
 
-exports.CartesianMarkLine = CartesianMarkLine, CartesianMarkLine.defaultAttributes = config_1.DEFAULT_CARTESIAN_MARK_LINE_THEME;
+exports.MarkLine = MarkLine, MarkLine.defaultAttributes = config_1.DEFAULT_MARK_LINE_THEME;
 //# sourceMappingURL=line.js.map

package/cjs/marker/line.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/marker/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import { isValidNumber, merge } from '@visactor/vutils';\nimport { IMarkLineLabelPosition } from './type';\nimport type { MarkLineAttrs } from './type';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkLineComponent } from './register';\nimport type { Point } from '../core/type';\nimport { MarkCommonLine } from './common-line';\nimport type { ArcSegment } from '../segment';\n// eslint-disable-next-line no-duplicate-imports\nimport { Segment } from '../segment';\nimport { DEFAULT_STATES } from '../constant';\nimport { DEFAULT_MARK_LINE_THEME } from './config';\nimport type { ILineGraphicAttribute } from '@visactor/vrender-core';\n\nloadMarkLineComponent();\nexport class MarkLine extends MarkCommonLine<ILineGraphicAttribute, IMarkLineLabelPosition> {\n  name = 'markLine';\n  // eslint-disable-next-line max-len\n  static defaultAttributes: Partial<MarkLineAttrs> = DEFAULT_MARK_LINE_THEME as unknown as MarkLineAttrs;\n  protected _line!: Segment | ArcSegment;\n\n  constructor(attributes: MarkLineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkLine.defaultAttributes, attributes));\n  }\n\n  protected getLabelOffsetByPosition(position: IMarkLineLabelPosition) {\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    switch (position) {\n      case IMarkLineLabelPosition.start:\n        return {\n          offsetX: -labelWidth / 2,\n          offsetY: 0\n        };\n      case IMarkLineLabelPosition.insideStartTop:\n        return {\n          offsetX: labelWidth / 2,\n          offsetY: labelHeight / 2\n        };\n      case IMarkLineLabelPosition.insideStartBottom:\n        return {\n          offsetX: labelWidth / 2,\n          offsetY: -labelHeight / 2\n        };\n      case IMarkLineLabelPosition.middle:\n        return {\n          offsetX: 0,\n          offsetY: 0\n        };\n      case IMarkLineLabelPosition.insideMiddleTop:\n        return {\n          offsetX: 0,\n          offsetY: labelHeight / 2\n        };\n      case IMarkLineLabelPosition.insideMiddleBottom:\n        return {\n          offsetX: 0,\n          offsetY: -labelHeight / 2\n        };\n      case IMarkLineLabelPosition.end:\n        return {\n          offsetX: labelWidth / 2,\n          offsetY: 0\n        };\n      case IMarkLineLabelPosition.insideEndTop:\n        return {\n          offsetX: -labelWidth / 2,\n          offsetY: labelHeight / 2\n        };\n      case IMarkLineLabelPosition.insideEndBottom:\n        return {\n          offsetX: -labelWidth / 2,\n          offsetY: -labelHeight / 2\n        };\n      default: // default end\n        return {\n          offsetX: labelWidth / 2,\n          offsetY: 0\n        };\n    }\n  }\n\n  protected getPointAttrByPosition(position: IMarkLineLabelPosition) {\n    const { label = {} } = this.attribute;\n    const { refX = 0, refY = 0 } = label;\n    const points = this._line.getMainSegmentPoints();\n    const labelAngle = this._line.getEndAngle() ?? 0;\n\n    const totalRefX = refX + this.getLabelOffsetByPosition(position).offsetX;\n    const totalRefY = refY + this.getLabelOffsetByPosition(position).offsetY;\n\n    const labelOffsetX = totalRefX * Math.cos(labelAngle) + totalRefY * Math.cos(labelAngle - Math.PI / 2);\n    const labelOffsetY = totalRefX * Math.sin(labelAngle) + totalRefY * Math.sin(labelAngle - Math.PI / 2);\n\n    if (position.includes('start') || position.includes('Start')) {\n      return {\n        position: {\n          x: points[0].x + labelOffsetX,\n          y: points[0].y + labelOffsetY\n        },\n        angle: labelAngle\n      };\n    } else if (position.includes('middle') || position.includes('Middle')) {\n      return {\n        position: {\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        angle: labelAngle\n      };\n    }\n    return {\n      position: {\n        x: points[points.length - 1].x + labelOffsetX,\n        y: points[points.length - 1].y + labelOffsetY\n      },\n      angle: labelAngle\n    };\n  }\n\n  protected getRotateByAngle(angle: number): number {\n    return angle + (this.attribute.label.refAngle ?? 0);\n  }\n\n  protected createSegment() {\n    const { points, startSymbol, endSymbol, lineStyle, mainSegmentIndex, multiSegment, state } = this\n      .attribute as MarkLineAttrs;\n    return 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  }\n\n  protected setLineAttributes() {\n    const { points, startSymbol, endSymbol, 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\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/register.d.ts

@@ -1,6 +1,5 @@
-export declare function loadCartesianMarkLineComponent(): void;
-export declare function loadPolarMarkLineComponent(): void;
-export declare function loadPolarMarkArcLineComponent(): void;
-export declare function loadCartesianMarkAreaComponent(): void;
-export declare function loadPolarMarkAreaComponent(): void;
+export declare function loadMarkLineComponent(): void;
+export declare function loadMarkArcLineComponent(): void;
+export declare function loadMarkAreaComponent(): void;
+export declare function loadMarkArcAreaComponent(): void;
 export declare function loadMarkPointComponent(): void;

package/cjs/marker/register.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.loadMarkPointComponent = exports.loadPolarMarkAreaComponent = exports.loadCartesianMarkAreaComponent = exports.loadPolarMarkArcLineComponent = exports.loadPolarMarkLineComponent = exports.loadCartesianMarkLineComponent = void 0;
+}), exports.loadMarkPointComponent = exports.loadMarkArcAreaComponent = exports.loadMarkAreaComponent = exports.loadMarkArcLineComponent = exports.loadMarkLineComponent = void 0;
 
 const vrender_kits_1 = require("@visactor/vrender-kits"), register_1 = require("../tag/register"), register_2 = require("../segment/register");
 
@@ -10,23 +10,19 @@ function loadBaseMarker() {
     (0, vrender_kits_1.registerGroup)(), (0, register_1.loadTagComponent)();
 }
 
-function loadCartesianMarkLineComponent() {
+function loadMarkLineComponent() {
     loadBaseMarker(), (0, register_2.loadSegmentComponent)();
 }
 
-function loadPolarMarkLineComponent() {
-    loadBaseMarker(), (0, register_2.loadSegmentComponent)();
-}
-
-function loadPolarMarkArcLineComponent() {
+function loadMarkArcLineComponent() {
     loadBaseMarker(), (0, register_2.loadArcSegmentComponent)();
 }
 
-function loadCartesianMarkAreaComponent() {
+function loadMarkAreaComponent() {
     loadBaseMarker(), (0, vrender_kits_1.registerPolygon)();
 }
 
-function loadPolarMarkAreaComponent() {
+function loadMarkArcAreaComponent() {
     loadBaseMarker(), (0, vrender_kits_1.registerArc)();
 }
 
@@ -35,7 +31,7 @@ function loadMarkPointComponent() {
     (0, vrender_kits_1.registerImage)(), (0, vrender_kits_1.registerLine)();
 }
 
-exports.loadCartesianMarkLineComponent = loadCartesianMarkLineComponent, exports.loadPolarMarkLineComponent = loadPolarMarkLineComponent, 
-exports.loadPolarMarkArcLineComponent = loadPolarMarkArcLineComponent, exports.loadCartesianMarkAreaComponent = loadCartesianMarkAreaComponent, 
-exports.loadPolarMarkAreaComponent = loadPolarMarkAreaComponent, exports.loadMarkPointComponent = loadMarkPointComponent;
+exports.loadMarkLineComponent = loadMarkLineComponent, exports.loadMarkArcLineComponent = loadMarkArcLineComponent, 
+exports.loadMarkAreaComponent = loadMarkAreaComponent, exports.loadMarkArcAreaComponent = loadMarkArcAreaComponent, 
+exports.loadMarkPointComponent = loadMarkPointComponent;
 //# sourceMappingURL=register.js.map

package/cjs/marker/register.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/register.ts"],"names":[],"mappings":";;;AAAA,yDAOgC;AAChC,8CAAmD;AACnD,kDAAoF;AACpF,SAAS,cAAc;IACrB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAgB,GAAE,CAAC;AACrB,CAAC;AAED,SAAgB,8BAA8B;IAC5C,cAAc,EAAE,CAAC;IACjB,IAAA,+BAAoB,GAAE,CAAC;AACzB,CAAC;AAHD,wEAGC;AAED,SAAgB,0BAA0B;IACxC,cAAc,EAAE,CAAC;IACjB,IAAA,+BAAoB,GAAE,CAAC;AACzB,CAAC;AAHD,gEAGC;AAED,SAAgB,6BAA6B;IAC3C,cAAc,EAAE,CAAC;IACjB,IAAA,kCAAuB,GAAE,CAAC;AAC5B,CAAC;AAHD,sEAGC;AAED,SAAgB,8BAA8B;IAC5C,cAAc,EAAE,CAAC;IACjB,IAAA,8BAAe,GAAE,CAAC;AACpB,CAAC;AAHD,wEAGC;AAED,SAAgB,0BAA0B;IACxC,cAAc,EAAE,CAAC;IACjB,IAAA,0BAAW,GAAE,CAAC;AAChB,CAAC;AAHD,gEAGC;AAED,SAAgB,sBAAsB;IACpC,cAAc,EAAE,CAAC;IACjB,IAAA,+BAAoB,GAAE,CAAC;IACvB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;AACjB,CAAC;AAND,wDAMC","file":"register.js","sourcesContent":["import {\n  registerArc,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPolygon,\n  registerSymbol\n} from '@visactor/vrender-kits';\nimport { loadTagComponent } from '../tag/register';\nimport { loadArcSegmentComponent, loadSegmentComponent } from '../segment/register';\nfunction loadBaseMarker() {\n  registerGroup();\n  loadTagComponent();\n}\n\nexport function loadCartesianMarkLineComponent() {\n  loadBaseMarker();\n  loadSegmentComponent();\n}\n\nexport function loadPolarMarkLineComponent() {\n  loadBaseMarker();\n  loadSegmentComponent();\n}\n\nexport function loadPolarMarkArcLineComponent() {\n  loadBaseMarker();\n  loadArcSegmentComponent();\n}\n\nexport function loadCartesianMarkAreaComponent() {\n  loadBaseMarker();\n  registerPolygon();\n}\n\nexport function loadPolarMarkAreaComponent() {\n  loadBaseMarker();\n  registerArc();\n}\n\nexport function loadMarkPointComponent() {\n  loadBaseMarker();\n  loadSegmentComponent();\n  registerSymbol();\n  registerImage();\n  registerLine();\n}\n"]}
+{"version":3,"sources":["../src/marker/register.ts"],"names":[],"mappings":";;;AAAA,yDAOgC;AAChC,8CAAmD;AACnD,kDAAoF;AACpF,SAAS,cAAc;IACrB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAgB,GAAE,CAAC;AACrB,CAAC;AAED,SAAgB,qBAAqB;IACnC,cAAc,EAAE,CAAC;IACjB,IAAA,+BAAoB,GAAE,CAAC;AACzB,CAAC;AAHD,sDAGC;AAED,SAAgB,wBAAwB;IACtC,cAAc,EAAE,CAAC;IACjB,IAAA,kCAAuB,GAAE,CAAC;AAC5B,CAAC;AAHD,4DAGC;AAED,SAAgB,qBAAqB;IACnC,cAAc,EAAE,CAAC;IACjB,IAAA,8BAAe,GAAE,CAAC;AACpB,CAAC;AAHD,sDAGC;AAED,SAAgB,wBAAwB;IACtC,cAAc,EAAE,CAAC;IACjB,IAAA,0BAAW,GAAE,CAAC;AAChB,CAAC;AAHD,4DAGC;AAED,SAAgB,sBAAsB;IACpC,cAAc,EAAE,CAAC;IACjB,IAAA,+BAAoB,GAAE,CAAC;IACvB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;AACjB,CAAC;AAND,wDAMC","file":"register.js","sourcesContent":["import {\n  registerArc,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPolygon,\n  registerSymbol\n} from '@visactor/vrender-kits';\nimport { loadTagComponent } from '../tag/register';\nimport { loadArcSegmentComponent, loadSegmentComponent } from '../segment/register';\nfunction loadBaseMarker() {\n  registerGroup();\n  loadTagComponent();\n}\n\nexport function loadMarkLineComponent() {\n  loadBaseMarker();\n  loadSegmentComponent();\n}\n\nexport function loadMarkArcLineComponent() {\n  loadBaseMarker();\n  loadArcSegmentComponent();\n}\n\nexport function loadMarkAreaComponent() {\n  loadBaseMarker();\n  registerPolygon();\n}\n\nexport function loadMarkArcAreaComponent() {\n  loadBaseMarker();\n  registerArc();\n}\n\nexport function loadMarkPointComponent() {\n  loadBaseMarker();\n  loadSegmentComponent();\n  registerSymbol();\n  registerImage();\n  registerLine();\n}\n"]}

package/cjs/marker/type.d.ts

@@ -2,7 +2,7 @@ import type { EasingType, IArcGraphicAttribute, IGroup, IGroupGraphicAttribute,
 import type { CommonSegmentAttributes, ILineGraphicWithCornerRadius, SegmentAttributes, SymbolAttributes } from '../segment';
 import type { TagAttributes } from '../tag';
 import type { Point, State } from '../core/type';
-export declare enum ICartesianMarkLineLabelPosition {
+export declare enum IMarkLineLabelPosition {
     start = "start",
     middle = "middle",
     end = "end",
@@ -13,7 +13,7 @@ export declare enum ICartesianMarkLineLabelPosition {
     insideEndTop = "insideEndTop",
     insideEndBottom = "insideEndBottom"
 }
-export declare enum ICartesianMarkAreaLabelPosition {
+export declare enum IMarkAreaLabelPosition {
     left = "left",
     right = "right",
     top = "top",
@@ -24,7 +24,7 @@ export declare enum ICartesianMarkAreaLabelPosition {
     insideTop = "insideTop",
     insideBottom = "insideBottom"
 }
-export declare enum IPolarMarkLabelPosition {
+export declare enum IMarkCommonArcLabelPosition {
     arcInnerStart = "arcInnerStart",
     arcInnerEnd = "arcInnerEnd",
     arcInnerMiddle = "arcInnerMiddle",
@@ -56,7 +56,7 @@ export type IMarkRef = {
     refAngle?: number;
 };
 export type MarkerAttrs = IGroupGraphicAttribute & {
-    type?: 'cartesian-line' | 'polar-line' | 'polar-arc-line' | 'cartesian-area' | 'polar-area' | 'point';
+    type?: 'line' | 'arc-line' | 'area' | 'arc-area' | 'point';
     interactive?: boolean;
     select?: boolean;
     hover?: boolean;
@@ -87,20 +87,15 @@ export type MarkerExitAnimation = {
     delay?: number;
     easing?: EasingType;
 };
-export type CommonMarkLineState = {
-    line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[] | IArcGraphicAttribute>;
+export type CommonMarkLineState<LineAttr> = {
+    line?: State<LineAttr>;
     lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;
     lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;
     label?: State<Partial<ITextGraphicAttribute>>;
     labelBackground?: State<Partial<IRectGraphicAttribute>>;
 };
-export type CartesianMarkAreaState = {
-    area?: State<Partial<IPolygonGraphicAttribute>>;
-    label?: State<Partial<ITextGraphicAttribute>>;
-    labelBackground?: State<Partial<IRectGraphicAttribute>>;
-};
-export type PolarMarkAreaState = {
-    area?: State<Partial<IArcGraphicAttribute>>;
+export type CommonMarkAreaState<AreaAttr> = {
+    area?: State<Partial<AreaAttr>>;
     label?: State<Partial<ITextGraphicAttribute>>;
     labelBackground?: State<Partial<IRectGraphicAttribute>>;
 };
@@ -115,27 +110,22 @@ export type MarkPointState = {
     richText?: State<Partial<IRichTextGraphicAttribute>>;
     customMark?: State<Partial<IGroupGraphicAttribute>>;
 };
-export type CommonMarkLineAttrs<T> = MarkerAttrs & Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {
+export type CommonMarkLineAttrs<LineAttr, LineLabelPosition> = MarkerAttrs & Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {
     label?: {
-        position?: T;
+        position?: LineLabelPosition;
         confine?: boolean;
     } & IMarkRef & IMarkLabel;
-    state?: CommonMarkLineState;
+    state?: CommonMarkLineState<LineAttr>;
 } & BaseMarkerAnimation<CommonMarkLineAnimationType>;
-export type CartesianMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {
-    type?: 'cartesian-line';
+export type MarkLineAttrs = CommonMarkLineAttrs<ILineGraphicWithCornerRadius | ILineGraphicAttribute[], keyof typeof IMarkLineLabelPosition> & {
+    type?: 'line';
     multiSegment?: boolean;
     mainSegmentIndex?: number;
     points: Point[] | Point[][];
     lineStyle?: ILineGraphicAttribute;
 };
-export type PolarMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {
-    type?: 'polar-line';
-    points: Point[] | Point[][];
-    lineStyle?: ILineGraphicAttribute;
-};
-export type PolarMarkArcLineAttrs = CommonMarkLineAttrs<keyof typeof IPolarMarkLabelPosition> & {
-    type?: 'polar-arc-line';
+export type MarkArcLineAttrs = CommonMarkLineAttrs<IArcGraphicAttribute, keyof typeof IMarkCommonArcLabelPosition> & {
+    type?: 'arc-line';
     center: {
         x: number;
         y: number;
@@ -145,18 +135,18 @@ export type PolarMarkArcLineAttrs = CommonMarkLineAttrs<keyof typeof IPolarMarkL
     endAngle: number;
     lineStyle?: IArcGraphicAttribute;
 };
-export type CartesianMarkAreaAttrs = MarkerAttrs & {
-    type?: 'cartesian-area';
+export type MarkAreaAttrs = MarkerAttrs & {
+    type?: 'area';
     points: Point[];
     label?: {
-        position?: keyof typeof ICartesianMarkAreaLabelPosition;
+        position?: keyof typeof IMarkAreaLabelPosition;
         confine?: boolean;
     } & IMarkLabel;
     areaStyle?: IPolygonAttribute;
-    state?: CartesianMarkAreaState;
+    state?: CommonMarkAreaState<IPolygonGraphicAttribute>;
 } & BaseMarkerAnimation<CommonMarkAreaAnimationType>;
-export type PolarMarkAreaAttrs = MarkerAttrs & {
-    type?: 'polar-area';
+export type MarkArcAreaAttrs = MarkerAttrs & {
+    type?: 'arc-area';
     center: {
         x: number;
         y: number;
@@ -166,11 +156,11 @@ export type PolarMarkAreaAttrs = MarkerAttrs & {
     startAngle: number;
     endAngle: number;
     label?: {
-        position?: keyof typeof IPolarMarkLabelPosition;
+        position?: keyof typeof IMarkCommonArcLabelPosition;
         confine?: boolean;
     } & IMarkRef & IMarkLabel;
     areaStyle?: IArcGraphicAttribute;
-    state?: PolarMarkAreaState;
+    state?: CommonMarkAreaState<IArcGraphicAttribute>;
 } & BaseMarkerAnimation<CommonMarkAreaAnimationType>;
 export type IItemContent = IMarkRef & {
     type?: 'symbol' | 'text' | 'image' | 'richText' | 'custom';

package/cjs/marker/type.js

@@ -1,30 +1,29 @@
 "use strict";
 
-var ICartesianMarkLineLabelPosition, ICartesianMarkAreaLabelPosition, IPolarMarkLabelPosition, IMarkPointItemPosition;
+var IMarkLineLabelPosition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkPointItemPosition;
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.IMarkPointItemPosition = exports.IPolarMarkLabelPosition = exports.ICartesianMarkAreaLabelPosition = exports.ICartesianMarkLineLabelPosition = void 0, 
-function(ICartesianMarkLineLabelPosition) {
-    ICartesianMarkLineLabelPosition.start = "start", ICartesianMarkLineLabelPosition.middle = "middle", 
-    ICartesianMarkLineLabelPosition.end = "end", ICartesianMarkLineLabelPosition.insideStartTop = "insideStartTop", 
-    ICartesianMarkLineLabelPosition.insideStartBottom = "insideStartBottom", ICartesianMarkLineLabelPosition.insideMiddleTop = "insideMiddleTop", 
-    ICartesianMarkLineLabelPosition.insideMiddleBottom = "insideMiddleBottom", ICartesianMarkLineLabelPosition.insideEndTop = "insideEndTop", 
-    ICartesianMarkLineLabelPosition.insideEndBottom = "insideEndBottom";
-}(ICartesianMarkLineLabelPosition = exports.ICartesianMarkLineLabelPosition || (exports.ICartesianMarkLineLabelPosition = {})), 
-function(ICartesianMarkAreaLabelPosition) {
-    ICartesianMarkAreaLabelPosition.left = "left", ICartesianMarkAreaLabelPosition.right = "right", 
-    ICartesianMarkAreaLabelPosition.top = "top", ICartesianMarkAreaLabelPosition.bottom = "bottom", 
-    ICartesianMarkAreaLabelPosition.middle = "middle", ICartesianMarkAreaLabelPosition.insideLeft = "insideLeft", 
-    ICartesianMarkAreaLabelPosition.insideRight = "insideRight", ICartesianMarkAreaLabelPosition.insideTop = "insideTop", 
-    ICartesianMarkAreaLabelPosition.insideBottom = "insideBottom";
-}(ICartesianMarkAreaLabelPosition = exports.ICartesianMarkAreaLabelPosition || (exports.ICartesianMarkAreaLabelPosition = {})), 
-function(IPolarMarkLabelPosition) {
-    IPolarMarkLabelPosition.arcInnerStart = "arcInnerStart", IPolarMarkLabelPosition.arcInnerEnd = "arcInnerEnd", 
-    IPolarMarkLabelPosition.arcInnerMiddle = "arcInnerMiddle", IPolarMarkLabelPosition.arcOuterStart = "arcOuterStart", 
-    IPolarMarkLabelPosition.arcOuterEnd = "arcOuterEnd", IPolarMarkLabelPosition.arcOuterMiddle = "arcOuterMiddle", 
-    IPolarMarkLabelPosition.center = "center";
-}(IPolarMarkLabelPosition = exports.IPolarMarkLabelPosition || (exports.IPolarMarkLabelPosition = {})), 
+}), exports.IMarkPointItemPosition = exports.IMarkCommonArcLabelPosition = exports.IMarkAreaLabelPosition = exports.IMarkLineLabelPosition = void 0, 
+function(IMarkLineLabelPosition) {
+    IMarkLineLabelPosition.start = "start", IMarkLineLabelPosition.middle = "middle", 
+    IMarkLineLabelPosition.end = "end", IMarkLineLabelPosition.insideStartTop = "insideStartTop", 
+    IMarkLineLabelPosition.insideStartBottom = "insideStartBottom", IMarkLineLabelPosition.insideMiddleTop = "insideMiddleTop", 
+    IMarkLineLabelPosition.insideMiddleBottom = "insideMiddleBottom", IMarkLineLabelPosition.insideEndTop = "insideEndTop", 
+    IMarkLineLabelPosition.insideEndBottom = "insideEndBottom";
+}(IMarkLineLabelPosition = exports.IMarkLineLabelPosition || (exports.IMarkLineLabelPosition = {})), 
+function(IMarkAreaLabelPosition) {
+    IMarkAreaLabelPosition.left = "left", IMarkAreaLabelPosition.right = "right", IMarkAreaLabelPosition.top = "top", 
+    IMarkAreaLabelPosition.bottom = "bottom", IMarkAreaLabelPosition.middle = "middle", 
+    IMarkAreaLabelPosition.insideLeft = "insideLeft", IMarkAreaLabelPosition.insideRight = "insideRight", 
+    IMarkAreaLabelPosition.insideTop = "insideTop", IMarkAreaLabelPosition.insideBottom = "insideBottom";
+}(IMarkAreaLabelPosition = exports.IMarkAreaLabelPosition || (exports.IMarkAreaLabelPosition = {})), 
+function(IMarkCommonArcLabelPosition) {
+    IMarkCommonArcLabelPosition.arcInnerStart = "arcInnerStart", IMarkCommonArcLabelPosition.arcInnerEnd = "arcInnerEnd", 
+    IMarkCommonArcLabelPosition.arcInnerMiddle = "arcInnerMiddle", IMarkCommonArcLabelPosition.arcOuterStart = "arcOuterStart", 
+    IMarkCommonArcLabelPosition.arcOuterEnd = "arcOuterEnd", IMarkCommonArcLabelPosition.arcOuterMiddle = "arcOuterMiddle", 
+    IMarkCommonArcLabelPosition.center = "center";
+}(IMarkCommonArcLabelPosition = exports.IMarkCommonArcLabelPosition || (exports.IMarkCommonArcLabelPosition = {})), 
 function(IMarkPointItemPosition) {
     IMarkPointItemPosition.top = "top", IMarkPointItemPosition.bottom = "bottom", IMarkPointItemPosition.middle = "middle", 
     IMarkPointItemPosition.insideTop = "insideTop", IMarkPointItemPosition.insideBottom = "insideBottom", 

package/cjs/marker/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/type.ts"],"names":[],"mappings":";;;AAwBA,IAAY,+BAUX;AAVD,WAAY,+BAA+B;IACzC,kDAAe,CAAA;IACf,oDAAiB,CAAA;IACjB,8CAAW,CAAA;IACX,oEAAiC,CAAA;IACjC,0EAAuC,CAAA;IACvC,sEAAmC,CAAA;IACnC,4EAAyC,CAAA;IACzC,gEAA6B,CAAA;IAC7B,sEAAmC,CAAA;AACrC,CAAC,EAVW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAU1C;AAED,IAAY,+BAUX;AAVD,WAAY,+BAA+B;IACzC,gDAAa,CAAA;IACb,kDAAe,CAAA;IACf,8CAAW,CAAA;IACX,oDAAiB,CAAA;IACjB,oDAAiB,CAAA;IACjB,4DAAyB,CAAA;IACzB,8DAA2B,CAAA;IAC3B,0DAAuB,CAAA;IACvB,gEAA6B,CAAA;AAC/B,CAAC,EAVW,+BAA+B,GAA/B,uCAA+B,KAA/B,uCAA+B,QAU1C;AAED,IAAY,uBAQX;AARD,WAAY,uBAAuB;IACjC,0DAA+B,CAAA;IAC/B,sDAA2B,CAAA;IAC3B,4DAAiC,CAAA;IACjC,0DAA+B,CAAA;IAC/B,sDAA2B,CAAA;IAC3B,4DAAiC,CAAA;IACjC,4CAAiB,CAAA;AACnB,CAAC,EARW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAQlC;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  IArcGraphicAttribute,\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 {\n  ArcSegmentAttributes,\n  CommonSegmentAttributes,\n  ILineGraphicWithCornerRadius,\n  SegmentAttributes,\n  SymbolAttributes\n} from '../segment';\nimport type { TagAttributes } from '../tag';\nimport type { Point, State } from '../core/type';\n\nexport enum ICartesianMarkLineLabelPosition {\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 ICartesianMarkAreaLabelPosition {\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 IPolarMarkLabelPosition {\n  arcInnerStart = 'arcInnerStart',\n  arcInnerEnd = 'arcInnerEnd',\n  arcInnerMiddle = 'arcInnerMiddle',\n  arcOuterStart = 'arcOuterStart',\n  arcOuterEnd = 'arcOuterEnd',\n  arcOuterMiddle = 'arcOuterMiddle',\n  center = 'center'\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?: 'cartesian-line' | 'polar-line' | 'polar-arc-line' | 'cartesian-area' | 'polar-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 CommonMarkLineAnimationType = 'clipIn' | 'fadeIn';\n\nexport type CommonMarkAreaAnimationType = '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 CommonMarkLineState = {\n  line?: State<ILineGraphicWithCornerRadius | Partial<ILineGraphicAttribute>[] | IArcGraphicAttribute>;\n  lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  label?: State<Partial<ITextGraphicAttribute>>;\n  labelBackground?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type CartesianMarkAreaState = {\n  area?: State<Partial<IPolygonGraphicAttribute>>;\n  label?: State<Partial<ITextGraphicAttribute>>;\n  labelBackground?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type PolarMarkAreaState = {\n  area?: State<Partial<IArcGraphicAttribute>>;\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 CommonMarkLineAttrs<T> = MarkerAttrs &\n  Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {\n    /**\n     * 标签\n     */\n    label?: {\n      /**\n       * label 相对line的位置\n       */\n      position?: T;\n      /**\n       * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n       * @default false\n       */\n      confine?: boolean;\n    } & IMarkRef &\n      IMarkLabel;\n    state?: CommonMarkLineState;\n  } & BaseMarkerAnimation<CommonMarkLineAnimationType>;\n\nexport type CartesianMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {\n  type?: 'cartesian-line';\n  /**\n   * 是否对 points 进行多段处理，默认为 false，即直接将所有的点连接成线。\n   * 如果需要进行多段处理，需要将 points 属性配置为 Point[][] 类型\n   * @default false\n   */\n  multiSegment?: boolean;\n  /**\n   * 在 `multiSegment` 属性开启的前提下，用于声明那一段线段用来作为主线段，如果不声明，默认全段为主线段\n   */\n  mainSegmentIndex?: number;\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: Point[] | Point[][];\n  lineStyle?: ILineGraphicAttribute;\n};\n\nexport type PolarMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {\n  type?: 'polar-line';\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: Point[] | Point[][];\n  lineStyle?: ILineGraphicAttribute;\n};\n\nexport type PolarMarkArcLineAttrs = CommonMarkLineAttrs<keyof typeof IPolarMarkLabelPosition> & {\n  type?: 'polar-arc-line';\n  /**\n   * 弧线中心位置\n   */\n  center: {\n    x: number;\n    y: number;\n  };\n  /**\n   * 弧线半径\n   */\n  radius: number;\n  /**\n   * 弧线起始角度（弧度）\n   */\n  startAngle: number;\n  /**\n   * 弧线终点角度（弧度）\n   */\n  endAngle: number;\n  lineStyle?: IArcGraphicAttribute;\n};\n\nexport type CartesianMarkAreaAttrs = MarkerAttrs & {\n  type?: 'cartesian-area';\n  /**\n   * 构成area的点\n   */\n  points: Point[];\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof ICartesianMarkAreaLabelPosition;\n    /**\n     * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n     * @default false\n     */\n    confine?: boolean;\n  } & IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IPolygonAttribute;\n\n  state?: CartesianMarkAreaState;\n} & BaseMarkerAnimation<CommonMarkAreaAnimationType>;\n\nexport type PolarMarkAreaAttrs = MarkerAttrs & {\n  type?: 'polar-area';\n  /**\n   * 扇区中心位置\n   */\n  center: {\n    x: number;\n    y: number;\n  };\n  /**\n   * 扇区内半径\n   */\n  innerRadius: number;\n  /**\n   * 扇区外半径\n   */\n  outerRadius: number;\n  /**\n   * 扇区起始角度（弧度）\n   */\n  startAngle: number;\n  /**\n   * 扇区终点角度（弧度）\n   */\n  endAngle: number;\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IPolarMarkLabelPosition;\n    /**\n     * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n     * @default false\n     */\n    confine?: boolean;\n  } & IMarkRef &\n    IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IArcGraphicAttribute;\n\n  state?: PolarMarkAreaState;\n} & BaseMarkerAnimation<CommonMarkAreaAnimationType>;\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":";;;AAwBA,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,2BAQX;AARD,WAAY,2BAA2B;IACrC,8DAA+B,CAAA;IAC/B,0DAA2B,CAAA;IAC3B,gEAAiC,CAAA;IACjC,8DAA+B,CAAA;IAC/B,0DAA2B,CAAA;IAC3B,gEAAiC,CAAA;IACjC,gDAAiB,CAAA;AACnB,CAAC,EARW,2BAA2B,GAA3B,mCAA2B,KAA3B,mCAA2B,QAQtC;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  IArcGraphicAttribute,\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 {\n  ArcSegmentAttributes,\n  CommonSegmentAttributes,\n  ILineGraphicWithCornerRadius,\n  SegmentAttributes,\n  SymbolAttributes\n} 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 IMarkCommonArcLabelPosition {\n  arcInnerStart = 'arcInnerStart',\n  arcInnerEnd = 'arcInnerEnd',\n  arcInnerMiddle = 'arcInnerMiddle',\n  arcOuterStart = 'arcOuterStart',\n  arcOuterEnd = 'arcOuterEnd',\n  arcOuterMiddle = 'arcOuterMiddle',\n  center = 'center'\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' | 'arc-line' | 'area' | 'arc-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 CommonMarkLineAnimationType = 'clipIn' | 'fadeIn';\n\nexport type CommonMarkAreaAnimationType = '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 CommonMarkLineState<LineAttr> = {\n  line?: State<LineAttr>;\n  lineStartSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  lineEndSymbol?: State<Partial<ISymbolGraphicAttribute>>;\n  label?: State<Partial<ITextGraphicAttribute>>;\n  labelBackground?: State<Partial<IRectGraphicAttribute>>;\n};\n\nexport type CommonMarkAreaState<AreaAttr> = {\n  area?: State<Partial<AreaAttr>>;\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 CommonMarkLineAttrs<LineAttr, LineLabelPosition> = MarkerAttrs &\n  Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {\n    /**\n     * 标签\n     */\n    label?: {\n      /**\n       * label 相对line的位置\n       */\n      position?: LineLabelPosition;\n      /**\n       * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n       * @default false\n       */\n      confine?: boolean;\n    } & IMarkRef &\n      IMarkLabel;\n    state?: CommonMarkLineState<LineAttr>;\n  } & BaseMarkerAnimation<CommonMarkLineAnimationType>;\n\nexport type MarkLineAttrs = CommonMarkLineAttrs<\n  ILineGraphicWithCornerRadius | ILineGraphicAttribute[],\n  keyof typeof IMarkLineLabelPosition\n> & {\n  type?: 'line';\n  /**\n   * 是否对 points 进行多段处理，默认为 false，即直接将所有的点连接成线。\n   * 如果需要进行多段处理，需要将 points 属性配置为 Point[][] 类型\n   * @default false\n   */\n  multiSegment?: boolean;\n  /**\n   * 在 `multiSegment` 属性开启的前提下，用于声明那一段线段用来作为主线段，如果不声明，默认全段为主线段\n   */\n  mainSegmentIndex?: number;\n  /**\n   * 构成line的点: 如果是两个点，则为直线；多个点则为曲线\n   */\n  points: Point[] | Point[][];\n  lineStyle?: ILineGraphicAttribute;\n};\n\nexport type MarkArcLineAttrs = CommonMarkLineAttrs<IArcGraphicAttribute, keyof typeof IMarkCommonArcLabelPosition> & {\n  type?: 'arc-line';\n  /**\n   * 弧线中心位置\n   */\n  center: {\n    x: number;\n    y: number;\n  };\n  /**\n   * 弧线半径\n   */\n  radius: number;\n  /**\n   * 弧线起始角度（弧度）\n   */\n  startAngle: number;\n  /**\n   * 弧线终点角度（弧度）\n   */\n  endAngle: number;\n  lineStyle?: IArcGraphicAttribute;\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  state?: CommonMarkAreaState<IPolygonGraphicAttribute>;\n} & BaseMarkerAnimation<CommonMarkAreaAnimationType>;\n\nexport type MarkArcAreaAttrs = MarkerAttrs & {\n  type?: 'arc-area';\n  /**\n   * 扇区中心位置\n   */\n  center: {\n    x: number;\n    y: number;\n  };\n  /**\n   * 扇区内半径\n   */\n  innerRadius: number;\n  /**\n   * 扇区外半径\n   */\n  outerRadius: number;\n  /**\n   * 扇区起始角度（弧度）\n   */\n  startAngle: number;\n  /**\n   * 扇区终点角度（弧度）\n   */\n  endAngle: number;\n  /**\n   * 标签\n   */\n  label?: {\n    position?: keyof typeof IMarkCommonArcLabelPosition;\n    /**\n     * 当 mark 配置了 limitRect 之后，label 是否自动调整位置\n     * @default false\n     */\n    confine?: boolean;\n  } & IMarkRef &\n    IMarkLabel;\n  /**\n   * area的样式\n   */\n  areaStyle?: IArcGraphicAttribute;\n\n  state?: CommonMarkAreaState<IArcGraphicAttribute>;\n} & BaseMarkerAnimation<CommonMarkAreaAnimationType>;\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"]}

package/cjs/util/interaction.d.ts

@@ -0,0 +1,4 @@
+import type { FederatedPointerEvent, IGraphic, IGroup } from '@visactor/vrender-core';
+export declare const dispatchHoverState: (e: FederatedPointerEvent, container: IGroup, lastHover: IGraphic | null) => IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
+export declare const dispatchUnHoverState: (e: FederatedPointerEvent, container: IGroup, lastHover: IGraphic | null) => IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
+export declare const dispatchClickState: (e: FederatedPointerEvent, container: IGroup, lastSelect: IGraphic | null) => IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;

package/cjs/util/interaction.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.dispatchClickState = exports.dispatchUnHoverState = exports.dispatchHoverState = void 0;
+
+const constant_1 = require("../constant"), util_1 = require("../util"), vutils_1 = require("@visactor/vutils"), dispatchHoverState = (e, container, lastHover) => {
+    const target = e.target;
+    return target !== lastHover && target.name && !(0, vutils_1.isEmpty)(target.states) ? (target.addState(constant_1.StateValue.hover, !0), 
+    (0, util_1.traverseGroup)(container, (node => {
+        node !== target && node.name && !(0, vutils_1.isEmpty)(node.states) && node.addState(constant_1.StateValue.hoverReverse, !0);
+    })), target) : lastHover;
+};
+
+exports.dispatchHoverState = dispatchHoverState;
+
+const dispatchUnHoverState = (e, container, lastHover) => lastHover ? ((0, util_1.traverseGroup)(container, (node => {
+    node.name && !(0, vutils_1.isEmpty)(node.states) && (node.removeState(constant_1.StateValue.hoverReverse), 
+    node.removeState(constant_1.StateValue.hover));
+})), null) : lastHover;
+
+exports.dispatchUnHoverState = dispatchUnHoverState;
+
+const dispatchClickState = (e, container, lastSelect) => {
+    const target = e.target;
+    return lastSelect === target && target.hasState(constant_1.StateValue.selected) ? ((0, 
+    util_1.traverseGroup)(container, (node => {
+        node.name && !(0, vutils_1.isEmpty)(node.states) && (node.removeState(constant_1.StateValue.selectedReverse), 
+        node.removeState(constant_1.StateValue.selected));
+    })), null) : target.name && !(0, vutils_1.isEmpty)(target.states) ? (target.addState(constant_1.StateValue.selected, !0), 
+    (0, util_1.traverseGroup)(container, (node => {
+        node !== target && node.name && !(0, vutils_1.isEmpty)(node.states) && node.addState(constant_1.StateValue.selectedReverse, !0);
+    })), target) : lastSelect;
+};
+
+exports.dispatchClickState = dispatchClickState;
+//# sourceMappingURL=interaction.js.map

package/cjs/util/interaction.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/interaction.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,kCAAwC;AACxC,6CAA2C;AAEpC,MAAM,kBAAkB,GAAG,CAAC,CAAwB,EAAE,SAAiB,EAAE,SAA0B,EAAE,EAAE;IAC5G,MAAM,MAAM,GAAG,CAAC,CAAC,MAA6B,CAAC;IAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAClE,MAAM,CAAC,QAAQ,CAAC,qBAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxC,IAAA,oBAAa,EAAC,SAAS,EAAE,CAAC,IAAc,EAAE,EAAE;YAC1C,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACzD,IAAI,CAAC,QAAQ,CAAC,qBAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;KACf;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAZW,QAAA,kBAAkB,sBAY7B;AAEK,MAAM,oBAAoB,GAAG,CAAC,CAAwB,EAAE,SAAiB,EAAE,SAA0B,EAAE,EAAE;IAC9G,IAAI,SAAS,EAAE;QACb,IAAA,oBAAa,EAAC,SAAS,EAAE,CAAC,IAAc,EAAE,EAAE;YAC1C,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACtC,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,YAAY,CAAC,CAAC;gBAC1C,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,KAAK,CAAC,CAAC;aACpC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;KACb;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAXW,QAAA,oBAAoB,wBAW/B;AAEK,MAAM,kBAAkB,GAAG,CAAC,CAAwB,EAAE,SAAiB,EAAE,UAA2B,EAAE,EAAE;IAC7G,MAAM,MAAM,GAAG,CAAC,CAAC,MAA6B,CAAC;IAC/C,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,qBAAU,CAAC,QAAQ,CAAC,EAAE;QACjE,IAAA,oBAAa,EAAC,SAAS,EAAE,CAAC,IAAc,EAAE,EAAE;YAC1C,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACtC,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,eAAe,CAAC,CAAC;gBAC7C,IAAI,CAAC,WAAW,CAAC,qBAAU,CAAC,QAAQ,CAAC,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;KACb;IAED,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC1C,MAAM,CAAC,QAAQ,CAAC,qBAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3C,IAAA,oBAAa,EAAC,SAAS,EAAE,CAAC,IAAc,EAAE,EAAE;YAC1C,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBACzD,IAAI,CAAC,QAAQ,CAAC,qBAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;KACf;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B","file":"interaction.js","sourcesContent":["import type { FederatedPointerEvent, IGraphic, IGroup } from '@visactor/vrender-core';\nimport { StateValue } from '../constant';\nimport { traverseGroup } from '../util';\nimport { isEmpty } from '@visactor/vutils';\n\nexport const dispatchHoverState = (e: FederatedPointerEvent, container: IGroup, lastHover: IGraphic | null) => {\n  const target = e.target as unknown as IGraphic;\n  if (target !== lastHover && target.name && !isEmpty(target.states)) {\n    target.addState(StateValue.hover, true);\n    traverseGroup(container, (node: IGraphic) => {\n      if (node !== target && node.name && !isEmpty(node.states)) {\n        node.addState(StateValue.hoverReverse, true);\n      }\n    });\n    return target;\n  }\n  return lastHover;\n};\n\nexport const dispatchUnHoverState = (e: FederatedPointerEvent, container: IGroup, lastHover: IGraphic | null) => {\n  if (lastHover) {\n    traverseGroup(container, (node: IGraphic) => {\n      if (node.name && !isEmpty(node.states)) {\n        node.removeState(StateValue.hoverReverse);\n        node.removeState(StateValue.hover);\n      }\n    });\n    return null;\n  }\n  return lastHover;\n};\n\nexport const dispatchClickState = (e: FederatedPointerEvent, container: IGroup, lastSelect: IGraphic | null) => {\n  const target = e.target as unknown as IGraphic;\n  if (lastSelect === target && target.hasState(StateValue.selected)) {\n    traverseGroup(container, (node: IGraphic) => {\n      if (node.name && !isEmpty(node.states)) {\n        node.removeState(StateValue.selectedReverse);\n        node.removeState(StateValue.selected);\n      }\n    });\n    // 取消选中\n    return null;\n  }\n\n  if (target.name && !isEmpty(target.states)) {\n    target.addState(StateValue.selected, true);\n    traverseGroup(container, (node: IGraphic) => {\n      if (node !== target && node.name && !isEmpty(node.states)) {\n        node.addState(StateValue.selectedReverse, true);\n      }\n    });\n    return target;\n  }\n  return lastSelect;\n};\n"]}