@visactor/vrender-components 0.18.10-alpha.1 → 0.18.10-alpha.3

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.18.10-alpha.1";
+export declare const version = "0.18.10-alpha.3";
 export * from './core/base';
 export * from './core/type';
 export * from './scrollbar';

package/cjs/index.js

@@ -17,7 +17,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.version = void 0, exports.version = "0.18.10-alpha.1", __exportStar(require("./core/base"), exports), 
+}), exports.version = void 0, exports.version = "0.18.10-alpha.3", __exportStar(require("./core/base"), exports), 
 __exportStar(require("./core/type"), exports), __exportStar(require("./scrollbar"), exports), 
 __exportStar(require("./tag"), exports), __exportStar(require("./poptip"), exports), 
 __exportStar(require("./crosshair"), exports), __exportStar(require("./label"), exports), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.18.10-alpha.1\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './util';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,yCAAuB","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.18.10-alpha.3\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './util';\n"]}

package/cjs/label/arc.d.ts

@@ -40,12 +40,12 @@ export declare class ArcLabel extends LabelBase<ArcLabelAttrs> {
     private _arcLeft;
     private _arcRight;
     constructor(attributes: ArcLabelAttrs, options?: ComponentOptions);
-    protected _overlapping(labels: (IText | IRichText)[]): (IRichText | IText)[];
+    protected _overlapping(labels: (IText | IRichText)[]): (IText | IRichText)[];
     protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): {
         x: number;
         y: number;
     } | undefined;
-    protected _layout(texts: (IText | IRichText)[]): (IRichText | IText)[];
+    protected _layout(texts: (IText | IRichText)[]): (IText | IRichText)[];
     protected layoutArcLabels(position: BaseLabelAttrs['position'], attribute: any, currentMarks?: IGraphic[], data?: LabelItem[], textBoundsArray?: any, ellipsisWidth?: number): ArcInfo[];
     private _layoutInsideLabels;
     private _layoutOutsideLabels;

package/cjs/label/base.d.ts

@@ -40,12 +40,12 @@ export declare class LabelBase<T extends BaseLabelAttrs> extends AbstractCompone
     private _onHover;
     private _onUnHover;
     private _onClick;
-    protected _createLabelText(attributes: LabelItem): IRichText | IText;
+    protected _createLabelText(attributes: LabelItem): IText | IRichText;
     private _prepare;
     protected getRelatedGraphic(item: LabelItem): IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;
     protected _initText(data?: LabelItem[]): (IText | IRichText)[];
     protected _layout(texts: (IText | IRichText)[]): (IText | IRichText)[];
-    protected _overlapping(labels: (IText | IRichText)[]): (IRichText | IText)[];
+    protected _overlapping(labels: (IText | IRichText)[]): (IText | IRichText)[];
     protected getBaseMarkGroup(): IGroup;
     protected getGraphicBounds(graphic?: IGraphic, point?: Partial<PointLocationCfg>, position?: string): IBoundsLike;
     protected _renderLabels(labels: (IText | IRichText)[]): void;

package/{es/marker/polar/area.d.ts → cjs/marker/arc-area.d.ts}

@@ -1,14 +1,14 @@
 import type { IArc, IGroup } from '@visactor/vrender-core';
