@visactor/vrender-components 0.14.3 → 0.14.4

package/es/axis/overlap/auto-rotate.d.ts

@@ -1,4 +1,4 @@
-import type { IText } from '@visactor/vrender';
+import type { IText, TextAlignType, TextBaselineType } from '@visactor/vrender';
 type RotateConfig = {
     orient: string;
     labelRotateAngle?: number[];
@@ -6,4 +6,12 @@ type RotateConfig = {
 export declare function autoRotate(items: IText[], rotateConfig: RotateConfig): void;
 export declare function rotateYAxis(orient: string, items: IText[]): void;
 export declare function rotateXAxis(orient: string, items: IText[]): void;
+export declare function getXAxisLabelAlign(orient: string, angle?: number): {
+    textAlign: TextAlignType;
+    textBaseline: TextBaselineType;
+};
+export declare function getYAxisLabelAlign(orient: string, angle?: number): {
+    textAlign: TextAlignType;
+    textBaseline: TextBaselineType;
+};
 export {};

package/es/axis/overlap/auto-rotate.js

@@ -55,41 +55,51 @@ function genRotateBounds(items) {
     }));
 }
 
+function clampAngle(angle = 0) {
+    if (angle < 0) for (;angle < 0; ) angle += 2 * Math.PI;
+    if (angle > 0) for (;angle >= 2 * Math.PI; ) angle -= 2 * Math.PI;
+    return angle;
+}
+
 export function rotateYAxis(orient, items) {
-    let align = [ "right", "right", "center", "left", "center", "left", "center", "right", "right" ], baseline = [ "middle", "middle", "top", "top", "middle", "middle", "bottom", "bottom", "middle" ];
-    "right" === orient && (align = [ "left", "right", "right", "right", "left", "left", "left", "left", "right" ], 
-    baseline = [ "middle", "bottom", "middle", "top", "top", "top", "middle", "bottom", "bottom" ]), 
     items.forEach(((item, i) => {
-        let angle = item.attribute.angle || 0;
-        if (angle < 0) for (;angle < 0; ) angle += 2 * Math.PI;
-        if (angle > 0) for (;angle >= 2 * Math.PI; ) angle -= 2 * Math.PI;
-        const step = angle / (.5 * Math.PI);
-        let index;
-        index = step === Math.floor(step) ? 2 * Math.floor(step) : 2 * Math.floor(step) + 1, 
-        item.setAttributes({
-            textAlign: align[index],
-            textBaseline: baseline[index],
-            angle: angle
-        });
+        item.setAttributes(Object.assign(Object.assign({}, getYAxisLabelAlign(orient, item.attribute.angle)), {
+            angle: clampAngle(item.attribute.angle)
+        }));
     }));
 }
 
 export function rotateXAxis(orient, items) {
-    let align = [ "center", "left", "left", "left", "center", "right", "right", "right", "left" ], baseline = [ "top", "top", "middle", "bottom", "bottom", "bottom", "middle", "top", "top" ];
-    "top" === orient && (align = [ "center", "right", "right", "right", "center", "left", "left", "left", "right" ], 
-    baseline = [ "bottom", "bottom", "middle", "top", "top", "top", "middle", "bottom", "bottom" ]), 
     items.forEach((item => {
-        let angle = item.attribute.angle || 0;
-        if (angle < 0) for (;angle < 0; ) angle += 2 * Math.PI;
-        if (angle > 0) for (;angle >= 2 * Math.PI; ) angle -= 2 * Math.PI;
-        const step = angle / (.5 * Math.PI);
-        let index;
-        index = step === Math.floor(step) ? 2 * Math.floor(step) : 2 * Math.floor(step) + 1, 
-        item.setAttributes({
-            textAlign: align[index],
-            textBaseline: baseline[index],
-            angle: angle
-        });
+        item.setAttributes(Object.assign(Object.assign({}, getXAxisLabelAlign(orient, item.attribute.angle)), {
+            angle: clampAngle(item.attribute.angle)
+        }));
     }));
 }
+
+export function getXAxisLabelAlign(orient, angle = 0) {
+    let align = [ "center", "left", "left", "left", "center", "right", "right", "right", "left" ], baseline = [ "top", "top", "middle", "bottom", "bottom", "bottom", "middle", "top", "top" ];
+    "top" === orient && (align = [ "center", "right", "right", "right", "center", "left", "left", "left", "right" ], 
+    baseline = [ "bottom", "bottom", "middle", "top", "top", "top", "middle", "bottom", "bottom" ]);
+    const step = (angle = clampAngle(angle)) / (.5 * Math.PI);
+    let index;
+    return index = step === Math.floor(step) ? 2 * Math.floor(step) : 2 * Math.floor(step) + 1, 
+    {
+        textAlign: align[index],
+        textBaseline: baseline[index]
+    };
+}
+
+export function getYAxisLabelAlign(orient, angle = 0) {
+    let align = [ "right", "right", "center", "left", "center", "left", "center", "right", "right" ], baseline = [ "middle", "middle", "top", "top", "middle", "middle", "bottom", "bottom", "middle" ];
+    "right" === orient && (align = [ "left", "right", "right", "right", "left", "left", "left", "left", "right" ], 
+    baseline = [ "middle", "bottom", "middle", "top", "top", "top", "middle", "bottom", "bottom" ]);
+    const step = (angle = clampAngle(angle)) / (.5 * Math.PI);
+    let index;
+    return index = step === Math.floor(step) ? 2 * Math.floor(step) : 2 * Math.floor(step) + 1, 
+    {
+        textAlign: align[index],
+        textBaseline: baseline[index]
+    };
+}
 //# sourceMappingURL=auto-rotate.js.map

