@visactor/vchart 1.2.3 → 1.3.0-beta.10

package/esm/util/data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,WAAW,CACzB,YAGG,EACH,WAGG;IAKH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE;YACZ,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAClF;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,IAGG,EACH,QAAgB;IAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,QAAkB,EAAE,KAAa;;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,OAAO,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,mCAAI,KAAK,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAkB,EAAE,GAAW;IAC5D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,IAAI,CAAC;KACb;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAiC,CAAC;IACnE,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AAC5B,CAAC","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport type { IFieldsMeta } from '../typings/spec/common';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nexport function findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n\nexport function getFieldFormat(dataView: DataView, key: string) {\n  if (!dataView) {\n    return null;\n  }\n  const fields = dataView.getFields() as Record<string, IFieldsMeta>;\n  if (!fields) {\n    return null;\n  }\n  if (!fields[key]) {\n    return null;\n  }\n  // @ts-ignore\n  return fields[key].format;\n}\n"]}
+{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,WAAW,CACzB,YAGG,EACH,WAGG;IAKH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE;YACZ,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAClF;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CACjB,IAGG,EACH,QAAgB;IAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAGD,MAAM,UAAU,aAAa,CAAC,QAAkB,EAAE,KAAa;;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,OAAO,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,mCAAI,KAAK,CAAC;AACtC,CAAC","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport type { IFieldsMeta } from '../typings/spec/common';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nfunction findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n"]}

package/esm/util/object.d.ts

@@ -1,5 +1,3 @@
 import { get, pick, merge, cloneDeep } from '@visactor/vutils';
 export { get, pick, merge, cloneDeep };
-export declare function removeEmpty<T extends object>(obj: T): Partial<T>;
-export declare function sortByKey<T extends object>(object: T, includeKeys?: string[], excludeKeys?: string[]): Partial<T>;
 export declare function field(f: string | string[]): (datum: any) => any;

package/esm/util/object.js

@@ -2,17 +2,6 @@ import { get, pick, merge, cloneDeep, isArray } from "@visactor/vutils";
 
 export { get, pick, merge, cloneDeep };
 
-export function removeEmpty(obj) {
-    return Object.keys(obj).forEach((key => {
-        obj[key] && "object" == typeof obj[key] ? removeEmpty(obj[key]) : void 0 === obj[key] && delete obj[key];
-    })), obj;
-}
-
-export function sortByKey(object, includeKeys, excludeKeys) {
-    return Object.keys(object).sort().reduce(((obj, key) => (includeKeys ? includeKeys.includes(key) && (obj[key] = object[key]) : excludeKeys && !excludeKeys.includes(key) && (obj[key] = object[key]), 
-    obj)), {});
-}
-
 export function field(f) {
     return function(datum) {
         let value;

package/esm/util/object.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAEvC,MAAM,UAAU,WAAW,CAAmB,GAAM;IAClD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC7B,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE;YAC5C,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACvB;aAAM,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;YACjC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,SAAS,CAAmB,MAAS,EAAE,WAAsB,EAAE,WAAsB;IACnG,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACvB,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnB,IAAI,WAAW,EAAE;YACf,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SACvD;aAAM,IAAI,WAAW,EAAE;YACtB,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SACxD;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAO,CAAC,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,CAAoB;IACxC,OAAO,UAAU,KAAU;QACzB,IAAI,KAAU,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAC;SACpB;aAAM;YACL,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SAC/C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC","file":"object.js","sourcesContent":["import { get, pick, merge, cloneDeep, isArray } from '@visactor/vutils';\n\nexport { get, pick, merge, cloneDeep };\n\nexport function removeEmpty<T extends object>(obj: T): Partial<T> {\n  Object.keys(obj).forEach(key => {\n    if (obj[key] && typeof obj[key] === 'object') {\n      removeEmpty(obj[key]);\n    } else if (obj[key] === undefined) {\n      delete obj[key];\n    }\n  });\n  return obj;\n}\n\nexport function sortByKey<T extends object>(object: T, includeKeys?: string[], excludeKeys?: string[]): Partial<T> {\n  return Object.keys(object)\n    .sort()\n    .reduce((obj, key) => {\n      if (includeKeys) {\n        includeKeys.includes(key) && (obj[key] = object[key]);\n      } else if (excludeKeys) {\n        !excludeKeys.includes(key) && (obj[key] = object[key]);\n      }\n      return obj;\n    }, {} as T);\n}\n\nexport function field(f: string | string[]) {\n  return function (datum: any) {\n    let value: any;\n    if (!isArray(f)) {\n      value = datum?.[f];\n    } else {\n      value = f.reduce((cur, g) => cur?.[g], datum);\n    }\n    return value;\n  };\n}\n"]}
+{"version":3,"sources":["../src/util/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAEvC,MAAM,UAAU,KAAK,CAAC,CAAoB;IACxC,OAAO,UAAU,KAAU;QACzB,IAAI,KAAU,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAC;SACpB;aAAM;YACL,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SAC/C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC","file":"object.js","sourcesContent":["import { get, pick, merge, cloneDeep, isArray } from '@visactor/vutils';\n\nexport { get, pick, merge, cloneDeep };\n\nexport function field(f: string | string[]) {\n  return function (datum: any) {\n    let value: any;\n    if (!isArray(f)) {\n      value = datum?.[f];\n    } else {\n      value = f.reduce((cur, g) => cur?.[g], datum);\n    }\n    return value;\n  };\n}\n"]}

package/esm/util/scale.d.ts

@@ -1,9 +1,7 @@
 import type { DataView } from '@visactor/vdataset';
 import type { IGlobalScale } from '../scale/interface';
-import { BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';
-import type { IBaseScale } from '@visactor/vscale';
-import type { ScaleType } from '../typings/scale';
-import type { IVisual, IVisualSpecBase } from '../typings/visual';
+import { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';
+import type { IVisual } from '../typings/visual';
 import { ColorOrdinalScale } from '../scale/color-ordinal-scale';
 declare const defaultScaleMap: {
     linear: typeof LinearScale;
@@ -18,8 +16,6 @@ export declare function createScaleWithSpec(spec: IVisual<any>, context: {
     globalScale: IGlobalScale;
     dataStatistics: DataView;
 }): IBaseScale | null;
-export declare function initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>): void;
-export declare function isValidScaleType(type: ScaleType): boolean;
 export declare function valueInScaleRange(v: number, s?: IBaseScale): number;
 export declare function isSpecValueWithScale(specValue: any): boolean;
 export {};

package/esm/util/scale.js

@@ -24,15 +24,11 @@ export function createScaleWithSpec(spec, context) {
     return scale && initScaleWithSpec(scale, spec), scale;
 }
 
-export function initScaleWithSpec(scale, spec) {
+function initScaleWithSpec(scale, spec) {
     scale && spec && (spec.domain && scale.domain(spec.domain), spec.range && scale.range(spec.range), 
     spec.specified && scale.specified && scale.specified(spec.specified));
 }
 
-export function isValidScaleType(type) {
-    return Object.keys(defaultScaleMap).includes(type);
-}
-
 export function valueInScaleRange(v, s) {
     if (!s) return v;
     const range = s.range(), min = Math.min(range[0], range[range.length - 1]), max = Math.max(range[0], range[range.length - 1]);

package/esm/util/scale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":"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","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { ScaleType } from '../typings/scale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    dataStatistics: DataView;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nexport function initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function isValidScaleType(type: ScaleType): boolean {\n  return Object.keys(defaultScaleMap).includes(type);\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}
+{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,EAAmB,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAErH,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,WAAW;IACnB,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,UAAU;IACjB,OAAO,EAAE,YAAY;IACrB,SAAS,EAAE,cAAc;IACzB,YAAY,EAAE,iBAAiB;CAChC,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAAkC;IAC5D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,gBAAgB,EAAE;QACpB,OAAO,IAAI,gBAAgB,EAAE,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,IAAkB,EAClB,OAGC;IAED,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;QACjC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE;YAChD,OAAO,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,CAAC,KAA8B,CAAC;KAC5C;IACD,MAAM,KAAK,GAAG,WAAW,CAAE,IAAkC,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,KAAK,EAAE;QACT,iBAAiB,CAAC,KAAK,EAAE,IAAiC,CAAC,CAAC;KAC7D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAGD,SAAS,iBAAiB,CAAC,KAAiB,EAAE,IAA+B;IAC3E,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;QACnB,OAAO;KACR;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,IAAI,IAAI,CAAC,SAAS,IAAmB,KAAM,CAAC,SAAS,EAAE;QACtC,KAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjD;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,CAAS,EAAE,CAAc;IACzD,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,CAAC,CAAC;KACV;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAc;IACjD,OAAO,OAAO,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,IAAI,OAAO,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,CAAC;AAChE,CAAC","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    dataStatistics: DataView;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nfunction initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}

package/esm/util/space.d.ts

@@ -1,19 +1,13 @@
-import type { ILayoutPaddingSpec } from '../model/interface';
-import type { IBoundsLike } from '@visactor/vutils';
-import type { ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';
+import { type IBoundsLike } from '@visactor/vutils';
+import type { ILayoutPaddingSpec, IPercentOffset, ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';
 import type { IPadding, IRect } from '../typings/space';
-import { Direction } from '../typings/space';
 import type { IPoint } from '../typings/coordinate';
 export declare function isValidOrient(orient: string): boolean;
-export declare function getSpecPadding(padding: IPadding | number | undefined | null, defaultPadding: IPadding): IPadding;
 export declare function isPointInRect(point: IPoint, rect: IRect): boolean;
 export declare function isPercent(v: any): v is IPercent;
+export declare function isPercentOffset(v: any): v is IPercentOffset;
 export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect): number;
 export declare function calcPadding(paddingSpec: ILayoutOrientPadding, rect: ILayoutRect, callOp: ILayoutRect): IPadding;
 export declare function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect;
-export declare function boundsOutViewBox(bounds: IBoundsLike, box: IBoundsLike, direction: Direction): {
-    start: number;
-    end: number;
-};
 export declare function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding;
 export declare function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean): IPoint;

package/esm/util/space.js

@@ -2,8 +2,6 @@ import { isArray } from "@visactor/vutils";
 
 import { isNumber, isNil, isString, isFunction, couldBeValidNumber, isObject } from "./type";
 
-import { Direction } from "../typings/space";
-
 export function isValidOrient(orient) {
     switch (orient) {
       case "left":
@@ -17,15 +15,6 @@ export function isValidOrient(orient) {
     }
 }
 
-export function getSpecPadding(padding, defaultPadding) {
-    return isNil(padding) ? Object.assign({}, defaultPadding) : "number" == typeof padding ? {
-        top: padding,
-        bottom: padding,
-        left: padding,
-        right: padding
-    } : Object.assign(Object.assign({}, defaultPadding), padding);
-}
-
 export function isPointInRect(point, rect) {
     const {x: x, y: y, width: width, height: height} = rect, {x: x0, y: y0} = point;
     return x0 < x + width && y0 < y + height && y0 > y && x0 > x;
@@ -35,8 +24,13 @@ export function isPercent(v) {
     return !!isString(v) && (!!v.endsWith("%") && couldBeValidNumber(v.substring(0, v.length - 1)));
 }
 
+export function isPercentOffset(v) {
+    return !!isObject(v) && ("percent" in v || "offset" in v);
+}
+
 export function calcLayoutNumber(v, size, callOp) {
-    return isNumber(v) ? v : isPercent(v) ? Number(v.substring(0, v.length - 1)) * size / 100 : isFunction(v) ? v(callOp) : 0;
+    var _a, _b;
+    return isNumber(v) ? v : isPercent(v) ? Number(v.substring(0, v.length - 1)) * size / 100 : isFunction(v) ? v(callOp) : isObject(v) ? size * (null !== (_a = v.percent) && void 0 !== _a ? _a : 0) + (null !== (_b = v.offset) && void 0 !== _b ? _b : 0) : 0;
 }
 
 export function calcPadding(paddingSpec, rect, callOp) {
@@ -73,24 +67,12 @@ export function boundsInRect(bounds, rect) {
     };
 }
 
-export function boundsOutViewBox(bounds, box, direction) {
-    if (!bounds || !box) return {
-        start: 0,
-        end: 0
-    };
-    const start = -(direction === Direction.horizontal ? bounds.x1 : bounds.y1), end = direction === Direction.horizontal ? bounds.x2 - (box.x2 - box.x1) : bounds.y2 - (box.y2 - box.y1);
-    return {
-        start: start > 0 ? start : 0,
-        end: end > 0 ? end : 0
-    };
-}
-
 export function normalizeLayoutPaddingSpec(spec) {
     let result = {};
     return isArray(spec) ? (isNil(spec[0]) || (result.top = result.left = result.bottom = result.right = spec[0]), 
     isNil(spec[1]) || (result.left = result.right = spec[1]), isNil(spec[2]) || (result.bottom = spec[2]), 
-    isNil(spec[3]) || (result.left = spec[3]), result) : isNumber(spec) || isPercent(spec) || isFunction(spec) ? (result.top = result.left = result.bottom = result.right = spec, 
-    result) : (isObject(spec) && (result = Object.assign({}, spec)), result);
+    isNil(spec[3]) || (result.left = spec[3]), result) : isNumber(spec) || isPercent(spec) || isFunction(spec) || isPercentOffset(spec) ? (result.top = result.left = result.bottom = result.right = spec, 
+    result) : isObject(spec) ? (result = Object.assign({}, spec), result) : result;
 }
 
 export function convertPoint(point, relativePoint, convert) {

package/esm/util/space.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/space.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAI7F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,QAAQ,MAAM,EAAE;QACd,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,KAAK,CAAC;QACX,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAA6C,EAAE,cAAwB;IACpG,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAClB,yBAAY,cAAc,EAAG;KAC9B;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO;YACL,GAAG,EAAE,OAAO;YACZ,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;SACf,CAAC;KACH;IACD,uCACK,cAAc,GACd,OAAO,EACV;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,IAAW;IACtD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACrC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IAC/B,OAAO,EAAE,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE,GAAG,CAAC,GAAG,MAAM,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAM;IAC9B,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QAChB,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IACD,OAAO,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,CAA4B,EAC5B,IAAY,EACZ,MAAoB;IAEpB,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE;QACf,OAAO,CAAC,CAAC;KACV;IACD,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE;QAChB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;KAC5D;IACD,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;QACjB,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;KAClB;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,WAAiC,EACjC,IAAiB,EACjB,MAAmB;;IAEnB,MAAM,MAAM,GAAa;QACvB,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;KACT,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;QAC9D,MAAM,CAAC,GAAG,GAAG,MAAW,WAAY,CAAC,GAAG,mCAAI,CAAC,CAAC;QAC9C,MAAM,CAAC,KAAK,GAAG,MAAW,WAAY,CAAC,KAAK,mCAAI,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,GAAG,MAAW,WAAY,CAAC,MAAM,mCAAI,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,GAAG,MAAW,WAAY,CAAC,IAAI,mCAAI,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;KACf;IACD,MAAM,QAAQ,GAAG;QACf;YACE,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YAC1B,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB;QACD;YACE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC1B,IAAI,EAAE,IAAI,CAAC,MAAM;SAClB;KACF,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACnB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACpB,MAAM,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAmB,EAAE,IAAiB;IACjE,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;KAChC;IACD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;KAChE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAmB,EACnB,GAAgB,EAChB,SAAoB;IAKpB,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE;QACnB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KAC7B;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,SAAS,KAAK,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/G,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAwB;IACjE,IAAI,MAAM,GAAyB,EAAE,CAAC;IACtC,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACnB,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;SACnE;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACnB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;SACtC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACnB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;SACzB;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;SACvB;QACD,OAAO,MAAM,CAAC;KACf;IACD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE;QACzD,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/D,OAAO,MAAM,CAAC;KACf;IACD,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,qBAAQ,IAAI,CAAE,CAAC;KACtB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAa,EAAE,aAAqB,EAAE,OAAgB;IACjF,IAAI,OAAO,EAAE;QACX,OAAO;YACL,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;YAC5B,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;SAC7B,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC","file":"space.js","sourcesContent":["import type { ILayoutPaddingSpec } from '../model/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { isArray } from '@visactor/vutils';\nimport { isNumber, isNil, isString, isFunction, couldBeValidNumber, isObject } from './type';\nimport type { ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';\nimport type { IPadding, IRect } from '../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../typings/space';\nimport type { IPoint } from '../typings/coordinate';\n\nexport function isValidOrient(orient: string): boolean {\n  switch (orient) {\n    case 'left':\n    case 'right':\n    case 'top':\n    case 'bottom':\n      return true;\n    default:\n      return false;\n  }\n}\n\nexport function getSpecPadding(padding: IPadding | number | undefined | null, defaultPadding: IPadding): IPadding {\n  if (isNil(padding)) {\n    return { ...defaultPadding };\n  }\n  if (typeof padding === 'number') {\n    return {\n      top: padding,\n      bottom: padding,\n      left: padding,\n      right: padding\n    };\n  }\n  return {\n    ...defaultPadding,\n    ...padding\n  };\n}\n\nexport function isPointInRect(point: IPoint, rect: IRect) {\n  const { x, y, width, height } = rect;\n  const { x: x0, y: y0 } = point;\n  return x0 < x + width && y0 < y + height && y0 > y && x0 > x;\n}\n\nexport function isPercent(v: any): v is IPercent {\n  if (!isString(v)) {\n    return false;\n  }\n  if (!v.endsWith('%')) {\n    return false;\n  }\n  return couldBeValidNumber(v.substring(0, v.length - 1));\n}\n\nexport function calcLayoutNumber(\n  v: ILayoutNumber | undefined,\n  size: number,\n  callOp?: ILayoutRect //如果是函数类型的话，函数的参数\n) {\n  if (isNumber(v)) {\n    return v;\n  }\n  if (isPercent(v)) {\n    return (Number(v.substring(0, v.length - 1)) * size) / 100;\n  }\n  if (isFunction(v)) {\n    return v(callOp);\n  }\n  return 0;\n}\n\nexport function calcPadding(\n  paddingSpec: ILayoutOrientPadding,\n  rect: ILayoutRect,\n  callOp: ILayoutRect //如果是函数类型的话，函数的参数\n): IPadding {\n  const result: IPadding = {\n    top: 0,\n    bottom: 0,\n    left: 0,\n    right: 0\n  };\n  if (Object.values(paddingSpec).every(value => isNumber(value))) {\n    result.top = (<IPadding>paddingSpec).top ?? 0;\n    result.right = (<IPadding>paddingSpec).right ?? 0;\n    result.bottom = (<IPadding>paddingSpec).bottom ?? 0;\n    result.left = (<IPadding>paddingSpec).left ?? 0;\n    return result;\n  }\n  const paddings = [\n    {\n      orients: ['left', 'right'],\n      size: rect.width\n    },\n    {\n      orients: ['top', 'bottom'],\n      size: rect.height\n    }\n  ];\n  paddings.forEach(p => {\n    p.orients.forEach(o => {\n      result[o] = calcLayoutNumber(paddingSpec[o], p.size, callOp);\n    });\n  });\n  return result;\n}\n\nexport function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect {\n  if (!bounds) {\n    return { width: 0, height: 0 };\n  }\n  return {\n    width: Math.ceil(Math.min(bounds.x2 - bounds.x1, rect.width)),\n    height: Math.ceil(Math.min(bounds.y2 - bounds.y1, rect.height))\n  };\n}\n\nexport function boundsOutViewBox(\n  bounds: IBoundsLike,\n  box: IBoundsLike,\n  direction: Direction\n): {\n  start: number;\n  end: number;\n} {\n  if (!bounds || !box) {\n    return { start: 0, end: 0 };\n  }\n  const start = -(direction === Direction.horizontal ? bounds.x1 : bounds.y1);\n  const end = direction === Direction.horizontal ? bounds.x2 - (box.x2 - box.x1) : bounds.y2 - (box.y2 - box.y1);\n  return { start: start > 0 ? start : 0, end: end > 0 ? end : 0 };\n}\n\nexport function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding {\n  let result: ILayoutOrientPadding = {};\n  if (isArray(spec)) {\n    if (!isNil(spec[0])) {\n      result.top = result.left = result.bottom = result.right = spec[0];\n    }\n    if (!isNil(spec[1])) {\n      result.left = result.right = spec[1];\n    }\n    if (!isNil(spec[2])) {\n      result.bottom = spec[2];\n    }\n    if (!isNil(spec[3])) {\n      result.left = spec[3];\n    }\n    return result;\n  }\n  if (isNumber(spec) || isPercent(spec) || isFunction(spec)) {\n    result.top = result.left = result.bottom = result.right = spec;\n    return result;\n  }\n  if (isObject(spec)) {\n    result = { ...spec };\n  }\n  return result;\n}\n\nexport function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean) {\n  if (convert) {\n    return {\n      x: point.x + relativePoint.x,\n      y: point.y + relativePoint.y\n    };\n  }\n  return point;\n}\n"]}
+{"version":3,"sources":["../src/util/space.ts"],"names":[],"mappings":"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","file":"space.js","sourcesContent":["import { isArray, type IBoundsLike } from '@visactor/vutils';\nimport { isNumber, isNil, isString, isFunction, couldBeValidNumber, isObject } from './type';\nimport type {\n  ILayoutPaddingSpec,\n  IPercentOffset,\n  ILayoutNumber,\n  IPercent,\n  ILayoutOrientPadding,\n  ILayoutRect\n} from '../model/interface';\nimport type { IPadding, IRect } from '../typings/space';\nimport type { IPoint } from '../typings/coordinate';\n\nexport function isValidOrient(orient: string): boolean {\n  switch (orient) {\n    case 'left':\n    case 'right':\n    case 'top':\n    case 'bottom':\n      return true;\n    default:\n      return false;\n  }\n}\n\nexport function isPointInRect(point: IPoint, rect: IRect) {\n  const { x, y, width, height } = rect;\n  const { x: x0, y: y0 } = point;\n  return x0 < x + width && y0 < y + height && y0 > y && x0 > x;\n}\n\nexport function isPercent(v: any): v is IPercent {\n  if (!isString(v)) {\n    return false;\n  }\n  if (!v.endsWith('%')) {\n    return false;\n  }\n  return couldBeValidNumber(v.substring(0, v.length - 1));\n}\n\nexport function isPercentOffset(v: any): v is IPercentOffset {\n  if (!isObject(v)) {\n    return false;\n  }\n  if ('percent' in v || 'offset' in v) {\n    return true;\n  }\n  return false;\n}\n\nexport function calcLayoutNumber(\n  v: ILayoutNumber | undefined,\n  size: number,\n  callOp?: ILayoutRect //如果是函数类型的话，函数的参数\n) {\n  if (isNumber(v)) {\n    return v;\n  }\n  if (isPercent(v)) {\n    return (Number(v.substring(0, v.length - 1)) * size) / 100;\n  }\n  if (isFunction(v)) {\n    return v(callOp);\n  }\n  if (isObject(v)) {\n    return size * (v.percent ?? 0) + (v.offset ?? 0);\n  }\n  return 0;\n}\n\nexport function calcPadding(\n  paddingSpec: ILayoutOrientPadding,\n  rect: ILayoutRect,\n  callOp: ILayoutRect //如果是函数类型的话，函数的参数\n): IPadding {\n  const result: IPadding = {\n    top: 0,\n    bottom: 0,\n    left: 0,\n    right: 0\n  };\n  if (Object.values(paddingSpec).every(value => isNumber(value))) {\n    result.top = (<IPadding>paddingSpec).top ?? 0;\n    result.right = (<IPadding>paddingSpec).right ?? 0;\n    result.bottom = (<IPadding>paddingSpec).bottom ?? 0;\n    result.left = (<IPadding>paddingSpec).left ?? 0;\n    return result;\n  }\n  const paddings = [\n    {\n      orients: ['left', 'right'],\n      size: rect.width\n    },\n    {\n      orients: ['top', 'bottom'],\n      size: rect.height\n    }\n  ];\n  paddings.forEach(p => {\n    p.orients.forEach(o => {\n      result[o] = calcLayoutNumber(paddingSpec[o], p.size, callOp);\n    });\n  });\n  return result;\n}\n\nexport function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect {\n  if (!bounds) {\n    return { width: 0, height: 0 };\n  }\n  return {\n    width: Math.ceil(Math.min(bounds.x2 - bounds.x1, rect.width)),\n    height: Math.ceil(Math.min(bounds.y2 - bounds.y1, rect.height))\n  };\n}\n\nexport function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding {\n  let result: ILayoutOrientPadding = {};\n  if (isArray(spec)) {\n    if (!isNil(spec[0])) {\n      result.top = result.left = result.bottom = result.right = spec[0];\n    }\n    if (!isNil(spec[1])) {\n      result.left = result.right = spec[1];\n    }\n    if (!isNil(spec[2])) {\n      result.bottom = spec[2];\n    }\n    if (!isNil(spec[3])) {\n      result.left = spec[3];\n    }\n    return result;\n  }\n  if (isNumber(spec) || isPercent(spec) || isFunction(spec) || isPercentOffset(spec)) {\n    result.top = result.left = result.bottom = result.right = spec;\n    return result;\n  }\n  if (isObject(spec)) {\n    result = { ...spec };\n    return result;\n  }\n  return result;\n}\n\nexport function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean) {\n  if (convert) {\n    return {\n      x: point.x + relativePoint.x,\n      y: point.y + relativePoint.y\n    };\n  }\n  return point;\n}\n"]}

package/esm/util/text.d.ts

@@ -1,9 +1,8 @@
 import type { ITextMeasureOption } from '@visactor/vutils';
-import { TextMeasure, TestTextMeasure } from '@visactor/vutils';
+import { TextMeasure } from '@visactor/vutils';
 import type { IRichTextAttribute } from '@visactor/vrender';
 import type { ITextMarkSpec } from '../typings';
 export declare const initTextMeasure: (textSpec?: Partial<ITextMarkSpec>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextMarkSpec>;
-export declare const testTextMeasure: (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean) => TestTextMeasure<any>;
 type IRichTextBoundsParams = Partial<IRichTextAttribute>;
 export declare function getRichTextBounds(params: IRichTextBoundsParams): import("@visactor/vutils").IBounds;
 export {};

package/esm/util/text.js

@@ -1,4 +1,4 @@
-import { TextMeasure, TestTextMeasure } from "@visactor/vutils";
+import { TextMeasure } from "@visactor/vutils";
 
 import { createRichText, getTextBounds } from "@visactor/vrender";
 
@@ -13,14 +13,6 @@ export const initTextMeasure = (textSpec, option, useNaiveCanvas) => new TextMea
     specialCharSet: "-/: .,@%'\"~" + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
 }, null != option ? option : {}), textSpec);
 
-export const testTextMeasure = (textSpec, useVRender) => new TestTextMeasure({
-    defaultFontParams: {
-        fontFamily: DEFAULT_TEXT_FONT_FAMILY,
-        fontSize: DEFAULT_TEXT_FONT_SIZE
-    },
-    getTextBounds: useVRender ? getTextBounds : void 0
-}, textSpec);
-
 const richText = createRichText({});
 
 export function getRichTextBounds(params) {

package/esm/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,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,CAAC,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAE,UAAoB,EAAwB,EAAE;IAC/G,OAAO,IAAI,eAAe,CACxB;QACE,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC;QACD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;KACtD,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAKF,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;AACpC,MAAM,UAAU,iBAAiB,CAAC,MAA6B;IAC7D,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC,UAAU,CAAC;AAC7B,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport type { IRichTextAttribute } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createRichText, getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\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/** 测试方法 */\nexport const testTextMeasure = (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean): TestTextMeasure<any> => {\n  return new TestTextMeasure(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useVRender ? getTextBounds : undefined\n    },\n    textSpec\n  );\n};\n\n/** 测量富文本 */\n// FIXME: 等 vrender 支持后删掉\ntype IRichTextBoundsParams = Partial<IRichTextAttribute>;\nconst richText = createRichText({});\nexport function getRichTextBounds(params: IRichTextBoundsParams) {\n  richText.setAttributes(params);\n  return richText.AABBBounds;\n}\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAmB,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,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;AAKF,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;AACpC,MAAM,UAAU,iBAAiB,CAAC,MAA6B;IAC7D,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC,UAAU,CAAC;AAC7B,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport type { IRichTextAttribute } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createRichText, getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\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/** 测量富文本 */\n// FIXME: 等 vrender 支持后删掉\ntype IRichTextBoundsParams = Partial<IRichTextAttribute>;\nconst richText = createRichText({});\nexport function getRichTextBounds(params: IRichTextBoundsParams) {\n  richText.setAttributes(params);\n  return richText.AABBBounds;\n}\n"]}

package/esm/vchart-all.js

@@ -2,14 +2,14 @@ import { VChart, Factory } from "./core";
 
 import { AreaChart, LineChart, BarChart, Bar3dChart, ScatterChart, MapChart, PieChart, Pie3dChart, RoseChart, RadarChart, CommonChart, SequenceChart, HistogramChart, Histogram3dChart, CircularProgressChart, WordCloudChart, WordCloud3dChart, FunnelChart, Funnel3dChart, LinearProgressChart, RangeColumnChart, RangeColumn3dChart, SunburstChart, CirclePackingChart, TreeMapChart, WaterfallChart, BoxPlotChart, SankeyChart, GaugeChart, RangeAreaChart, HeatmapChart } from "./chart";
 
-import { CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, PolarBandAxis, CartesianLogAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Tooltip, CartesianCrossHair, PolarCrossHair, DataZoom, ScrollBar, Indicator, GeoCoordinate, MarkLine, Title, MarkArea, Player, Label, MarkPoint, Brush, CustomMark, MapLabelComponent } from "./component";
+import { CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, PolarBandAxis, CartesianLogAxis, CartesianSymlogAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Tooltip, CartesianCrossHair, PolarCrossHair, DataZoom, ScrollBar, Indicator, GeoCoordinate, MarkLine, Title, MarkArea, Player, Label, MarkPoint, Brush, CustomMark, MapLabelComponent, TotalLabel } from "./component";
 
 import { GridLayout, Layout3d } from "./layout";
 
 import { loadPoptip } from "@visactor/vrender-components";
 
 loadPoptip({}), VChart.useChart([ AreaChart, LineChart, BarChart, Bar3dChart, ScatterChart, MapChart, PieChart, Pie3dChart, RoseChart, RadarChart, CommonChart, SequenceChart, HistogramChart, Histogram3dChart, CircularProgressChart, WordCloudChart, WordCloud3dChart, FunnelChart, Funnel3dChart, LinearProgressChart, RangeColumnChart, RangeColumn3dChart, SunburstChart, CirclePackingChart, TreeMapChart, WaterfallChart, BoxPlotChart, SankeyChart, GaugeChart, RangeAreaChart, HeatmapChart ]), 
-VChart.useComponent([ CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, CartesianLogAxis, PolarBandAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Tooltip, CartesianCrossHair, PolarCrossHair, DataZoom, ScrollBar, Indicator, GeoCoordinate, MarkLine, Title, MarkArea, Player, Label, MarkPoint, Brush, CustomMark, MapLabelComponent ]), 
+VChart.useComponent([ CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, CartesianLogAxis, CartesianSymlogAxis, PolarBandAxis, PolarLinearAxis, DiscreteLegend, ContinuousLegend, Tooltip, CartesianCrossHair, PolarCrossHair, DataZoom, ScrollBar, Indicator, GeoCoordinate, MarkLine, Title, MarkArea, Player, TotalLabel, Label, MarkPoint, Brush, CustomMark, MapLabelComponent ]), 
 Factory.registerLayout("grid", GridLayout), Factory.registerLayout("layout3d", Layout3d);
 
 export { VChart };

package/esm/vchart-all.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,MAAM,EACN,KAAK,EACL,SAAS,EACT,KAAK,EACL,UAAU,EACV,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,UAAU,CAAC,EAAE,CAAC,CAAC;AAGf,MAAM,CAAC,QAAQ,CAAC;IACd,SAAS;IACT,SAAS;IACT,QAAQ;IACR,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,SAAS;IACT,UAAU;IACV,WAAW;IACX,aAAa;IACb,cAAc;IACd,gBAAgB;IAChB,qBAAqB;IACrB,cAAc;IACd,gBAAgB;IAChB,WAAW;IACX,aAAa;IACb,mBAAmB;IACnB,gBAAgB;IAChB,kBAAkB;IAClB,aAAa;IACb,kBAAkB;IAClB,YAAY;IACZ,cAAc;IACd,YAAY;IACZ,WAAW;IACX,UAAU;IACV,cAAc;IACd,YAAY;CACb,CAAC,CAAC;AAGH,MAAM,CAAC,YAAY,CAAC;IAClB,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,aAAa;IACb,eAAe;IACf,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,kBAAkB;IAClB,cAAc;IACd,QAAQ;IACR,SAAS;IACT,SAAS;IACT,aAAa;IACb,QAAQ;IACR,KAAK;IACL,QAAQ;IACR,MAAM;IACN,KAAK;IACL,SAAS;IACT,KAAK;IACL,UAAU;IACV,iBAAiB;CAClB,CAAC,CAAC;AAGH,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,UAAiB,CAAC,CAAC;AAClD,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE,QAAe,CAAC,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,cAAc,EACd,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,SAAS,EACT,SAAS,EACT,aAAa,EACb,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,MAAM,EACN,KAAK,EACL,SAAS,EACT,KAAK,EACL,UAAU,EACV,iBAAiB,EACjB,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,UAAU,CAAC,EAAE,CAAC,CAAC;AAGf,MAAM,CAAC,QAAQ,CAAC;IACd,SAAS;IACT,SAAS;IACT,QAAQ;IACR,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,SAAS;IACT,UAAU;IACV,WAAW;IACX,aAAa;IACb,cAAc;IACd,gBAAgB;IAChB,qBAAqB;IACrB,cAAc;IACd,gBAAgB;IAChB,WAAW;IACX,aAAa;IACb,mBAAmB;IACnB,gBAAgB;IAChB,kBAAkB;IAClB,aAAa;IACb,kBAAkB;IAClB,YAAY;IACZ,cAAc;IACd,YAAY;IACZ,WAAW;IACX,UAAU;IACV,cAAc;IACd,YAAY;CACb,CAAC,CAAC;AAGH,MAAM,CAAC,YAAY,CAAC;IAClB,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,mBAAmB;IACnB,aAAa;IACb,eAAe;IACf,cAAc;IACd,gBAAgB;IAChB,OAAO;IACP,kBAAkB;IAClB,cAAc;IACd,QAAQ;IACR,SAAS;IACT,SAAS;IACT,aAAa;IACb,QAAQ;IACR,KAAK;IACL,QAAQ;IACR,MAAM;IACN,UAAU;IACV,KAAK;IACL,SAAS;IACT,KAAK;IACL,UAAU;IACV,iBAAiB;CAClB,CAAC,CAAC;AAGH,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,UAAiB,CAAC,CAAC;AAClD,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE,QAAe,CAAC,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent,\n  TotalLabel\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  TotalLabel,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}

package/esm/vchart-simple.js

@@ -1,8 +1,24 @@
+import { Label } from "./component/label/label";
+
+import { CartesianCrossHair } from "./component/crosshair/cartesian";
+
+import { Tooltip } from "./component/tooltip/tooltip";
+
+import { DiscreteLegend } from "./component/legend/discrete/legend";
+
+import { CartesianTimeAxis } from "./component/axis/cartesian/time-axis";
+
+import { CartesianBandAxis } from "./component/axis/cartesian/band-axis";
+
+import { CartesianLinearAxis } from "./component/axis/cartesian/linear-axis";
+
 import { VChart } from "./core";
 
-import { LineChart, BarChart, PieChart } from "./chart";
+import { LineChart } from "./chart/line";
+
+import { PieChart } from "./chart/pie";
 
-import { CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, DiscreteLegend, Tooltip, CartesianCrossHair, Label } from "./component";
+import { BarChart } from "./chart/bar";
 
 VChart.useChart([ LineChart, BarChart, PieChart ]), VChart.useComponent([ CartesianLinearAxis, CartesianBandAxis, CartesianTimeAxis, DiscreteLegend, Tooltip, CartesianCrossHair, Label ]);
 

package/esm/vchart-simple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,KAAK,EACN,MAAM,aAAa,CAAC;AAGrB,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAGjD,MAAM,CAAC,YAAY,CAAC;IAClB,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,cAAc;IACd,OAAO;IACP,kBAAkB;IAClB,KAAK;CACN,CAAC,CAAC;AAEH,OAAO,EAAE,MAAM,EAAE,CAAC","file":"vchart-simple.js","sourcesContent":["/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart, BarChart, PieChart } from './chart';\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n} from './component';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAI7E,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAGjD,MAAM,CAAC,YAAY,CAAC;IAClB,mBAAmB;IACnB,iBAAiB;IACjB,iBAAiB;IACjB,cAAc;IACd,OAAO;IACP,kBAAkB;IAClB,KAAK;CACN,CAAC,CAAC;AAEH,OAAO,EAAE,MAAM,EAAE,CAAC","file":"vchart-simple.js","sourcesContent":["import { Label } from './component/label/label';\nimport { CartesianCrossHair } from './component/crosshair/cartesian';\nimport { Tooltip } from './component/tooltip/tooltip';\nimport { DiscreteLegend } from './component/legend/discrete/legend';\nimport { CartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { CartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { CartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart } from './chart/line';\nimport { PieChart } from './chart/pie';\nimport { BarChart } from './chart/bar';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.2.3",
+  "version": "1.3.0-beta.10",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -65,28 +65,32 @@
     "@esbuild-plugins/node-globals-polyfill": "0.1.1",
     "@esbuild-plugins/node-modules-polyfill": "0.1.4",
     "rollup-plugin-node-polyfills": "0.2.1",
+    "rollup-plugin-visualizer": "5.9.2",
+    "rollup-plugin-gzip": "3.1.0",
+    "rollup-plugin-bundle-size": "1.0.3",
+    "rollup-plugin-sizes": "1.0.5",
     "rollup": "3.20.5",
     "node-fetch": "2.6.7",
     "form-data": "~4.0.0",
     "canvas": "2.11.2",
-    "@internal/ts-config": "0.0.1",
     "@internal/typescript-json-schema": "0.0.1",
     "@internal/bundler": "0.0.1",
+    "@internal/ts-config": "0.0.1",
     "@internal/eslint-config": "0.0.1"
   },
   "dependencies": {
-    "@visactor/vutils": "~0.13.3",
-    "@visactor/vdataset": "~0.13.4",
-    "@visactor/vscale": "~0.13.4",
-    "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vgrammar-projection": "~0.5.7",
-    "@visactor/vgrammar-wordcloud": "~0.5.7",
-    "@visactor/vgrammar-wordcloud-shape": "~0.5.7",
-    "@visactor/vgrammar-hierarchy": "~0.5.7",
-    "@visactor/vgrammar-sankey": "~0.5.7",
-    "@visactor/vgrammar-util": "~0.5.7",
-    "@visactor/vrender": "~0.13.11",
-    "@visactor/vrender-components": "~0.13.12"
+    "@visactor/vutils": "~0.15.7",
+    "@visactor/vdataset": "~0.15.7",
+    "@visactor/vscale": "~0.15.7",
+    "@visactor/vgrammar": "~0.6.3",
+    "@visactor/vgrammar-projection": "~0.6.3",
+    "@visactor/vgrammar-wordcloud": "~0.6.3",
+    "@visactor/vgrammar-wordcloud-shape": "~0.6.3",
+    "@visactor/vgrammar-hierarchy": "~0.6.3",
+    "@visactor/vgrammar-sankey": "~0.6.3",
+    "@visactor/vgrammar-util": "~0.6.3",
+    "@visactor/vrender": "~0.14.5",
+    "@visactor/vrender-components": "0.14.6-alpha.2"
   },
   "publishConfig": {
     "access": "public",
@@ -97,6 +101,9 @@
     "build:schema": "schema src/typings/spec/chart.ts ISpec --useTypeOfKeyword --ignoreErrors --required > ../vchart-schema/vchart.json",
     "build": "bundle --clean && npm run build:schema && npm run build:es5",
     "build:ci": "bundle --clean -f umd --minify=false --ignorePostTasks --name ChartSpace",
+    "analyze": "npm run analyze-full && npm run analyze-line && npm run analyze-simple",
+    "analyze-full": "BUNDLE_ANALYZE='full' bundle -f umd ",
+    "analyze-simple": "BUNDLE_ANALYZE='simple' bundle -f umd",
     "dev": "bundle --clean -f es -w",
     "compile": "tsc --noEmit",
     "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser",

package/cjs/plugin/components/axis-label-overlap-plugin.d.ts

@@ -1,10 +0,0 @@
-import { BasicComponentPlugin } from './basic-plugin';
-import type { IComponentPlugin, IComponentPluginService } from './interface';
-import type { CartesianAxis } from '../../component/axis/cartesian';
-export declare class AxisLabelOverlapPlugin extends BasicComponentPlugin implements IComponentPlugin {
-    Name: string;
-    constructor();
-    onDidLayoutVertical(service: IComponentPluginService, axis: CartesianAxis): void;
-    onDidLayoutHorizontal(service: IComponentPluginService, axis: CartesianAxis): void;
-    private _doOverlap;
-}

package/cjs/plugin/components/axis-label-overlap-plugin.js

@@ -1,75 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.AxisLabelOverlapPlugin = void 0;
-
-const vutils_1 = require("@visactor/vutils"), basic_plugin_1 = require("./basic-plugin"), common_1 = require("../../component/axis/cartesian/util/common"), util_1 = require("../../util");
-
-function labelFlush(axisLabels, axis) {
-    const {width: width, height: height} = axis.getLayoutRect(), isX = (0, common_1.isXAxis)(axis.layoutOrient), isInverse = !0 === axis.getSpec().inverse, first = axisLabels[0], last = (0, 
-    util_1.peek)(axisLabels);
-    if (isX) if (isInverse) {
-        const start = width, end = 0, startBound = first.AABBBounds.x2, endBound = last.AABBBounds.x1;
-        startBound > start && first.setAttributes({
-            x: start,
-            textAlign: "right"
-        }), endBound < end && last.setAttributes({
-            x: end,
-            textAlign: "left"
-        });
-    } else {
-        const start = 0, end = width, startBound = first.AABBBounds.x1, endBound = last.AABBBounds.x2;
-        startBound < start && first.setAttributes({
-            x: start,
-            textAlign: "left"
-        }), endBound > end && last.setAttributes({
-            x: end,
-            textAlign: "right"
-        });
-    } else if (isInverse) {
-        const startBound = first.AABBBounds.y1, endBound = last.AABBBounds.y2, start = 0, end = height;
-        startBound < start && first.setAttributes({
-            y: start,
-            textBaseline: "top"
-        }), endBound > end && last.setAttributes({
-            y: end,
-            textBaseline: "bottom"
-        });
-    } else {
-        const start = height, end = 0, startBound = first.AABBBounds.y2, endBound = last.AABBBounds.y1;
-        startBound > start && first.setAttributes({
-            y: start,
-            textBaseline: "bottom"
-        }), endBound < end && last.setAttributes({
-            y: end,
-            textBaseline: "top"
-        });
-    }
-}
-
-function overlap(axisLabels, axis) {
-    var _a, _b;
-    const spec = null === (_a = axis.getSpec) || void 0 === _a ? void 0 : _a.call(axis);
-    (0, vutils_1.isEmpty)(axisLabels) || (null === (_b = null == spec ? void 0 : spec.label) || void 0 === _b ? void 0 : _b.flush) && labelFlush(axisLabels, axis);
-}
-
-class AxisLabelOverlapPlugin extends basic_plugin_1.BasicComponentPlugin {
-    constructor() {
-        super(AxisLabelOverlapPlugin.Name), this.Name = "AxisLabelOverlapPlugin";
-    }
-    onDidLayoutVertical(service, axis) {
-        this._doOverlap(service, axis);
-    }
-    onDidLayoutHorizontal(service, axis) {
-        this._doOverlap(service, axis);
-    }
-    _doOverlap(service, axis) {
-        const axisComponent = axis.getSceneNodeMarks()[0].getGroupGraphicItem(), layer0LabelsContainer = axisComponent.find((node => "axis-label-container-layer-0" === node.name), !0), layer1LabelsContainer = axisComponent.find((node => "axis-label-container-layer-1" === node.name), !0);
-        overlap(layer0LabelsContainer ? layer0LabelsContainer.getChildren() : [], service.component), 
-        overlap(layer1LabelsContainer ? layer1LabelsContainer.getChildren() : [], service.component);
-    }
-}
-
-exports.AxisLabelOverlapPlugin = AxisLabelOverlapPlugin;
-//# sourceMappingURL=axis-label-overlap-plugin.js.map

package/cjs/plugin/components/axis-label-overlap-plugin.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/plugin/components/axis-label-overlap-plugin.ts"],"names":[],"mappings":"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","file":"axis-label-overlap-plugin.js","sourcesContent":["import { isEmpty } from '@visactor/vutils';\nimport type { IText, IGroup, INode } from '@visactor/vrender';\nimport { BasicComponentPlugin } from './basic-plugin';\nimport type { IComponentPlugin, IComponentPluginService } from './interface';\nimport type { IComponent } from '../../component/interface';\nimport { isXAxis } from '../../component/axis/cartesian/util/common';\nimport { peek } from '../../util';\nimport type { CartesianAxis } from '../../component/axis/cartesian';\n\nfunction labelFlush(axisLabels: IText[], axis: IComponent) {\n  const { width, height } = axis.getLayoutRect();\n  const isX = isXAxis(axis.layoutOrient);\n  const isInverse = axis.getSpec().inverse === true;\n  const first = axisLabels[0];\n  const last = peek(axisLabels);\n\n  if (isX) {\n    if (isInverse) {\n      const start = width;\n      const end = 0;\n      const startBound = first.AABBBounds.x2;\n      const endBound = last.AABBBounds.x1;\n\n      if (startBound > start) {\n        first.setAttributes({\n          x: start,\n          textAlign: 'right'\n        });\n      }\n\n      if (endBound < end) {\n        last.setAttributes({\n          x: end,\n          textAlign: 'left'\n        });\n      }\n    } else {\n      const start = 0;\n      const end = width;\n      const startBound = first.AABBBounds.x1;\n      const endBound = last.AABBBounds.x2;\n      if (startBound < start) {\n        first.setAttributes({\n          x: start,\n          textAlign: 'left'\n        });\n      }\n\n      if (endBound > end) {\n        last.setAttributes({\n          x: end,\n          textAlign: 'right'\n        });\n      }\n    }\n  } else {\n    if (isInverse) {\n      const startBound = first.AABBBounds.y1;\n      const endBound = last.AABBBounds.y2;\n      const start = 0;\n      const end = height;\n\n      if (startBound < start) {\n        first.setAttributes({\n          y: start,\n          textBaseline: 'top'\n        });\n      }\n\n      if (endBound > end) {\n        last.setAttributes({\n          y: end,\n          textBaseline: 'bottom'\n        });\n      }\n    } else {\n      const start = height;\n      const end = 0;\n      const startBound = first.AABBBounds.y2;\n      const endBound = last.AABBBounds.y1;\n\n      if (startBound > start) {\n        first.setAttributes({\n          y: start,\n          textBaseline: 'bottom'\n        });\n      }\n\n      if (endBound < end) {\n        last.setAttributes({\n          y: end,\n          textBaseline: 'top'\n        });\n      }\n    }\n  }\n}\n\nfunction overlap(axisLabels: IText[], axis: IComponent) {\n  const spec = axis.getSpec?.();\n  if (!isEmpty(axisLabels)) {\n    // 首尾标签向内偏移\n    if (spec?.label?.flush) {\n      labelFlush(axisLabels, axis);\n    }\n  }\n}\n\nexport class AxisLabelOverlapPlugin extends BasicComponentPlugin implements IComponentPlugin {\n  Name: string = 'AxisLabelOverlapPlugin';\n\n  constructor() {\n    super(AxisLabelOverlapPlugin.Name);\n  }\n\n  onDidLayoutVertical(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n  onDidLayoutHorizontal(service: IComponentPluginService, axis: CartesianAxis) {\n    this._doOverlap(service, axis);\n  }\n\n  private _doOverlap(service: IComponentPluginService, axis: CartesianAxis) {\n    const axisComponent = axis.getSceneNodeMarks()[0].getGroupGraphicItem();\n    const layer0LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-0',\n      true\n    ) as IGroup;\n    const layer1LabelsContainer = axisComponent.find(\n      (node: INode) => node.name === 'axis-label-container-layer-1',\n      true\n    ) as IGroup;\n    overlap(layer0LabelsContainer ? (layer0LabelsContainer.getChildren() as IText[]) : [], service.component);\n    overlap(layer1LabelsContainer ? (layer1LabelsContainer.getChildren() as IText[]) : [], service.component);\n  }\n}\n"]}

package/esm/plugin/components/axis-label-overlap-plugin.d.ts

@@ -1,10 +0,0 @@
-import { BasicComponentPlugin } from './basic-plugin';
-import type { IComponentPlugin, IComponentPluginService } from './interface';
-import type { CartesianAxis } from '../../component/axis/cartesian';
-export declare class AxisLabelOverlapPlugin extends BasicComponentPlugin implements IComponentPlugin {
-    Name: string;
-    constructor();
-    onDidLayoutVertical(service: IComponentPluginService, axis: CartesianAxis): void;
-    onDidLayoutHorizontal(service: IComponentPluginService, axis: CartesianAxis): void;
-    private _doOverlap;
-}