@visactor/vrender-components 0.20.1-alpha.4 → 0.20.1-alpha.5

package/cjs/poptip/contribution.js

@@ -18,7 +18,7 @@ function wrapPoptip(target, source) {
 
 let PopTipRenderContribution = class {
     render(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
-        var _a;
+        var _a, _b;
         if (1 === graphic._showPoptip) {
             const {visible: visible, visibleCb: visibleCb} = graphic.attribute.poptip || {};
             if (!1 === visible || visibleCb && !1 === visibleCb(graphic)) return;
@@ -41,9 +41,9 @@ let PopTipRenderContribution = class {
             })), drawContext.stage.tryInitInteractiveLayer();
             const interactiveLayer = drawContext.stage.getLayer("_builtin_interactive");
             interactiveLayer && interactiveLayer.add(this.poptipComponent);
-        } else 2 === graphic._showPoptip && (graphic._showPoptip = 0, this.poptipComponent && this.poptipComponent.setAttributes({
+        } else 2 === graphic._showPoptip && (graphic._showPoptip = 0, this.poptipComponent && (this.poptipComponent.setAttributes({
             visibleAll: !1
-        }));
+        }), null === (_b = this.poptipComponent.parent) || void 0 === _b || _b.removeChild(this.poptipComponent)));
     }
 };
 