package/es/axis/overlap/auto-rotate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["axis/overlap/auto-rotate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAalF,MAAM,UAAU,UAAU,CAAC,KAAc,EAAE,YAA0B;IACnE,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO;KACR;IAED,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC;IAChE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QAC/E,OAAO;KACR;IAED,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC;KAC7B;IAED,OAAO,CAAC,GAAG,CAAC,EAAE;QACZ,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;QACpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAEnB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM;SACP;KACF;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,KAAY,EAAE,KAAY;IAC/C,OAAO,qBAAqB,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,SAAS,CAAC,MAAc,EAAE,KAAc;IAE/C,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3C,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KAC5B;IACD,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,EAAE;QAC3C,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KAC5B;IAED,eAAe,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,MAAM,CAAC,CAAS,EAAE,CAAS,EAAE,GAAW,EAAE,OAAe,EAAE,OAAe;IACjF,OAAO;QACL,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO;QAC1E,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO;KAC3E,CAAC;AACJ,CAAC;AAGD,SAAS,eAAe,CAAC,IAAW;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;IAE/B,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;KAC5B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAEnB,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/G,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QAChD,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;QACzB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,KAAc;IAExD,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/F,IAAI,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEpG,IAAI,MAAM,KAAK,OAAO,EAAE;QAEtB,KAAK,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACrF,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9F;IAED,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACxB,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC;QACtC,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,KAAK,GAAG,CAAC,EAAE;gBAChB,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACtB;SACF;QACD,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE;gBAC3B,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACtB;SACF;QACD,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7B,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,aAAa,CAAC;YACjB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAkB;YACxC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAqB;YACjD,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,KAAc;IAExD,IAAI,KAAK,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5F,IAAI,QAAQ,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC9F,IAAI,MAAM,KAAK,KAAK,EAAE;QAEpB,KAAK,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACzF,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9F;IACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC;QAGtC,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,KAAK,GAAG,CAAC,EAAE;gBAChB,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACtB;SACF;QACD,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE;gBAC3B,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACtB;SACF;QACD,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7B,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,IAAI,CAAC,aAAa,CAAC;YACjB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAkB;YACxC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAqB;YACjD,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","file":"auto-rotate.js","sourcesContent":["/**\n * @description 坐标轴标签自动旋转\n */\nimport type { IText, TextAlignType, TextBaselineType } from '@visactor/vrender';\nimport { degreeToRadian, isEmpty, isRotateAABBIntersect } from '@visactor/vutils';\n\ntype RotateConfig = {\n  /**\n   * 坐标轴的显示位置\n   */\n  orient: string;\n  /**\n   * 自动旋转的可选角度\n   */\n  labelRotateAngle?: number[];\n};\n\nexport function autoRotate(items: IText[], rotateConfig: RotateConfig) {\n  if (isEmpty(items)) {\n    return;\n  }\n\n  const { orient, labelRotateAngle = [0, 45, 90] } = rotateConfig;\n  if (labelRotateAngle.length === 0 || items.some(item => !!item.attribute.angle)) {\n    return;\n  }\n\n  let i = 0;\n  let n = 0;\n  if (labelRotateAngle && labelRotateAngle.length > 0) {\n    n = labelRotateAngle.length;\n  }\n\n  while (i < n) {\n    const angle = labelRotateAngle[i++];\n    items.forEach(item => {\n      // item.angle = angle;\n      item.attribute.angle = degreeToRadian(angle);\n    });\n    tryRotate(orient, items);\n    if (!hasIntersect(items)) {\n      break;\n    }\n  }\n}\n\nfunction hasIntersect(items: IText[]): boolean {\n  for (let i = 1; i < items.length; i++) {\n    if (itemIntersect(items[i - 1], items[i])) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction itemIntersect(item1: IText, item2: IText) {\n  return isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, true);\n}\n\nfunction tryRotate(orient: string, items: IText[]) {\n  // 针对 top bottom轴的自动旋转逻辑\n  if (orient === 'bottom' || orient === 'top') {\n    rotateXAxis(orient, items);\n  }\n  if (orient === 'left' || orient === 'right') {\n    rotateYAxis(orient, items);\n  }\n  // 先旋转，再计算这个limit，避免算limit后发现不需要旋转，导致莫名的水平limit\n  genRotateBounds(items);\n}\n\nfunction rotate(x: number, y: number, deg: number, originX: number, originY: number) {\n  return {\n    x: (x - originX) * Math.cos(deg) + (y - originY) * Math.sin(deg) + originX,\n    y: (x - originX) * Math.sin(deg) + (originY - y) * Math.cos(deg) + originY\n  };\n}\n\n// 计算水平情况下的包围盒\nfunction genNormalBounds(item: IText) {\n  const bounds = item.AABBBounds;\n\n  return {\n    x1: bounds.x1,\n    x2: bounds.x2,\n    y1: bounds.y1,\n    y2: bounds.y2,\n    centerX: item.attribute.x,\n    centerY: item.attribute.y,\n    angle: item.attribute.angle\n  };\n}\n\nfunction genRotateBounds(items: IText[]) {\n  items.forEach(item => {\n    // 计算水平情况下的包围盒\n    const bounds = genNormalBounds(item);\n    // 旋转\n    const rotatedCenter = rotate(bounds.centerX, bounds.centerY, bounds.angle, item.attribute.x, item.attribute.y);\n    const deltaX = rotatedCenter.x - bounds.centerX;\n    const deltaY = rotatedCenter.y - bounds.centerY;\n    bounds.x1 += deltaX;\n    bounds.x2 += deltaX;\n    bounds.y1 += deltaY;\n    bounds.y2 += deltaY;\n    bounds.centerX += deltaX;\n    bounds.centerY += deltaY;\n    item.rotatedBounds = bounds;\n  });\n}\n\nexport function rotateYAxis(orient: string, items: IText[]) {\n  //                0,      0-90,       90,     90-180,   180,    180-270, 270,     270-360,   360\n  let align = ['right', 'right', 'center', 'left', 'center', 'left', 'center', 'right', 'right'];\n  let baseline = ['middle', 'middle', 'top', 'top', 'middle', 'middle', 'bottom', 'bottom', 'middle'];\n\n  if (orient === 'right') {\n    //            0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n    align = ['left', 'right', 'right', 'right', 'left', 'left', 'left', 'left', 'right'];\n    baseline = ['middle', 'bottom', 'middle', 'top', 'top', 'top', 'middle', 'bottom', 'bottom'];\n  }\n  // 由于左右轴会裁切，所以上下两个label需要额外处理，做tighten处理\n  items.forEach((item, i) => {\n    let angle = item.attribute.angle || 0;\n    if (angle < 0) {\n      while (angle < 0) {\n        angle += Math.PI * 2;\n      }\n    }\n    if (angle > 0) {\n      while (angle >= Math.PI * 2) {\n        angle -= Math.PI * 2;\n      }\n    }\n    const step = angle / (Math.PI * 0.5);\n    let index;\n    if (step === Math.floor(step)) {\n      index = Math.floor(step) * 2;\n    } else {\n      index = Math.floor(step) * 2 + 1;\n    }\n    item.setAttributes({\n      textAlign: align[index] as TextAlignType,\n      textBaseline: baseline[index] as TextBaselineType,\n      angle: angle\n    });\n  });\n}\n\nexport function rotateXAxis(orient: string, items: IText[]) {\n  //                0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n  let align = ['center', 'left', 'left', 'left', 'center', 'right', 'right', 'right', 'left'];\n  let baseline = ['top', 'top', 'middle', 'bottom', 'bottom', 'bottom', 'middle', 'top', 'top'];\n  if (orient === 'top') {\n    //            0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n    align = ['center', 'right', 'right', 'right', 'center', 'left', 'left', 'left', 'right'];\n    baseline = ['bottom', 'bottom', 'middle', 'top', 'top', 'top', 'middle', 'bottom', 'bottom'];\n  }\n  items.forEach(item => {\n    let angle = item.attribute.angle || 0;\n    // todo angle为0跳过会导致下轴高度有bug\n    // if (angle === 0) return;\n    if (angle < 0) {\n      while (angle < 0) {\n        angle += Math.PI * 2;\n      }\n    }\n    if (angle > 0) {\n      while (angle >= Math.PI * 2) {\n        angle -= Math.PI * 2;\n      }\n    }\n    const step = angle / (Math.PI * 0.5);\n    let index;\n    if (step === Math.floor(step)) {\n      index = Math.floor(step) * 2;\n    } else {\n      index = Math.floor(step) * 2 + 1;\n    }\n    item.setAttributes({\n      textAlign: align[index] as TextAlignType,\n      textBaseline: baseline[index] as TextBaselineType,\n      angle\n    });\n  });\n}\n"]}
+{"version":3,"sources":["axis/overlap/auto-rotate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAalF,MAAM,UAAU,UAAU,CAAC,KAAc,EAAE,YAA0B;IACnE,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO;KACR;IAED,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC;IAChE,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QAC/E,OAAO;KACR;IAED,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC;KAC7B;IAED,OAAO,CAAC,GAAG,CAAC,EAAE;QACZ,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;QACpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAEnB,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM;SACP;KACF;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAAC,KAAY,EAAE,KAAY;IAC/C,OAAO,qBAAqB,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,SAAS,CAAC,MAAc,EAAE,KAAc;IAE/C,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3C,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KAC5B;IACD,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,EAAE;QAC3C,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;KAC5B;IAED,eAAe,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,MAAM,CAAC,CAAS,EAAE,CAAS,EAAE,GAAW,EAAE,OAAe,EAAE,OAAe;IACjF,OAAO;QACL,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO;QAC1E,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO;KAC3E,CAAC;AACJ,CAAC;AAGD,SAAS,eAAe,CAAC,IAAW;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;IAE/B,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;KAC5B,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAEnB,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/G,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QAChD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QAChD,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC;QACpB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;QACzB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,KAAK,GAAG,CAAC;IAC3B,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,KAAK,GAAG,CAAC,EAAE;YAChB,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACtB;KACF;IACD,IAAI,KAAK,GAAG,CAAC,EAAE;QACb,OAAO,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE;YAC3B,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;SACtB;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,KAAc;IAExD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,aAAa,iCACb,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KACnD,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IACvC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,KAAc;IACxD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,CAAC,aAAa,iCACb,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KACnD,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IACvC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,QAAgB,CAAC;IAElE,IAAI,KAAK,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5F,IAAI,QAAQ,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC9F,IAAI,MAAM,KAAK,KAAK,EAAE;QAEpB,KAAK,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACzF,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9F;IAED,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC;IACV,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9B;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClC;IAED,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,KAAK,CAAkB;QACxC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAqB;KAClD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc,EAAE,QAAgB,CAAC;IAElE,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/F,IAAI,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEpG,IAAI,MAAM,KAAK,OAAO,EAAE;QAEtB,KAAK,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACrF,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC9F;IAED,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC;IACV,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC7B,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9B;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClC;IAED,OAAO;QACL,SAAS,EAAE,KAAK,CAAC,KAAK,CAAkB;QACxC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAqB;KAClD,CAAC;AACJ,CAAC","file":"auto-rotate.js","sourcesContent":["/**\n * @description 坐标轴标签自动旋转\n */\nimport type { IText, TextAlignType, TextBaselineType } from '@visactor/vrender';\nimport { degreeToRadian, isEmpty, isRotateAABBIntersect } from '@visactor/vutils';\n\ntype RotateConfig = {\n  /**\n   * 坐标轴的显示位置\n   */\n  orient: string;\n  /**\n   * 自动旋转的可选角度\n   */\n  labelRotateAngle?: number[];\n};\n\nexport function autoRotate(items: IText[], rotateConfig: RotateConfig) {\n  if (isEmpty(items)) {\n    return;\n  }\n\n  const { orient, labelRotateAngle = [0, 45, 90] } = rotateConfig;\n  if (labelRotateAngle.length === 0 || items.some(item => !!item.attribute.angle)) {\n    return;\n  }\n\n  let i = 0;\n  let n = 0;\n  if (labelRotateAngle && labelRotateAngle.length > 0) {\n    n = labelRotateAngle.length;\n  }\n\n  while (i < n) {\n    const angle = labelRotateAngle[i++];\n    items.forEach(item => {\n      // item.angle = angle;\n      item.attribute.angle = degreeToRadian(angle);\n    });\n    tryRotate(orient, items);\n    if (!hasIntersect(items)) {\n      break;\n    }\n  }\n}\n\nfunction hasIntersect(items: IText[]): boolean {\n  for (let i = 1; i < items.length; i++) {\n    if (itemIntersect(items[i - 1], items[i])) {\n      return true;\n    }\n  }\n  return false;\n}\n\nfunction itemIntersect(item1: IText, item2: IText) {\n  return isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, true);\n}\n\nfunction tryRotate(orient: string, items: IText[]) {\n  // 针对 top bottom轴的自动旋转逻辑\n  if (orient === 'bottom' || orient === 'top') {\n    rotateXAxis(orient, items);\n  }\n  if (orient === 'left' || orient === 'right') {\n    rotateYAxis(orient, items);\n  }\n  // 先旋转，再计算这个limit，避免算limit后发现不需要旋转，导致莫名的水平limit\n  genRotateBounds(items);\n}\n\nfunction rotate(x: number, y: number, deg: number, originX: number, originY: number) {\n  return {\n    x: (x - originX) * Math.cos(deg) + (y - originY) * Math.sin(deg) + originX,\n    y: (x - originX) * Math.sin(deg) + (originY - y) * Math.cos(deg) + originY\n  };\n}\n\n// 计算水平情况下的包围盒\nfunction genNormalBounds(item: IText) {\n  const bounds = item.AABBBounds;\n\n  return {\n    x1: bounds.x1,\n    x2: bounds.x2,\n    y1: bounds.y1,\n    y2: bounds.y2,\n    centerX: item.attribute.x,\n    centerY: item.attribute.y,\n    angle: item.attribute.angle\n  };\n}\n\nfunction genRotateBounds(items: IText[]) {\n  items.forEach(item => {\n    // 计算水平情况下的包围盒\n    const bounds = genNormalBounds(item);\n    // 旋转\n    const rotatedCenter = rotate(bounds.centerX, bounds.centerY, bounds.angle, item.attribute.x, item.attribute.y);\n    const deltaX = rotatedCenter.x - bounds.centerX;\n    const deltaY = rotatedCenter.y - bounds.centerY;\n    bounds.x1 += deltaX;\n    bounds.x2 += deltaX;\n    bounds.y1 += deltaY;\n    bounds.y2 += deltaY;\n    bounds.centerX += deltaX;\n    bounds.centerY += deltaY;\n    item.rotatedBounds = bounds;\n  });\n}\n\nfunction clampAngle(angle = 0) {\n  if (angle < 0) {\n    while (angle < 0) {\n      angle += Math.PI * 2;\n    }\n  }\n  if (angle > 0) {\n    while (angle >= Math.PI * 2) {\n      angle -= Math.PI * 2;\n    }\n  }\n\n  return angle;\n}\n\nexport function rotateYAxis(orient: string, items: IText[]) {\n  // 由于左右轴会裁切，所以上下两个label需要额外处理，做tighten处理\n  items.forEach((item, i) => {\n    item.setAttributes({\n      ...getYAxisLabelAlign(orient, item.attribute.angle),\n      angle: clampAngle(item.attribute.angle)\n    });\n  });\n}\n\nexport function rotateXAxis(orient: string, items: IText[]) {\n  items.forEach(item => {\n    item.setAttributes({\n      ...getXAxisLabelAlign(orient, item.attribute.angle),\n      angle: clampAngle(item.attribute.angle)\n    });\n  });\n}\n\nexport function getXAxisLabelAlign(orient: string, angle: number = 0) {\n  //                0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n  let align = ['center', 'left', 'left', 'left', 'center', 'right', 'right', 'right', 'left'];\n  let baseline = ['top', 'top', 'middle', 'bottom', 'bottom', 'bottom', 'middle', 'top', 'top'];\n  if (orient === 'top') {\n    //            0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n    align = ['center', 'right', 'right', 'right', 'center', 'left', 'left', 'left', 'right'];\n    baseline = ['bottom', 'bottom', 'middle', 'top', 'top', 'top', 'middle', 'bottom', 'bottom'];\n  }\n\n  angle = clampAngle(angle);\n  const step = angle / (Math.PI * 0.5);\n  let index;\n  if (step === Math.floor(step)) {\n    index = Math.floor(step) * 2;\n  } else {\n    index = Math.floor(step) * 2 + 1;\n  }\n\n  return {\n    textAlign: align[index] as TextAlignType,\n    textBaseline: baseline[index] as TextBaselineType\n  };\n}\n\nexport function getYAxisLabelAlign(orient: string, angle: number = 0) {\n  //                0,      0-90,       90,     90-180,   180,    180-270, 270,     270-360,   360\n  let align = ['right', 'right', 'center', 'left', 'center', 'left', 'center', 'right', 'right'];\n  let baseline = ['middle', 'middle', 'top', 'top', 'middle', 'middle', 'bottom', 'bottom', 'middle'];\n\n  if (orient === 'right') {\n    //            0,      0-90,   90,     90-180,   180,    180-270, 270,     270-360,   360\n    align = ['left', 'right', 'right', 'right', 'left', 'left', 'left', 'left', 'right'];\n    baseline = ['middle', 'bottom', 'middle', 'top', 'top', 'top', 'middle', 'bottom', 'bottom'];\n  }\n\n  angle = clampAngle(angle);\n  const step = angle / (Math.PI * 0.5);\n  let index;\n  if (step === Math.floor(step)) {\n    index = Math.floor(step) * 2;\n  } else {\n    index = Math.floor(step) * 2 + 1;\n  }\n\n  return {\n    textAlign: align[index] as TextAlignType,\n    textBaseline: baseline[index] as TextBaselineType\n  };\n}\n"]}

package/es/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.14.3";
+export declare const version = "0.14.4";
 export * from './core/base';
 export * from './scrollbar';
 export * from './tag';

package/es/index.js

@@ -1,4 +1,4 @@
-export const version = "0.14.3";
+export const version = "0.14.4";
 
 export * from "./core/base";
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.14.3\";\n\nexport * from './core/base';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\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';\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.14.4\";\n\nexport * from './core/base';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\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';\n"]}