-import { Tag } from '../../tag';
-import { Marker } from '../base';
-import { IPolarMarkAreaLabelPosition, type PolarMarkAreaAttrs } from '../type';
-import type { ComponentOptions } from '../../interface';
-export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
+import { Tag } from '../tag';
+import { Marker } from './base';
+import { IMarkCommonArcLabelPosition, type MarkArcAreaAttrs } from './type';
+import type { ComponentOptions } from '../interface';
+export declare class MarkArcArea extends Marker<MarkArcAreaAttrs> {
     name: string;
     static defaultAttributes: {
         interactive: boolean;
         label: {
-            position: IPolarMarkAreaLabelPosition;
+            position: IMarkCommonArcLabelPosition;
             textStyle: {
                 fill: string;
                 stroke: string;
@@ -17,7 +17,7 @@ export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
                 fontWeight: string;
                 fontStyle: string;
                 textAlign: string;
-                textBaseLine: string;
+                textBaseline: string;
             };
             padding: number[];
             panel: {
@@ -35,8 +35,14 @@ export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
     private _area;
     getArea(): IArc;
     getLabel(): Tag;
-    constructor(attributes: PolarMarkAreaAttrs, options?: ComponentOptions);
-    private _getPositionByDirection;
+    constructor(attributes: MarkArcAreaAttrs, options?: ComponentOptions);
+    protected getPositionByDirection(direction: string): {
+        position: {
+            x: number;
+            y: number;
+        };
+        angle: number;
+    };
     protected setLabelPos(): void;
     protected initMarker(container: IGroup): void;
     protected updateMarker(): void;

package/cjs/marker/arc-area.js

@@ -0,0 +1,123 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.MarkArcArea = void 0;
+
+const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), type_1 = require("./type"), limit_shape_1 = require("../util/limit-shape"), register_1 = require("./register"), constant_1 = require("../constant");
+
+(0, register_1.loadMarkArcAreaComponent)();
+
+class MarkArcArea extends base_1.Marker {
+    getArea() {
+        return this._area;
+    }
+    getLabel() {
+        return this._label;
+    }
+    constructor(attributes, options) {
+        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, MarkArcArea.defaultAttributes, attributes)), 
+        this.name = "polarMarkArea";
+    }
+    getPositionByDirection(direction) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const {center: center, innerRadius: innerRadius, outerRadius: outerRadius, startAngle: startAngle, endAngle: endAngle, label: label} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, 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);
+        let radius, angle, orthogonalOffsetDirection;
+        switch (direction) {
+          case type_1.IMarkCommonArcLabelPosition.center:
+            radius = (innerRadius + outerRadius) / 2, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 0;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerStart:
+            radius = innerRadius, angle = startAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterStart:
+            radius = outerRadius, angle = startAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerEnd:
+            radius = innerRadius, angle = endAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterEnd:
+            radius = outerRadius, angle = endAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerMiddle:
+            radius = innerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterMiddle:
+            radius = outerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 1;
+            break;
+
+          default:
+            radius = innerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+        }
+        return {
+            position: {
+                x: center.x + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.cos(angle) + refX * Math.cos(angle - Math.PI / 2),
+                y: center.y + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.sin(angle) + refX * Math.sin(angle - Math.PI / 2)
+            },
+            angle: angle
+        };
+    }
+    setLabelPos() {
+        var _a;
+        if (this._label && this._area) {
+            const {label: label = {}} = this.attribute, {position: labelPosition = "arcInnerMiddle", autoRotate: autoRotate = !0} = label, labelAttr = this.getPositionByDirection(labelPosition);
+            if (this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
+                angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0
+            })), this.attribute.limitRect && label.confine) {
+                const {x: x, y: y, width: width, height: height} = this.attribute.limitRect;
+                (0, limit_shape_1.limitShapeInBounds)(this._label, {
+                    x1: x,
+                    y1: y,
+                    x2: x + width,
+                    y2: y + height
+                });
+            }
+        }
+    }
+    initMarker(container) {
+        const {center: center, innerRadius: innerRadius, outerRadius: outerRadius, startAngle: startAngle, endAngle: endAngle, areaStyle: areaStyle, label: label, state: state} = this.attribute, area = vrender_core_1.graphicCreator.arc(Object.assign({
+            x: center.x,
+            y: center.y,
+            innerRadius: innerRadius,
+            outerRadius: outerRadius,
+            startAngle: startAngle,
+            endAngle: endAngle
+        }, areaStyle));
+        area.states = (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.area), 
+        area.name = "polar-mark-area-area", this._area = area, container.add(area);
+        const markLabel = new tag_1.Tag(Object.assign(Object.assign({}, label), {
+            state: {
+                panel: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.labelBackground),
+                text: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.label)
+            }
+        }));
+        markLabel.name = "mark-area-label", this._label = markLabel, container.add(markLabel), 
+        this.setLabelPos();
+    }
+    updateMarker() {
+        const {center: center, innerRadius: innerRadius, outerRadius: outerRadius, startAngle: startAngle, endAngle: endAngle, areaStyle: areaStyle, label: label} = this.attribute;
+        this._area && this._area.setAttributes(Object.assign({
+            x: center.x,
+            y: center.y,
+            innerRadius: innerRadius,
+            outerRadius: outerRadius,
+            startAngle: startAngle,
+            endAngle: endAngle
+        }, areaStyle)), this._area && this._label.setAttributes(Object.assign({
+            dx: 0,
+            dy: 0
+        }, label)), this.setLabelPos();
+    }
+    isValidPoints() {
+        return !0;
+    }
+}
+
+exports.MarkArcArea = MarkArcArea, MarkArcArea.defaultAttributes = config_1.DEFAULT_MARK_ARC_AREA_THEME;
+//# sourceMappingURL=arc-area.js.map