package/cjs/poptip/contribution.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/poptip/contribution.ts"],"names":[],"mappings":";;;;;;;;;AAQA,yDAAoD;AACpD,qCAAkC;AAClC,6CAAyC;AACzC,mCAAgC;AAEhC,SAAS,UAAU,CAAC,MAA2B,EAAE,MAA2B;IAC1E,IAAA,cAAK,EAAC,MAAM,EAAE,aAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,MAAM,CAAC;AAChB,CAAC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEnC,MAAM,CACJ,OAA6C,EAC7C,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,gBAA6C,EAC7C,WAAyB,EACzB,MAAiH,EACjH,QAAmH,EACnH,OAAa;;QAEb,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YAC7B,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACvE,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE;gBACpE,OAAO;aACR;YACD,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,IAAA,cAAK,EACH,SAAS,EACT,eAAM,CAAC,iBAAiB,EACvB,OAAO,CAAC,SAAiB,CAAC,MAAM,CAAC,CAAC,CAAE,OAAO,CAAC,SAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAC3E,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACzB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;aAChD;YAED,IAAI,MAAM,GAAI,OAAO,CAAC,SAAiB,CAAC,MAAM,IAAI,EAAE,CAAC;YACrD,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;gBAC7E,MAAM,GAAG,GAAG,EAAE,CAAC;gBACf,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACxB,MAAM,GAAG,GAAG,CAAC;gBACb,MAAM,CAAC,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAK,OAAO,CAAC,SAAiB,CAAC,IAAI,CAAC;aACpE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YACzC,IAAI,CAAC,eAAe,CAAC,aAAa,+BAChC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,KAAK,EACf,gBAAgB,EAAE,KAAK,IACpB,MAAM,KACT,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,CAAC,EAAE,MAAM,CAAC,CAAC,IACX,CAAC;YAEH,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC5C,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;YAC5E,IAAI,gBAAgB,EAAE;gBACpB,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC5C;SACF;aAAM,IAAI,OAAO,CAAC,WAAW,KAAK,CAAC,EAAE;YACpC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,eAAe;gBAClB,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;oBACjC,UAAU,EAAE,KAAK;iBAClB,CAAC,CAAC;SACN;IACH,CAAC;CACF,CAAA;AAhEY,wBAAwB;IADpC,IAAA,yBAAU,GAAE;GACA,wBAAwB,CAgEpC;AAhEY,4DAAwB","file":"contribution.js","sourcesContent":["import type {\n  IContext2d,\n  IGraphic,\n  IGraphicAttribute,\n  IInteractiveSubRenderContribution,\n  IThemeAttribute,\n  IDrawContext\n} from '@visactor/vrender-core';\nimport { injectable } from '@visactor/vrender-core';\nimport { PopTip } from './poptip';\nimport { merge } from '@visactor/vutils';\nimport { theme } from './theme';\n\nfunction wrapPoptip(target: Record<string, any>, source: Record<string, any>) {\n  merge(target, theme.poptip, source);\n  return target;\n}\n\n@injectable()\nexport class PopTipRenderContribution implements IInteractiveSubRenderContribution {\n  declare poptipComponent: PopTip;\n  render(\n    graphic: IGraphic<Partial<IGraphicAttribute>>,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    graphicAttribute: Required<IGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    options?: any\n  ): void {\n    if (graphic._showPoptip === 1) {\n      const { visible, visibleCb } = (graphic.attribute as any).poptip || {};\n      if (visible === false || (visibleCb && visibleCb(graphic) === false)) {\n        return;\n      }\n      const attribute = {};\n      merge(\n        attribute,\n        PopTip.defaultAttributes,\n        (graphic.attribute as any).poptip ? (graphic.attribute as any).poptip : {}\n      );\n      if (!this.poptipComponent) {\n        this.poptipComponent = new PopTip(attribute);\n      } else {\n        this.poptipComponent.initAttributes(attribute);\n      }\n      // 如果text图元没有配置title和content的话\n      let poptip = (graphic.attribute as any).poptip || {};\n      if (graphic.type === 'text' && poptip.title == null && poptip.content == null) {\n        const out = {};\n        wrapPoptip(out, poptip);\n        poptip = out;\n        poptip.content = poptip.content ?? (graphic.attribute as any).text;\n      }\n      const matrix = graphic.globalTransMatrix;\n      this.poptipComponent.setAttributes({\n        visibleAll: true,\n        pickable: false,\n        childrenPickable: false,\n        ...poptip,\n        x: matrix.e,\n        y: matrix.f\n      });\n      // 添加到交互层中\n      drawContext.stage.tryInitInteractiveLayer();\n      const interactiveLayer = drawContext.stage.getLayer('_builtin_interactive');\n      if (interactiveLayer) {\n        interactiveLayer.add(this.poptipComponent);\n      }\n    } else if (graphic._showPoptip === 2) {\n      graphic._showPoptip = 0;\n      this.poptipComponent &&\n        this.poptipComponent.setAttributes({\n          visibleAll: false\n        });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/poptip/contribution.ts"],"names":[],"mappings":"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","file":"contribution.js","sourcesContent":["import type {\n  IContext2d,\n  IGraphic,\n  IGraphicAttribute,\n  IInteractiveSubRenderContribution,\n  IThemeAttribute,\n  IDrawContext\n} from '@visactor/vrender-core';\nimport { injectable } from '@visactor/vrender-core';\nimport { PopTip } from './poptip';\nimport { merge } from '@visactor/vutils';\nimport { theme } from './theme';\n\nfunction wrapPoptip(target: Record<string, any>, source: Record<string, any>) {\n  merge(target, theme.poptip, source);\n  return target;\n}\n\n@injectable()\nexport class PopTipRenderContribution implements IInteractiveSubRenderContribution {\n  declare poptipComponent: PopTip;\n  render(\n    graphic: IGraphic<Partial<IGraphicAttribute>>,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    graphicAttribute: Required<IGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    strokeCb?: (ctx: IContext2d, markAttribute: Partial<IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean,\n    options?: any\n  ): void {\n    if (graphic._showPoptip === 1) {\n      const { visible, visibleCb } = (graphic.attribute as any).poptip || {};\n      if (visible === false || (visibleCb && visibleCb(graphic) === false)) {\n        return;\n      }\n      const attribute = {};\n      merge(\n        attribute,\n        PopTip.defaultAttributes,\n        (graphic.attribute as any).poptip ? (graphic.attribute as any).poptip : {}\n      );\n      if (!this.poptipComponent) {\n        this.poptipComponent = new PopTip(attribute);\n      } else {\n        this.poptipComponent.initAttributes(attribute);\n      }\n      // 如果text图元没有配置title和content的话\n      let poptip = (graphic.attribute as any).poptip || {};\n      if (graphic.type === 'text' && poptip.title == null && poptip.content == null) {\n        const out = {};\n        wrapPoptip(out, poptip);\n        poptip = out;\n        poptip.content = poptip.content ?? (graphic.attribute as any).text;\n      }\n      const matrix = graphic.globalTransMatrix;\n      this.poptipComponent.setAttributes({\n        visibleAll: true,\n        pickable: false,\n        childrenPickable: false,\n        ...poptip,\n        x: matrix.e,\n        y: matrix.f\n      });\n      // 添加到交互层中\n      drawContext.stage.tryInitInteractiveLayer();\n      const interactiveLayer = drawContext.stage.getLayer('_builtin_interactive');\n      if (interactiveLayer) {\n        interactiveLayer.add(this.poptipComponent);\n      }\n    } else if (graphic._showPoptip === 2) {\n      graphic._showPoptip = 0;\n      if (this.poptipComponent) {\n        this.poptipComponent.setAttributes({\n          visibleAll: false\n        });\n        this.poptipComponent.parent?.removeChild(this.poptipComponent);\n      }\n    }\n  }\n}\n"]}

package/cjs/util/align.js

@@ -1,57 +1,37 @@
 "use strict";
 
 function alignAxisLabels(labels, start, containerSize, orient, align) {
-    if ("right" === orient || "left" === orient) {
-        if ("left" === align) {
-            const flag = "right" === orient ? 0 : -1;
-            labels.forEach((label => {
-                label.setAttributes({
-                    x: start + containerSize * flag,
-                    textAlign: "left"
-                });
-            }));
-        } else if ("right" === align) {
-            const flag = "right" === orient ? 1 : 0;
-            labels.forEach((label => {
-                label.setAttributes({
-                    x: start + containerSize * flag,
-                    textAlign: "right"
-                });
-            }));
-        } else if ("center" === align) {
-            const flag = "right" === orient ? 1 : -1;
-            labels.forEach((label => {
-                label.setAttributes({
-                    x: start + .5 * containerSize * flag,
-                    textAlign: "center"
-                });
-            }));
-        }
-    } else if ("bottom" === orient || "top" === orient) if ("top" === align) {
-        const flag = "bottom" === orient ? 0 : -1;
-        labels.forEach((label => {
-            label.setAttributes({
-                y: start + containerSize * flag,
-                textBaseline: "top"
-            });
-        }));
-    } else if ("bottom" === align) {
-        const flag = "bottom" === orient ? 1 : 0;
-        labels.forEach((label => {
-            label.setAttributes({
-                y: start + containerSize * flag,
-                textBaseline: "bottom"
-            });
-        }));
-    } else if ("middle" === align) {
-        const flag = "bottom" === orient ? 1 : -1;
-        labels.forEach((label => {
-            label.setAttributes({
-                y: start + .5 * containerSize * flag,
-                textBaseline: "middle"
-            });
-        }));
-    }
+    "left" === orient || "right" === orient ? "left" === align ? labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dx: (null !== (_a = label.attribute.dx) && void 0 !== _a ? _a : 0) + start - label.AABBBounds.x1
+        });
+    })) : "right" === align ? labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dx: (null !== (_a = label.attribute.dx) && void 0 !== _a ? _a : 0) + start + containerSize - label.AABBBounds.x2
+        });
+    })) : "center" === align && labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dx: (null !== (_a = label.attribute.dx) && void 0 !== _a ? _a : 0) + start + containerSize / 2 - (label.AABBBounds.x1 + label.AABBBounds.x2) / 2
+        });
+    })) : "bottom" !== orient && "top" !== orient || ("top" === align ? labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dy: (null !== (_a = label.attribute.dy) && void 0 !== _a ? _a : 0) + start - label.AABBBounds.y1
+        });
+    })) : "bottom" === align ? labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dy: (null !== (_a = label.attribute.dy) && void 0 !== _a ? _a : 0) + start + containerSize - label.AABBBounds.y2
+        });
+    })) : "middle" === align && labels.forEach((label => {
+        var _a;
+        label.setAttributes({
+            dy: (null !== (_a = label.attribute.dy) && void 0 !== _a ? _a : 0) + start + containerSize / 2 - (label.AABBBounds.y1 + label.AABBBounds.y2) / 2
+        });
+    })));
 }
 
 Object.defineProperty(exports, "__esModule", {

package/cjs/util/align.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/align.ts"],"names":[],"mappings":";;;AAEA,SAAgB,eAAe,CAAC,MAAe,EAAE,KAAa,EAAE,aAAqB,EAAE,MAAc,EAAE,KAAa;IAClH,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,MAAM,EAAE;QAC3C,IAAI,KAAK,KAAK,MAAM,EAAE;YACpB,MAAM,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI;oBAC/B,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,OAAO,EAAE;YAC5B,MAAM,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI;oBAC/B,SAAS,EAAE,OAAO;iBACnB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,GAAG,GAAG,IAAI;oBACrC,SAAS,EAAE,QAAQ;iBACpB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;KACF;SAAM,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,MAAM,IAAI,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI;oBAC/B,YAAY,EAAE,KAAK;iBACpB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,IAAI;oBAC/B,YAAY,EAAE,QAAQ;iBACvB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,CAAC,EAAE,KAAK,GAAG,aAAa,GAAG,GAAG,GAAG,IAAI;oBACrC,YAAY,EAAE,QAAQ;iBACvB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AAtDD,0CAsDC","file":"align.js","sourcesContent":["import type { IText } from '@visactor/vrender-core';\n\nexport function alignAxisLabels(labels: IText[], start: number, containerSize: number, orient: string, align: string) {\n  if (orient === 'right' || orient === 'left') {\n    if (align === 'left') {\n      const flag = orient === 'right' ? 0 : -1;\n      labels.forEach(label => {\n        label.setAttributes({\n          x: start + containerSize * flag,\n          textAlign: 'left'\n        });\n      });\n    } else if (align === 'right') {\n      const flag = orient === 'right' ? 1 : 0;\n      labels.forEach(label => {\n        label.setAttributes({\n          x: start + containerSize * flag,\n          textAlign: 'right'\n        });\n      });\n    } else if (align === 'center') {\n      const flag = orient === 'right' ? 1 : -1;\n      labels.forEach(label => {\n        label.setAttributes({\n          x: start + containerSize * 0.5 * flag,\n          textAlign: 'center'\n        });\n      });\n    }\n  } else if (orient === 'bottom' || orient === 'top') {\n    if (align === 'top') {\n      const flag = orient === 'bottom' ? 0 : -1;\n      labels.forEach(label => {\n        label.setAttributes({\n          y: start + containerSize * flag,\n          textBaseline: 'top'\n        });\n      });\n    } else if (align === 'bottom') {\n      const flag = orient === 'bottom' ? 1 : 0;\n      labels.forEach(label => {\n        label.setAttributes({\n          y: start + containerSize * flag,\n          textBaseline: 'bottom'\n        });\n      });\n    } else if (align === 'middle') {\n      const flag = orient === 'bottom' ? 1 : -1;\n      labels.forEach(label => {\n        label.setAttributes({\n          y: start + containerSize * 0.5 * flag,\n          textBaseline: 'middle'\n        });\n      });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/util/align.ts"],"names":[],"mappings":";;;AAEA,SAAgB,eAAe,CAAC,MAAe,EAAE,KAAa,EAAE,aAAqB,EAAE,MAAc,EAAE,KAAa;IAClH,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,EAAE;QAC3C,IAAI,KAAK,KAAK,MAAM,EAAE;YACpB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE;iBAC5D,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,OAAO,EAAE;YAC5B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE;iBAC5E,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC;iBAC5G,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;KACF;SAAM,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,EAAE;QAClD,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE;iBAC5D,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE;iBAC5E,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;;gBACrB,KAAK,CAAC,aAAa,CAAC;oBAClB,EAAE,EAAE,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,EAAE,mCAAI,CAAC,CAAC,GAAG,KAAK,GAAG,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC;iBAC5G,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;KACF;AACH,CAAC;AA1CD,0CA0CC","file":"align.js","sourcesContent":["import type { IText } from '@visactor/vrender-core';\n\nexport function alignAxisLabels(labels: IText[], start: number, containerSize: number, orient: string, align: string) {\n  if (orient === 'left' || orient === 'right') {\n    if (align === 'left') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dx: (label.attribute.dx ?? 0) + start - label.AABBBounds.x1\n        });\n      });\n    } else if (align === 'right') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dx: (label.attribute.dx ?? 0) + start + containerSize - label.AABBBounds.x2\n        });\n      });\n    } else if (align === 'center') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dx: (label.attribute.dx ?? 0) + start + containerSize / 2 - (label.AABBBounds.x1 + label.AABBBounds.x2) / 2\n        });\n      });\n    }\n  } else if (orient === 'bottom' || orient === 'top') {\n    if (align === 'top') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dy: (label.attribute.dy ?? 0) + start - label.AABBBounds.y1\n        });\n      });\n    } else if (align === 'bottom') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dy: (label.attribute.dy ?? 0) + start + containerSize - label.AABBBounds.y2\n        });\n      });\n    } else if (align === 'middle') {\n      labels.forEach(label => {\n        label.setAttributes({\n          dy: (label.attribute.dy ?? 0) + start + containerSize / 2 - (label.AABBBounds.y1 + label.AABBBounds.y2) / 2\n        });\n      });\n    }\n  }\n}\n"]}

