@visactor/vrender-components 0.20.6-alpha.0 → 0.20.6-alpha.2

package/cjs/axis/overlap/auto-hide.js

@@ -4,63 +4,59 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.autoHide = void 0;
 
-const vutils_1 = require("@visactor/vutils"), util_1 = require("./util");
-
-function itemIntersect(item1, item2) {
-    return (0, vutils_1.isRectIntersect)(item1.AABBBounds, item2.AABBBounds, !1) && (!item1.rotatedBounds || !item2.rotatedBounds || (0, 
-    vutils_1.isRotateAABBIntersect)(item1.rotatedBounds, item2.rotatedBounds, !0));
-}
-
-const methods = {
+const vutils_1 = require("@visactor/vutils"), util_1 = require("../util"), methods = {
     parity: function(items) {
         return items.filter(((item, i) => i % 2 ? item.setAttribute("opacity", 0) : 1));
     },
     greedy: function(items, sep) {
         let a;
-        return items.filter(((b, i) => i && intersect(a, b, sep) ? b.setAttribute("opacity", 0) : (a = b, 
+        return items.filter(((b, i) => i && (0, util_1.textIntersect)(a, b, sep) ? b.setAttribute("opacity", 0) : (a = b, 
         1)));
     }
 };
 
-function intersect(textA, textB, sep) {
-    const a = textA.AABBBounds, b = textB.AABBBounds;
-    return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2) && (!textA.rotatedBounds || !textB.rotatedBounds || sep > Math.max(textB.rotatedBounds.x1 - textA.rotatedBounds.x2, textA.rotatedBounds.x1 - textB.rotatedBounds.x2, textB.rotatedBounds.y1 - textA.rotatedBounds.y2, textA.rotatedBounds.y1 - textB.rotatedBounds.y2));
-}
-
-function hasOverlap(items, pad) {
-    for (let b, i = 1, n = items.length, a = items[0]; i < n; a = b, ++i) if (intersect(a, b = items[i], pad)) return !0;
-}
-
 function hasBounds(item) {
-    const b = item.AABBBounds;
-    return b.width() > 1 && b.height() > 1;
+    let bounds;
+    return bounds = item.OBBBounds.empty() ? item.AABBBounds : item.OBBBounds, bounds.width() > 1 && bounds.height() > 1;
 }
 
 function reset(items) {
     return items.forEach((item => item.setAttribute("opacity", 1))), items;
 }
 
+function forceItemVisible(sourceItem, items, check, comparator, inverse = !1) {
+    if (check && !sourceItem.attribute.opacity) {
+        const remainLength = items.length;
+        if (remainLength > 1) {
+            sourceItem.setAttribute("opacity", 1);
+            for (let i = 0; i < remainLength; i++) {
+                const item = inverse ? items[remainLength - 1 - i] : items[i];
+                if (!comparator(item)) break;
+                item.setAttribute("opacity", 0);
+            }
+        }
+    }
+}
+
 function autoHide(labels, config) {
     if ((0, vutils_1.isEmpty)(labels)) return;
     const source = labels.filter(hasBounds);
     if ((0, vutils_1.isEmpty)(source)) return;
     let items;
-    items = reset(source), (0, util_1.genRotateBounds)(items);
+    items = reset(source);
     const {method: method = "parity", separation: sep = 0} = config, reduce = (0, vutils_1.isFunction)(method) ? method : methods[method] || methods.parity;
-    if (items.length >= 3 && hasOverlap(items, sep)) {
+    if (items.length >= 3 && (0, util_1.hasOverlap)(items, sep)) {
         do {
             items = reduce(items, sep);
-        } while (items.length >= 3 && hasOverlap(items, sep));
-        if (items.length < 3 || config.lastVisible) {
-            const lastSourceItem = (0, vutils_1.last)(source);
-            if (!lastSourceItem.attribute.opacity) {
-                const remainLength = items.length;
-                if (remainLength > 1) {
-                    lastSourceItem.setAttribute("opacity", 1);
-                    for (let i = remainLength - 1; i >= 0 && intersect(items[i], lastSourceItem, sep); i--) items[i].setAttribute("opacity", 0);
-                }
-            }
-        }
+        } while (items.length >= 3 && (0, util_1.hasOverlap)(items, sep));
+        const shouldCheck = (length, visibility) => length < 3 || visibility, checkFirst = shouldCheck(items.length, config.firstVisible);
+        let checkLast = shouldCheck(items.length, config.lastVisible);
+        const firstSourceItem = source[0], lastSourceItem = (0, vutils_1.last)(source);
+        (0, util_1.textIntersect)(firstSourceItem, lastSourceItem, sep) && (lastSourceItem.setAttribute("opacity", 0), 
+        checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, (item => (0, 
+        util_1.textIntersect)(item, firstSourceItem, sep))), forceItemVisible(lastSourceItem, items, checkLast, (item => (0, 
+        util_1.textIntersect)(item, lastSourceItem, sep) || !(!checkFirst || item === firstSourceItem) && (0, 
+        util_1.textIntersect)(item, firstSourceItem, sep)), !0);
     }
     source.forEach((item => {
         item.setAttribute("visible", !!item.attribute.opacity);

package/cjs/axis/overlap/auto-hide.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/axis/overlap/auto-hide.ts"],"names":[],"mappings":";;;AAOA,6CAAqG;AAErG,iCAAyC;AAEzC,SAAS,aAAa,CAAC,KAAY,EAAE,KAAY;IAC/C,OAAO,CACL,IAAA,wBAAe,EAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC;QAC1D,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;YACzC,CAAC,CAAC,IAAA,8BAAqB,EAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC;YACvE,CAAC,CAAC,IAAI,CAAC,CACV,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,GAAG;IACd,MAAM,EAAE,UAAU,KAAc;QAC9B,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,EAAE,UAAU,KAAc,EAAE,GAAW;QAC3C,IAAI,CAAQ,CAAC;QACb,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;gBAC/B,CAAC,GAAG,CAAC,CAAC;gBACN,OAAO,CAAC,CAAC;aACV;YACD,OAAO,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,SAAS,SAAS,CAAC,KAAY,EAAE,KAAY,EAAE,GAAW;IACxD,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;IAC3B,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;IAC3B,OAAO,CACL,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QAClE,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;YACzC,CAAC,CAAC,GAAG;gBACH,IAAI,CAAC,GAAG,CACN,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,EAC/C,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,EAC/C,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,EAC/C,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,KAAK,CAAC,aAAa,CAAC,EAAE,CAChD;YACH,CAAC,CAAC,IAAI,CAAC,CACV,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAc,EAAE,GAAW;IAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;QACpE,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;KACF;AACH,CAAC;AAED,SAAS,SAAS,CAAC,IAAW;IAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;IAC1B,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AAGD,SAAS,KAAK,CAAC,KAAc;IAC3B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC;AAwBD,SAAgB,QAAQ,CAAC,MAAe,EAAE,MAAkB;IAC1D,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACR;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACR;IAED,IAAI,KAAK,CAAC;IAEV,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAGtB,IAAA,sBAAe,EAAC,KAAK,CAAC,CAAC;IAEvB,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;IAE1D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;IAE/E,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;QAC/C,GAAG;YACD,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAC5B,QAAQ,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;QAItD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC;QAEzD,IAAI,SAAS,EAAE;YACb,MAAM,cAAc,GAAG,IAAA,aAAI,EAAC,MAAM,CAAC,CAAC;YAEpC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,EAAE;gBACrC,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC;gBAClC,IAAI,YAAY,GAAG,CAAC,EAAE;oBACpB,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;oBAE1C,KAAK,IAAI,CAAC,GAAG,YAAY,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;wBAC1C,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE;4BAC5C,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;yBACrC;6BAAM;4BAEL,MAAM;yBACP;qBACF;iBACF;aACF;SACF;KACF;IAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AAtDD,4BAsDC","file":"auto-hide.js","sourcesContent":["/**\n * @description 自动隐藏\n */\n\nimport type { IText } from '@visactor/vrender-core';\nimport type { IBounds } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isFunction, isRectIntersect, isRotateAABBIntersect, last } from '@visactor/vutils';\nimport type { CustomMethod } from '../type';\nimport { genRotateBounds } from './util';\n\nfunction itemIntersect(item1: IText, item2: IText) {\n  return (\n    isRectIntersect(item1.AABBBounds, item2.AABBBounds, false) &&\n    (item1.rotatedBounds && item2.rotatedBounds\n      ? isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, true)\n      : true)\n  );\n}\n\nconst methods = {\n  parity: function (items: IText[]) {\n    return items.filter((item, i) => (i % 2 ? item.setAttribute('opacity', 0) : 1));\n  },\n  greedy: function (items: IText[], sep: number) {\n    let a: IText;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a, b, sep)) {\n        a = b;\n        return 1;\n      }\n      return b.setAttribute('opacity', 0);\n    });\n  }\n};\n\nfunction intersect(textA: IText, textB: IText, sep: number) {\n  const a = textA.AABBBounds;\n  const b = textB.AABBBounds;\n  return (\n    sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2) &&\n    (textA.rotatedBounds && textB.rotatedBounds\n      ? sep >\n        Math.max(\n          textB.rotatedBounds.x1 - textA.rotatedBounds.x2,\n          textA.rotatedBounds.x1 - textB.rotatedBounds.x2,\n          textB.rotatedBounds.y1 - textA.rotatedBounds.y2,\n          textA.rotatedBounds.y1 - textB.rotatedBounds.y2\n        )\n      : true)\n  );\n}\n\nfunction hasOverlap(items: IText[], pad: number) {\n  for (let i = 1, n = items.length, a = items[0], b; i < n; a = b, ++i) {\n    if (intersect(a, (b = items[i]), pad)) {\n      return true;\n    }\n  }\n}\n\nfunction hasBounds(item: IText) {\n  const b = item.AABBBounds;\n  return b.width() > 1 && b.height() > 1;\n}\n\n// reset all items to be fully opaque\nfunction reset(items: IText[]) {\n  items.forEach(item => item.setAttribute('opacity', 1));\n  return items;\n}\n\ntype HideConfig = {\n  /**\n   * 轴的方向\n   */\n  orient: string;\n  /**\n   * 防重叠策略。\n   * - 'parity': 奇偶校验，使用删除所有其他标签的策略（这对于标准线性轴非常有效）。\n   * - 'greedy': 将执行标签的线性扫描，并删除与最后一个可见标签重叠的所有标签。\n   * - 也可以传入函数用于自定义策略\n   */\n  method?: 'parity' | 'greedy' | CustomMethod;\n  /**\n   * 设置文本之间的间隔距离，单位 px\n   */\n  separation?: number;\n  /**\n   * 保证最后的label展示\n   */\n  lastVisible?: boolean;\n};\n\nexport function autoHide(labels: IText[], config: HideConfig) {\n  if (isEmpty(labels)) {\n    return;\n  }\n\n  const source = labels.filter(hasBounds);\n  if (isEmpty(source)) {\n    return;\n  }\n\n  let items;\n\n  items = reset(source);\n\n  // 计算旋转包围盒\n  genRotateBounds(items);\n\n  const { method = 'parity', separation: sep = 0 } = config;\n\n  const reduce = isFunction(method) ? method : methods[method] || methods.parity;\n\n  if (items.length >= 3 && hasOverlap(items, sep)) {\n    do {\n      items = reduce(items, sep);\n    } while (items.length >= 3 && hasOverlap(items, sep));\n    /**\n     * 0.17.10 之前，当最后label个数小于3 的时候，才做最后的label强制显示的策略\n     */\n    const checkLast = items.length < 3 || config.lastVisible;\n\n    if (checkLast) {\n      const lastSourceItem = last(source);\n\n      if (!lastSourceItem.attribute.opacity) {\n        const remainLength = items.length;\n        if (remainLength > 1) {\n          lastSourceItem.setAttribute('opacity', 1);\n\n          for (let i = remainLength - 1; i >= 0; i--) {\n            if (intersect(items[i], lastSourceItem, sep)) {\n              items[i].setAttribute('opacity', 0);\n            } else {\n              // 当遇到第一个不相交的label的时候，就可以停止了\n              break;\n            }\n          }\n        }\n      }\n    }\n  }\n\n  source.forEach(item => {\n    item.setAttribute('visible', !!item.attribute.opacity);\n  });\n}\n"]}
+{"version":3,"sources":["../src/axis/overlap/auto-hide.ts"],"names":[],"mappings":";;;AAMA,6CAA6D;AAE7D,kCAAiE;AAEjE,MAAM,OAAO,GAAG;IACd,MAAM,EAAE,UAAU,KAAc;QAC9B,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,EAAE,UAAU,KAAc,EAAE,GAAW;QAC3C,IAAI,CAAQ,CAAC;QACb,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAS,EAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;gBAC/B,CAAC,GAAG,CAAC,CAAC;gBACN,OAAO,CAAC,CAAC;aACV;YACD,OAAO,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,SAAS,SAAS,CAAC,IAAW;IAC5B,IAAI,MAAM,CAAC;IACX,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;KACzB;SAAM;QACL,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;KAC1B;IACD,OAAO,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACnD,CAAC;AAGD,SAAS,KAAK,CAAC,KAAc;IAC3B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAiB,EAAE,KAAc,EAAE,KAAc,EAAE,UAAe,EAAE,OAAO,GAAG,KAAK;IAC3G,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE;QAC1C,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC;QAClC,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9D,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;oBACpB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;iBACjC;qBAAM;oBACL,MAAM;iBACP;aACF;SACF;KACF;AACH,CAAC;AA4BD,SAAgB,QAAQ,CAAC,MAAe,EAAE,MAAkB;IAC1D,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACR;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,IAAA,gBAAO,EAAC,MAAM,CAAC,EAAE;QACnB,OAAO;KACR;IAED,IAAI,KAAc,CAAC;IAEnB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtB,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;IAE1D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;IAE/E,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAA,iBAAU,EAAC,KAAK,EAAE,GAAG,CAAC,EAAE;QAC/C,GAAG;YACD,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAC5B,QAAQ,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAA,iBAAU,EAAC,KAAK,EAAE,GAAG,CAAC,EAAE;QAKtD,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,UAAmB,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC;QAEtF,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAClE,IAAI,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAE9D,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,cAAc,GAAG,IAAA,aAAI,EAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,IAAA,oBAAS,EAAC,eAAe,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE;YACnD,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC1C,SAAS,GAAG,KAAK,CAAC;SACnB;QAED,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,IAAW,EAAE,EAAE,CAAC,IAAA,oBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7G,gBAAgB,CACd,cAAc,EACd,KAAK,EACL,SAAS,EACT,CAAC,IAAW,EAAE,EAAE,CACd,IAAA,oBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC;YACpC,CAAC,UAAU,IAAI,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,IAAA,oBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAC1F,IAAI,CACL,CAAC;KACH;IAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4BAuDC","file":"auto-hide.js","sourcesContent":["/**\n * @description 自动隐藏\n */\n\nimport { createRect, type IText } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEmpty, isFunction, last } from '@visactor/vutils';\nimport type { CustomMethod } from '../type';\nimport { textIntersect as intersect, hasOverlap } from '../util';\n\nconst methods = {\n  parity: function (items: IText[]) {\n    return items.filter((item, i) => (i % 2 ? item.setAttribute('opacity', 0) : 1));\n  },\n  greedy: function (items: IText[], sep: number) {\n    let a: IText;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a, b, sep)) {\n        a = b;\n        return 1;\n      }\n      return b.setAttribute('opacity', 0);\n    });\n  }\n};\n\nfunction hasBounds(item: IText) {\n  let bounds;\n  if (!item.OBBBounds.empty()) {\n    bounds = item.OBBBounds;\n  } else {\n    bounds = item.AABBBounds;\n  }\n  return bounds.width() > 1 && bounds.height() > 1;\n}\n\n// reset all items to be fully opaque\nfunction reset(items: IText[]) {\n  items.forEach(item => item.setAttribute('opacity', 1));\n  return items;\n}\n\nfunction forceItemVisible(sourceItem: IText, items: IText[], check: boolean, comparator: any, inverse = false) {\n  if (check && !sourceItem.attribute.opacity) {\n    const remainLength = items.length;\n    if (remainLength > 1) {\n      sourceItem.setAttribute('opacity', 1);\n      for (let i = 0; i < remainLength; i++) {\n        const item = inverse ? items[remainLength - 1 - i] : items[i];\n        if (comparator(item)) {\n          item.setAttribute('opacity', 0);\n        } else {\n          break;\n        }\n      }\n    }\n  }\n}\n\ntype HideConfig = {\n  /**\n   * 轴的方向\n   */\n  orient: string;\n  /**\n   * 防重叠策略。\n   * - 'parity': 奇偶校验，使用删除所有其他标签的策略（这对于标准线性轴非常有效）。\n   * - 'greedy': 将执行标签的线性扫描，并删除与最后一个可见标签重叠的所有标签。\n   * - 也可以传入函数用于自定义策略\n   */\n  method?: 'parity' | 'greedy' | CustomMethod;\n  /**\n   * 设置文本之间的间隔距离，单位 px\n   */\n  separation?: number;\n  /**\n   * 保证最后的label展示\n   */\n  lastVisible?: boolean;\n  /**\n   * 保证第一个的label展示\n   */\n  firstVisible?: boolean;\n};\n\nexport function autoHide(labels: IText[], config: HideConfig) {\n  if (isEmpty(labels)) {\n    return;\n  }\n\n  const source = labels.filter(hasBounds);\n  if (isEmpty(source)) {\n    return;\n  }\n\n  let items: IText[];\n\n  items = reset(source);\n\n  const { method = 'parity', separation: sep = 0 } = config;\n\n  const reduce = isFunction(method) ? method : methods[method] || methods.parity;\n\n  if (items.length >= 3 && hasOverlap(items, sep)) {\n    do {\n      items = reduce(items, sep);\n    } while (items.length >= 3 && hasOverlap(items, sep));\n    /**\n     * 0.17.10 之前，当最后label个数小于3 的时候，才做最后的label强制显示的策略\n     */\n\n    const shouldCheck = (length: number, visibility: boolean) => length < 3 || visibility;\n\n    const checkFirst = shouldCheck(items.length, config.firstVisible);\n    let checkLast = shouldCheck(items.length, config.lastVisible);\n\n    const firstSourceItem = source[0];\n    const lastSourceItem = last(source);\n\n    if (intersect(firstSourceItem, lastSourceItem, sep)) {\n      lastSourceItem.setAttribute('opacity', 0); // Or firstSourceItem, depending on preference\n      checkLast = false;\n    }\n\n    forceItemVisible(firstSourceItem, items, checkFirst, (item: IText) => intersect(item, firstSourceItem, sep));\n\n    forceItemVisible(\n      lastSourceItem,\n      items,\n      checkLast,\n      (item: IText) =>\n        intersect(item, lastSourceItem, sep) ||\n        (checkFirst && item !== firstSourceItem ? intersect(item, firstSourceItem, sep) : false),\n      true\n    );\n  }\n\n  source.forEach(item => {\n    item.setAttribute('visible', !!item.attribute.opacity);\n  });\n}\n"]}