package/cjs/marker/arc-area.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/marker/arc-area.ts"],"names":[],"mappings":"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","file":"arc-area.js","sourcesContent":["import type { IArc, IGroup, INode } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { 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_ARC_AREA_THEME } from './config';\nimport { IMarkCommonArcLabelPosition, type MarkArcAreaAttrs } from './type';\nimport { limitShapeInBounds } from '../util/limit-shape';\nimport type { ComponentOptions } from '../interface';\nimport { loadMarkArcAreaComponent } from './register';\nimport { DEFAULT_STATES } from '../constant';\n\nloadMarkArcAreaComponent();\nexport class MarkArcArea extends Marker<MarkArcAreaAttrs> {\n  name = 'polarMarkArea';\n  static defaultAttributes = DEFAULT_MARK_ARC_AREA_THEME;\n  private _area!: IArc;\n\n  getArea() {\n    return this._area;\n  }\n\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: MarkArcAreaAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkArcArea.defaultAttributes, attributes));\n  }\n\n  protected getPositionByDirection(direction: string) {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, label } = this.attribute as MarkArcAreaAttrs;\n    const { refX = 0, refY = 0 } = label;\n    // eslint-disable-next-line max-len\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\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    let radius;\n    let angle;\n    // tag在正交方向是向内偏移，还是向外偏移\n    // 不偏移: 0, 内: -1, 外: 1\n    let orthogonalOffsetDirection;\n\n    switch (direction) {\n      case IMarkCommonArcLabelPosition.center:\n        radius = (innerRadius + outerRadius) / 2;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 0;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerStart:\n        radius = innerRadius;\n        angle = startAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterStart:\n        radius = outerRadius;\n        angle = startAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerEnd:\n        radius = innerRadius;\n        angle = endAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterEnd:\n        radius = outerRadius;\n        angle = endAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerMiddle:\n        radius = innerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterMiddle:\n        radius = outerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 1;\n        break;\n      default: // default arcInnerMiddle\n        radius = innerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n    }\n\n    return {\n      position: {\n        x:\n          center.x +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.cos(angle) +\n          refX * Math.cos(angle - Math.PI / 2),\n        y:\n          center.y +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.sin(angle) +\n          refX * Math.sin(angle - Math.PI / 2)\n      },\n      angle\n    };\n  }\n\n  protected setLabelPos() {\n    if (this._label && this._area) {\n      const { label = {} } = this.attribute as MarkArcAreaAttrs;\n      const { position: labelPosition = 'arcInnerMiddle', autoRotate = true } = label;\n      const labelAttr = this.getPositionByDirection(labelPosition);\n\n      this._label.setAttributes({\n        ...labelAttr.position,\n        angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (label.refAngle ?? 0) : 0\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 { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label, state } = this\n      .attribute as MarkArcAreaAttrs;\n    const area = graphicCreator.arc({\n      x: center.x,\n      y: center.y,\n      innerRadius,\n      outerRadius,\n      startAngle,\n      endAngle,\n      ...areaStyle\n    });\n    area.states = merge({}, DEFAULT_STATES, state?.area);\n    area.name = 'polar-mark-area-area';\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 { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label } = this\n      .attribute as MarkArcAreaAttrs;\n    if (this._area) {\n      this._area.setAttributes({\n        x: center.x,\n        y: center.y,\n        innerRadius,\n        outerRadius,\n        startAngle,\n        endAngle,\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    return true;\n  }\n}\n"]}