package/dist/index.es.js

@@ -3857,7 +3857,7 @@ class Animate {
       delta = this._duringTime + delta * this.timeScale - this._startTime, this._duringTime = this._startTime;
     }
     this.status === AnimateStatus.INITIAL && (this.status = AnimateStatus.RUNNING, this._onStart && this._onStart.forEach(cb => cb()));
-    this.setPosition(this.rawPosition + delta * this.timeScale) && this.status === AnimateStatus.RUNNING && (this.status = AnimateStatus.END, this._onEnd && this._onEnd.forEach(cb => cb()));
+    this.setPosition(Math.max(this.rawPosition, 0) + delta * this.timeScale) && this.status === AnimateStatus.RUNNING && (this.status = AnimateStatus.END, this._onEnd && this._onEnd.forEach(cb => cb()));
   }
   setPosition(rawPosition) {
     let sa,
@@ -3980,7 +3980,7 @@ class SubAnimate {
       end = !1;
     const startAt = null !== (_a = this._startAt) && void 0 !== _a ? _a : 0;
     if (rawPosition < 0 && (rawPosition = 0), rawPosition < startAt) return this.rawPosition = rawPosition, !1;
-    if (rawPosition -= startAt, d <= 0) return end = !0, end;
+    if (rawPosition -= startAt, d <= 0 && (end = !0, d < 0)) return end;
     if (loop = Math.floor(rawPosition / d), position = rawPosition - loop * d, end = rawPosition >= loopCount * d + d, end && (position = d, loop = loopCount, rawPosition = position * loop + d), rawPosition === prevRawPos) return end;
     const rev = !this.reversed != !(this.bounce && loop % 2);
     return rev && (position = d - position), this._deltaPosition = position - this.position, this.position = position, this.rawPosition = rawPosition + startAt, this.updatePosition(end, rev), end;
@@ -15166,7 +15166,7 @@ function wrapPoptip(target, source) {
 }
 let PopTipRenderContribution = class PopTipRenderContribution {
     render(graphic, context, x, y, doFill, doStroke, fVisible, sVisible, graphicAttribute, drawContext, fillCb, strokeCb, options) {
-        var _a;
+        var _a, _b;
         if (graphic._showPoptip === 1) {
             const { visible, visibleCb } = graphic.attribute.poptip || {};
             if (visible === false || (visibleCb && visibleCb(graphic) === false)) {
@@ -15197,10 +15197,12 @@ let PopTipRenderContribution = class PopTipRenderContribution {
         }
         else if (graphic._showPoptip === 2) {
             graphic._showPoptip = 0;
-            this.poptipComponent &&
+            if (this.poptipComponent) {
                 this.poptipComponent.setAttributes({
                     visibleAll: false
                 });
+                (_b = this.poptipComponent.parent) === null || _b === void 0 ? void 0 : _b.removeChild(this.poptipComponent);
+            }
         }
     }
 };
@@ -16853,7 +16855,17 @@ class LineLabel extends LabelBase {
         if (!graphic || (graphic.type !== 'line' && graphic.type !== 'area')) {
             return super.getGraphicBounds(graphic, point);
         }
-        const points = graphic.attribute.points || [point];
+        let points = graphic.attribute.points;
+        const segments = graphic.attribute.segments;
+        if (!points && segments && segments.length) {
+            points = segments.reduce((res, seg) => {
+                var _a;
+                return res.concat((_a = seg.points) !== null && _a !== void 0 ? _a : []);
+            }, []);
+        }
+        if (!points || points.length === 0) {
+            points = [point];
+        }
         const index = position === 'start' ? 0 : points.length - 1;
         if (!points[index]) {
             return;
@@ -18010,7 +18022,6 @@ var AXIS_ELEMENT_NAME;
     AXIS_ELEMENT_NAME["line"] = "axis-line";
     AXIS_ELEMENT_NAME["background"] = "axis-background";
     AXIS_ELEMENT_NAME["axisLabelBackground"] = "axis-label-background";
-    AXIS_ELEMENT_NAME["axisBreakSymbol"] = "axis-break-symbol";
 })(AXIS_ELEMENT_NAME || (AXIS_ELEMENT_NAME = {}));
 var AxisStateValue;
 (function (AxisStateValue) {
@@ -18080,12 +18091,6 @@ const DEFAULT_AXIS_THEME = {
         }
     }
 };
-const DEFAULT_AXIS_BREAK_SYMBOL_STYLE = {
-    size: 8,
-    stroke: '#000',
-    lineWidth: 1,
-    zIndex: 1
-};
 
 const clampRadian = (angle = 0) => {
     if (angle < 0) {
@@ -18143,13 +18148,6 @@ function getCircleLabelPosition(tickPosition, tickVector, text, style) {
     const y = baseY - dy;
     return { x, y };
 }
-function getAxisBreakSymbolAttrs(props = {}) {
-    var _a, _b;
-    const { style = {} } = props;
-    const symbolStyle = merge({}, DEFAULT_AXIS_BREAK_SYMBOL_STYLE, style);
-    const symbolSize = (_a = symbolStyle.size) !== null && _a !== void 0 ? _a : DEFAULT_AXIS_BREAK_SYMBOL_STYLE.size;
-    return Object.assign(Object.assign({}, symbolStyle), { symbolType: (_b = symbolStyle.symbolType) !== null && _b !== void 0 ? _b : `M ${-symbolSize / 2} ${symbolSize / 6} L ${symbolSize / 2} ${-symbolSize / 6}`, symbolSize });
-}
 function getElMap(g) {
     const elMap = {};
     traverseGroup(g, (el) => {
@@ -18366,7 +18364,8 @@ class AxisBase extends AbstractComponent {
                     let maxTextHeight = 0;
                     let textAlign = 'center';
                     let textBaseline = 'middle';
-                    labels.forEach((label) => {
+                    let labelPos = 0;
+                    labels.forEach((label, index) => {
                         var _a;
                         const labelStyle = label.attribute;
                         const angle = (_a = labelStyle.angle) !== null && _a !== void 0 ? _a : 0;
@@ -18381,10 +18380,14 @@ class AxisBase extends AbstractComponent {
                         maxTextHeight = Math.max(maxTextHeight, textHeight);
                         textAlign = labelStyle.textAlign;
                         textBaseline = labelStyle.textBaseline;
+                        if (index === 0) {
+                            labelPos = labelStyle.x;
+                        }
                     });
                     this.axisLabelLayerSize[layer] = {
                         width: maxTextWidth,
                         height: maxTextHeight,
+                        labelPos,
                         textAlign,
                         textBaseline
                     };
@@ -18876,11 +18879,11 @@ function getXAxisLabelAlign(orient, angle = 0) {
     };
 }
 function getYAxisLabelAlign(orient, angle = 0) {
-    let align = ['right', 'right', 'center', 'left', 'center', 'left', 'center', 'right', 'right'];
+    let align = ['right', 'right', 'center', 'left', 'left', 'left', 'center', 'right', 'right'];
     let baseline = ['middle', 'middle', 'top', 'top', 'middle', 'middle', 'bottom', 'bottom', 'middle'];
     if (orient === 'right') {
-        align = ['left', 'right', 'right', 'right', 'left', 'left', 'left', 'left', 'right'];
-        baseline = ['middle', 'bottom', 'middle', 'top', 'top', 'top', 'middle', 'bottom', 'bottom'];
+        align = ['left', 'left', 'center', 'right', 'right', 'right', 'center', 'left', 'left'];
+        baseline = ['middle', 'middle', 'bottom', 'bottom', 'middle', 'middle', 'top', 'middle', 'middle'];
     }
     angle = clampAngle(angle);
     const step = angle / (Math.PI * 0.5);
@@ -18972,60 +18975,54 @@ function autoLimit(labels, config) {
 }
 
 function alignAxisLabels(labels, start, containerSize, orient, align) {
-    if (orient === 'right' || orient === 'left') {
+    if (orient === 'left' || orient === 'right') {
         if (align === 'left') {
-            const flag = orient === 'right' ? 0 : -1;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    x: start + containerSize * flag,
-                    textAlign: 'left'
+                    dx: ((_a = label.attribute.dx) !== null && _a !== void 0 ? _a : 0) + start - label.AABBBounds.x1
                 });
             });
         }
         else if (align === 'right') {
-            const flag = orient === 'right' ? 1 : 0;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    x: start + containerSize * flag,
-                    textAlign: 'right'
+                    dx: ((_a = label.attribute.dx) !== null && _a !== void 0 ? _a : 0) + start + containerSize - label.AABBBounds.x2
                 });
             });
         }
         else if (align === 'center') {
-            const flag = orient === 'right' ? 1 : -1;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    x: start + containerSize * 0.5 * flag,
-                    textAlign: 'center'
+                    dx: ((_a = label.attribute.dx) !== null && _a !== void 0 ? _a : 0) + start + containerSize / 2 - (label.AABBBounds.x1 + label.AABBBounds.x2) / 2
                 });
             });
         }
     }
     else if (orient === 'bottom' || orient === 'top') {
         if (align === 'top') {
-            const flag = orient === 'bottom' ? 0 : -1;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    y: start + containerSize * flag,
-                    textBaseline: 'top'
+                    dy: ((_a = label.attribute.dy) !== null && _a !== void 0 ? _a : 0) + start - label.AABBBounds.y1
                 });
             });
         }
         else if (align === 'bottom') {
-            const flag = orient === 'bottom' ? 1 : 0;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    y: start + containerSize * flag,
-                    textBaseline: 'bottom'
+                    dy: ((_a = label.attribute.dy) !== null && _a !== void 0 ? _a : 0) + start + containerSize - label.AABBBounds.y2
                 });
             });
         }
         else if (align === 'middle') {
-            const flag = orient === 'bottom' ? 1 : -1;
             labels.forEach(label => {
+                var _a;
                 label.setAttributes({
-                    y: start + containerSize * 0.5 * flag,
-                    textBaseline: 'middle'
+                    dy: ((_a = label.attribute.dy) !== null && _a !== void 0 ? _a : 0) + start + containerSize / 2 - (label.AABBBounds.y1 + label.AABBBounds.y2) / 2
                 });
             });
         }
