@visactor/vrender-components 0.19.4-alpha.5 → 0.19.5-alpha.1

package/es/util/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,UAAU,aAAa,CAAC,KAAe,EAAE,EAAsC;IACnF,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,OAAO,GAAG,EAAE,CAAC,IAAgB,CAAC,CAAC;QACrC,IAAK,IAAe,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE;YAC5C,aAAa,CAAC,IAAgB,EAAE,EAAE,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAgC,EAAW,EAAE;IACrE,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,KAAK,CAAC;KACd;IACD,OAAO,GAAG,CAAC,OAAO,KAAK,KAAK,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,CAAW,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IACD,OAAO,KAAK,CAAC,WAAW,EAAgB,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAY,EAAE,IAAY;IAChE,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,CAAW,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,EAAE,CAAC;KACX;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,IAAI,CAA0B,CAAC;AACrF,CAAC","file":"common.js","sourcesContent":["/**\n * @description 存放工具函数\n */\nimport type { IGraphicAttribute, IGraphic, IGroup } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\n\nexport function traverseGroup(group: IGraphic, cb: (node: IGraphic) => boolean | void) {\n  group.forEachChildren(node => {\n    const stopped = cb(node as IGraphic);\n    if ((node as IGroup).isContainer && !stopped) {\n      traverseGroup(node as IGraphic, cb);\n    }\n  });\n}\n\nexport const isVisible = (obj?: Partial<IGraphicAttribute>): boolean => {\n  if (isNil(obj)) {\n    return false;\n  }\n  return obj.visible !== false;\n};\n\nexport function getMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.getChildren() as IGraphic[];\n}\n\nexport function getNoneGroupMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.findAll(node => node.type !== 'group', true) as unknown as IGraphic[];\n}\n"]}
+{"version":3,"sources":["../src/util/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["/**\n * @description 存放工具函数\n */\nimport type { IGraphicAttribute, IGraphic, IGroup } from '@visactor/vrender-core';\nimport { isNil } from '@visactor/vutils';\nimport type { Point } from '../core/type';\n\nexport function traverseGroup(group: IGraphic, cb: (node: IGraphic) => boolean | void) {\n  group.forEachChildren(node => {\n    const stopped = cb(node as IGraphic);\n    if ((node as IGroup).isContainer && !stopped) {\n      traverseGroup(node as IGraphic, cb);\n    }\n  });\n}\n\nexport const isVisible = (obj?: Partial<IGraphicAttribute>): boolean => {\n  if (isNil(obj)) {\n    return false;\n  }\n  return obj.visible !== false;\n};\n\nexport function getMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.getChildren() as IGraphic[];\n}\n\nexport function getNoneGroupMarksByName(root: IGroup, name: string) {\n  if (!name) {\n    return [];\n  }\n  const group = root.find(node => node.name === name, true) as IGroup;\n  if (!group) {\n    return [];\n  }\n  return group.findAll(node => node.type !== 'group', true) as unknown as IGraphic[];\n}\n\nexport function removeRepeatPoint(points: Point[]) {\n  const result = [points[0]];\n  for (let i = 1; i < points.length; i++) {\n    if (points[i].x !== points[i - 1].x || points[i].y !== points[i - 1].y) {\n      result.push(points[i]);\n    }\n  }\n  return result;\n}\n\nexport function isPostiveXAxisCartes(angle: number) {\n  return angle > -Math.PI / 2 && angle < Math.PI / 2;\n}\n\nexport function isPostiveXAxisPolar(angle: number, isReverse: boolean) {\n  if (isReverse) {\n    return (angle > 0 && angle < Math.PI / 2) || (angle < 0 && angle > -Math.PI * 2);\n  }\n  return (angle > 0 && angle < Math.PI / 2) || (angle > (Math.PI * 3) / 2 && angle < Math.PI * 2);\n}\n"]}

package/es/util/index.d.ts

@@ -2,3 +2,4 @@ export * from './common';
 export * from './label-smartInvert';
 export * from './matrix';
 export * from './text';
+export * from './polar';

package/es/util/index.js

@@ -5,4 +5,6 @@ export * from "./label-smartInvert";
 export * from "./matrix";
 
 export * from "./text";
+
+export * from "./polar";
 //# sourceMappingURL=index.js.map

package/es/util/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["export * from './common';\nexport * from './label-smartInvert';\nexport * from './matrix';\nexport * from './text';\n"]}
+{"version":3,"sources":["../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC","file":"index.js","sourcesContent":["export * from './common';\nexport * from './label-smartInvert';\nexport * from './matrix';\nexport * from './text';\nexport * from './polar';\n"]}

package/es/util/polar.d.ts

@@ -0,0 +1,2 @@
+export declare const deltaXYToAngle: (y: number, x: number) => number;
+export declare const tan2AngleToAngle: (angle: number) => number;

package/es/util/polar.js

@@ -0,0 +1,7 @@
+export const deltaXYToAngle = (y, x) => {
+    const angle = Math.atan2(y, x);
+    return angle < 0 ? angle + 2 * Math.PI : angle;
+};
+
+export const tan2AngleToAngle = angle => angle < 0 ? angle + 2 * Math.PI : angle;
+//# sourceMappingURL=polar.js.map

package/es/util/polar.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/polar.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IACrD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE/B,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE;IAChD,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACjD,CAAC,CAAC","file":"polar.js","sourcesContent":["/**\n *\n * @param x x方向到圆心距离\n * @param y y方向到圆心距离\n * @returns 在圆上的角度(顺时针方向, 与arc图元绘制方向一致)\n */\nexport const deltaXYToAngle = (y: number, x: number) => {\n  const angle = Math.atan2(y, x);\n  // ref: https://jsbin.com/taxozoyaja/2/edit?html,js,output\n  return angle < 0 ? angle + Math.PI * 2 : angle;\n};\n\nexport const tan2AngleToAngle = (angle: number) => {\n  return angle < 0 ? angle + Math.PI * 2 : angle;\n};\n"]}

package/es/util/text.d.ts

@@ -2,7 +2,7 @@ import type { IRichTextAttribute, ITextGraphicAttribute } from '@visactor/vrende
 import type { ITextMeasureOption } from '@visactor/vutils';
 import { TextMeasure } from '@visactor/vutils';
 import type { TextContent } from '../core/type';
-export declare const initTextMeasure: (textSpec?: Partial<ITextGraphicAttribute>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean, defaultFontParams?: Partial<ITextGraphicAttribute>) => TextMeasure<ITextGraphicAttribute>;
+export declare const initTextMeasure: (textSpec?: Partial<ITextGraphicAttribute>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextGraphicAttribute>;
 export declare function measureTextSize(text: string | number | string[] | number[], textSpec: Partial<ITextGraphicAttribute>, defaultTextTheme?: Partial<ITextGraphicAttribute>): {
     width: any;
     height: any;

package/es/util/text.js

@@ -4,11 +4,11 @@ import { TextMeasure, isObject } from "@visactor/vutils";
 
 import { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from "../constant";
 
-export const initTextMeasure = (textSpec, option, useNaiveCanvas, defaultFontParams) => new TextMeasure(Object.assign({
-    defaultFontParams: Object.assign({
+export const initTextMeasure = (textSpec, option, useNaiveCanvas) => new TextMeasure(Object.assign({
+    defaultFontParams: {
         fontFamily: DEFAULT_TEXT_FONT_FAMILY,
         fontSize: DEFAULT_TEXT_FONT_SIZE
-    }, defaultFontParams),
+    },
     getTextBounds: useNaiveCanvas ? void 0 : getTextBounds,
     specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
 }, null != option ? option : {}), textSpec);

package/es/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["import type { IRichTextAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getTextBounds, graphicCreator } from '@visactor/vrender-core';\nimport type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, isObject } from '@visactor/vutils';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../constant';\nimport type { HTMLTextContent, ReactTextContent, TextContent } from '../core/type';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean,\n  defaultFontParams?: Partial<ITextGraphicAttribute>\n): TextMeasure<ITextGraphicAttribute> => {\n  return new TextMeasure<ITextGraphicAttribute>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE,\n        ...defaultFontParams\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n// FIXME: 和上一个方法统一，使用 TextMeasure 类\nexport function measureTextSize(\n  text: string | number | string[] | number[],\n  textSpec: Partial<ITextGraphicAttribute>,\n  defaultTextTheme: Partial<ITextGraphicAttribute> = {}\n) {\n  if (!text) {\n    return { width: 0, height: 0 };\n  }\n  const bounds = getTextBounds({\n    text,\n    fontFamily: textSpec.fontFamily || defaultTextTheme.fontFamily || DEFAULT_TEXT_FONT_FAMILY,\n    fontSize: textSpec.fontSize || defaultTextTheme.fontSize || 12,\n    fontWeight: textSpec.fontWeight || defaultTextTheme.fontWeight,\n    textAlign: textSpec.textAlign || 'center',\n    textBaseline: textSpec.textBaseline,\n    ellipsis: !!textSpec.ellipsis,\n    maxLineWidth: textSpec.maxLineWidth || Infinity,\n    lineHeight: textSpec.fontSize || defaultTextTheme.fontSize || 12\n  });\n\n  return { width: bounds.width(), height: bounds.height() };\n}\n\nexport function isRichText(attributes: TextContent, typeKey = 'type') {\n  return getTextType(attributes, typeKey) === 'rich';\n}\n\nexport function getTextType(attributes: TextContent, typeKey = 'type') {\n  if (isObject(attributes.text) && 'type' in attributes.text) {\n    return attributes.text.type ?? 'text';\n  }\n\n  if (typeKey in attributes) {\n    return attributes[typeKey] ?? 'text';\n  }\n\n  return 'text';\n}\n\nexport function richTextAttributeTransform(attributes: ITextGraphicAttribute & IRichTextAttribute & TextContent) {\n  attributes.width = attributes.width ?? 0;\n  attributes.height = attributes.height ?? 0;\n  attributes.maxWidth = attributes.maxLineWidth;\n  attributes.textConfig = (attributes.text as unknown as any).text || attributes.text;\n  return attributes;\n}\n\nexport function htmlAttributeTransform(attributes: ITextGraphicAttribute) {\n  const { text, _originText } = attributes as unknown as HTMLTextContent;\n  const { text: html } = text;\n\n  attributes.html = html;\n  attributes.text = _originText;\n  attributes.renderable = false; // 文字图元配置了 html，则不绘制原始文字\n  return attributes;\n}\n\nexport function reactAttributeTransform(attributes: ITextGraphicAttribute) {\n  const { text, _originText } = attributes as unknown as ReactTextContent;\n  const { text: react } = text;\n\n  attributes.react = react;\n  attributes.text = _originText;\n  attributes.renderable = false; // 文字图元配置了 react，则不绘制原始文字\n\n  return attributes;\n}\n\nexport function createTextGraphicByType(textAttributes: ITextGraphicAttribute, typeKey = 'type') {\n  const textType = getTextType(textAttributes, typeKey);\n  if (textType === 'rich') {\n    return graphicCreator.richtext(richTextAttributeTransform(textAttributes as IRichTextAttribute));\n  }\n\n  if (textType === 'html') {\n    textAttributes = htmlAttributeTransform(textAttributes);\n  } else if (textType === 'react') {\n    textAttributes = reactAttributeTransform(textAttributes);\n  }\n\n  return graphicCreator.text(textAttributes as ITextGraphicAttribute);\n}\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGvE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG/E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAyC,EACzC,MAAoC,EACpC,cAAwB,EACY,EAAE;IACtC,OAAO,IAAI,WAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EACzD,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAGF,MAAM,UAAU,eAAe,CAC7B,IAA2C,EAC3C,QAAwC,EACxC,mBAAmD,EAAE;IAErD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;KAChC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC;QAC3B,IAAI;QACJ,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,gBAAgB,CAAC,UAAU,IAAI,wBAAwB;QAC1F,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,gBAAgB,CAAC,QAAQ,IAAI,EAAE;QAC9D,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,gBAAgB,CAAC,UAAU;QAC9D,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,QAAQ;QACzC,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ;QAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,QAAQ;QAC/C,UAAU,EAAE,QAAQ,CAAC,QAAQ,IAAI,gBAAgB,CAAC,QAAQ,IAAI,EAAE;KACjE,CAAC,CAAC;IAEH,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,UAAuB,EAAE,OAAO,GAAG,MAAM;IAClE,OAAO,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,UAAuB,EAAE,OAAO,GAAG,MAAM;;IACnE,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,UAAU,CAAC,IAAI,EAAE;QAC1D,OAAO,MAAA,UAAU,CAAC,IAAI,CAAC,IAAI,mCAAI,MAAM,CAAC;KACvC;IAED,IAAI,OAAO,IAAI,UAAU,EAAE;QACzB,OAAO,MAAA,UAAU,CAAC,OAAO,CAAC,mCAAI,MAAM,CAAC;KACtC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,UAAoE;;IAC7G,UAAU,CAAC,KAAK,GAAG,MAAA,UAAU,CAAC,KAAK,mCAAI,CAAC,CAAC;IACzC,UAAU,CAAC,MAAM,GAAG,MAAA,UAAU,CAAC,MAAM,mCAAI,CAAC,CAAC;IAC3C,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,YAAY,CAAC;IAC9C,UAAU,CAAC,UAAU,GAAI,UAAU,CAAC,IAAuB,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,CAAC;IACpF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,UAAiC;IACtE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,UAAwC,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IAE5B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;IACvB,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC;IAC9B,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC;IAC9B,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,UAAiC;IACvE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,UAAyC,CAAC;IACxE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAE7B,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC;IAC9B,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC;IAE9B,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,cAAqC,EAAE,OAAO,GAAG,MAAM;IAC7F,MAAM,QAAQ,GAAG,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,OAAO,cAAc,CAAC,QAAQ,CAAC,0BAA0B,CAAC,cAAoC,CAAC,CAAC,CAAC;KAClG;IAED,IAAI,QAAQ,KAAK,MAAM,EAAE;QACvB,cAAc,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;KACzD;SAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;QAC/B,cAAc,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;KAC1D;IAED,OAAO,cAAc,CAAC,IAAI,CAAC,cAAuC,CAAC,CAAC;AACtE,CAAC","file":"text.js","sourcesContent":["import type { IRichTextAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { getTextBounds, graphicCreator } from '@visactor/vrender-core';\nimport type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, isObject } from '@visactor/vutils';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../constant';\nimport type { HTMLTextContent, ReactTextContent, TextContent } from '../core/type';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextGraphicAttribute>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextGraphicAttribute> => {\n  return new TextMeasure<ITextGraphicAttribute>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n// FIXME: 和上一个方法统一，使用 TextMeasure 类\nexport function measureTextSize(\n  text: string | number | string[] | number[],\n  textSpec: Partial<ITextGraphicAttribute>,\n  defaultTextTheme: Partial<ITextGraphicAttribute> = {}\n) {\n  if (!text) {\n    return { width: 0, height: 0 };\n  }\n  const bounds = getTextBounds({\n    text,\n    fontFamily: textSpec.fontFamily || defaultTextTheme.fontFamily || DEFAULT_TEXT_FONT_FAMILY,\n    fontSize: textSpec.fontSize || defaultTextTheme.fontSize || 12,\n    fontWeight: textSpec.fontWeight || defaultTextTheme.fontWeight,\n    textAlign: textSpec.textAlign || 'center',\n    textBaseline: textSpec.textBaseline,\n    ellipsis: !!textSpec.ellipsis,\n    maxLineWidth: textSpec.maxLineWidth || Infinity,\n    lineHeight: textSpec.fontSize || defaultTextTheme.fontSize || 12\n  });\n\n  return { width: bounds.width(), height: bounds.height() };\n}\n\nexport function isRichText(attributes: TextContent, typeKey = 'type') {\n  return getTextType(attributes, typeKey) === 'rich';\n}\n\nexport function getTextType(attributes: TextContent, typeKey = 'type') {\n  if (isObject(attributes.text) && 'type' in attributes.text) {\n    return attributes.text.type ?? 'text';\n  }\n\n  if (typeKey in attributes) {\n    return attributes[typeKey] ?? 'text';\n  }\n\n  return 'text';\n}\n\nexport function richTextAttributeTransform(attributes: ITextGraphicAttribute & IRichTextAttribute & TextContent) {\n  attributes.width = attributes.width ?? 0;\n  attributes.height = attributes.height ?? 0;\n  attributes.maxWidth = attributes.maxLineWidth;\n  attributes.textConfig = (attributes.text as unknown as any).text || attributes.text;\n  return attributes;\n}\n\nexport function htmlAttributeTransform(attributes: ITextGraphicAttribute) {\n  const { text, _originText } = attributes as unknown as HTMLTextContent;\n  const { text: html } = text;\n\n  attributes.html = html;\n  attributes.text = _originText;\n  attributes.renderable = false; // 文字图元配置了 html，则不绘制原始文字\n  return attributes;\n}\n\nexport function reactAttributeTransform(attributes: ITextGraphicAttribute) {\n  const { text, _originText } = attributes as unknown as ReactTextContent;\n  const { text: react } = text;\n\n  attributes.react = react;\n  attributes.text = _originText;\n  attributes.renderable = false; // 文字图元配置了 react，则不绘制原始文字\n\n  return attributes;\n}\n\nexport function createTextGraphicByType(textAttributes: ITextGraphicAttribute, typeKey = 'type') {\n  const textType = getTextType(textAttributes, typeKey);\n  if (textType === 'rich') {\n    return graphicCreator.richtext(richTextAttributeTransform(textAttributes as IRichTextAttribute));\n  }\n\n  if (textType === 'html') {\n    textAttributes = htmlAttributeTransform(textAttributes);\n  } else if (textType === 'react') {\n    textAttributes = reactAttributeTransform(textAttributes);\n  }\n\n  return graphicCreator.text(textAttributes as ITextGraphicAttribute);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.19.4-alpha.5",
+  "version": "0.19.5-alpha.1",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -12,14 +12,14 @@
     "dist"
   ],
   "dependencies": {
-    "@visactor/vrender-core": "0.19.4-alpha.5",
-    "@visactor/vrender-kits": "0.19.4-alpha.5",
-    "@visactor/vutils": "~0.18.7",
-    "@visactor/vscale": "~0.18.7"
+    "@visactor/vrender-core": "0.19.5-alpha.1",
+    "@visactor/vrender-kits": "0.19.5-alpha.1",
+    "@visactor/vutils": "~0.18.4",
+    "@visactor/vscale": "~0.17.3"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "~1.1.4",
-    "@visactor/vscale": "~0.18.7",
+    "@visactor/vscale": "~0.17.3",
     "@types/jest": "^26.0.0",
     "jest": "^26.0.0",
     "jest-electron": "^0.1.12",
@@ -29,8 +29,8 @@
     "vite": "3.2.6",
     "typescript": "4.9.5",
     "@internal/bundler": "0.0.1",
-    "@internal/ts-config": "0.0.1",
-    "@internal/eslint-config": "0.0.1"
+    "@internal/eslint-config": "0.0.1",
+    "@internal/ts-config": "0.0.1"
   },
   "keywords": [
     "VisActor",

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

@@ -1,4 +0,0 @@
-import type { ContinuousScale } from '@visactor/vscale';
-import type { ITickData, ITickDataOpt } from '../type';
-export declare const DEFAULT_CONTINUOUS_TICK_COUNT = 5;
-export declare const continuousTicks: (scale: ContinuousScale, op: ITickDataOpt) => ITickData[];

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

@@ -1,61 +0,0 @@
-"use strict";
-
-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");
-
-exports.DEFAULT_CONTINUOUS_TICK_COUNT = 5;
-
-const continuousTicks = (scale, op) => {
-    if (!(0, vscale_1.isContinuous)(scale.type)) return (0, util_1.convertDomainToTickData)(scale.domain());
-    const range = scale.range(), rangeSize = Math.abs(range[range.length - 1] - range[0]);
-    if (rangeSize < 2) return (0, util_1.convertDomainToTickData)([ scale.domain()[0] ]);
-    const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep, noDecimals: noDecimals = !1, labelStyle: labelStyle} = op;
-    let scaleTicks;
-    if ((0, vutils_1.isValid)(tickStep)) scaleTicks = scale.stepTicks(tickStep); else if ((0, 
-    vutils_1.isValid)(forceTickCount)) scaleTicks = scale.forceTicks(forceTickCount); else if ("d3" === op.tickMode) {
-        const count = (0, vutils_1.isFunction)(tickCount) ? tickCount({
-            axisLength: rangeSize,
-            labelStyle: labelStyle
-        }) : tickCount;
-        scaleTicks = scale.d3Ticks(null != count ? count : exports.DEFAULT_CONTINUOUS_TICK_COUNT, {
-            noDecimals: noDecimals
-        });
-    } else {
-        const count = (0, vutils_1.isFunction)(tickCount) ? tickCount({
-            axisLength: rangeSize,
-            labelStyle: labelStyle
-        }) : tickCount;
-        scaleTicks = scale.ticks(null != count ? count : exports.DEFAULT_CONTINUOUS_TICK_COUNT, {
-            noDecimals: noDecimals
-        });
-    }
-    if (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]
-        })));
-        for (;items.length >= 3 && (0, util_1.hasOverlap)(items, labelGap); ) items = methods.parity(items);
-        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;
-    }
-    return (0, util_1.convertDomainToTickData)(scaleTicks);
-};
-
-exports.continuousTicks = continuousTicks;
-
-const methods = {
-    parity: function(items) {
-        return items.filter(((item, i) => i % 2 == 0));
-    },
-    greedy: function(items, sep) {
-        let a;
-        return items.filter(((b, i) => (!i || !(0, util_1.intersect)(a.AABBBounds, b.AABBBounds, sep)) && (a = b, 
-        !0)));
-    }
-};
-//# sourceMappingURL=continuous.js.map

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

@@ -1 +0,0 @@
-{"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\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 } = op;\n\n  let scaleTicks: number[];\n  if (isValid(tickStep)) {\n    scaleTicks = (scale as LinearScale).stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = (scale as LinearScale).forceTicks(forceTickCount);\n  } else if (op.tickMode === 'd3') {\n    const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;\n    scaleTicks = (scale as LinearScale).d3Ticks(count ?? DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals });\n  } else {\n    const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;\n    scaleTicks = (scale as LinearScale).ticks(count ?? DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals });\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      while (items.length >= 3 && hasOverlap(items, labelGap)) {\n        items = methods.parity(items);\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"]}

package/cjs/axis/tick-data/discrete/linear.d.ts

@@ -1,6 +0,0 @@
-import type { BandScale } from '@visactor/vscale';
-import type { ICartesianTickDataOpt, ITickData } from '../../type';
-type OneDimensionalBounds = [number, number, number];
-export declare const boundsDistance: (prevBounds: OneDimensionalBounds, nextBounds: OneDimensionalBounds) => number;
-export declare const linearDiscreteTicks: (scale: BandScale, op: ICartesianTickDataOpt) => ITickData[];
-export {};

package/cjs/axis/tick-data/discrete/linear.js

@@ -1,101 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.linearDiscreteTicks = exports.boundsDistance = void 0;
-
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../util"), getOneDimensionalLabelBounds = (scale, domain, op, isHorizontal) => (0, 
-util_1.getCartesianLabelBounds)(scale, domain, op).map((bounds => isHorizontal ? [ bounds.x1, bounds.x2, bounds.width() ] : [ bounds.y1, bounds.y2, bounds.height() ])), boundsOverlap = (prevBounds, nextBounds, gap = 0) => Math.max(prevBounds[0], nextBounds[0]) - gap / 2 <= Math.min(prevBounds[1], nextBounds[1]) + gap / 2, boundsDistance = (prevBounds, nextBounds) => prevBounds[1] < nextBounds[0] ? nextBounds[0] - prevBounds[1] : nextBounds[1] < prevBounds[0] ? prevBounds[0] - nextBounds[1] : 0;
-
-exports.boundsDistance = boundsDistance;
-
-const linearDiscreteTicks = (scale, op) => {
-    var _a;
-    const domain = scale.domain();
-    if (!domain.length) return [];
-    const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep, labelGap: labelGap = 4, axisOrientType: axisOrientType, labelStyle: labelStyle} = op, isHorizontal = (0, 
-    util_1.isAxisHorizontal)(axisOrientType), range = scale.range(), rangeSize = scale.calculateWholeRangeSize();
-    if (rangeSize < 2) return op.labelLastVisible ? (0, util_1.convertDomainToTickData)([ domain[domain.length - 1] ]) : (0, 
-    util_1.convertDomainToTickData)([ domain[0] ]);
-    let scaleTicks;
-    if ((0, vutils_1.isValid)(tickStep)) scaleTicks = scale.stepTicks(tickStep); else if ((0, 
-    vutils_1.isValid)(forceTickCount)) scaleTicks = scale.forceTicks(forceTickCount); else if ((0, 
-    vutils_1.isValid)(tickCount)) {
-        const count = (0, vutils_1.isFunction)(tickCount) ? tickCount({
-            axisLength: rangeSize,
-            labelStyle: labelStyle
-        }) : tickCount;
-        scaleTicks = scale.ticks(count);
-    } else if (op.sampling) {
-        const fontSize = (null !== (_a = op.labelStyle.fontSize) && void 0 !== _a ? _a : 12) + 2, rangeStart = (0, 
-        vutils_1.minInArray)(range), rangeEnd = (0, vutils_1.maxInArray)(range);
-        if (domain.length <= rangeSize / fontSize) {
-            const incrementUnit = (rangeEnd - rangeStart) / domain.length, labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal), minBoundsLength = Math.min(...labelBoundsList.map((bounds => bounds[2]))), stepResult = getStep(domain, labelBoundsList, labelGap, op.labelLastVisible, Math.floor(minBoundsLength / incrementUnit), !1);
-            scaleTicks = scale.stepTicks(stepResult.step), op.labelLastVisible && (stepResult.delCount && (scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount)), 
-            scaleTicks.push(domain[domain.length - 1]));
-        } else {
-            const tempDomain = [ domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1] ], tempList = getOneDimensionalLabelBounds(scale, tempDomain, op, isHorizontal);
-            let maxBounds = null;
-            tempList.forEach((current => {
-                maxBounds ? maxBounds[2] < current[2] && (maxBounds = current) : maxBounds = current;
-            }));
-            const step = rangeEnd - rangeStart - labelGap > 0 ? Math.ceil(domain.length * (labelGap + maxBounds[2]) / (rangeEnd - rangeStart - labelGap)) : domain.length - 1;
-            scaleTicks = scale.stepTicks(step), !op.labelLastVisible || scaleTicks.length && scaleTicks[scaleTicks.length - 1] === domain[domain.length - 1] || (scaleTicks.length && Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) < maxBounds[2] && (scaleTicks = scaleTicks.slice(0, -1)), 
-            scaleTicks.push(domain[domain.length - 1]));
-        }
-    } else scaleTicks = scale.domain();
-    return (0, util_1.convertDomainToTickData)(scaleTicks);
-};
-
-exports.linearDiscreteTicks = linearDiscreteTicks;
-
-const getStep = (domain, labelBoundsList, labelGap, labelLastVisible, defaultStep, areAllBoundsSame) => {
-    let resultDelCount = 0, resultStep = 0, resultTickCount = -1, minDiff = Number.MAX_VALUE;
-    const validateStep = step => {
-        let success = !0, ptr = 0;
-        do {
-            ptr + step < domain.length && boundsOverlap(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap) && (success = !1), 
-            ptr += step;
-        } while (success && ptr < domain.length);
-        return success;
-    }, minValidStep = (0, vutils_1.binaryFuzzySearchInNumberRange)(defaultStep, domain.length, (step => validateStep(step) ? 1 : -1));
-    let step = minValidStep;
-    do {
-        if (step > minValidStep && !areAllBoundsSame && !validateStep(step)) step++; else {
-            if (!labelLastVisible) {
-                resultStep = step;
-                break;
-            }
-            {
-                const lastIndex = domain.length - 1;
-                let ptr, delCount = 0;
-                ptr = domain.length % step > 0 ? domain.length - domain.length % step + step : domain.length;
-                do {
-                    if (ptr -= step, ptr !== lastIndex && !boundsOverlap(labelBoundsList[ptr], labelBoundsList[lastIndex], labelGap)) break;
-                    delCount++;
-                } while (ptr > 0);
-                if (ptr === lastIndex) {
-                    resultStep = step, resultDelCount = delCount;
-                    break;
-                }
-                {
-                    const tickCount = Math.floor(domain.length / step) - delCount + 1;
-                    if (tickCount < resultTickCount) break;
-                    {
-                        resultTickCount = tickCount;
-                        const distance1 = (0, exports.boundsDistance)(labelBoundsList[ptr], labelBoundsList[lastIndex]), distance2 = ptr - step >= 0 ? (0, 
-                        exports.boundsDistance)(labelBoundsList[ptr - step], labelBoundsList[ptr]) : distance1, diff = Math.abs(distance1 - distance2);
-                        if (diff < minDiff && (minDiff = diff, resultStep = step, resultDelCount = delCount), 
-                        distance1 <= distance2) break;
-                    }
-                }
-            }
-            step++;
-        }
-    } while (step <= domain.length);
-    return {
-        step: resultStep,
-        delCount: resultDelCount
-    };
-};
-//# sourceMappingURL=linear.js.map