package/cjs/marker/arc-line.d.ts

@@ -0,0 +1,23 @@
+import { ArcSegment } from '../segment';
+import { BaseMarkLine } from './base-line';
+import type { ComponentOptions } from '../interface';
+import type { IArcGraphicAttribute } from '@visactor/vrender-core';
+import { IMarkCommonArcLabelPosition } from './type';
+import type { MarkArcLineAttrs } from './type';
+export declare class MarkArcLine extends BaseMarkLine<IArcGraphicAttribute, IMarkCommonArcLabelPosition> {
+    name: string;
+    static defaultAttributes: Partial<MarkArcLineAttrs>;
+    protected _line: ArcSegment;
+    constructor(attributes: MarkArcLineAttrs, options?: ComponentOptions);
+    protected isValidPoints(): boolean;
+    protected getPositionByDirection(direction: IMarkCommonArcLabelPosition): {
+        position: {
+            x: number;
+            y: number;
+        };
+        angle: number;
+    };
+    protected setLabelPos(): void;
+    protected createSegment(): ArcSegment;
+    protected setLineAttributes(): void;
+}

package/cjs/marker/arc-line.js

@@ -0,0 +1,103 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.MarkArcLine = void 0;
+
+const vutils_1 = require("@visactor/vutils"), segment_1 = require("../segment"), register_1 = require("./register"), constant_1 = require("../constant"), base_line_1 = require("./base-line"), type_1 = require("./type"), config_1 = require("./config");
+
+(0, register_1.loadMarkArcLineComponent)();
+
+class MarkArcLine extends base_line_1.BaseMarkLine {
+    constructor(attributes, options) {
+        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, MarkArcLine.defaultAttributes, attributes)), 
+        this.name = "polarMarkArcLine";
+    }
+    isValidPoints() {
+        return !0;
+    }
+    getPositionByDirection(direction) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const {center: center, radius: radius, startAngle: startAngle, endAngle: endAngle, label: label} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, 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);
+        let angle, orthogonalOffsetDirection;
+        switch (direction) {
+          case type_1.IMarkCommonArcLabelPosition.center:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 0;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerStart:
+            angle = startAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterStart:
+            angle = startAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerEnd:
+            angle = endAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterEnd:
+            angle = endAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcInnerMiddle:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IMarkCommonArcLabelPosition.arcOuterMiddle:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 1;
+            break;
+
+          default:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+        }
+        return {
+            position: {
+                x: center.x + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.cos(angle) + refX * Math.cos(angle - Math.PI / 2),
+                y: center.y + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.sin(angle) + refX * Math.sin(angle - Math.PI / 2)
+            },
+            angle: angle
+        };
+    }
+    setLabelPos() {
+        var _a;
+        super.setLabelPos();
+        const {label: label = {}} = this.attribute, {position: position = "arcInnerMiddle", autoRotate: autoRotate = !0} = label, labelAttr = this.getPositionByDirection(position);
+        this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
+            angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0
+        }));
+    }
+    createSegment() {
+        const {center: center, radius: radius, startAngle: startAngle, endAngle: endAngle, startSymbol: startSymbol, endSymbol: endSymbol, lineStyle: lineStyle, state: state} = this.attribute;
+        return new segment_1.ArcSegment({
+            center: center,
+            radius: radius,
+            startAngle: startAngle,
+            endAngle: endAngle,
+            startSymbol: startSymbol,
+            endSymbol: endSymbol,
+            lineStyle: lineStyle,
+            state: {
+                line: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.line),
+                startSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineStartSymbol),
+                endSymbol: (0, vutils_1.merge)({}, constant_1.DEFAULT_STATES, null == state ? void 0 : state.lineEndSymbol)
+            }
+        });
+    }
+    setLineAttributes() {
+        const {center: center, radius: radius, startAngle: startAngle, endAngle: endAngle, startSymbol: startSymbol, endSymbol: endSymbol, lineStyle: lineStyle} = this.attribute;
+        this._line && this._line.setAttributes({
+            center: center,
+            radius: radius,
+            startAngle: startAngle,
+            endAngle: endAngle,
+            startSymbol: startSymbol,
+            endSymbol: endSymbol,
+            lineStyle: lineStyle
+        });
+    }
+}
+
+exports.MarkArcLine = MarkArcLine, MarkArcLine.defaultAttributes = config_1.DEFAULT_MARK_ARC_LINE_THEME;
+//# sourceMappingURL=arc-line.js.map