@@ -19087,34 +19084,7 @@ class LineAxis extends AxisBase {
     }
     _renderInner(container) {
         var _a;
-        if (this.attribute.breaks && this.attribute.breaks.length) {
-            this._breaks = this.attribute.breaks
-                .sort((preBreak, currBreak) => preBreak.range[0] - currBreak.range[1])
-                .map(breakProps => {
-                const { range, breakSymbol } = breakProps;
-                return {
-                    startPoint: this.getTickCoord(range[0]),
-                    endPoint: this.getTickCoord(range[1]),
-                    range,
-                    breakSymbol
-                };
-            });
-        }
         super._renderInner(container);
-        if (this._breaks && this._breaks.length) {
-            this._breaks.forEach(b => {
-                const { startPoint, endPoint, breakSymbol } = b;
-                if ((breakSymbol === null || breakSymbol === void 0 ? void 0 : breakSymbol.visible) !== false) {
-                    const symbolStyle = getAxisBreakSymbolAttrs(breakSymbol);
-                    const shape1 = graphicCreator.symbol(Object.assign({ x: startPoint.x, y: startPoint.y }, symbolStyle));
-                    shape1.name = AXIS_ELEMENT_NAME.axisBreakSymbol;
-                    const shape2 = graphicCreator.symbol(Object.assign({ x: endPoint.x, y: endPoint.y }, symbolStyle));
-                    shape2.name = AXIS_ELEMENT_NAME.axisBreakSymbol;
-                    container.add(shape1);
-                    container.add(shape2);
-                }
-            });
-        }
         const { panel } = this.attribute;
         if (panel && panel.visible) {
             const axisContainer = this.axisContainer;
@@ -19128,24 +19098,9 @@ class LineAxis extends AxisBase {
     }
     renderLine(container) {
         const { start, end, line } = this.attribute;
-        const _a = line, { startSymbol, endSymbol, style, state } = _a, restLineAttrs = __rest(_a, ["startSymbol", "endSymbol", "style", "state"]);
-        const lineAttrs = Object.assign({ startSymbol,
+        const _a = line, { startSymbol, endSymbol, style, breakRange, breakShape, breakShapeStyle, state } = _a, restLineAttrs = __rest(_a, ["startSymbol", "endSymbol", "style", "breakRange", "breakShape", "breakShapeStyle", "state"]);
+        const lineAttrs = Object.assign({ points: [start, end], startSymbol,
             endSymbol, lineStyle: style }, restLineAttrs);
-        if (this._breaks && this._breaks.length) {
-            const linePoints = [];
-            let lastStartPoint = start;
-            this._breaks.forEach(b => {
-                const { startPoint, endPoint } = b;
-                linePoints.push([lastStartPoint, startPoint]);
-                lastStartPoint = endPoint;
-            });
-            linePoints.push([lastStartPoint, end]);
-            lineAttrs.points = linePoints;
-            lineAttrs.multiSegment = true;
-        }
-        else {
-            lineAttrs.points = [start, end];
-        }
         if (!isEmpty(state)) {
             lineAttrs.state = {
                 line: merge({}, DEFAULT_STATES$1, state),
@@ -19187,9 +19142,20 @@ class LineAxis extends AxisBase {
             }
             else {
                 if (axisVector[0] === 0) {
-                    const boundsWidth = this.axisLabelsContainer ? this.axisLabelsContainer.AABBBounds.width() : 0;
-                    if (isFinite(boundsWidth)) {
-                        labelLength += boundsWidth + (layerCount - 1) * space;
+                    if (this.axisLabelsContainer &&
+                        this.axisLabelsContainer.AABBBounds &&
+                        !this.axisLabelsContainer.AABBBounds.empty()) {
+                        const baseX = this.axisLabelLayerSize[0].labelPos;
+                        const bounds = this.axisLabelsContainer.AABBBounds;
+                        labelLength +=
+                            (factor === 1
+                                ? bounds.x2 > baseX
+                                    ? Math.min(bounds.x2 - baseX, bounds.width())
+                                    : 0
+                                : bounds.x1 < baseX
+                                    ? Math.min(baseX - bounds.x1, bounds.width())
+                                    : 0) +
+                                (layerCount - 1) * space;
                     }
                     else {
                         labelLength = 0;
@@ -19200,36 +19166,6 @@ class LineAxis extends AxisBase {
                         labelLength += this.axisLabelLayerSize[layer].width + (index > 0 ? space : 0);
                     });
                 }
-                const textAlign = this.axisLabelLayerSize[0].textAlign;
-                const isTextAlignStart = textAlign === 'start' || textAlign === 'left';
-                const isTextCenter = textAlign === 'center';
-                const isReverse = axisVector[1] > 0;
-                if (factor === 1) {
-                    labelLength = isReverse
-                        ? isTextAlignStart
-                            ? labelLength
-                            : isTextCenter
-                                ? labelLength / 2
-                                : space
-                        : isTextAlignStart
-                            ? space
-                            : isTextCenter
-                                ? labelLength / 2
-                                : labelLength;
-                }
-                else {
-                    labelLength = isReverse
-                        ? isTextAlignStart
-                            ? space
-                            : isTextCenter
-                                ? labelLength / 2
-                                : labelLength
-                        : isTextAlignStart
-                            ? labelLength
-                            : isTextCenter
-                                ? labelLength / 2
-                                : space;
-                }
             }
         }
         let tickLength = 0;
@@ -19517,13 +19453,13 @@ class LineAxis extends AxisBase {
         if (isValid(this.attribute.label.containerAlign)) {
             let start;
             if (orient === 'left') {
-                start = axisLabelContainerBounds.x2;
+                start = axisLabelContainerBounds.x2 - axisLabelContainerSize;
             }
             else if (orient === 'right') {
                 start = axisLabelContainerBounds.x1;
             }
             else if (orient === 'top') {
-                start = axisLabelContainerBounds.y2;
+                start = axisLabelContainerBounds.y2 - axisLabelContainerSize;
             }
             else if (orient === 'bottom') {
                 start = axisLabelContainerBounds.y1;
@@ -19919,38 +19855,8 @@ const isAxisHorizontal = (axisOrientType) => {
     return ['bottom', 'top', 'z'].includes(axisOrientType);
 };
 
-function getScaleTicks(op, scale, count, getTicks) {
-    let scaleTicks;
-    const { breakData } = op;
-    if (breakData) {
-        const { scope, range: breakRanges } = breakData();
-        const domain = scale.domain();
-        scaleTicks = [];
-        for (let i = 0; i < domain.length; i++) {
-            if (i < domain.length - 1) {
-                const range = [domain[i], domain[i + 1]];
-                const [start, end] = scope[i];
-                const subCount = (end - start) * count;
-                if (subCount > 0) {
-                    const ticks = getTicks(subCount > 1 ? Math.floor(subCount) : 1, range);
-                    ticks.forEach(tick => {
-                        if (!breakRanges.some((breakRange) => tick >= breakRange[0] && tick <= breakRange[1])) {
-                            scaleTicks.push(tick);
-                        }
-                    });
-                }
-            }
-        }
-        scale.domain(domain);
-    }
-    else {
-        scaleTicks = getTicks(count);
-    }
-    return scaleTicks;
-}
 const DEFAULT_CONTINUOUS_TICK_COUNT = 5;
 const continuousTicks = (scale, op) => {
-    var _a, _b;
     if (!isContinuous(scale.type)) {
         return convertDomainToTickData(scale.domain());
     }
@@ -19959,37 +19865,22 @@ const continuousTicks = (scale, op) => {
     if (rangeSize < 2) {
         return convertDomainToTickData([scale.domain()[0]]);
     }
-    const { tickCount, forceTickCount, tickStep, noDecimals = false, labelStyle, breakData } = op;
+    const { tickCount, forceTickCount, tickStep, noDecimals = false, labelStyle } = op;
     let scaleTicks;
     if (isValid(tickStep)) {
         scaleTicks = scale.stepTicks(tickStep);
     }
     else if (isValid(forceTickCount)) {
-        scaleTicks = getScaleTicks(op, scale, forceTickCount, (count, range) => {
-            if (range && range.length) {
-                return scale.domain(range).forceTicks(count);
-            }
-            return scale.forceTicks(count);
-        });
+        scaleTicks = scale.forceTicks(forceTickCount);
     }
     else if (op.tickMode === 'd3') {
-        const count = (_a = (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount)) !== null && _a !== void 0 ? _a : DEFAULT_CONTINUOUS_TICK_COUNT;
-        scaleTicks = getScaleTicks(op, scale, count, (count, range) => {
-            if (range && range.length) {
-                return scale.domain(range).d3Ticks(count, { noDecimals });
-            }
-            return scale.d3Ticks(count, { noDecimals });
-        });
+        const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;
+        scaleTicks = scale.d3Ticks(count !== null && count !== void 0 ? count : DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals });
     }
     else {
-        const count = (_b = (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount)) !== null && _b !== void 0 ? _b : DEFAULT_CONTINUOUS_TICK_COUNT;
+        const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;
         const customTicks = isFunction(op.tickMode) ? op.tickMode : undefined;
-        scaleTicks = getScaleTicks(op, scale, count, (count, range) => {
-            if (range && range.length) {
-                return scale.domain(range).ticks(count, { noDecimals, customTicks });
-            }
-            return scale.ticks(count, { noDecimals, customTicks });
-        });
+        scaleTicks = scale.ticks(count !== null && count !== void 0 ? count : DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals, customTicks });
     }
     if (op.sampling) {
         if (op.coordinateType === 'cartesian' || (op.coordinateType === 'polar' && op.axisOrientType === 'radius')) {
@@ -26206,14 +26097,14 @@ class Indicator extends AbstractComponent {
         return undefined;
     }
     render() {
-        var _a;
+        var _a, _b;
         this.removeAllChild(true);
         if (this.attribute.visible !== true) {
             return;
         }
         const { title = {}, content, size, limitRatio = Infinity } = this.attribute;
         const limit = Math.min(size.width, size.height) * limitRatio;
-        const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1 }, 'group');
+        const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1, pickable: (_a = this.attribute.pickable) !== null && _a !== void 0 ? _a : true }, 'group');
         if (isValid(title)) {
             this._title = this._renderText(group, title, limit, limitRatio, 'title.style', 'indicator-title');
         }
@@ -26229,7 +26120,7 @@ class Indicator extends AbstractComponent {
         }
         this._setGlobalAutoFit(limit);
         this._setYPosition();
-        const totalHeight = (_a = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _a !== void 0 ? _a : 0;
+        const totalHeight = (_b = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _b !== void 0 ? _b : 0;
         group.setAttribute('y', size.height / 2 - totalHeight / 2);
         group.setAttribute('x', size.width / 2);
     }
@@ -28618,6 +28509,6 @@ EmptyTip.defaultAttributes = {
     }
 };
 
-const version = "0.20.1-alpha.4";
+const version = "0.20.1-alpha.5";
 
-export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SizeContinuousLegend, Slider, SymbolLabel, Tag, Timeline, Title, Tooltip, VTag, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getAxisBreakSymbolAttrs, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, htmlAttributeTransform, initTextMeasure, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, ticks, traverseGroup, version };
+export { AXIS_ELEMENT_NAME, AbstractComponent, ArcInfo, ArcLabel, ArcSegment, AxisStateValue, BasePlayer, Brush, CheckBox, CircleAxis, CircleAxisGrid, CircleCrosshair, ColorContinuousLegend, ContinuousPlayer, DEFAULT_ITEM_SPACE_COL, DEFAULT_ITEM_SPACE_ROW, DEFAULT_LABEL_SPACE, DEFAULT_PAGER_SPACE, DEFAULT_SHAPE_SIZE, DEFAULT_SHAPE_SPACE, DEFAULT_STATES$1 as DEFAULT_STATES, DEFAULT_TITLE_SPACE, DEFAULT_VALUE_SPACE, DataLabel, DataZoom, DataZoomActiveTag, DirectionEnum, DiscreteLegend, DiscretePlayer, EmptyTip, GroupTransition, IMarkAreaLabelPosition, IMarkCommonArcLabelPosition, IMarkLineLabelPosition, IMarkPointItemPosition, IOperateType, Indicator, LEGEND_ELEMENT_NAME, LabelBase, LegendEvent, LegendStateValue, LineAxis, LineAxisGrid, LineCrosshair, LineLabel, LinkPath, MarkArcArea, MarkArcLine, MarkArea, MarkLine, MarkPoint, Pager, PlayerEventEnum, PolygonCrosshair, PopTip, Radio, RectCrosshair, RectLabel, SLIDER_ELEMENT_NAME, ScrollBar, SectorCrosshair, Segment, SizeContinuousLegend, Slider, SymbolLabel, Tag, Timeline, Title, Tooltip, VTag, alignTextInLine, angle, angleLabelOrientAttribute, angleTo, cartesianTicks, clampRadian, computeOffsetForlimit, continuousTicks, contrastAccessibilityChecker, convertDomainToTickData, createTextGraphicByType, deltaXYToAngle, fuzzyEqualNumber, getCircleLabelPosition, getCirclePoints, getCircleVerticalVector, getElMap, getHorizontalPath, getMarksByName, getNoneGroupMarksByName, getPolarAngleLabelPosition, getPolygonPath, getSizeHandlerPath, getTextAlignAttrOfVerticalDir, getTextType, getVerticalCoord, getVerticalPath, htmlAttributeTransform, initTextMeasure, isInRange, isPostiveXAxis, isRichText, isVisible, labelSmartInvert, length, limitShapeInBounds, linearDiscreteTicks, loadPoptip, measureTextSize, normalize, polarAngleAxisDiscreteTicks, polarTicks, reactAttributeTransform, registerArcDataLabel, registerLineDataLabel, registerMarkArcAreaAnimate, registerMarkArcLineAnimate, registerMarkAreaAnimate, registerMarkLineAnimate, registerMarkPointAnimate, registerRectDataLabel, registerSymbolDataLabel, removeRepeatPoint, richTextAttributeTransform, scale, setPoptipTheme, smartInvertStrategy, tan2AngleToAngle, ticks, traverseGroup, version };

package/es/axis/base.d.ts

@@ -22,6 +22,7 @@ export declare abstract class AxisBase<T extends AxisBaseAttributes> extends Abs
         height: number;
         textAlign: string;
         textBaseline: string;
+        labelPos: number;
     }>;
     protected axisLabelsContainer: IGroup | null;
     protected axisContainer: IGroup;