package/cjs/axis/tick-data/discrete/linear.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/axis/tick-data/discrete/linear.ts"],"names":[],"mappings":"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","file":"linear.js","sourcesContent":["import type { BandScale, IBaseScale } from '@visactor/vscale';\nimport { isFunction, isValid, maxInArray, minInArray, binaryFuzzySearchInNumberRange } from '@visactor/vutils';\nimport type { ICartesianTickDataOpt, ITickData } from '../../type';\nimport { convertDomainToTickData, getCartesianLabelBounds, isAxisHorizontal } from '../util';\n\n/** x1, x2, length */\ntype OneDimensionalBounds = [number, number, number];\n\nconst getOneDimensionalLabelBounds = (\n  scale: IBaseScale,\n  domain: any[],\n  op: ICartesianTickDataOpt,\n  isHorizontal: boolean\n): OneDimensionalBounds[] => {\n  const labelBoundsList = getCartesianLabelBounds(scale, domain, op);\n  return labelBoundsList.map(bounds => {\n    if (isHorizontal) {\n      return [bounds.x1, bounds.x2, bounds.width()];\n    }\n    return [bounds.y1, bounds.y2, bounds.height()];\n  });\n};\n\n/** 判断两个 bounds 是否有重叠情况 */\nconst boundsOverlap = (prevBounds: OneDimensionalBounds, nextBounds: OneDimensionalBounds, gap = 0): boolean => {\n  return Math.max(prevBounds[0], nextBounds[0]) - gap / 2 <= Math.min(prevBounds[1], nextBounds[1]) + gap / 2;\n};\n\n/** 判断两个不相交的 bounds 相隔的距离 */\nexport const boundsDistance = (prevBounds: OneDimensionalBounds, nextBounds: OneDimensionalBounds): number => {\n  if (prevBounds[1] < nextBounds[0]) {\n    return nextBounds[0] - prevBounds[1];\n  } else if (nextBounds[1] < prevBounds[0]) {\n    return prevBounds[0] - nextBounds[1];\n  }\n  return 0;\n};\n\n/**\n * 对于离散轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出BandScale的ticks()、forceTicks()、stepTicks()结果；\n * - 估算所有轴label的宽度（或高度，在竖轴的情况下）并存为数组domainLengthList；\n * - 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡（此处用到domainLengthList和scale.range()）；\n * - 如果用户配置了spec.label.lastVisible，则处理右边界：强制采样最后一个tick数据，并删掉这个tick的label所覆盖的那些tick数据。\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const linearDiscreteTicks = (scale: BandScale, op: ICartesianTickDataOpt): ITickData[] => {\n  const domain = scale.domain();\n  if (!domain.length) {\n    return [];\n  }\n  const { tickCount, forceTickCount, tickStep, labelGap = 4, axisOrientType, labelStyle } = op;\n  const isHorizontal = isAxisHorizontal(axisOrientType);\n  const range = scale.range();\n\n  // if range is so small\n  const rangeSize = scale.calculateWholeRangeSize();\n  if (rangeSize < 2) {\n    if (op.labelLastVisible) {\n      return convertDomainToTickData([domain[domain.length - 1]]);\n    }\n    return convertDomainToTickData([domain[0]]);\n  }\n\n  let scaleTicks;\n  if (isValid(tickStep)) {\n    scaleTicks = scale.stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = scale.forceTicks(forceTickCount);\n  } else if (isValid(tickCount)) {\n    const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;\n    scaleTicks = scale.ticks(count);\n  } else if (op.sampling) {\n    const fontSize = (op.labelStyle.fontSize ?? 12) + 2;\n    const rangeStart = minInArray(range);\n    const rangeEnd = maxInArray(range);\n\n    if (domain.length <= rangeSize / fontSize) {\n      const incrementUnit = (rangeEnd - rangeStart) / domain.length;\n      const labelBoundsList = getOneDimensionalLabelBounds(scale, domain, op, isHorizontal);\n      const minBoundsLength = Math.min(...labelBoundsList.map(bounds => bounds[2]));\n\n      const stepResult = getStep(\n        domain,\n        labelBoundsList,\n        labelGap,\n        op.labelLastVisible,\n        Math.floor(minBoundsLength / incrementUnit), // 给step赋上合适的初值，有效改善外层循环次数\n        false\n      );\n\n      scaleTicks = (scale as BandScale).stepTicks(stepResult.step);\n      if (op.labelLastVisible) {\n        if (stepResult.delCount) {\n          scaleTicks = scaleTicks.slice(0, scaleTicks.length - stepResult.delCount);\n        }\n        scaleTicks.push(domain[domain.length - 1]);\n      }\n    } else {\n      // only check first middle last, use the max size to sampling\n      const tempDomain = [domain[0], domain[Math.floor(domain.length / 2)], domain[domain.length - 1]];\n      const tempList = getOneDimensionalLabelBounds(scale, tempDomain, op, isHorizontal);\n      let maxBounds: OneDimensionalBounds = null;\n      tempList.forEach(current => {\n        if (!maxBounds) {\n          maxBounds = current;\n          return;\n        }\n        if (maxBounds[2] < current[2]) {\n          maxBounds = current;\n        }\n      });\n\n      const step =\n        rangeEnd - rangeStart - labelGap > 0\n          ? Math.ceil((domain.length * (labelGap + maxBounds[2])) / (rangeEnd - rangeStart - labelGap))\n          : domain.length - 1;\n\n      scaleTicks = (scale as BandScale).stepTicks(step);\n\n      if (\n        op.labelLastVisible &&\n        (!scaleTicks.length || scaleTicks[scaleTicks.length - 1] !== domain[domain.length - 1])\n      ) {\n        if (\n          scaleTicks.length &&\n          Math.abs(scale.scale(scaleTicks[scaleTicks.length - 1]) - scale.scale(domain[domain.length - 1])) <\n            maxBounds[2]\n        ) {\n          scaleTicks = scaleTicks.slice(0, -1);\n        }\n        scaleTicks.push(domain[domain.length - 1]);\n      }\n    }\n  } else {\n    scaleTicks = scale.domain();\n  }\n\n  return convertDomainToTickData(scaleTicks);\n};\n\n/** 计算合适的step */\nconst getStep = (\n  domain: any[],\n  labelBoundsList: OneDimensionalBounds[],\n  labelGap: number,\n  labelLastVisible: boolean,\n  defaultStep: number,\n  areAllBoundsSame: boolean\n) => {\n  let resultDelCount = 0;\n  let resultStep = 0;\n  let resultTickCount = -1;\n  let minDiff = Number.MAX_VALUE;\n\n  /** 验证在当前 step 下是否会产生重叠 */\n  const validateStep = (step: number) => {\n    let success = true;\n    let ptr = 0;\n    do {\n      if (ptr + step < domain.length && boundsOverlap(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap)) {\n        success = false;\n      }\n      ptr += step;\n    } while (success && ptr < domain.length);\n    return success;\n  };\n\n  // 通过二分来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡\n  const minValidStep = binaryFuzzySearchInNumberRange(defaultStep, domain.length, step =>\n    validateStep(step) ? 1 : -1\n  );\n\n  // 对 step 进行微调\n  let step = minValidStep;\n  do {\n    if (step > minValidStep && !areAllBoundsSame) {\n      if (!validateStep(step)) {\n        step++;\n        continue;\n      }\n    }\n    if (labelLastVisible) {\n      const lastIndex = domain.length - 1;\n      let delCount = 0;\n      let ptr;\n      if (domain.length % step > 0) {\n        ptr = domain.length - (domain.length % step) + step;\n      } else {\n        ptr = domain.length;\n      }\n      do {\n        ptr -= step; // 获取最后一个label位置\n        if (ptr === lastIndex || boundsOverlap(labelBoundsList[ptr], labelBoundsList[lastIndex], labelGap)) {\n          delCount++;\n        } else {\n          break;\n        }\n      } while (ptr > 0);\n      if (ptr === lastIndex) {\n        // 采到的最后的一个 label 刚好是最后一项，直接退出\n        resultStep = step;\n        resultDelCount = delCount;\n        break;\n      } else {\n        // 尝试获取最均匀的结果，防止倒数第二项和最后一项有大的空档\n        const tickCount = Math.floor(domain.length / step) - delCount + 1;\n        if (tickCount < resultTickCount) {\n          break;\n        } else {\n          resultTickCount = tickCount;\n          const distance1 = boundsDistance(labelBoundsList[ptr], labelBoundsList[lastIndex]); // 倒数第2项和最后一项的距离\n          const distance2 =\n            ptr - step >= 0 ? boundsDistance(labelBoundsList[ptr - step], labelBoundsList[ptr]) : distance1; // 倒数第3项和倒数第2项的距离\n          const diff = Math.abs(distance1 - distance2);\n          if (diff < minDiff) {\n            minDiff = diff;\n            resultStep = step; // 记录最均匀的 step\n            resultDelCount = delCount;\n          }\n          if (distance1 <= distance2) {\n            break;\n          }\n        }\n      }\n    } else {\n      resultStep = step;\n      break;\n    }\n    step++;\n  } while (step <= domain.length);\n\n  return {\n    step: resultStep,\n    delCount: resultDelCount\n  };\n};\n"]}

package/cjs/axis/tick-data/discrete/polar-angle.d.ts

@@ -1,3 +0,0 @@
-import type { BandScale } from '@visactor/vscale';
-import type { IPolarTickDataOpt, ITickData } from '../../type';
-export declare const polarAngleAxisDiscreteTicks: (scale: BandScale, op: IPolarTickDataOpt) => ITickData[];

package/cjs/axis/tick-data/discrete/polar-angle.js

@@ -1,53 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.polarAngleAxisDiscreteTicks = void 0;
-
-const vutils_1 = require("@visactor/vutils"), util_1 = require("../util"), polarAngleAxisDiscreteTicks = (scale, op) => {
-    const {tickCount: tickCount, forceTickCount: forceTickCount, tickStep: tickStep, getRadius: getRadius, labelOffset: labelOffset, labelGap: labelGap = 0, labelStyle: labelStyle} = op, radius = null == getRadius ? void 0 : getRadius();
-    if (!radius) return (0, util_1.convertDomainToTickData)(scale.domain());
-    let scaleTicks;
-    if ((0, vutils_1.isValid)(tickStep)) scaleTicks = scale.stepTicks(tickStep); else if ((0, 
-    vutils_1.isValid)(forceTickCount)) scaleTicks = scale.forceTicks(forceTickCount); else if ((0, 
-    vutils_1.isValid)(tickCount)) {
-        const range = scale.range(), rangeSize = Math.abs(range[range.length - 1] - range[0]), count = (0, 
-        vutils_1.isFunction)(tickCount) ? tickCount({
-            axisLength: rangeSize,
-            labelStyle: labelStyle
-        }) : tickCount;
-        scaleTicks = scale.ticks(count);
-    } else if (op.sampling) {
-        const domain = scale.domain(), range = scale.range(), labelBoundsList = (0, util_1.getPolarAngleLabelBounds)(scale, domain, op), rangeStart = (0, 
-        vutils_1.minInArray)(range), rangeEnd = (0, vutils_1.maxInArray)(range), incrementUnit = Math.abs(rangeEnd - rangeStart) * (radius + labelOffset) / domain.length, {step: step, delCount: delCount} = getStep(domain, labelBoundsList, labelGap, Math.floor(labelBoundsList.reduce(((min, curBounds) => Math.min(min, curBounds.width(), curBounds.height())), Number.MAX_VALUE) / incrementUnit));
-        scaleTicks = scale.stepTicks(step), scaleTicks = scaleTicks.slice(0, scaleTicks.length - delCount);
-    } else scaleTicks = scale.domain();
-    return (0, util_1.convertDomainToTickData)(scaleTicks);
-};
-
-exports.polarAngleAxisDiscreteTicks = polarAngleAxisDiscreteTicks;
-
-const getStep = (domain, labelBoundsList, labelGap, defaultStep) => {
-    let step = defaultStep;
-    do {
-        let success = !0;
-        step++;
-        let ptr = 0;
-        do {
-            ptr + step < domain.length && (0, util_1.labelOverlap)(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap) && (success = !1), 
-            ptr += step;
-        } while (success && ptr < domain.length);
-        if (success) break;
-    } while (step <= domain.length);
-    let delCount = 0;
-    if (domain.length > 2) {
-        let ptr = domain.length - domain.length % step;
-        for (ptr >= domain.length && (ptr -= step); ptr > 0 && (0, util_1.labelOverlap)(labelBoundsList[0], labelBoundsList[ptr]); ) delCount++, 
-        ptr -= step;
-    }
-    return {
-        step: step,
-        delCount: delCount
-    };
-};
-//# sourceMappingURL=polar-angle.js.map

package/cjs/axis/tick-data/discrete/polar-angle.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/axis/tick-data/discrete/polar-angle.ts"],"names":[],"mappings":"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","file":"polar-angle.js","sourcesContent":["import type { BandScale } from '@visactor/vscale';\nimport { isFunction, isValid, maxInArray, minInArray } from '@visactor/vutils';\nimport type { IPolarTickDataOpt, ITickData } from '../../type';\nimport { convertDomainToTickData, getPolarAngleLabelBounds, labelOverlap } from '../util';\nimport type { AABBBounds } from '@visactor/vutils';\n\n/**\n * 对于离散轴：\n * - 如果spec配了tickCount、forceTickCount、tickStep，则直接输出BandScale的ticks()、forceTicks()、stepTicks()结果；\n * - 估算所有轴label的宽高并存为数组labelBoundsList；\n * - 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡（此处用到labelBoundsList和scale.range()）；\n *\n * @param scale\n * @param op\n * @returns\n */\nexport const polarAngleAxisDiscreteTicks = (scale: BandScale, op: IPolarTickDataOpt): ITickData[] => {\n  const { tickCount, forceTickCount, tickStep, getRadius, labelOffset, labelGap = 0, labelStyle } = op;\n  const radius = getRadius?.();\n  if (!radius) {\n    return convertDomainToTickData(scale.domain());\n  }\n\n  let scaleTicks;\n  if (isValid(tickStep)) {\n    scaleTicks = scale.stepTicks(tickStep);\n  } else if (isValid(forceTickCount)) {\n    scaleTicks = scale.forceTicks(forceTickCount);\n  } else if (isValid(tickCount)) {\n    const range = scale.range();\n    const rangeSize = Math.abs(range[range.length - 1] - range[0]);\n    const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;\n    scaleTicks = scale.ticks(count);\n  } else if (op.sampling) {\n    const domain = scale.domain();\n    const range = scale.range();\n\n    const labelBoundsList = getPolarAngleLabelBounds(scale, domain, op);\n\n    const rangeStart = minInArray(range);\n    const rangeEnd = maxInArray(range);\n\n    const axisLength = Math.abs(rangeEnd - rangeStart) * (radius + labelOffset);\n    const incrementUnit = axisLength / domain.length;\n    const { step, delCount } = getStep(\n      domain,\n      labelBoundsList,\n      labelGap,\n      Math.floor(\n        labelBoundsList.reduce((min, curBounds) => {\n          return Math.min(min, curBounds.width(), curBounds.height());\n        }, Number.MAX_VALUE) / incrementUnit\n      ) // 给step赋上合适的初值，有效改善外层循环次数\n    );\n\n    scaleTicks = (scale as BandScale).stepTicks(step);\n    scaleTicks = scaleTicks.slice(0, scaleTicks.length - delCount);\n  } else {\n    scaleTicks = scale.domain();\n  }\n\n  return convertDomainToTickData(scaleTicks);\n};\n\n/** 计算合适的step */\nconst getStep = (domain: any[], labelBoundsList: AABBBounds[], labelGap: number, defaultStep: number) => {\n  let step = defaultStep;\n  // 通过循环来寻找最小的step，使：如果在这个step下采样，轴标签互不遮挡\n  do {\n    let success = true;\n    step++;\n    let ptr = 0;\n    do {\n      if (ptr + step < domain.length && labelOverlap(labelBoundsList[ptr], labelBoundsList[ptr + step], labelGap)) {\n        success = false;\n      }\n      ptr += step;\n    } while (success && ptr < domain.length);\n    if (success) {\n      break;\n    }\n  } while (step <= domain.length);\n\n  let delCount = 0;\n  if (domain.length > 2) {\n    let ptr = domain.length - (domain.length % step);\n    if (ptr >= domain.length) {\n      ptr -= step;\n    }\n    // 判断首尾是否互相覆盖\n    while (ptr > 0 && labelOverlap(labelBoundsList[0], labelBoundsList[ptr])) {\n      delCount++;\n      ptr -= step;\n    }\n  }\n\n  return {\n    step,\n    delCount\n  };\n};\n"]}

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

@@ -1,5 +0,0 @@
-import type { IBaseScale } from '@visactor/vscale';
-import type { ITickData, ITickDataOpt } from '../type';
-import { convertDomainToTickData } from './util';
-export { convertDomainToTickData };
-export declare const ticks: (scale: IBaseScale, op: ITickDataOpt) => ITickData[];

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

@@ -1,26 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.ticks = exports.convertDomainToTickData = void 0;
-
-const vscale_1 = require("@visactor/vscale"), continuous_1 = require("./continuous"), linear_1 = require("./discrete/linear"), polar_angle_1 = require("./discrete/polar-angle"), util_1 = require("./util");
-
-Object.defineProperty(exports, "convertDomainToTickData", {
-    enumerable: !0,
-    get: function() {
-        return util_1.convertDomainToTickData;
-    }
-});
-
-const ticks = (scale, op) => {
-    if ((0, vscale_1.isContinuous)(scale.type)) return (0, continuous_1.continuousTicks)(scale, op);
-    if ((0, vscale_1.isDiscrete)(scale.type)) {
-        if ("cartesian" === op.coordinateType) return (0, linear_1.linearDiscreteTicks)(scale, op);
-        if ("polar" === op.coordinateType && "angle" === op.axisOrientType) return (0, polar_angle_1.polarAngleAxisDiscreteTicks)(scale, op);
-    }
-    return (0, util_1.convertDomainToTickData)(scale.domain());
-};
-
-exports.ticks = ticks;
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/axis/tick-data/index.ts"],"names":[],"mappings":";;;AAEA,6CAA4D;AAC5D,6CAA+C;AAC/C,8CAAwD;AACxD,wDAAqE;AAErE,iCAAiD;AAExC,wGAFA,8BAAuB,OAEA;AAGzB,MAAM,KAAK,GAAG,CAAC,KAAiB,EAAE,EAAgB,EAAe,EAAE;IACxE,IAAI,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,IAAA,4BAAe,EAAC,KAAwB,EAAE,EAAE,CAAC,CAAC;KACtD;SAAM,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QACjC,IAAI,EAAE,CAAC,cAAc,KAAK,WAAW,EAAE;YACrC,OAAO,IAAA,4BAAmB,EAAC,KAAkB,EAAE,EAA2B,CAAC,CAAC;SAC7E;aAAM,IAAI,EAAE,CAAC,cAAc,KAAK,OAAO,EAAE;YACxC,IAAI,EAAE,CAAC,cAAc,KAAK,OAAO,EAAE;gBACjC,OAAO,IAAA,yCAA2B,EAAC,KAAkB,EAAE,EAAuB,CAAC,CAAC;aACjF;SACF;KACF;IACD,OAAO,IAAA,8BAAuB,EAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC;AAbW,QAAA,KAAK,SAahB","file":"index.js","sourcesContent":["import type { BandScale, ContinuousScale, IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { isContinuous, isDiscrete } from '@visactor/vscale';\nimport { continuousTicks } from './continuous';\nimport { linearDiscreteTicks } from './discrete/linear';\nimport { polarAngleAxisDiscreteTicks } from './discrete/polar-angle';\nimport type { ICartesianTickDataOpt, IPolarTickDataOpt, ITickData, ITickDataOpt } from '../type';\nimport { convertDomainToTickData } from './util';\n\nexport { convertDomainToTickData };\n\n// 总入口\nexport const ticks = (scale: IBaseScale, op: ITickDataOpt): ITickData[] => {\n  if (isContinuous(scale.type)) {\n    return continuousTicks(scale as ContinuousScale, op);\n  } else if (isDiscrete(scale.type)) {\n    if (op.coordinateType === 'cartesian') {\n      return linearDiscreteTicks(scale as BandScale, op as ICartesianTickDataOpt);\n    } else if (op.coordinateType === 'polar') {\n      if (op.axisOrientType === 'angle') {\n        return polarAngleAxisDiscreteTicks(scale as BandScale, op as IPolarTickDataOpt);\n      }\n    }\n  }\n  return convertDomainToTickData(scale.domain());\n};\n"]}

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

@@ -1,13 +0,0 @@
-import type { IBaseScale } from '@visactor/vscale';
-import type { IBoundsLike } from '@visactor/vutils';
-import { AABBBounds } from '@visactor/vutils';
-import type { ICartesianTickDataOpt, ILabelItem, IOrientType, IPolarTickDataOpt, 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 getPolarAngleLabelBounds: (scale: IBaseScale, domain: any[], op: IPolarTickDataOpt) => AABBBounds[];
-export declare const isAxisHorizontal: (axisOrientType: IOrientType) => boolean;