package/cjs/marker/arc-line.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/marker/arc-line.ts"],"names":[],"mappings":"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","file":"arc-line.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { ArcSegment } from '../segment';\nimport { loadMarkArcLineComponent } from './register';\nimport { DEFAULT_STATES } from '../constant';\nimport { BaseMarkLine } from './base-line';\nimport type { ComponentOptions } from '../interface';\nimport type { IArcGraphicAttribute } from '@visactor/vrender-core';\nimport { IMarkCommonArcLabelPosition } from './type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { MarkArcLineAttrs } from './type';\nimport { DEFAULT_MARK_ARC_LINE_THEME } from './config';\n\nloadMarkArcLineComponent();\nexport class MarkArcLine extends BaseMarkLine<IArcGraphicAttribute, IMarkCommonArcLabelPosition> {\n  name = 'polarMarkArcLine';\n  // eslint-disable-next-line max-len\n  static defaultAttributes: Partial<MarkArcLineAttrs> = DEFAULT_MARK_ARC_LINE_THEME as unknown as MarkArcLineAttrs;\n  protected _line!: ArcSegment;\n\n  constructor(attributes: MarkArcLineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, MarkArcLine.defaultAttributes, attributes));\n  }\n\n  protected isValidPoints() {\n    return true;\n  }\n\n  protected getPositionByDirection(direction: IMarkCommonArcLabelPosition) {\n    const { center, radius, startAngle, endAngle, label } = this.attribute as MarkArcLineAttrs;\n    const { refX = 0, refY = 0 } = label;\n    // eslint-disable-next-line max-len\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\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    let angle;\n    // tag在正交方向是向内偏移，还是向外偏移\n    // 不偏移: 0, 内: -1, 外: 1\n    let orthogonalOffsetDirection;\n\n    switch (direction) {\n      case IMarkCommonArcLabelPosition.center:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 0;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerStart:\n        angle = startAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterStart:\n        angle = startAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerEnd:\n        angle = endAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterEnd:\n        angle = endAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IMarkCommonArcLabelPosition.arcInnerMiddle:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IMarkCommonArcLabelPosition.arcOuterMiddle:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 1;\n        break;\n      default: // default arcInnerMiddle\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n    }\n\n    return {\n      position: {\n        x:\n          center.x +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.cos(angle) +\n          refX * Math.cos(angle - Math.PI / 2),\n        y:\n          center.y +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.sin(angle) +\n          refX * Math.sin(angle - Math.PI / 2)\n      },\n      angle\n    };\n  }\n\n  protected setLabelPos(): void {\n    super.setLabelPos();\n    const { label = {} } = this.attribute as MarkArcLineAttrs;\n    const { position = 'arcInnerMiddle', autoRotate = true } = label;\n    const labelAttr = this.getPositionByDirection(position as any);\n    this._label.setAttributes({\n      ...labelAttr.position,\n      angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (label.refAngle ?? 0) : 0\n    });\n  }\n\n  protected createSegment() {\n    const { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle, state } = this\n      .attribute as MarkArcLineAttrs;\n    return new ArcSegment({\n      center,\n      radius,\n      startAngle,\n      endAngle,\n      startSymbol,\n      endSymbol,\n      lineStyle,\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 { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle } = this\n      .attribute as MarkArcLineAttrs;\n    if (this._line) {\n      (this._line as any).setAttributes({\n        center,\n        radius,\n        startAngle,\n        endAngle,\n        startSymbol,\n        endSymbol,\n        lineStyle\n      });\n    }\n  }\n}\n"]}