package/cjs/axis/overlap/util.js

@@ -6,13 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 
 const vutils_1 = require("@visactor/vutils");
 
-function rotate(x, y, deg, originX, originY) {
-    return {
-        x: (x - originX) * Math.cos(deg) + (y - originY) * Math.sin(deg) + originX,
-        y: (x - originX) * Math.sin(deg) + (originY - y) * Math.cos(deg) + originY
-    };
-}
-
 function genNormalBounds(item) {
     const bounds = item.AABBBounds;
     return {
@@ -29,15 +22,23 @@ function genNormalBounds(item) {
 function genRotateBounds(items) {
     items.forEach((item => {
         if (item.rotatedBounds || !item.attribute.angle) return;
-        const bounds = genNormalBounds(item), rotatedCenter = rotate(bounds.centerX, bounds.centerY, bounds.angle, item.attribute.x, item.attribute.y), deltaX = rotatedCenter.x - bounds.centerX, deltaY = rotatedCenter.y - bounds.centerY;
+        const bounds = genNormalBounds(item), rotatedCenter = (0, vutils_1.rotatePoint)({
+            x: item.attribute.x,
+            y: item.attribute.y
+        }, bounds.angle, {
+            x: bounds.centerX,
+            y: bounds.centerY
+        }), deltaX = rotatedCenter.x - bounds.centerX, deltaY = rotatedCenter.y - bounds.centerY;
         bounds.x1 += deltaX, bounds.x2 += deltaX, bounds.y1 += deltaY, bounds.y2 += deltaY, 
         bounds.centerX += deltaX, bounds.centerY += deltaY, item.rotatedBounds = bounds;
     }));
 }
 
 function itemIntersect(item1, item2) {
-    return (0, vutils_1.isRectIntersect)(item1.AABBBounds, item2.AABBBounds, !1) && (!item1.rotatedBounds || !item2.rotatedBounds || (0, 
-    vutils_1.isRotateAABBIntersect)(item1.rotatedBounds, item2.rotatedBounds, !0));
+    var _a, _b;
+    return (null === (_a = item1.OBBBounds) || void 0 === _a ? void 0 : _a.empty()) || (null === (_b = item2.OBBBounds) || void 0 === _b ? void 0 : _b.empty()) ? (0, 
+    vutils_1.isRectIntersect)(item1.AABBBounds, item2.AABBBounds, !1) && (!item1.rotatedBounds || !item2.rotatedBounds || (0, 
+    vutils_1.isRotateAABBIntersect)(item1.rotatedBounds, item2.rotatedBounds, !0)) : item1.OBBBounds.intersects(item2.OBBBounds);
 }
 
 exports.genRotateBounds = genRotateBounds, exports.itemIntersect = itemIntersect;

package/cjs/axis/overlap/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/axis/overlap/util.ts"],"names":[],"mappings":";;;AACA,6CAAiF;AAEjF,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,SAAgB,eAAe,CAAC,KAAc;IAC5C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YAC/C,OAAO;SACR;QAED,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;AAnBD,0CAmBC;AAED,SAAgB,aAAa,CAAC,KAAY,EAAE,KAAY;IACtD,OAAO,CACL,IAAA,wBAAe,EAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC;QAC1D,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;YACzC,CAAC,CAAC,IAAA,8BAAqB,EAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC;YACvE,CAAC,CAAC,IAAI,CAAC,CACV,CAAC;AACJ,CAAC;AAPD,sCAOC;AAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AAC3C,SAAgB,eAAe,CAAC,KAAa;IAC3C,MAAM,QAAQ,GAAG,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC;AAClD,CAAC;AAJD,0CAIC;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,MAAM,QAAQ,GAAG,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC;AACnD,CAAC;AAJD,8CAIC","file":"util.js","sourcesContent":["import type { IText } from '@visactor/vrender-core';\nimport { isNil, isRectIntersect, isRotateAABBIntersect } from '@visactor/vutils';\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\nexport function genRotateBounds(items: IText[]) {\n  items.forEach(item => {\n    if (item.rotatedBounds || !item.attribute.angle) {\n      return;\n    }\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 itemIntersect(item1: IText, item2: IText) {\n  return (\n    isRectIntersect(item1.AABBBounds, item2.AABBBounds, false) &&\n    (item1.rotatedBounds && item2.rotatedBounds\n      ? isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, true)\n      : true)\n  );\n}\n\nconst DELTA_ANGLE = Math.sin(Math.PI / 10);\nexport function isAngleVertical(angle: number) {\n  const hasAngle = !isNil(angle) && angle !== 0;\n  const cos = hasAngle ? Math.cos(angle) : 1;\n  return hasAngle && Math.abs(cos) <= DELTA_ANGLE;\n}\n\nexport function isAngleHorizontal(angle: number) {\n  const hasAngle = !isNil(angle) && angle !== 0;\n  const sin = hasAngle ? Math.sin(angle) : 0;\n  return !hasAngle || Math.abs(sin) <= DELTA_ANGLE;\n}\n"]}
+{"version":3,"sources":["../src/axis/overlap/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import type { IText } from '@visactor/vrender-core';\nimport { isNil, isRectIntersect, isRotateAABBIntersect, rotatePoint } from '@visactor/vutils';\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\nexport function genRotateBounds(items: IText[]) {\n  items.forEach(item => {\n    if (item.rotatedBounds || !item.attribute.angle) {\n      return;\n    }\n    // 计算水平情况下的包围盒\n    const bounds = genNormalBounds(item);\n    const rotatedCenter = rotatePoint({ x: item.attribute.x, y: item.attribute.y }, bounds.angle, {\n      x: bounds.centerX,\n      y: bounds.centerY\n    });\n\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 itemIntersect(item1: IText, item2: IText) {\n  if (!item1.OBBBounds?.empty() && !item2.OBBBounds?.empty()) {\n    return item1.OBBBounds.intersects(item2.OBBBounds);\n  }\n  return (\n    isRectIntersect(item1.AABBBounds, item2.AABBBounds, false) &&\n    (item1.rotatedBounds && item2.rotatedBounds\n      ? isRotateAABBIntersect(item1.rotatedBounds, item2.rotatedBounds, true)\n      : true)\n  );\n}\n\nconst DELTA_ANGLE = Math.sin(Math.PI / 10);\nexport function isAngleVertical(angle: number) {\n  const hasAngle = !isNil(angle) && angle !== 0;\n  const cos = hasAngle ? Math.cos(angle) : 1;\n  return hasAngle && Math.abs(cos) <= DELTA_ANGLE;\n}\n\nexport function isAngleHorizontal(angle: number) {\n  const hasAngle = !isNil(angle) && angle !== 0;\n  const sin = hasAngle ? Math.sin(angle) : 0;\n  return !hasAngle || Math.abs(sin) <= DELTA_ANGLE;\n}\n"]}

package/cjs/axis/tick-data/continuous.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.continuousTicks = exports.DEFAULT_CONTINUOUS_TICK_COUNT = void 0;
 
-const vscale_1 = require("@visactor/vscale"), vutils_1 = require("@visactor/vutils"), util_1 = require("./util");
+const vscale_1 = require("@visactor/vscale"), vutils_1 = require("@visactor/vutils"), util_1 = require("./util"), util_2 = require("../util");
 
 function getScaleTicks(op, scale, count, getTicks) {
     let scaleTicks;
@@ -22,6 +22,20 @@ function getScaleTicks(op, scale, count, getTicks) {
     return scaleTicks;
 }
 
+function forceItemVisible(sourceItem, items, check, comparator, inverse = !1) {
+    if (check && !items.includes(sourceItem)) {
+        let remainLength = items.length;
+        if (remainLength > 1) {
+            inverse ? items.push(sourceItem) : items.unshift(sourceItem);
+            for (let i = 0; i < remainLength; i++) {
+                const index = inverse ? remainLength - 1 - i : i;
+                if (!comparator(items[index])) break;
+                items.splice(index, 1), i--, remainLength--;
+            }
+        }
+    }
+}
+
 exports.DEFAULT_CONTINUOUS_TICK_COUNT = 5;
 
 const continuousTicks = (scale, op) => {
@@ -56,14 +70,24 @@ const continuousTicks = (scale, op) => {
             customTicks: customTicks
         })));
     }
-    if (op.sampling && ("cartesian" === op.coordinateType || "polar" === op.coordinateType && "radius" === op.axisOrientType)) {
+    const domain = scale.domain();
+    if (op.labelFirstVisible && domain[0] !== scaleTicks[0] && scaleTicks.unshift(domain[0]), 
+    op.labelLastVisible && domain[domain.length - 1] !== scaleTicks[scaleTicks.length - 1] && scaleTicks.push(domain[domain.length - 1]), 
+    op.sampling && ("cartesian" === op.coordinateType || "polar" === op.coordinateType && "radius" === op.axisOrientType)) {
         const {labelGap: labelGap = 4, labelFlush: labelFlush} = op;
         let items = (0, util_1.getCartesianLabelBounds)(scale, scaleTicks, op).map(((bounds, i) => ({
             AABBBounds: bounds,
             value: scaleTicks[i]
         })));
-        const samplingMethod = breakData && breakData() ? methods.greedy : methods.parity;
-        for (;items.length >= 3 && (0, util_1.hasOverlap)(items, labelGap); ) items = samplingMethod(items, labelGap);
+        const source = [ ...items ], firstSourceItem = source[0], lastSourceItem = (0, vutils_1.last)(source), samplingMethod = breakData && breakData() ? methods.greedy : methods.parity;
+        for (;items.length >= 3 && (0, util_2.hasOverlap)(items, labelGap); ) items = samplingMethod(items, labelGap);
+        const shouldCheck = (length, visibility) => length < 3 || visibility, checkFirst = shouldCheck(items.length, op.labelFirstVisible);
+        let checkLast = shouldCheck(items.length, op.labelLastVisible);
+        (0, util_2.textIntersect)(firstSourceItem, lastSourceItem, labelGap) && (items.push(firstSourceItem), 
+        checkLast = !1), forceItemVisible(firstSourceItem, items, checkFirst, (item => (0, 
+        util_2.textIntersect)(item, firstSourceItem, labelGap))), forceItemVisible(lastSourceItem, items, checkLast, (item => (0, 
+        util_2.textIntersect)(item, lastSourceItem, labelGap) || !(!checkFirst || item === firstSourceItem) && (0, 
+        util_2.textIntersect)(item, firstSourceItem, labelGap)), !0);
         const ticks = items.map((item => item.value));
         ticks.length < 3 && labelFlush && (ticks.length > 1 && ticks.pop(), (0, vutils_1.last)(ticks) !== (0, 
         vutils_1.last)(scaleTicks) && ticks.push((0, vutils_1.last)(scaleTicks))), scaleTicks = ticks;
@@ -79,7 +103,7 @@ const methods = {
     },
     greedy: function(items, sep) {
         let a;
-        return items.filter(((b, i) => (!i || !(0, util_1.intersect)(a.AABBBounds, b.AABBBounds, sep)) && (a = b, 
+        return items.filter(((b, i) => (!i || !(0, util_2.textIntersect)(a, b, sep)) && (a = b, 
         !0)));
     }
 };

package/cjs/axis/tick-data/continuous.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/axis/tick-data/continuous.ts"],"names":[],"mappings":"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","file":"continuous.js","sourcesContent":["import type { LinearScale, ContinuousScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { isFunction, isValid, last } from '@visactor/vutils';\nimport type { ICartesianTickDataOpt, ILabelItem, ITickData, ITickDataOpt } from '../type';\n// eslint-disable-next-line no-duplicate-imports\nimport { convertDomainToTickData, getCartesianLabelBounds, hasOverlap, intersect } from './util';\n\nfunction getScaleTicks(\n  op: ITickDataOpt,\n  scale: ContinuousScale,\n  count: number,\n  getTicks: (count: number, domain?: [number, number]) => number[]\n) {\n  let scaleTicks: number[];\n  const { breakData } = op;\n\n  // Todo: @zwx 将截断的逻辑挪到 scale 中\n  if (breakData && breakData()) {\n    const { breakDomains } = breakData();\n    const domain = scale.domain();\n    scaleTicks = [];\n    for (let i = 0; i < domain.length - 1; i++) {\n      const subDomain: [number, number] = [domain[i], domain[i + 1]];\n      const ticks = getTicks(count, subDomain); // 暂时不对个数进行分段\n      ticks.forEach(tick => {\n        if (!breakDomains.some(breakDomain => tick >= breakDomain[0] && tick <= breakDomain[1])) {\n          scaleTicks.push(tick);\n        }\n      });\n    }\n    // reset\n    (scale as LinearScale).domain(domain);\n  } else {\n    scaleTicks = getTicks(count);\n  }\n\n  return scaleTicks;\n}\n\n/** 连续轴默认 tick 数量 */\nexport const DEFAULT_CONTINUOUS_TICK_COUNT = 5;\n/**\n * 对于连续轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出LinearScale的ticks()、forceTicks()、stepTicks()结果；\n * - 默认输出tickCount为10的ticks()结果。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITickData[] => {\n  if (!isContinuous(scale.type)) {\n    return convertDomainToTickData(scale.domain());\n  }\n  // if range is so small\n  const range = scale.range();\n  const rangeSize = Math.abs(range[range.length - 1] - range[0]);\n  if (rangeSize < 2) {\n    return convertDomainToTickData([scale.domain()[0]]);\n  }\n\n  const { tickCount, forceTickCount, tickStep, noDecimals = false, labelStyle, breakData } = op;\n\n  let scaleTicks: number[];\n  if (isValid(tickStep)) {\n    scaleTicks = (scale as LinearScale).stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = getScaleTicks(op, scale, forceTickCount, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).forceTicks(count);\n      }\n      return (scale as LinearScale).forceTicks(count);\n    });\n  } else if (op.tickMode === 'd3') {\n    const count =\n      (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount) ??\n      DEFAULT_CONTINUOUS_TICK_COUNT;\n\n    scaleTicks = getScaleTicks(op, scale, count, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).d3Ticks(count, { noDecimals });\n      }\n      return (scale as LinearScale).d3Ticks(count, { noDecimals });\n    });\n  } else {\n    const count =\n      (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount) ??\n      DEFAULT_CONTINUOUS_TICK_COUNT;\n    const customTicks = isFunction(op.tickMode) ? op.tickMode : undefined;\n\n    scaleTicks = getScaleTicks(op, scale, count, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).ticks(count, { noDecimals, customTicks });\n      }\n      return (scale as LinearScale).ticks(count, { noDecimals, customTicks });\n    });\n  }\n\n  if (op.sampling) {\n    // 判断重叠\n    if (op.coordinateType === 'cartesian' || (op.coordinateType === 'polar' && op.axisOrientType === 'radius')) {\n      const { labelGap = 4, labelFlush } = op as ICartesianTickDataOpt;\n      let items = getCartesianLabelBounds(scale, scaleTicks, op as ICartesianTickDataOpt).map(\n        (bounds, i) =>\n          ({\n            AABBBounds: bounds,\n            value: scaleTicks[i]\n          } as ILabelItem<number>)\n      );\n      const samplingMethod = breakData && breakData() ? methods.greedy : methods.parity; // 由于轴截断后刻度会存在不均匀的情况，所以不能使用 parity 算法\n      while (items.length >= 3 && hasOverlap(items, labelGap)) {\n        items = samplingMethod(items, labelGap);\n      }\n      const ticks = items.map(item => item.value);\n\n      if (ticks.length < 3 && labelFlush) {\n        if (ticks.length > 1) {\n          ticks.pop();\n        }\n        if (last(ticks) !== last(scaleTicks)) {\n          ticks.push(last(scaleTicks));\n        }\n      }\n\n      scaleTicks = ticks;\n    }\n  }\n\n  return convertDomainToTickData(scaleTicks);\n};\n\nconst methods = {\n  parity: function <T>(items: ILabelItem<T>[]) {\n    return items.filter((item, i) => i % 2 === 0);\n  },\n  greedy: function <T>(items: ILabelItem<T>[], sep: number) {\n    let a: ILabelItem<T>;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a.AABBBounds, b.AABBBounds, sep)) {\n        a = b;\n        return true;\n      }\n      return false;\n    });\n  }\n};\n"]}
+{"version":3,"sources":["../src/axis/tick-data/continuous.ts"],"names":[],"mappings":"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","file":"continuous.js","sourcesContent":["import type { LinearScale, ContinuousScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous } from '@visactor/vscale';\nimport { isFunction, isValid, last } from '@visactor/vutils';\nimport type { ICartesianTickDataOpt, ILabelItem, ITickData, ITickDataOpt } from '../type';\n// eslint-disable-next-line no-duplicate-imports\nimport { convertDomainToTickData, getCartesianLabelBounds } from './util';\nimport { textIntersect as intersect, hasOverlap } from '../util';\nfunction getScaleTicks(\n  op: ITickDataOpt,\n  scale: ContinuousScale,\n  count: number,\n  getTicks: (count: number, domain?: [number, number]) => number[]\n) {\n  let scaleTicks: number[];\n  const { breakData } = op;\n\n  // Todo: @zwx 将截断的逻辑挪到 scale 中\n  if (breakData && breakData()) {\n    const { breakDomains } = breakData();\n    const domain = scale.domain();\n    scaleTicks = [];\n    for (let i = 0; i < domain.length - 1; i++) {\n      const subDomain: [number, number] = [domain[i], domain[i + 1]];\n      const ticks = getTicks(count, subDomain); // 暂时不对个数进行分段\n      ticks.forEach(tick => {\n        if (!breakDomains.some(breakDomain => tick >= breakDomain[0] && tick <= breakDomain[1])) {\n          scaleTicks.push(tick);\n        }\n      });\n    }\n    // reset\n    (scale as LinearScale).domain(domain);\n  } else {\n    scaleTicks = getTicks(count);\n  }\n\n  return scaleTicks;\n}\n\nfunction forceItemVisible(\n  sourceItem: ILabelItem<number>,\n  items: ILabelItem<number>[],\n  check: boolean,\n  comparator: any,\n  inverse = false\n) {\n  if (check && !items.includes(sourceItem)) {\n    let remainLength = items.length;\n    if (remainLength > 1) {\n      if (inverse) {\n        items.push(sourceItem);\n      } else {\n        items.unshift(sourceItem);\n      }\n      for (let i = 0; i < remainLength; i++) {\n        const index = inverse ? remainLength - 1 - i : i;\n        if (comparator(items[index])) {\n          items.splice(index, 1);\n          i--;\n          remainLength--;\n        } else {\n          break;\n        }\n      }\n    }\n  }\n}\n/** 连续轴默认 tick 数量 */\nexport const DEFAULT_CONTINUOUS_TICK_COUNT = 5;\n/**\n * 对于连续轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出LinearScale的ticks()、forceTicks()、stepTicks()结果；\n * - 默认输出tickCount为10的ticks()结果。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITickData[] => {\n  if (!isContinuous(scale.type)) {\n    return convertDomainToTickData(scale.domain());\n  }\n  // if range is so small\n  const range = scale.range();\n  const rangeSize = Math.abs(range[range.length - 1] - range[0]);\n  if (rangeSize < 2) {\n    return convertDomainToTickData([scale.domain()[0]]);\n  }\n\n  const { tickCount, forceTickCount, tickStep, noDecimals = false, labelStyle, breakData } = op;\n\n  let scaleTicks: number[];\n  if (isValid(tickStep)) {\n    scaleTicks = (scale as LinearScale).stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = getScaleTicks(op, scale, forceTickCount, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).forceTicks(count);\n      }\n      return (scale as LinearScale).forceTicks(count);\n    });\n  } else if (op.tickMode === 'd3') {\n    const count =\n      (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount) ??\n      DEFAULT_CONTINUOUS_TICK_COUNT;\n\n    scaleTicks = getScaleTicks(op, scale, count, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).d3Ticks(count, { noDecimals });\n      }\n      return (scale as LinearScale).d3Ticks(count, { noDecimals });\n    });\n  } else {\n    const count =\n      (isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount) ??\n      DEFAULT_CONTINUOUS_TICK_COUNT;\n    const customTicks = isFunction(op.tickMode) ? op.tickMode : undefined;\n\n    scaleTicks = getScaleTicks(op, scale, count, (count: number, subDomain?: [number, number]) => {\n      if (subDomain && subDomain.length) {\n        return (scale as LinearScale).domain(subDomain, true).ticks(count, { noDecimals, customTicks });\n      }\n      return (scale as LinearScale).ticks(count, { noDecimals, customTicks });\n    });\n  }\n\n  const domain = scale.domain();\n\n  if (op.labelFirstVisible && domain[0] !== scaleTicks[0]) {\n    scaleTicks.unshift(domain[0]);\n  }\n\n  if (op.labelLastVisible && domain[domain.length - 1] !== scaleTicks[scaleTicks.length - 1]) {\n    scaleTicks.push(domain[domain.length - 1]);\n  }\n\n  if (op.sampling) {\n    // 判断重叠\n    if (op.coordinateType === 'cartesian' || (op.coordinateType === 'polar' && op.axisOrientType === 'radius')) {\n      const { labelGap = 4, labelFlush } = op as ICartesianTickDataOpt;\n      let items = getCartesianLabelBounds(scale, scaleTicks, op as ICartesianTickDataOpt).map(\n        (bounds, i) =>\n          ({\n            AABBBounds: bounds,\n            value: scaleTicks[i]\n          } as ILabelItem<number>)\n      );\n      const source = [...items];\n      const firstSourceItem = source[0];\n      const lastSourceItem = last(source);\n\n      const samplingMethod = breakData && breakData() ? methods.greedy : methods.parity; // 由于轴截断后刻度会存在不均匀的情况，所以不能使用 parity 算法\n      while (items.length >= 3 && hasOverlap(items as any, labelGap)) {\n        items = samplingMethod(items, labelGap);\n      }\n\n      const shouldCheck = (length: number, visibility: boolean) => length < 3 || visibility;\n\n      const checkFirst = shouldCheck(items.length, op.labelFirstVisible);\n      let checkLast = shouldCheck(items.length, op.labelLastVisible);\n\n      if (intersect(firstSourceItem as any, lastSourceItem as any, labelGap)) {\n        items.push(firstSourceItem);\n        checkLast = false;\n      }\n      forceItemVisible(firstSourceItem, items, checkFirst, (item: ILabelItem<number>) =>\n        intersect(item as any, firstSourceItem as any, labelGap)\n      );\n      forceItemVisible(\n        lastSourceItem,\n        items,\n        checkLast,\n        (item: ILabelItem<number>) =>\n          intersect(item as any, lastSourceItem as any, labelGap) ||\n          (checkFirst && item !== firstSourceItem ? intersect(item as any, firstSourceItem as any, labelGap) : false),\n        true\n      );\n\n      const ticks = items.map(item => item.value);\n\n      if (ticks.length < 3 && labelFlush) {\n        if (ticks.length > 1) {\n          ticks.pop();\n        }\n        if (last(ticks) !== last(scaleTicks)) {\n          ticks.push(last(scaleTicks));\n        }\n      }\n\n      scaleTicks = ticks;\n    }\n  }\n\n  return convertDomainToTickData(scaleTicks);\n};\n\nconst methods = {\n  parity: function <T>(items: ILabelItem<T>[]) {\n    return items.filter((item, i) => i % 2 === 0);\n  },\n  greedy: function <T>(items: ILabelItem<T>[], sep: number) {\n    let a: ILabelItem<T>;\n    return items.filter((b, i) => {\n      if (!i || !intersect(a as any, b as any, sep)) {\n        a = b;\n        return true;\n      }\n      return false;\n    });\n  }\n};\n"]}

package/cjs/axis/tick-data/util.d.ts

@@ -1,12 +1,9 @@
 import type { IBaseScale } from '@visactor/vscale';
-import type { IBoundsLike } from '@visactor/vutils';
 import { AABBBounds } from '@visactor/vutils';
-import type { ICartesianTickDataOpt, ILabelItem, IOrientType, ITickData } from '../type';
+import type { ICartesianTickDataOpt, IOrientType, ITickData } from '../type';
 export declare const convertDomainToTickData: (domain: any[]) => ITickData[];
 export declare const labelOverlap: (prevLabel: AABBBounds, nextLabel: AABBBounds, gap?: number) => boolean;
 export declare const labelDistance: (prevLabel: AABBBounds, nextLabel: AABBBounds) => [number, number];
-export declare function intersect(a: IBoundsLike, b: IBoundsLike, sep: number): boolean;
-export declare function hasOverlap<T>(items: ILabelItem<T>[], pad: number): boolean;
 export declare const MIN_TICK_GAP = 12;
 export declare const getCartesianLabelBounds: (scale: IBaseScale, domain: any[], op: ICartesianTickDataOpt) => AABBBounds[];
 export declare const isAxisHorizontal: (axisOrientType: IOrientType) => boolean;

package/cjs/axis/tick-data/util.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.isAxisHorizontal = exports.getCartesianLabelBounds = exports.MIN_TICK_GAP = exports.hasOverlap = exports.intersect = exports.labelDistance = exports.labelOverlap = exports.convertDomainToTickData = void 0;
+}), exports.isAxisHorizontal = exports.getCartesianLabelBounds = exports.MIN_TICK_GAP = exports.labelDistance = exports.labelOverlap = exports.convertDomainToTickData = void 0;
 
 const vutils_1 = require("@visactor/vutils"), text_1 = require("../../util/text"), convertDomainToTickData = domain => domain.map(((t, index) => ({
     index: index,
@@ -26,18 +26,7 @@ const labelDistance = (prevLabel, nextLabel) => {
     [ horizontal, vertical ];
 };
 
-function intersect(a, b, sep) {
-    return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);
-}
-
-function hasOverlap(items, pad) {
-    for (let b, i = 1, n = items.length, a = items[0]; i < n; a = b, ++i) if (b = items[i], 
-    intersect(a.AABBBounds, b.AABBBounds, pad)) return !0;
-    return !1;
-}
-
-exports.labelDistance = labelDistance, exports.intersect = intersect, exports.hasOverlap = hasOverlap, 
-exports.MIN_TICK_GAP = 12;
+exports.labelDistance = labelDistance, exports.MIN_TICK_GAP = 12;
 
 const calculateFlushPos = (basePosition, size, rangePosition, otherEnd) => rangePosition < basePosition ? Math.max(basePosition - size / 2, rangePosition) : rangePosition > basePosition ? Math.min(basePosition - size / 2, rangePosition - size) : rangePosition < otherEnd ? rangePosition : rangePosition - size, getCartesianLabelBounds = (scale, domain, op) => {
     var _a;

package/cjs/axis/tick-data/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/axis/tick-data/util.ts"],"names":[],"mappings":";;;AAGA,6CAA8D;AAE9D,0CAAkD;AAG3C,MAAM,uBAAuB,GAAG,CAAC,MAAa,EAAe,EAAE;IACpE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,KAAa,EAAE,EAAE;QACpD,OAAO;YACL,KAAK;YACL,KAAK,EAAE,CAAC;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC;AAGK,MAAM,YAAY,GAAG,CAAC,SAAqB,EAAE,SAAqB,EAAE,GAAG,GAAG,CAAC,EAAW,EAAE;IAC7F,MAAM,UAAU,GAAG,IAAI,mBAAU,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAI,mBAAU,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC7D,OAAO,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC3C,CAAC,CAAC;AAJW,QAAA,YAAY,gBAIvB;AAGK,MAAM,aAAa,GAAG,CAAC,SAAqB,EAAE,SAAqB,EAAoB,EAAE;IAC9F,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE;QAC/B,UAAU,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;KAC1C;SAAM,IAAI,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE;QACtC,UAAU,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;KAC1C;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE;QAC/B,QAAQ,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;KACxC;SAAM,IAAI,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE;QACtC,QAAQ,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;KACxC;IAED,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC;AAhBW,QAAA,aAAa,iBAgBxB;AAEF,SAAgB,SAAS,CAAC,CAAc,EAAE,CAAc,EAAE,GAAW;IACnE,OAAO,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;AAC5E,CAAC;AAFD,8BAEC;AAED,SAAgB,UAAU,CAAI,KAAsB,EAAE,GAAW;IAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;QACpE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,IAAI,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AARD,gCAQC;AAEY,QAAA,YAAY,GAAG,EAAE,CAAC;AAE/B,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,IAAY,EAAE,aAAqB,EAAE,QAAgB,EAAE,EAAE;IACxG,OAAO,aAAa,GAAG,YAAY;QACjC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,IAAI,GAAG,CAAC,EAAE,aAAa,CAAC;QAClD,CAAC,CAAC,aAAa,GAAG,YAAY;YAC9B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,IAAI,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;YACzD,CAAC,CAAC,aAAa,GAAG,QAAQ;gBAC1B,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC;AAC3B,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,KAAiB,EAAE,MAAa,EAAE,EAAyB,EAAgB,EAAE;;IACnH,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;IACtF,IAAI,UAAU,GAAG,MAAA,UAAU,CAAC,KAAK,mCAAI,CAAC,CAAC;IACvC,IAAI,UAAU,CAAC,SAAS,KAAK,UAAU,EAAE;QACvC,UAAU,IAAI,IAAA,uBAAc,EAAC,EAAE,CAAC,CAAC;KAClC;IACD,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC9D,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,YAAY,EAAE;KAEjB;SAAM,IAAI,UAAU,EAAE;QACrB,MAAM,GAAG,CAAC,CAAC;QACX,MAAM,GAAG,CAAC,CAAC;KACZ;SAAM,IAAI,UAAU,EAAE;QACrB,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9B,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KAChC;IAED,MAAM,WAAW,GAAG,IAAA,sBAAe,EAAC,UAAU,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE;;QACvD,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAGxD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,oBAAY,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAY,CAAC,CAAC;QAGlD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,MAAM,GAAG,GAAG,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,GAAG,GAAG,CAAC;QAC/B,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,IAAI,KAAK,GAAG,SAAS,CAAC;QAEtB,IAAI,KAAoB,CAAC;QACzB,IAAI,UAAU,IAAI,YAAY,IAAI,CAAC,KAAK,CAAC,EAAE;YACzC,KAAK,GAAG,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;SACpF;aAAM,IAAI,UAAU,IAAI,YAAY,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAChE,KAAK,GAAG,iBAAiB,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACpF;aAAM;YACL,KAAK,GAAG,MAAA,UAAU,CAAC,SAAS,mCAAI,QAAQ,CAAC;SAC1C;QACD,IAAI,KAAK,KAAK,OAAO,EAAE;YACrB,KAAK,IAAI,SAAS,CAAC;SACpB;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,IAAI,SAAS,GAAG,CAAC,CAAC;SACxB;QAED,IAAI,QAA0B,CAAC;QAC/B,IAAI,UAAU,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,EAAE;YACvC,KAAK,GAAG,iBAAiB,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;SACrF;aAAM,IAAI,UAAU,IAAI,UAAU,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,KAAK,GAAG,iBAAiB,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACrF;aAAM;YACL,QAAQ,GAAG,MAAA,UAAU,CAAC,YAAY,mCAAI,QAAQ,CAAC;SAChD;QACD,IAAI,QAAQ,KAAK,QAAQ,EAAE;YACzB,KAAK,IAAI,UAAU,CAAC;SACrB;aAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE;YAChC,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC;SACzB;QAGD,MAAM,MAAM,GAAG,IAAI,mBAAU,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,UAAU,CAAC,CAAC;QAEzF,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;SACjD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AA5EW,QAAA,uBAAuB,2BA4ElC;AAEK,MAAM,gBAAgB,GAAG,CAAC,cAA2B,EAAE,EAAE;IAC9D,OAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B","file":"util.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { AABBBounds, degreeToRadian } from '@visactor/vutils';\nimport type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { initTextMeasure } from '../../util/text';\nimport type { ICartesianTickDataOpt, ILabelItem, IOrientType, ITickData } from '../type';\n\nexport const convertDomainToTickData = (domain: any[]): ITickData[] => {\n  const ticks = domain.map((t: number, index: number) => {\n    return {\n      index,\n      value: t\n    };\n  });\n  return ticks;\n};\n\n/** 判断两个label是否有重叠情况 */\nexport const labelOverlap = (prevLabel: AABBBounds, nextLabel: AABBBounds, gap = 0): boolean => {\n  const prevBounds = new AABBBounds(prevLabel).expand(gap / 2);\n  const nextBounds = new AABBBounds(nextLabel).expand(gap / 2);\n  return prevBounds.intersects(nextBounds);\n};\n\n/** 判断两个不相交的label相隔的距离 */\nexport const labelDistance = (prevLabel: AABBBounds, nextLabel: AABBBounds): [number, number] => {\n  let horizontal = 0;\n  if (prevLabel.x2 < nextLabel.x1) {\n    horizontal = nextLabel.x1 - prevLabel.x2;\n  } else if (nextLabel.x2 < prevLabel.x1) {\n    horizontal = prevLabel.x1 - nextLabel.x2;\n  }\n\n  let vertical = 0;\n  if (prevLabel.y2 < nextLabel.y1) {\n    vertical = nextLabel.y1 - prevLabel.y2;\n  } else if (nextLabel.y2 < prevLabel.y1) {\n    vertical = prevLabel.y1 - nextLabel.y2;\n  }\n\n  return [horizontal, vertical];\n};\n\nexport function intersect(a: IBoundsLike, b: IBoundsLike, sep: number) {\n  return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);\n}\n\nexport function hasOverlap<T>(items: ILabelItem<T>[], pad: number): boolean {\n  for (let i = 1, n = items.length, a = items[0], b; i < n; a = b, ++i) {\n    b = items[i];\n    if (intersect(a.AABBBounds, b.AABBBounds, pad)) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport const MIN_TICK_GAP = 12;\n\nconst calculateFlushPos = (basePosition: number, size: number, rangePosition: number, otherEnd: number) => {\n  return rangePosition < basePosition\n    ? Math.max(basePosition - size / 2, rangePosition)\n    : rangePosition > basePosition\n    ? Math.min(basePosition - size / 2, rangePosition - size)\n    : rangePosition < otherEnd\n    ? rangePosition\n    : rangePosition - size;\n};\n\nexport const getCartesianLabelBounds = (scale: IBaseScale, domain: any[], op: ICartesianTickDataOpt): AABBBounds[] => {\n  const { labelStyle, axisOrientType, labelFlush, labelFormatter, startAngle = 0 } = op;\n  let labelAngle = labelStyle.angle ?? 0;\n  if (labelStyle.direction === 'vertical') {\n    labelAngle += degreeToRadian(90);\n  }\n  const isHorizontal = ['bottom', 'top'].includes(axisOrientType);\n  const isVertical = ['left', 'right'].includes(axisOrientType);\n  let scaleX = 1;\n  let scaleY = 0;\n  if (isHorizontal) {\n    // nothing to update\n  } else if (isVertical) {\n    scaleX = 0;\n    scaleY = 1;\n  } else if (startAngle) {\n    scaleX = Math.cos(startAngle);\n    scaleY = -Math.sin(startAngle);\n  }\n\n  const textMeasure = initTextMeasure(labelStyle);\n  const range = scale.range();\n  const labelBoundsList = domain.map((v: any, i: number) => {\n    const str = labelFormatter ? labelFormatter(v) : `${v}`;\n\n    // 估算文本宽高\n    const { width, height } = textMeasure.quickMeasure(str);\n    const textWidth = Math.max(width, MIN_TICK_GAP);\n    const textHeight = Math.max(height, MIN_TICK_GAP);\n\n    // 估算文本位置\n    const pos = scale.scale(v);\n    const baseTextX = scaleX * pos;\n    const baseTextY = scaleY * pos;\n    let textX = baseTextX;\n    let textY = baseTextY;\n\n    let align: TextAlignType;\n    if (labelFlush && isHorizontal && i === 0) {\n      textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]);\n    } else if (labelFlush && isHorizontal && i === domain.length - 1) {\n      textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]);\n    } else {\n      align = labelStyle.textAlign ?? 'center';\n    }\n    if (align === 'right') {\n      textX -= textWidth;\n    } else if (align === 'center') {\n      textX -= textWidth / 2;\n    }\n\n    let baseline: TextBaselineType;\n    if (labelFlush && isVertical && i === 0) {\n      textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]);\n    } else if (labelFlush && isVertical && i === domain.length - 1) {\n      textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]);\n    } else {\n      baseline = labelStyle.textBaseline ?? 'middle';\n    }\n    if (baseline === 'bottom') {\n      textY -= textHeight;\n    } else if (baseline === 'middle') {\n      textY -= textHeight / 2;\n    }\n\n    // 计算 label 包围盒\n    const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);\n\n    if (labelAngle) {\n      bounds.rotate(labelAngle, baseTextX, baseTextY);\n    }\n\n    return bounds;\n  });\n\n  return labelBoundsList;\n};\n\nexport const isAxisHorizontal = (axisOrientType: IOrientType) => {\n  return (['bottom', 'top', 'z'] as IOrientType[]).includes(axisOrientType);\n};\n"]}
+{"version":3,"sources":["../src/axis/tick-data/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport { AABBBounds, degreeToRadian } from '@visactor/vutils';\nimport type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { initTextMeasure } from '../../util/text';\nimport type { ICartesianTickDataOpt, IOrientType, ITickData } from '../type';\n\nexport const convertDomainToTickData = (domain: any[]): ITickData[] => {\n  const ticks = domain.map((t: number, index: number) => {\n    return {\n      index,\n      value: t\n    };\n  });\n  return ticks;\n};\n\n/** 判断两个label是否有重叠情况 */\nexport const labelOverlap = (prevLabel: AABBBounds, nextLabel: AABBBounds, gap = 0): boolean => {\n  const prevBounds = new AABBBounds(prevLabel).expand(gap / 2);\n  const nextBounds = new AABBBounds(nextLabel).expand(gap / 2);\n  return prevBounds.intersects(nextBounds);\n};\n\n/** 判断两个不相交的label相隔的距离 */\nexport const labelDistance = (prevLabel: AABBBounds, nextLabel: AABBBounds): [number, number] => {\n  let horizontal = 0;\n  if (prevLabel.x2 < nextLabel.x1) {\n    horizontal = nextLabel.x1 - prevLabel.x2;\n  } else if (nextLabel.x2 < prevLabel.x1) {\n    horizontal = prevLabel.x1 - nextLabel.x2;\n  }\n\n  let vertical = 0;\n  if (prevLabel.y2 < nextLabel.y1) {\n    vertical = nextLabel.y1 - prevLabel.y2;\n  } else if (nextLabel.y2 < prevLabel.y1) {\n    vertical = prevLabel.y1 - nextLabel.y2;\n  }\n\n  return [horizontal, vertical];\n};\n\nexport const MIN_TICK_GAP = 12;\n\nconst calculateFlushPos = (basePosition: number, size: number, rangePosition: number, otherEnd: number) => {\n  return rangePosition < basePosition\n    ? Math.max(basePosition - size / 2, rangePosition)\n    : rangePosition > basePosition\n    ? Math.min(basePosition - size / 2, rangePosition - size)\n    : rangePosition < otherEnd\n    ? rangePosition\n    : rangePosition - size;\n};\n\nexport const getCartesianLabelBounds = (scale: IBaseScale, domain: any[], op: ICartesianTickDataOpt): AABBBounds[] => {\n  const { labelStyle, axisOrientType, labelFlush, labelFormatter, startAngle = 0 } = op;\n  let labelAngle = labelStyle.angle ?? 0;\n  if (labelStyle.direction === 'vertical') {\n    labelAngle += degreeToRadian(90);\n  }\n  const isHorizontal = ['bottom', 'top'].includes(axisOrientType);\n  const isVertical = ['left', 'right'].includes(axisOrientType);\n  let scaleX = 1;\n  let scaleY = 0;\n  if (isHorizontal) {\n    // nothing to update\n  } else if (isVertical) {\n    scaleX = 0;\n    scaleY = 1;\n  } else if (startAngle) {\n    scaleX = Math.cos(startAngle);\n    scaleY = -Math.sin(startAngle);\n  }\n\n  const textMeasure = initTextMeasure(labelStyle);\n  const range = scale.range();\n  const labelBoundsList = domain.map((v: any, i: number) => {\n    const str = labelFormatter ? labelFormatter(v) : `${v}`;\n\n    // 估算文本宽高\n    const { width, height } = textMeasure.quickMeasure(str);\n    const textWidth = Math.max(width, MIN_TICK_GAP);\n    const textHeight = Math.max(height, MIN_TICK_GAP);\n\n    // 估算文本位置\n    const pos = scale.scale(v);\n    const baseTextX = scaleX * pos;\n    const baseTextY = scaleY * pos;\n    let textX = baseTextX;\n    let textY = baseTextY;\n\n    let align: TextAlignType;\n    if (labelFlush && isHorizontal && i === 0) {\n      textX = calculateFlushPos(baseTextX, textWidth, range[0], range[range.length - 1]);\n    } else if (labelFlush && isHorizontal && i === domain.length - 1) {\n      textX = calculateFlushPos(baseTextX, textWidth, range[range.length - 1], range[0]);\n    } else {\n      align = labelStyle.textAlign ?? 'center';\n    }\n    if (align === 'right') {\n      textX -= textWidth;\n    } else if (align === 'center') {\n      textX -= textWidth / 2;\n    }\n\n    let baseline: TextBaselineType;\n    if (labelFlush && isVertical && i === 0) {\n      textY = calculateFlushPos(baseTextY, textHeight, range[0], range[range.length - 1]);\n    } else if (labelFlush && isVertical && i === domain.length - 1) {\n      textY = calculateFlushPos(baseTextY, textHeight, range[range.length - 1], range[0]);\n    } else {\n      baseline = labelStyle.textBaseline ?? 'middle';\n    }\n    if (baseline === 'bottom') {\n      textY -= textHeight;\n    } else if (baseline === 'middle') {\n      textY -= textHeight / 2;\n    }\n\n    // 计算 label 包围盒\n    const bounds = new AABBBounds().set(textX, textY, textX + textWidth, textY + textHeight);\n\n    if (labelAngle) {\n      bounds.rotate(labelAngle, baseTextX, baseTextY);\n    }\n\n    return bounds;\n  });\n\n  return labelBoundsList;\n};\n\nexport const isAxisHorizontal = (axisOrientType: IOrientType) => {\n  return (['bottom', 'top', 'z'] as IOrientType[]).includes(axisOrientType);\n};\n"]}

package/cjs/axis/type.d.ts

@@ -70,6 +70,7 @@ export interface LineAxisAttributes extends Omit<AxisBaseAttributes, 'label'> {
         containerAlign?: 'left' | 'right' | 'center' | 'top' | 'bottom' | 'middle';
         flush?: boolean;
         lastVisible?: boolean;
+        firstVisible?: boolean;
     };
     panel?: {
         visible?: boolean;
@@ -175,11 +176,12 @@ export interface ITickDataOpt {
     labelFormatter?: (value: any) => string;
     labelStyle: ITextGraphicAttribute;
     labelGap?: number;
+    labelFirstVisible?: boolean;
+    labelLastVisible?: boolean;
     breakData?: () => breakData;
 }
 export interface ICartesianTickDataOpt extends ITickDataOpt {
     axisOrientType: IOrientType;
-    labelLastVisible: boolean;
     labelFlush: boolean;
     breakData?: () => breakData;
 }

package/cjs/axis/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/axis/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n  ILineGraphicAttribute,\n  SymbolType,\n  ITextGraphicAttribute,\n  ISymbolGraphicAttribute,\n  IRectGraphicAttribute,\n  IGroupGraphicAttribute,\n  IText,\n  IGroup,\n  IGraphic\n} from '@visactor/vrender-core';\nimport type { Dict } from '@visactor/vutils';\nimport type { ContinuousScale, CustomTicksFunc } from '@visactor/vscale';\nimport type { Point, TextContent } from '../core/type';\nimport type { SegmentAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\n\nexport type AxisItemStateStyle<T> = {\n  hover?: T;\n  hover_reverse?: T;\n  selected?: T;\n  selected_reverse?: T;\n};\n\nexport type callbackFunc<T> = (datum: Dict<any>, index: number, data?: Dict<any>[], layer?: number) => T;\n\n// 处理过的用于绘制的 tickLine 数据\nexport type TickLineItem = {\n  start: Point;\n  end: Point;\n  /** 归一化后的数据 */\n  value: number;\n  // 3d数据\n  anchor?: [number, number];\n  alpha?: number;\n  beta?: number;\n  [key: string]: any;\n};\n\n// 处理过的用于绘制的数据\nexport type TransformedAxisItem = AxisItem & {\n  point: Point;\n};\n\nexport type AxisItem = {\n  /** 标识符，用于动画以及图形查找 */\n  id?: string | number;\n  /** 显示文本 */\n  label: string | number;\n  /** 归一化后的数据 */\n  value: number;\n  /** 对应原始数据 */\n  rawValue: any;\n  [key: string]: any;\n};\n\nexport interface AxisBaseAttributes extends IGroupGraphicAttribute {\n  /**\n   * 是否开启选中交互\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 交互\n   * @default false\n   */\n  hover?: boolean;\n  /**\n   * 垂直于坐标轴方向的因子，默认为 1\n   */\n  verticalFactor?: number;\n  /**\n   * 坐标轴的显示位置，用于文本的防重叠处理\n   */\n  orient?: string;\n  /** 坐标轴数据 */\n  items: AxisItem[][];\n  /**\n   * 轴标题配置\n   */\n  title?: TitleAttributes;\n  /**\n   * 轴标签配置\n   */\n  label?: LabelAttributes;\n  /**\n   * 轴刻度线配置\n   */\n  tick?: TickAttributes;\n  /**\n   * 自刻度线配置\n   */\n  subTick?: SubTickAttributes;\n  /**\n   * 轴线配置\n   */\n  line?: LineAttributes;\n  /**\n   * 关闭交互效果\n   * @default false\n   */\n  disableTriggerEvent?: boolean;\n}\n\nexport interface ILine3dType {\n  alpha: number;\n  anchor3d?: [number, number];\n}\n\nexport interface BreakSymbol {\n  /**\n   * 是否显示\n   */\n  visible?: boolean;\n  /**\n   * 截断图形旋转的弧度。\n   */\n  angle?: number;\n\n  /**\n   * 样式配置\n   */\n  style?: Partial<ISymbolGraphicAttribute>;\n}\nexport interface AxisBreakProps {\n  /**\n   * 轴截断的范围，值为归一化后的数据\n   */\n  range: [number, number];\n  /**\n   * 截断图形配置\n   */\n  breakSymbol?: BreakSymbol;\n  /**\n   * 轴截断原始的数据范围\n   */\n  rawRange?: [number, number];\n}\n\nexport interface TransformedAxisBreak extends AxisBreakProps {\n  /**\n   * 截断的起始点\n   */\n  startPoint: Point;\n  /**\n   * 截断的结束点\n   */\n  endPoint: Point;\n}\n\nexport interface LineAxisAttributes extends Omit<AxisBaseAttributes, 'label'> {\n  /**\n   * 起始点坐标\n   */\n  start: Point;\n  /**\n   * 结束点坐标\n   */\n  end: Point;\n  /**\n   * 坐标轴垂直方向的限制空间，该配置会影响文本的显示，\n   * 即如果超出，文本则会进行自动旋转、自动隐藏等动作。\n   */\n  verticalLimitSize?: number;\n  /**\n   * 坐标轴垂直方向的最小空间，如果小于该值，则以该值占据显示空间。\n   * 如果同时声明了 verticalLimitSize，请保证 verticalMinSize <= verticalLimitSize，否则会以 verticalLimitSize 为准。\n   */\n  verticalMinSize?: number;\n\n  /**\n   * 轴标签配置\n   */\n  label?: LabelAttributes & {\n    /**\n     * label 相对于容器整体的对齐方式\n     * - `top`：整体向上对齐（垂直方向）\n     * - `middle`：整体居中对齐（垂直方向）\n     * - `bottom`：整体向下对齐（垂直方向）\n     * - `left`：整体向左对齐（水平方向）\n     * - `center`：整体居中对齐（水平方向）\n     * - `right`：整体向右对齐（水平方向）\n     */\n    containerAlign?: 'left' | 'right' | 'center' | 'top' | 'bottom' | 'middle';\n    /**\n     * 坐标轴首尾文字向内收缩\n     * @default false\n     */\n    flush?: boolean;\n    /**\n     * 保证最后的label必须展示\n     * @default false\n     * @since 0.17.10\n     */\n    lastVisible?: boolean;\n  };\n  /**\n   * 坐标轴背景配置\n   */\n  panel?: {\n    /**\n     * 是否绘制坐标轴背景\n     */\n    visible?: boolean;\n    /**\n     * 坐标轴背景配置\n     */\n    style?: Partial<IRectGraphicAttribute>;\n    /**\n     * 坐标轴背景交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectGraphicAttribute>>;\n  };\n\n  /**\n   * 轴截断配置\n   * @since 0.20.3\n   */\n  breaks?: AxisBreakProps[];\n}\n\nexport interface CircleAxisAttributes extends AxisBaseAttributes {\n  /**\n   * 当配置了 innerRadius 时，可以通过设置 inside: true，将坐标轴战士在内圆半径上。\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 圆心坐标\n   */\n  center: Point;\n  /**\n   * **弧度值**，起始弧度，默认 -0.5 * Math.PI\n   *\n   */\n  startAngle?: number;\n  /**\n   * **弧度值**，结束弧度，默认 1.5 * Math.PI\n   */\n  endAngle?: number;\n  /**\n   * 半径\n   */\n  radius: number;\n  /** 内半径 */\n  innerRadius?: number;\n  /**\n   * 边数\n   * @since 0.19.24\n   */\n  sides?: number;\n}\n\n// 坐标轴标题配置\nexport type TitleAttributes = Omit<TagAttributes, 'shape' | 'space' | 'panel' | 'state'> & {\n  /**\n   * 是否展示标题\n   */\n  visible?: boolean;\n  /**\n   * 标题的显示位置，默认 'middle'\n   */\n  position?: 'start' | 'middle' | 'end';\n  /**\n   * 标题距离坐标轴(轴线、刻度、标签共同构成的包围盒)的距离\n   */\n  space?: number;\n  /**\n   * 标题是否自动旋转以和坐标轴平行\n   */\n  autoRotate?: boolean;\n  shape?: {\n    /**\n     * 是否展示 shape\n     */\n    visible?: boolean;\n    /**\n     * shape 同 文本的间距\n     */\n    space?: number;\n    style?: Omit<Partial<ISymbolGraphicAttribute>, 'visible'>;\n  };\n  /**\n   * 背景设置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景层样式\n     */\n    style?: Omit<Partial<IRectGraphicAttribute>, 'visible' | 'width' | 'height'>;\n  };\n\n  /**\n   * 交互状态样式配置\n   */\n  state?: {\n    /**\n     * text 文本的状态配置\n     */\n    text?: AxisItemStateStyle<Partial<ITextGraphicAttribute>>;\n    /**\n     * shape 标记的状态配置\n     */\n    shape?: AxisItemStateStyle<Partial<ISymbolGraphicAttribute>>;\n    /**\n     * panel 背景的状态配置\n     */\n    background?: AxisItemStateStyle<Partial<IRectGraphicAttribute>>;\n  };\n};\n// 坐标轴线配置\nexport interface LineAttributes extends Pick<SegmentAttributes, 'startSymbol' | 'endSymbol'> {\n  /**\n   * 是否展示轴线\n   */\n  visible?: boolean;\n  /**\n   * 线的样式配置\n   */\n  style?: Partial<ILineGraphicAttribute>;\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute>>;\n}\n\n// 轴刻度线配置\nexport interface TickAttributes {\n  /** 是否显示轴刻度线 */\n  visible: boolean;\n  /**\n   * 刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * tick 是否与 label 对齐\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /**\n   * 刻度线的长度\n   */\n  length?: number;\n  /**\n   * 刻度线样式配置\n   */\n  style?: Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>;\n  /**\n   * 刻度线状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>>;\n  /**\n   * 用于 tick 的数据过滤\n   * @param data\n   * @returns\n   */\n  dataFilter?: (data: AxisItem[]) => AxisItem[];\n}\n\n// 子轴刻度线配置\nexport interface SubTickAttributes {\n  /** 是否显示子轴刻度线 */\n  visible: boolean;\n  /**\n   * TODO: 考虑下 log 轴，自刻度线之间的间距是不均匀的问题\n   * 子刻度个数\n   */\n  count?: number;\n  /**\n   * 子刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 子刻度线的长度\n   */\n  length?: number;\n  /**\n   * 子刻度线样式配置\n   */\n  style?: Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>;\n  /**\n   * 子刻度线状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>>;\n}\n\nexport type CustomMethod = (items: IText[], separation: number) => IText[];\n\nexport interface AxisLabelOverlap {\n  /**\n   * 自动旋转配置\n   * @default false\n   */\n  autoRotate?: boolean;\n  /**\n   * 仅当 `autoRotate` 为 true 时生效，可选的旋转范围，默认为 [0, 45, 90]\n   * @default [0, 45, 90]\n   */\n  autoRotateAngle?: number[];\n  /**\n   * 自动隐藏配置\n   * @default false\n   */\n  autoHide?: boolean;\n  /**\n   * 防重叠策略，默认为 'parity'。\n   * - 'parity': 奇偶校验，使用删除所有其他标签的策略（这对于标准线性轴非常有效）。\n   * - 'greedy': 将执行标签的线性扫描，并删除与最后一个可见标签重叠的所有标签。\n   * - 也可以传入函数用于自定义策略\n   * @default 'parity'\n   */\n  autoHideMethod?: 'parity' | 'greedy' | CustomMethod;\n  /**\n   * 仅当 `autoHide` 为 true 时生效，设置文本之间的间隔距离，单位 px\n   * @default 0\n   */\n  autoHideSeparation?: number;\n  /**\n   * 自动隐藏配置\n   * @default false\n   */\n  autoLimit?: boolean;\n  /**\n   * 仅当 `autoLimit` 为 true 时生效，省略占位符，默认为 '...'\n   * @default '...'\n   */\n  limitEllipsis?: string;\n  /**\n   * 文字超出坐标轴范围时，两侧可以提供扩充的空间大小。\n   * 例如，x 轴坐标 135 度旋转时，左侧第一个标签可能超出坐标轴范围，导致文本被缩略，此时可以通过配置 `overflowLimitLength` 优化效果。\n   * 仅当 `autoLimit` 为 true 时生效。\n   * @default 0\n   * @since 0.20.3 支持 X 轴配置生效\n   */\n  overflowLimitLength?:\n    | number\n    | {\n        left?: number;\n        right?: number;\n        // top?: number;\n        // bottom?: number;\n      };\n\n  /**\n   * 自定义布局配置，如果声明了 `layoutFunc`，则默认提供的防重叠相关的配置（`autoHide`, `autoRotate`, `autoLimit`）均不生效\n   * @param labels 标签图形元素\n   * @param labelData 标签数据\n   * @param layer 当前轴的层级\n   * @param axis 当前轴组件实例\n   * @returns void\n   */\n  layoutFunc?: (labels: IText[], labelData: AxisItem[], layer: number, axis: IGroup) => void;\n\n  /**\n   * 标签自动换行。与 `autoRotate` 不能同时生效，若开启了 `autoRotate`，则优先使用自动旋转策略。\n   * @since 0.20.3\n   * @default false\n   */\n  autoWrap?: boolean;\n}\n\nexport type LabelAttributes = Omit<AxisLabelOverlap, 'text'> &\n  TextContent & {\n    /** 是否展示标签 */\n    visible: boolean;\n    /**\n     * 标签朝向，默认朝外(坐标线包围盒外部)\n     * @default false\n     */\n    inside?: boolean;\n    /** 标签同 tick 之间的间距 */\n    space?: number;\n    /**\n     * 格式化文本回调\n     * @param text 文本原始值\n     * @param item 对应的图形元素\n     * @param index 文本索引顺序\n     * @returns 格式化文本\n     */\n    formatMethod?: (value: string, datum: Dict<any>, index: number, data?: Dict<any>[], layer?: number) => string;\n    /**\n     * 文本样式\n     */\n    style?: Partial<ITextGraphicAttribute> | callbackFunc<Partial<ITextGraphicAttribute> | undefined>;\n    /**\n     * 文本状态样式配置\n     */\n    state?: AxisItemStateStyle<\n      Partial<ITextGraphicAttribute> | callbackFunc<Partial<ITextGraphicAttribute> | undefined>\n    >;\n\n    /**\n     * 用于 label 的数据过滤\n     * @param data\n     * @param layer\n     * @returns\n     */\n    dataFilter?: (data: AxisItem[], layer: number) => AxisItem[];\n  };\n\nexport type CoordinateType = 'cartesian' | 'polar' | 'geo' | 'none';\nexport type IOrientType = 'left' | 'top' | 'right' | 'bottom' | 'z';\nexport type IPolarOrientType = 'radius' | 'angle';\n\ntype breakData = {\n  /**\n   * 截断后的值域范围\n   */\n  domain?: [number, number][];\n  /**\n   * 截断后的归一化范围\n   */\n  scope?: [number, number][];\n  /**\n   * 用户配置的截断范围\n   */\n  breakDomains: [number, number][];\n};\n\nexport interface ITickDataOpt {\n  /**\n   * 是否进行轴采样\n   */\n  sampling?: boolean;\n  tickCount?: number | ((option: ITickCallbackOption) => number);\n  forceTickCount?: number;\n  tickStep?: number;\n  tickMode?: 'average' | 'd3' | string | CustomTicksFunc<ContinuousScale>;\n  noDecimals?: boolean;\n\n  coordinateType: CoordinateType;\n  axisOrientType: IOrientType | IPolarOrientType;\n  startAngle?: number;\n\n  labelFormatter?: (value: any) => string;\n  labelStyle: ITextGraphicAttribute;\n  labelGap?: number;\n  /**\n   * 截断数据范围配置\n   */\n  breakData?: () => breakData;\n}\n\nexport interface ICartesianTickDataOpt extends ITickDataOpt {\n  axisOrientType: IOrientType;\n  labelLastVisible: boolean;\n  labelFlush: boolean;\n  /**\n   * 截断数据范围配置\n   */\n  breakData?: () => breakData;\n}\n\nexport interface IPolarTickDataOpt extends ITickDataOpt {\n  axisOrientType: IPolarOrientType;\n  getRadius: () => number;\n  labelOffset: number;\n  inside: boolean;\n}\n\nexport interface ITickData {\n  index: number;\n  value: number | string;\n  // label: string;\n}\n\nexport type ITickCallbackOption = {\n  /**\n   * 坐标轴占据的画布大小。\n   * 直角坐标系中为轴的宽度或高度。\n   * 极坐标系中半径轴的长度。\n   */\n  axisLength?: number;\n  /**\n   * 轴标签的样式\n   */\n  labelStyle?: ITextGraphicAttribute;\n};\n\nexport interface ILabelItem<T> extends Pick<IGraphic, 'AABBBounds'> {\n  value?: T;\n}\n"]}
+{"version":3,"sources":["../src/axis/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n  ILineGraphicAttribute,\n  SymbolType,\n  ITextGraphicAttribute,\n  ISymbolGraphicAttribute,\n  IRectGraphicAttribute,\n  IGroupGraphicAttribute,\n  IText,\n  IGroup,\n  IGraphic\n} from '@visactor/vrender-core';\nimport type { Dict } from '@visactor/vutils';\nimport type { ContinuousScale, CustomTicksFunc } from '@visactor/vscale';\nimport type { Point, TextContent } from '../core/type';\nimport type { SegmentAttributes } from '../segment';\nimport type { TagAttributes } from '../tag';\n\nexport type AxisItemStateStyle<T> = {\n  hover?: T;\n  hover_reverse?: T;\n  selected?: T;\n  selected_reverse?: T;\n};\n\nexport type callbackFunc<T> = (datum: Dict<any>, index: number, data?: Dict<any>[], layer?: number) => T;\n\n// 处理过的用于绘制的 tickLine 数据\nexport type TickLineItem = {\n  start: Point;\n  end: Point;\n  /** 归一化后的数据 */\n  value: number;\n  // 3d数据\n  anchor?: [number, number];\n  alpha?: number;\n  beta?: number;\n  [key: string]: any;\n};\n\n// 处理过的用于绘制的数据\nexport type TransformedAxisItem = AxisItem & {\n  point: Point;\n};\n\nexport type AxisItem = {\n  /** 标识符，用于动画以及图形查找 */\n  id?: string | number;\n  /** 显示文本 */\n  label: string | number;\n  /** 归一化后的数据 */\n  value: number;\n  /** 对应原始数据 */\n  rawValue: any;\n  [key: string]: any;\n};\n\nexport interface AxisBaseAttributes extends IGroupGraphicAttribute {\n  /**\n   * 是否开启选中交互\n   * @default false\n   */\n  select?: boolean;\n  /**\n   * 是否开启 hover 交互\n   * @default false\n   */\n  hover?: boolean;\n  /**\n   * 垂直于坐标轴方向的因子，默认为 1\n   */\n  verticalFactor?: number;\n  /**\n   * 坐标轴的显示位置，用于文本的防重叠处理\n   */\n  orient?: string;\n  /** 坐标轴数据 */\n  items: AxisItem[][];\n  /**\n   * 轴标题配置\n   */\n  title?: TitleAttributes;\n  /**\n   * 轴标签配置\n   */\n  label?: LabelAttributes;\n  /**\n   * 轴刻度线配置\n   */\n  tick?: TickAttributes;\n  /**\n   * 自刻度线配置\n   */\n  subTick?: SubTickAttributes;\n  /**\n   * 轴线配置\n   */\n  line?: LineAttributes;\n  /**\n   * 关闭交互效果\n   * @default false\n   */\n  disableTriggerEvent?: boolean;\n}\n\nexport interface ILine3dType {\n  alpha: number;\n  anchor3d?: [number, number];\n}\n\nexport interface BreakSymbol {\n  /**\n   * 是否显示\n   */\n  visible?: boolean;\n  /**\n   * 截断图形旋转的弧度。\n   */\n  angle?: number;\n\n  /**\n   * 样式配置\n   */\n  style?: Partial<ISymbolGraphicAttribute>;\n}\nexport interface AxisBreakProps {\n  /**\n   * 轴截断的范围，值为归一化后的数据\n   */\n  range: [number, number];\n  /**\n   * 截断图形配置\n   */\n  breakSymbol?: BreakSymbol;\n  /**\n   * 轴截断原始的数据范围\n   */\n  rawRange?: [number, number];\n}\n\nexport interface TransformedAxisBreak extends AxisBreakProps {\n  /**\n   * 截断的起始点\n   */\n  startPoint: Point;\n  /**\n   * 截断的结束点\n   */\n  endPoint: Point;\n}\n\nexport interface LineAxisAttributes extends Omit<AxisBaseAttributes, 'label'> {\n  /**\n   * 起始点坐标\n   */\n  start: Point;\n  /**\n   * 结束点坐标\n   */\n  end: Point;\n  /**\n   * 坐标轴垂直方向的限制空间，该配置会影响文本的显示，\n   * 即如果超出，文本则会进行自动旋转、自动隐藏等动作。\n   */\n  verticalLimitSize?: number;\n  /**\n   * 坐标轴垂直方向的最小空间，如果小于该值，则以该值占据显示空间。\n   * 如果同时声明了 verticalLimitSize，请保证 verticalMinSize <= verticalLimitSize，否则会以 verticalLimitSize 为准。\n   */\n  verticalMinSize?: number;\n\n  /**\n   * 轴标签配置\n   */\n  label?: LabelAttributes & {\n    /**\n     * label 相对于容器整体的对齐方式\n     * - `top`：整体向上对齐（垂直方向）\n     * - `middle`：整体居中对齐（垂直方向）\n     * - `bottom`：整体向下对齐（垂直方向）\n     * - `left`：整体向左对齐（水平方向）\n     * - `center`：整体居中对齐（水平方向）\n     * - `right`：整体向右对齐（水平方向）\n     */\n    containerAlign?: 'left' | 'right' | 'center' | 'top' | 'bottom' | 'middle';\n    /**\n     * 坐标轴首尾文字向内收缩\n     * @default false\n     */\n    flush?: boolean;\n    /**\n     * 保证最后的label必须展示\n     * @default false\n     * @since 0.17.10\n     */\n    lastVisible?: boolean;\n    /**\n     * 保证第一个的label必须展示\n     * @default false\n     * @since 0.20.7\n     */\n    firstVisible?: boolean;\n  };\n  /**\n   * 坐标轴背景配置\n   */\n  panel?: {\n    /**\n     * 是否绘制坐标轴背景\n     */\n    visible?: boolean;\n    /**\n     * 坐标轴背景配置\n     */\n    style?: Partial<IRectGraphicAttribute>;\n    /**\n     * 坐标轴背景交互状态样式配置\n     */\n    state?: AxisItemStateStyle<Partial<IRectGraphicAttribute>>;\n  };\n\n  /**\n   * 轴截断配置\n   * @since 0.20.3\n   */\n  breaks?: AxisBreakProps[];\n}\n\nexport interface CircleAxisAttributes extends AxisBaseAttributes {\n  /**\n   * 当配置了 innerRadius 时，可以通过设置 inside: true，将坐标轴战士在内圆半径上。\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 圆心坐标\n   */\n  center: Point;\n  /**\n   * **弧度值**，起始弧度，默认 -0.5 * Math.PI\n   *\n   */\n  startAngle?: number;\n  /**\n   * **弧度值**，结束弧度，默认 1.5 * Math.PI\n   */\n  endAngle?: number;\n  /**\n   * 半径\n   */\n  radius: number;\n  /** 内半径 */\n  innerRadius?: number;\n  /**\n   * 边数\n   * @since 0.19.24\n   */\n  sides?: number;\n}\n\n// 坐标轴标题配置\nexport type TitleAttributes = Omit<TagAttributes, 'shape' | 'space' | 'panel' | 'state'> & {\n  /**\n   * 是否展示标题\n   */\n  visible?: boolean;\n  /**\n   * 标题的显示位置，默认 'middle'\n   */\n  position?: 'start' | 'middle' | 'end';\n  /**\n   * 标题距离坐标轴(轴线、刻度、标签共同构成的包围盒)的距离\n   */\n  space?: number;\n  /**\n   * 标题是否自动旋转以和坐标轴平行\n   */\n  autoRotate?: boolean;\n  shape?: {\n    /**\n     * 是否展示 shape\n     */\n    visible?: boolean;\n    /**\n     * shape 同 文本的间距\n     */\n    space?: number;\n    style?: Omit<Partial<ISymbolGraphicAttribute>, 'visible'>;\n  };\n  /**\n   * 背景设置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景层样式\n     */\n    style?: Omit<Partial<IRectGraphicAttribute>, 'visible' | 'width' | 'height'>;\n  };\n\n  /**\n   * 交互状态样式配置\n   */\n  state?: {\n    /**\n     * text 文本的状态配置\n     */\n    text?: AxisItemStateStyle<Partial<ITextGraphicAttribute>>;\n    /**\n     * shape 标记的状态配置\n     */\n    shape?: AxisItemStateStyle<Partial<ISymbolGraphicAttribute>>;\n    /**\n     * panel 背景的状态配置\n     */\n    background?: AxisItemStateStyle<Partial<IRectGraphicAttribute>>;\n  };\n};\n// 坐标轴线配置\nexport interface LineAttributes extends Pick<SegmentAttributes, 'startSymbol' | 'endSymbol'> {\n  /**\n   * 是否展示轴线\n   */\n  visible?: boolean;\n  /**\n   * 线的样式配置\n   */\n  style?: Partial<ILineGraphicAttribute>;\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute>>;\n}\n\n// 轴刻度线配置\nexport interface TickAttributes {\n  /** 是否显示轴刻度线 */\n  visible: boolean;\n  /**\n   * 刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * tick 是否与 label 对齐\n   * @default true\n   */\n  alignWithLabel?: boolean;\n  /**\n   * 刻度线的长度\n   */\n  length?: number;\n  /**\n   * 刻度线样式配置\n   */\n  style?: Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>;\n  /**\n   * 刻度线状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>>;\n  /**\n   * 用于 tick 的数据过滤\n   * @param data\n   * @returns\n   */\n  dataFilter?: (data: AxisItem[]) => AxisItem[];\n}\n\n// 子轴刻度线配置\nexport interface SubTickAttributes {\n  /** 是否显示子轴刻度线 */\n  visible: boolean;\n  /**\n   * TODO: 考虑下 log 轴，自刻度线之间的间距是不均匀的问题\n   * 子刻度个数\n   */\n  count?: number;\n  /**\n   * 子刻度线朝向，默认朝外(坐标线包围盒外部)\n   * @default false\n   */\n  inside?: boolean;\n  /**\n   * 子刻度线的长度\n   */\n  length?: number;\n  /**\n   * 子刻度线样式配置\n   */\n  style?: Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>;\n  /**\n   * 子刻度线状态样式配置\n   */\n  state?: AxisItemStateStyle<Partial<ILineGraphicAttribute> | callbackFunc<Partial<ILineGraphicAttribute> | undefined>>;\n}\n\nexport type CustomMethod = (items: IText[], separation: number) => IText[];\n\nexport interface AxisLabelOverlap {\n  /**\n   * 自动旋转配置\n   * @default false\n   */\n  autoRotate?: boolean;\n  /**\n   * 仅当 `autoRotate` 为 true 时生效，可选的旋转范围，默认为 [0, 45, 90]\n   * @default [0, 45, 90]\n   */\n  autoRotateAngle?: number[];\n  /**\n   * 自动隐藏配置\n   * @default false\n   */\n  autoHide?: boolean;\n  /**\n   * 防重叠策略，默认为 'parity'。\n   * - 'parity': 奇偶校验，使用删除所有其他标签的策略（这对于标准线性轴非常有效）。\n   * - 'greedy': 将执行标签的线性扫描，并删除与最后一个可见标签重叠的所有标签。\n   * - 也可以传入函数用于自定义策略\n   * @default 'parity'\n   */\n  autoHideMethod?: 'parity' | 'greedy' | CustomMethod;\n  /**\n   * 仅当 `autoHide` 为 true 时生效，设置文本之间的间隔距离，单位 px\n   * @default 0\n   */\n  autoHideSeparation?: number;\n  /**\n   * 自动隐藏配置\n   * @default false\n   */\n  autoLimit?: boolean;\n  /**\n   * 仅当 `autoLimit` 为 true 时生效，省略占位符，默认为 '...'\n   * @default '...'\n   */\n  limitEllipsis?: string;\n  /**\n   * 文字超出坐标轴范围时，两侧可以提供扩充的空间大小。\n   * 例如，x 轴坐标 135 度旋转时，左侧第一个标签可能超出坐标轴范围，导致文本被缩略，此时可以通过配置 `overflowLimitLength` 优化效果。\n   * 仅当 `autoLimit` 为 true 时生效。\n   * @default 0\n   * @since 0.20.3 支持 X 轴配置生效\n   */\n  overflowLimitLength?:\n    | number\n    | {\n        left?: number;\n        right?: number;\n        // top?: number;\n        // bottom?: number;\n      };\n\n  /**\n   * 自定义布局配置，如果声明了 `layoutFunc`，则默认提供的防重叠相关的配置（`autoHide`, `autoRotate`, `autoLimit`）均不生效\n   * @param labels 标签图形元素\n   * @param labelData 标签数据\n   * @param layer 当前轴的层级\n   * @param axis 当前轴组件实例\n   * @returns void\n   */\n  layoutFunc?: (labels: IText[], labelData: AxisItem[], layer: number, axis: IGroup) => void;\n\n  /**\n   * 标签自动换行。与 `autoRotate` 不能同时生效，若开启了 `autoRotate`，则优先使用自动旋转策略。\n   * @since 0.20.3\n   * @default false\n   */\n  autoWrap?: boolean;\n}\n\nexport type LabelAttributes = Omit<AxisLabelOverlap, 'text'> &\n  TextContent & {\n    /** 是否展示标签 */\n    visible: boolean;\n    /**\n     * 标签朝向，默认朝外(坐标线包围盒外部)\n     * @default false\n     */\n    inside?: boolean;\n    /** 标签同 tick 之间的间距 */\n    space?: number;\n    /**\n     * 格式化文本回调\n     * @param text 文本原始值\n     * @param item 对应的图形元素\n     * @param index 文本索引顺序\n     * @returns 格式化文本\n     */\n    formatMethod?: (value: string, datum: Dict<any>, index: number, data?: Dict<any>[], layer?: number) => string;\n    /**\n     * 文本样式\n     */\n    style?: Partial<ITextGraphicAttribute> | callbackFunc<Partial<ITextGraphicAttribute> | undefined>;\n    /**\n     * 文本状态样式配置\n     */\n    state?: AxisItemStateStyle<\n      Partial<ITextGraphicAttribute> | callbackFunc<Partial<ITextGraphicAttribute> | undefined>\n    >;\n\n    /**\n     * 用于 label 的数据过滤\n     * @param data\n     * @param layer\n     * @returns\n     */\n    dataFilter?: (data: AxisItem[], layer: number) => AxisItem[];\n  };\n\nexport type CoordinateType = 'cartesian' | 'polar' | 'geo' | 'none';\nexport type IOrientType = 'left' | 'top' | 'right' | 'bottom' | 'z';\nexport type IPolarOrientType = 'radius' | 'angle';\n\ntype breakData = {\n  /**\n   * 截断后的值域范围\n   */\n  domain?: [number, number][];\n  /**\n   * 截断后的归一化范围\n   */\n  scope?: [number, number][];\n  /**\n   * 用户配置的截断范围\n   */\n  breakDomains: [number, number][];\n};\n\nexport interface ITickDataOpt {\n  /**\n   * 是否进行轴采样\n   */\n  sampling?: boolean;\n  tickCount?: number | ((option: ITickCallbackOption) => number);\n  forceTickCount?: number;\n  tickStep?: number;\n  tickMode?: 'average' | 'd3' | string | CustomTicksFunc<ContinuousScale>;\n  noDecimals?: boolean;\n\n  coordinateType: CoordinateType;\n  axisOrientType: IOrientType | IPolarOrientType;\n  startAngle?: number;\n\n  labelFormatter?: (value: any) => string;\n  labelStyle: ITextGraphicAttribute;\n  labelGap?: number;\n  labelFirstVisible?: boolean;\n  labelLastVisible?: boolean;\n  /**\n   * 截断数据范围配置\n   */\n  breakData?: () => breakData;\n}\n\nexport interface ICartesianTickDataOpt extends ITickDataOpt {\n  axisOrientType: IOrientType;\n  labelFlush: boolean;\n  /**\n   * 截断数据范围配置\n   */\n  breakData?: () => breakData;\n}\n\nexport interface IPolarTickDataOpt extends ITickDataOpt {\n  axisOrientType: IPolarOrientType;\n  getRadius: () => number;\n  labelOffset: number;\n  inside: boolean;\n}\n\nexport interface ITickData {\n  index: number;\n  value: number | string;\n  // label: string;\n}\n\nexport type ITickCallbackOption = {\n  /**\n   * 坐标轴占据的画布大小。\n   * 直角坐标系中为轴的宽度或高度。\n   * 极坐标系中半径轴的长度。\n   */\n  axisLength?: number;\n  /**\n   * 轴标签的样式\n   */\n  labelStyle?: ITextGraphicAttribute;\n};\n\nexport interface ILabelItem<T> extends Pick<IGraphic, 'AABBBounds'> {\n  value?: T;\n}\n"]}

package/cjs/axis/util.d.ts

@@ -1,4 +1,4 @@
-import type { IGraphic, IGroup } from '@visactor/vrender-core';
+import type { IGraphic, IGroup, IText } from '@visactor/vrender-core';
 import type { Dict } from '@visactor/vutils';
 import type { Vector2 } from '../util';
 import type { BreakSymbol } from './type';
@@ -26,3 +26,5 @@ export declare function getPolarAngleLabelPosition(angle: number, center: {
 };
 export declare function getCirclePoints(center: Point, count: number, radius: number, startAngle: number, endAngle: number): Point[];
 export declare function getPolygonPath(points: Point[], closed: boolean): string;
+export declare function textIntersect(textA: IText, textB: IText, sep: number): boolean;
+export declare function hasOverlap<T>(items: IText[], pad: number): boolean;

package/cjs/axis/util.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getPolygonPath = exports.getCirclePoints = exports.getPolarAngleLabelPosition = exports.angleLabelOrientAttribute = exports.getCircleVerticalVector = exports.getVerticalCoord = exports.getElMap = exports.getAxisBreakSymbolAttrs = exports.getCircleLabelPosition = exports.isInRange = exports.clampRadian = void 0;
+}), exports.hasOverlap = exports.textIntersect = exports.getPolygonPath = exports.getCirclePoints = exports.getPolarAngleLabelPosition = exports.angleLabelOrientAttribute = exports.getCircleVerticalVector = exports.getVerticalCoord = exports.getElMap = exports.getAxisBreakSymbolAttrs = exports.getCircleLabelPosition = exports.isInRange = exports.clampRadian = void 0;
 
 const vutils_1 = require("@visactor/vutils"), common_1 = require("../util/common"), util_1 = require("../util"), config_1 = require("./config"), clampRadian = (angle = 0) => {
     if (angle < 0) for (;angle < 0; ) angle += vutils_1.tau; else if (angle > 0) for (;angle > vutils_1.tau; ) angle -= vutils_1.tau;
@@ -84,8 +84,22 @@ function getPolygonPath(points, closed) {
     })), closed && (path += "Z")), path;
 }
 
+function textIntersect(textA, textB, sep) {
+    let a = textA.OBBBounds, b = textB.OBBBounds;
+    return a && b && !a.empty() && !b.empty() ? a.intersects(b) : (a = textA.AABBBounds, 
+    b = textB.AABBBounds, sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2));
+}
+
+function hasOverlap(items, pad) {
+    for (let b, i = 1, n = items.length, a = items[0]; i < n; a = b, ++i) if (b = items[i], 
+    textIntersect(a, b, pad)) return !0;
+    return !1;
+}
+
 exports.clampRadian = clampRadian, exports.isInRange = isInRange, exports.getCircleLabelPosition = getCircleLabelPosition, 
 exports.getAxisBreakSymbolAttrs = getAxisBreakSymbolAttrs, exports.getElMap = getElMap, 
 exports.getVerticalCoord = getVerticalCoord, exports.getCircleVerticalVector = getCircleVerticalVector, 
 exports.angleLabelOrientAttribute = angleLabelOrientAttribute, exports.getPolarAngleLabelPosition = getPolarAngleLabelPosition, 
-exports.getCirclePoints = getCirclePoints, exports.getPolygonPath = getPolygonPath;
+exports.getCirclePoints = getCirclePoints, exports.getPolygonPath = getPolygonPath, 
+exports.textIntersect = textIntersect, exports.hasOverlap = hasOverlap;
+//# sourceMappingURL=util.js.map