package/es/label/arc.d.ts

@@ -1,9 +1,7 @@
 import type { IBoundsLike } from '@visactor/vutils';
 import { LabelBase } from './base';
-import type { ArcLabelAttrs, IPoint, Quadrant } from './type';
-import type { BaseLabelAttrs } from './type';
-import type { TextAlignType, TextBaselineType, IText } from '@visactor/vrender';
-import type { IGraphic } from '@visactor/vrender';
+import type { ArcLabelAttrs, IPoint, Quadrant, BaseLabelAttrs } from './type';
+import type { IText, IGraphic } from '@visactor/vrender';
 export declare class ArcInfo {
     key: string;
     refDatum: any;
@@ -22,13 +20,10 @@ export declare class ArcInfo {
     pointA: IPoint;
     pointB: IPoint;
     pointC: IPoint;
-    labelLinePath: string;
     quadrant: Quadrant;
     radian: number;
     middleAngle: number;
     k: number;
-    textAlign: TextAlignType;
-    textBaseline: TextBaselineType;
     angle: number;
     constructor(refDatum: any, center: IPoint, outerCenter: IPoint, quadrant: Quadrant, radian: number, middleAngle: number);
     getLabelBounds(): IBoundsLike;
@@ -45,7 +40,7 @@ export declare class ArcLabel extends LabelBase<ArcLabelAttrs> {
         x: number;
         y: number;
     } | undefined;
-    protected layoutArcLabels(position: BaseLabelAttrs['position'], attribute: any, currentMarks?: IGraphic[], data?: any, textBoundsArray?: any): ArcInfo[];
+    protected layoutArcLabels(position: BaseLabelAttrs['position'], attribute: any, currentMarks?: IGraphic[], data?: any, textBoundsArray?: any, ellipsisWidth?: number): ArcInfo[];
     private _layoutInsideLabels;
     private _layoutOutsideLabels;
     private _computeX;
@@ -64,7 +59,7 @@ export declare class ArcLabel extends LabelBase<ArcLabelAttrs> {
     private _restoreY;
     private _checkYRange;
     private _coverLabels;
-    protected computeRadius(r: number, width?: number, height?: number, k?: number): number;
+    protected computeRadius(r: number, width?: number, height?: number, centerOffset?: number, k?: number): number;
     protected computeLayoutRadius(width: number, height: number): number;
     private computeLayoutOuterRadius;
     private computeDatumRadius;

package/es/label/arc.js

@@ -1,9 +1,7 @@
-import { merge } from "@visactor/vutils";
+import { merge, isValidNumber, isNil, isLess, isGreater, isNumberClose as isClose } from "@visactor/vutils";
 
 import { LabelBase } from "./base";
 
-import { isValidNumber, isNil, isLess, isGreater, isNumberClose as isClose } from "@visactor/vutils";
-
 import { circlePoint, isQuadrantRight, isQuadrantLeft, lineCirclePoints, connectLineRadian, checkBoundsOverlap, computeQuadrant } from "./util";
 
 export class ArcInfo {
@@ -41,16 +39,17 @@ export class ArcLabel extends LabelBase {
             y: 0
         };
     }
-    layoutArcLabels(position, attribute, currentMarks, data, textBoundsArray) {
-        this._arcLeft.clear(), this._arcRight.clear();
-        const {width: width, height: height} = attribute;
+    layoutArcLabels(position, attribute, currentMarks, data, textBoundsArray, ellipsisWidth) {
+        var _a;
+        this._arcLeft.clear(), this._arcRight.clear(), this._ellipsisWidth = ellipsisWidth;
+        const {width: width, height: height} = attribute, centerOffset = null !== (_a = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _a ? _a : 0;
         currentMarks.forEach(((currentMark, index) => {
             var _a, _b;
-            const graphicAttribute = currentMark.attribute, radiusRatio = this.computeLayoutOuterRadius(graphicAttribute.outerRadius, width, height), radius = this.computeRadius(radiusRatio, width, height), center = {
+            const graphicAttribute = currentMark.attribute, radiusRatio = this.computeLayoutOuterRadius(graphicAttribute.outerRadius, width, height), radius = this.computeRadius(radiusRatio, width, height, centerOffset), center = {
                 x: null !== (_a = null == graphicAttribute ? void 0 : graphicAttribute.x) && void 0 !== _a ? _a : 0,
                 y: null !== (_b = null == graphicAttribute ? void 0 : graphicAttribute.y) && void 0 !== _b ? _b : 0
             }, item = data[index], textBounds = textBoundsArray[index], arcMiddleAngle = (graphicAttribute.startAngle + graphicAttribute.endAngle) / 2, intervalAngle = graphicAttribute.endAngle - graphicAttribute.startAngle, arcQuadrant = computeQuadrant(graphicAttribute.endAngle - intervalAngle / 2), arcMiddle = circlePoint(center.x, center.y, graphicAttribute.outerRadius, arcMiddleAngle), outerArcMiddle = circlePoint(center.x, center.y, radius + attribute.line.line1MinLength, arcMiddleAngle), arc = new ArcInfo(item, arcMiddle, outerArcMiddle, arcQuadrant, intervalAngle, arcMiddleAngle);
-            arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(2 * center.x, 2 * center.y, graphicAttribute.outerRadius), arc.middleAngle), 
+            arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(2 * center.x, 2 * center.y, graphicAttribute.outerRadius, centerOffset), arc.middleAngle), 
             arc.labelSize = {
                 width: textBounds.x2 - textBounds.x1,
                 height: textBounds.y2 - textBounds.y1
@@ -62,13 +61,14 @@ export class ArcLabel extends LabelBase {
         arcs.push(...this._layoutOutsideLabels(leftArcs, attribute, currentMarks))), arcs;
     }
     _layoutInsideLabels(arcs, attribute, currentMarks) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const center = {
             x: null !== (_b = null === (_a = currentMarks[0].attribute) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : 0,
             y: null !== (_d = null === (_c = currentMarks[0].attribute) || void 0 === _c ? void 0 : _c.y) && void 0 !== _d ? _d : 0
-        }, innerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.innerRadius, attribute.width, attribute.height), outerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), labelConfig = attribute, spaceWidth = labelConfig.spaceWidth;
+        }, centerOffset = null !== (_e = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _e ? _e : 0, innerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.innerRadius, attribute.width, attribute.height), outerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), labelConfig = attribute, spaceWidth = labelConfig.spaceWidth;
         return arcs.forEach((arc => {
-            const {labelSize: labelSize, radian: radian} = arc, innerRadius = this.computeRadius(innerRadiusRatio, attribute.width, attribute.height, 1), outerRadius = this.computeRadius(outerRadiusRatio, attribute.width, attribute.height, 1);
+            var _a, _b;
+            const {labelSize: labelSize, radian: radian} = arc, innerRadius = this.computeRadius(innerRadiusRatio, attribute.width, attribute.height, centerOffset, 1), outerRadius = this.computeRadius(outerRadiusRatio, attribute.width, attribute.height, centerOffset, 1);
             let limit;
             if (radian < connectLineRadian(outerRadius, labelSize.height)) limit = 0; else {
                 let minRadius;
@@ -81,7 +81,7 @@ export class ArcLabel extends LabelBase {
             const labelWidth = Math.min(limit, arc.labelSize.width), align = this._computeAlign(arc, attribute), labelRadius = outerRadius - spaceWidth - ("left" === align ? labelWidth : "right" === align ? 0 : labelWidth / 2);
             arc.labelPosition = circlePoint(center.x, center.y, labelRadius, arc.middleAngle), 
             arc.labelLimit = labelWidth, isGreater(labelWidth, 0) || (arc.labelVisible = !1), 
-            arc.angle = arc.middleAngle;
+            arc.angle = null !== (_b = null === (_a = null == attribute ? void 0 : attribute.textStyle) || void 0 === _a ? void 0 : _a.angle) && void 0 !== _b ? _b : arc.middleAngle;
         })), arcs;
     }
     _layoutOutsideLabels(arcs, attribute, currentMarks) {
@@ -120,20 +120,20 @@ export class ArcLabel extends LabelBase {
         }
         const width = 2 * center_x;
         return arcs.forEach((arc => {
+            var _a, _b;
             arc.labelVisible && (isLess(arc.pointB.x, line2MinLength + spaceWidth) || isGreater(arc.pointB.x, width - line2MinLength - spaceWidth)) && (arc.labelVisible = !1), 
-            arc.angle = 0, arc.labelLinePath = `M${Math.round(arc.pointA.x)},${Math.round(arc.pointA.y)} L${Math.round(arc.pointB.x)},${Math.round(arc.pointB.y)} L${Math.round(arc.pointC.x)},${Math.round(arc.pointC.y)}`;
+            arc.angle = null !== (_b = null === (_a = null == attribute ? void 0 : attribute.textStyle) || void 0 === _a ? void 0 : _a.angle) && void 0 !== _b ? _b : 0;
         })), arcs;
     }
     _computeX(arc, attribute, currentMarks) {
-        var _a, _b, _c, _d, _e;
-        const center_x = null !== (_b = null === (_a = currentMarks[0].attribute) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : 0, plotLayout_width = 2 * center_x, radiusRatio = (_d = null === (_c = currentMarks[0].attribute) || void 0 === _c ? void 0 : _c.y, 
-        this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height)), line1MinLength = attribute.line.line1MinLength, line2MinLength = attribute.line.line2MinLength, labelLayoutAlign = null === (_e = attribute.layout) || void 0 === _e ? void 0 : _e.align, spaceWidth = attribute.spaceWidth, {labelPosition: labelPosition, quadrant: quadrant, pointB: pointB} = (this._computeAlign(arc, attribute), 
-        arc);
+        var _a, _b, _c, _d, _e, _f;
+        const center_x = null !== (_b = null === (_a = currentMarks[0].attribute) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : 0, centerOffset = (_d = null === (_c = currentMarks[0].attribute) || void 0 === _c ? void 0 : _c.y, 
+        null !== (_e = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _e ? _e : 0), plotLayout_width = 2 * center_x, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), line1MinLength = attribute.line.line1MinLength, line2MinLength = attribute.line.line2MinLength, labelLayoutAlign = null === (_f = attribute.layout) || void 0 === _f ? void 0 : _f.align, spaceWidth = attribute.spaceWidth, {labelPosition: labelPosition, quadrant: quadrant, pointB: pointB} = arc;
         isValidNumber(pointB.x * pointB.y) || (arc.pointC = {
             x: NaN,
             y: NaN
         }, labelPosition.x = NaN, arc.labelLimit = 0);
-        const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height), flag = isQuadrantLeft(quadrant) ? -1 : 1;
+        const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset), flag = isQuadrantLeft(quadrant) ? -1 : 1;
         let cx = 0;
         let limit = (flag > 0 ? plotLayout_width - pointB.x : pointB.x) - line2MinLength - spaceWidth;
         "labelLine" === labelLayoutAlign && (cx = (radius + line1MinLength + line2MinLength) * flag + center_x, 
@@ -152,17 +152,19 @@ export class ArcLabel extends LabelBase {
           default:
             cx = pointB.x + flag * line2MinLength;
         }
-        if (labelWidth = Math.max(this._ellipsisWidth, labelWidth), arc.pointC = {
+        labelWidth = Math.max(this._ellipsisWidth, labelWidth), arc.labelLimit = labelWidth, 
+        arc.pointC = {
             x: cx,
             y: labelPosition.y
-        }, "edge" === labelLayoutAlign) {
+        };
+        const targetCenterOffset = .5 * (arc.labelLimit < arc.labelSize.width ? arc.labelLimit : arc.labelSize.width);
+        if ("edge" === labelLayoutAlign) {
             const alignOffset = 0;
-            labelPosition.x = flag > 0 ? plotLayout_width + alignOffset : alignOffset;
+            labelPosition.x = (flag > 0 ? plotLayout_width + alignOffset : alignOffset) - flag * targetCenterOffset;
         } else {
             const alignOffset = 0;
-            labelPosition.x = cx + alignOffset + flag * (spaceWidth + .5 * arc.labelSize.width);
+            labelPosition.x = cx + alignOffset + flag * (spaceWidth + .5 * targetCenterOffset);
         }
-        arc.labelLimit = labelWidth;
     }
     _computeAlignOffset(align, labelWidth, alignFlag) {
         switch (align) {
@@ -268,7 +270,7 @@ export class ArcLabel extends LabelBase {
         return -1;
     }
     _computePointB(arc, r, attribute, currentMarks) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const labelConfig = attribute, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), line1MinLength = labelConfig.line.line1MinLength;
         if ("none" === labelConfig.layout.strategy) arc.pointB = {
             x: arc.outerCenter.x,
@@ -277,7 +279,7 @@ export class ArcLabel extends LabelBase {
             const center = {
                 x: null !== (_b = null === (_a = currentMarks[0].attribute) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : 0,
                 y: null !== (_d = null === (_c = currentMarks[0].attribute) || void 0 === _c ? void 0 : _c.y) && void 0 !== _d ? _d : 0
-            }, radius = this.computeRadius(radiusRatio, attribute.width, attribute.height), {labelPosition: labelPosition, quadrant: quadrant} = arc, rd = r - Math.max(radius + line1MinLength, currentMarks[0].attribute.outerRadius), x = Math.sqrt(r ** 2 - Math.abs(center.y - labelPosition.y) ** 2) - rd;
+            }, centerOffset = null !== (_e = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _e ? _e : 0, radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset), {labelPosition: labelPosition, quadrant: quadrant} = arc, rd = r - Math.max(radius + line1MinLength, currentMarks[0].attribute.outerRadius), x = Math.sqrt(r ** 2 - Math.abs(center.y - labelPosition.y) ** 2) - rd;
             isValidNumber(x) ? arc.pointB = {
                 x: center.x + x * (isQuadrantLeft(quadrant) ? -1 : 1),
                 y: labelPosition.y
@@ -291,11 +293,11 @@ export class ArcLabel extends LabelBase {
         for (const arc of arcs) arc.labelVisible && (arc.lastLabelY = arc.labelPosition.y);
     }
     _computeYRange(arc, attribute, currentMarks) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const plotRect = {
             width: 2 * (null !== (_b = null === (_a = currentMarks[0].attribute) || void 0 === _a ? void 0 : _a.x) && void 0 !== _b ? _b : 0),
             height: 2 * (null !== (_d = null === (_c = currentMarks[0].attribute) || void 0 === _c ? void 0 : _c.y) && void 0 !== _d ? _d : 0)
-        }, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), line1MinLength = attribute.line.line1MinLength, {width: width, height: height} = plotRect, radius = this.computeRadius(radiusRatio, attribute.width, attribute.height), r = this._computeLayoutRadius(height / 2, attribute, currentMarks), cx = Math.abs(arc.center.x - width / 2), cy = arc.center.y - height / 2;
+        }, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), line1MinLength = attribute.line.line1MinLength, {width: width, height: height} = plotRect, centerOffset = null !== (_e = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _e ? _e : 0, radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset), r = this._computeLayoutRadius(height / 2, attribute, currentMarks), cx = Math.abs(arc.center.x - width / 2), cy = arc.center.y - height / 2;
         let a, b, c;
         if (isClose(width / 2, cx)) a = 0, b = 1, c = -cy; else if (isClose(height / 2, cy)) a = 1, 
         b = 0, c = -cx; else {
@@ -311,7 +313,8 @@ export class ArcLabel extends LabelBase {
         max = Math.max(points[0].y, points[1].y) + height / 2), arc.labelYRange = [ min, max ];
     }
     _computeLayoutRadius(halfYLength, attribute, currentMarks) {
-        const labelConfig = attribute, layoutArcGap = labelConfig.layoutArcGap, line1MinLength = labelConfig.line.line1MinLength, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), outerR = this.computeRadius(radiusRatio, attribute.width, attribute.height) + line1MinLength, a = outerR - layoutArcGap;
+        var _a;
+        const labelConfig = attribute, layoutArcGap = labelConfig.layoutArcGap, line1MinLength = labelConfig.line.line1MinLength, radiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height), centerOffset = null !== (_a = null == attribute ? void 0 : attribute.centerOffset) && void 0 !== _a ? _a : 0, outerR = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset) + line1MinLength, a = outerR - layoutArcGap;
         return Math.max((a ** 2 + halfYLength ** 2) / (2 * a), outerR);
     }
     _findNeighborIndex(arcs, priorityArc) {
@@ -355,8 +358,9 @@ export class ArcLabel extends LabelBase {
             checkBoundsOverlap(lastBounds, bounds) ? arcs[i].labelVisible = !1 : lastBounds = bounds;
         }
     }
-    computeRadius(r, width, height, k) {
-        return this.computeLayoutRadius(width || 0, height || 0) * r * (isNil(k) ? 1 : k);
+    computeRadius(r, width, height, centerOffset, k) {
+        var _a;
+        return null !== (_a = this.computeLayoutRadius(width || 0, height || 0) * r * (isNil(k) ? 1 : k) + centerOffset) && void 0 !== _a ? _a : 0;
     }
     computeLayoutRadius(width, height) {
         return Math.min(width / 2, height / 2);
@@ -364,9 +368,10 @@ export class ArcLabel extends LabelBase {
     computeLayoutOuterRadius(r, width, height) {
         return r / (Math.min(width, height) / 2);
     }
-    computeDatumRadius(width, height, outerRadius) {
+    computeDatumRadius(width, height, outerRadius, centerOffset) {
+        var _a;
         const outerRadiusRatio = this.computeLayoutOuterRadius(outerRadius, width, height);
-        return this.computeLayoutRadius(width || 0, height || 0) * outerRadiusRatio;
+        return null !== (_a = this.computeLayoutRadius(width || 0, height || 0) * outerRadiusRatio + centerOffset) && void 0 !== _a ? _a : 0;
     }
 }