package/cjs/marker/{cartesian/area.d.ts → 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 { 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: import("./type").IMarkAreaLabelPosition;
             textStyle: {
                 fill: string;
                 stroke: string;
@@ -16,6 +16,8 @@ export declare class CartesianMarkArea extends Marker<CartesianMarkAreaAttrs> {
                 fontSize: number;
                 fontWeight: string;
                 fontStyle: string;
+                textAlign: string;
+                textBaseline: string;
             };
             padding: number[];
             panel: {
@@ -33,8 +35,11 @@ export declare class CartesianMarkArea extends Marker<CartesianMarkAreaAttrs> {
     private _area;
     getArea(): IPolygon;
     getLabel(): Tag;
-    constructor(attributes: CartesianMarkAreaAttrs, options?: ComponentOptions);
-    private _getPositionByDirection;
+    constructor(attributes: MarkAreaAttrs, options?: ComponentOptions);
+    protected getPositionByDirection(direction: string): {
+        x: number;
+        y: number;
+    };
     protected setLabelPos(): void;
     protected initMarker(container: IGroup): void;
     protected updateMarker(): void;

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

@@ -2,13 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.CartesianMarkArea = void 0;
+}), exports.MarkArea = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), tag_1 = require("../../tag"), base_1 = require("../base"), config_1 = require("../config"), limit_shape_1 = require("../../util/limit-shape"), register_1 = require("../register"), constant_1 = require("../../constant");
+const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), tag_1 = require("../tag"), base_1 = require("./base"), config_1 = require("./config"), limit_shape_1 = require("../util/limit-shape"), register_1 = require("./register"), constant_1 = require("../constant");
 
-(0, register_1.loadCartesianMarkAreaComponent)();
+(0, register_1.loadMarkAreaComponent)();
 
-class CartesianMarkArea extends base_1.Marker {
+class MarkArea extends base_1.Marker {
     getArea() {
         return this._area;
     }
@@ -16,23 +16,24 @@ class CartesianMarkArea extends base_1.Marker {
         return this._label;
     }
     constructor(attributes, options) {
-        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, CartesianMarkArea.defaultAttributes, attributes)), 
-        this.name = "cartesianMarkArea";
+        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, MarkArea.defaultAttributes, attributes)), 
+        this.name = "markArea";
     }
-    _getPositionByDirection(area, direction) {
-        const {x1: x1, x2: x2, y1: y1, y2: y2} = this._area.AABBBounds;
+    getPositionByDirection(direction) {
+        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,
+            x: x1 + (direction.includes("inside") ? .5 : -.5) * labelWidth,
             y: (y1 + y2) / 2
         } : direction.includes("right") || direction.includes("Right") ? {
-            x: x2,
+            x: x2 + (direction.includes("inside") ? -.5 : .5) * labelWidth,
             y: (y1 + y2) / 2
         } : direction.includes("top") || direction.includes("Top") ? {
             x: (x1 + x2) / 2,
-            y: y1
+            y: y1 + (direction.includes("inside") ? .5 : -.5) * labelHeight
         } : direction.includes("bottom") || direction.includes("Bottom") ? {
             x: (x1 + x2) / 2,
-            y: y2
+            y: y2 + (direction.includes("inside") ? -.5 : .5) * labelHeight
         } : {
             x: (x1 + x2) / 2,
             y: (y1 + y2) / 2
@@ -41,10 +42,8 @@ class CartesianMarkArea extends base_1.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(this._area, labelPosition);
-            if (this._label.setAttributes(Object.assign(Object.assign({}, labelPoint), {
-                textStyle: Object.assign(Object.assign({}, config_1.DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP[labelPosition]), label.textStyle)
-            })), this.attribute.limitRect && label.confine) {
+            const {label: label = {}} = this.attribute, labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle", labelPoint = this.getPositionByDirection(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;
                 (0, limit_shape_1.limitShapeInBounds)(this._label, {
                     x1: x,
@@ -89,5 +88,5 @@ class CartesianMarkArea extends base_1.Marker {
     }
 }
 
-exports.CartesianMarkArea = CartesianMarkArea, CartesianMarkArea.defaultAttributes = config_1.DEFAULT_CARTESIAN_MARK_AREA_THEME;
+exports.MarkArea = MarkArea, MarkArea.defaultAttributes = config_1.DEFAULT_MARK_AREA_THEME;
 //# sourceMappingURL=area.js.map

package/cjs/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 { 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 getPositionByDirection(direction: string) {\n    const { x1, x2, y1, y2 } = this._area.AABBBounds;\n    // labelHeight\n    // eslint-disable-next-line max-len\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\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    // eslint-disable-next-line max-len\n    const labelRectWidth = Math.abs(\n      (this._label.getTextShape().AABBBounds?.x2 ?? 0) - (this._label.getTextShape()?.AABBBounds.x1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\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 (direction.includes('left') || direction.includes('Left')) {\n      return {\n        x: x1 + (direction.includes('inside') ? 0.5 : -0.5) * labelWidth,\n        y: (y1 + y2) / 2\n      };\n    }\n    if (direction.includes('right') || direction.includes('Right')) {\n      return {\n        x: x2 + (direction.includes('inside') ? -0.5 : 0.5) * labelWidth,\n        y: (y1 + y2) / 2\n      };\n    }\n    if (direction.includes('top') || direction.includes('Top')) {\n      return {\n        x: (x1 + x2) / 2,\n        y: y1 + (direction.includes('inside') ? 0.5 : -0.5) * labelHeight\n      };\n    }\n    if (direction.includes('bottom') || direction.includes('Bottom')) {\n      return {\n        x: (x1 + x2) / 2,\n        y: y2 + (direction.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.getPositionByDirection(labelPosition);\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-polygon-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-polygon-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/cjs/marker/base-line.d.ts

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

package/cjs/marker/base-line.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseMarkLine = void 0;
 
-const vutils_1 = require("@visactor/vutils"), tag_1 = require("../tag"), config_1 = require("./config"), limit_shape_1 = require("../util/limit-shape"), constant_1 = require("../constant"), base_1 = require("./base");
+const vutils_1 = require("@visactor/vutils"), tag_1 = require("../tag"), limit_shape_1 = require("../util/limit-shape"), constant_1 = require("../constant"), base_1 = require("./base");
 
 class BaseMarkLine extends base_1.Marker {
     constructor() {
@@ -17,22 +17,8 @@ class BaseMarkLine extends base_1.Marker {
         return this._label;
     }
     setLabelPos() {
-        var _a, _b;
-        const {label: label = {}, limitRect: limitRect} = this.attribute, {position: position = "end", refX: refX = 0, refY: refY = 0, confine: confine} = label, points = this._line.getMainSegmentPoints(), labelAngle = null !== (_a = this._line.getEndAngle()) && void 0 !== _a ? _a : 0, labelOffsetX = refX * Math.cos(labelAngle) + refY * Math.cos(labelAngle - Math.PI / 2), labelOffsetY = refX * Math.sin(labelAngle) + refY * Math.sin(labelAngle - Math.PI / 2);
-        let labelPoint;
-        if (labelPoint = position.includes("start") || position.includes("Start") ? {
-            x: points[0].x + labelOffsetX,
-            y: points[0].y + labelOffsetY
-        } : position.includes("middle") || position.includes("Middle") ? {
-            x: (points[0].x + points[points.length - 1].x) / 2 + labelOffsetX,
-            y: (points[0].y + points[points.length - 1].y) / 2 + labelOffsetY
-        } : {
-            x: points[points.length - 1].x + labelOffsetX,
-            y: points[points.length - 1].y + labelOffsetY
-        }, this._label.setAttributes(Object.assign(Object.assign({}, labelPoint), {
-            angle: label.autoRotate ? labelAngle + (null !== (_b = label.refAngle) && void 0 !== _b ? _b : 0) : 0,
-            textStyle: Object.assign(Object.assign({}, config_1.DEFAULT_COMMON_MARK_LINE_TEXT_STYLE_MAP[position]), label.textStyle)
-        })), limitRect && confine) {
+        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 {x: x, y: y, width: width, height: height} = limitRect;
             (0, limit_shape_1.limitShapeInBounds)(this._label, {
                 x1: x,
@@ -63,5 +49,5 @@ class BaseMarkLine extends base_1.Marker {
     }
 }
 
-exports.BaseMarkLine = BaseMarkLine, BaseMarkLine.defaultAttributes = config_1.DEFAULT_COMMON_MARK_LINE_THEME;
+exports.BaseMarkLine = BaseMarkLine;
 //# sourceMappingURL=base-line.js.map