@visactor/vchart 1.2.0-beta.5 → 1.2.0-beta.6

package/esm/core/vchart.d.ts

@@ -101,8 +101,8 @@ export declare class VChart implements IVChart {
     getTooltipHandler(): ITooltipHandler | undefined;
     showTooltip(datum: Datum, options: IShowTooltipOption): boolean;
     hideTooltip(): boolean;
-    getLegendDataById(id: string): StringOrNumber[];
-    getLegendDataByIndex(index?: number): StringOrNumber[];
+    getLegendDataById(id: string): Datum[];
+    getLegendDataByIndex(index?: number): Datum[];
     getLegendSelectedDataById(id: string): StringOrNumber[];
     getLegendSelectedDataByIndex(index?: number): StringOrNumber[];
     setLegendSelectedDataById(id: string, selectedData: StringOrNumber[]): void;

package/esm/data/transforms/lookup.d.ts

@@ -1,4 +1,5 @@
 import type { DataView } from '@visactor/vdataset';
+import type { Datum } from '../../typings';
 export interface ILookUpOpt {
     from: () => object[];
     key: string;
@@ -6,5 +7,6 @@ export interface ILookUpOpt {
     values?: string[];
     as?: string[];
     default?: any;
+    set?: (A: Datum, B: Datum) => void;
 }
 export declare const lookup: (data: Array<DataView>, opt: ILookUpOpt) => DataView[];

package/esm/data/transforms/lookup.js

@@ -1,4 +1,4 @@
-import { isNil, isValid } from "../../util";
+import { isFunction, isNil, isValid } from "../../util";
 
 export const lookup = (data, opt) => {
     if (!opt.from || !opt.from()) return data;
@@ -6,7 +6,10 @@ export const lookup = (data, opt) => {
         return obj[fields] && map.set(obj[fields], obj), map;
     }), new Map);
     let set;
-    if (values) {
+    if (isFunction(opt.set)) set = function(d) {
+        const v = index.get(d[key]);
+        opt.set(d, v);
+    }; else if (values) {
         const m = values.length;
         set = function(d) {
             const v = index.get(d[key]);

package/esm/data/transforms/lookup.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/lookup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAY5C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAE,GAAe,EAAE,EAAE;IAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;IACjC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,GAAwB,EAAE,GAAG;QACrE,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE;YACf,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3B;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAC;IAE9B,IAAI,GAAqB,CAAC;IAC1B,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACxB,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;gBACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;iBACzB;aACF;iBAAM;gBACL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzB;aACF;QACH,CAAC,CAAC;KACH;SAAM;QACL,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3C,CAAC,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAClB,GAAG,CAAC,CAAC,CAAC,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","file":"lookup.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isNil, isValid } from '../../util';\n\nexport interface ILookUpOpt {\n  from: () => object[];\n  key: string;\n  // 暂时不支持Multi-field lookup\n  fields: string;\n  values?: string[];\n  as?: string[];\n  default?: any;\n}\n\nexport const lookup = (data: Array<DataView>, opt: ILookUpOpt) => {\n  if (!opt.from || !opt.from()) {\n    return data;\n  }\n\n  const fields = opt.fields;\n  const key = opt.key;\n  const values = opt.values;\n  const defaultValue = opt.default;\n  const as = opt.as || [fields];\n  const index = opt.from().reduce(function (map: Map<string, object>, obj) {\n    if (obj[fields]) {\n      map.set(obj[fields], obj);\n    }\n    return map;\n  }, new Map<string, object>());\n\n  let set: (d: any) => void;\n  if (values) {\n    const m = values.length;\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      if (isNil(v)) {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = defaultValue;\n        }\n      } else {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = v[values[i]];\n        }\n      }\n    };\n  } else {\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      d[as[0]] = isValid(v) ? v : defaultValue;\n    };\n  }\n\n  if (data.length === 0) {\n    return [];\n  }\n  return data.map(d => {\n    set(d);\n    return d;\n  });\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/lookup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAcxD,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAE,GAAe,EAAE,EAAE;IAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;IACjC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,GAAwB,EAAE,GAAG;QACrE,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE;YACf,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3B;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAC;IAE9B,IAAI,GAAqB,CAAC;IAC1B,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC;KACH;SAAM,IAAI,MAAM,EAAE;QACjB,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACxB,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;gBACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;iBACzB;aACF;iBAAM;gBACL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzB;aACF;QACH,CAAC,CAAC;KACH;SAAM;QACL,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3C,CAAC,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAClB,GAAG,CAAC,CAAC,CAAC,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","file":"lookup.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isFunction, isNil, isValid } from '../../util';\nimport type { Datum } from '../../typings';\n\nexport interface ILookUpOpt {\n  from: () => object[];\n  key: string;\n  // 暂时不支持Multi-field lookup\n  fields: string;\n  values?: string[];\n  as?: string[];\n  default?: any;\n  set?: (A: Datum, B: Datum) => void;\n}\n\nexport const lookup = (data: Array<DataView>, opt: ILookUpOpt) => {\n  if (!opt.from || !opt.from()) {\n    return data;\n  }\n\n  const fields = opt.fields;\n  const key = opt.key;\n  const values = opt.values;\n  const defaultValue = opt.default;\n  const as = opt.as || [fields];\n  const index = opt.from().reduce(function (map: Map<string, object>, obj) {\n    if (obj[fields]) {\n      map.set(obj[fields], obj);\n    }\n    return map;\n  }, new Map<string, object>());\n\n  let set: (d: any) => void;\n  if (isFunction(opt.set)) {\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      opt.set(d, v);\n    };\n  } else if (values) {\n    const m = values.length;\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      if (isNil(v)) {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = defaultValue;\n        }\n      } else {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = v[values[i]];\n        }\n      }\n    };\n  } else {\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      d[as[0]] = isValid(v) ? v : defaultValue;\n    };\n  }\n\n  if (data.length === 0) {\n    return [];\n  }\n  return data.map(d => {\n    set(d);\n    return d;\n  });\n};\n"]}

package/esm/data/transforms/map.d.ts

@@ -3,4 +3,5 @@ export interface IMapOpt {
     nameMap: Record<string, string>;
     nameProperty: string;
 }
+export declare const DEFAULT_MAP_LOOK_UP_KEY: string;
 export declare const map: (data: GeoSourceType, opt: IMapOpt) => any;

package/esm/data/transforms/map.js

@@ -1,7 +1,9 @@
-import { DEFAULT_DATA_INDEX } from "../../constant";
+import { DEFAULT_DATA_INDEX, PREFIX } from "../../constant";
+
+export const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;
 
 export const map = (data, opt) => (data.features && data.features.forEach(((f, index) => {
     var _a, _b;
-    f[DEFAULT_DATA_INDEX] = index, opt.nameMap ? f.name = opt.nameMap[null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty]] : f.name = null === (_b = f.properties) || void 0 === _b ? void 0 : _b[opt.nameProperty];
+    f[DEFAULT_DATA_INDEX] = index, opt.nameMap ? f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty]] : f[DEFAULT_MAP_LOOK_UP_KEY] = null === (_b = f.properties) || void 0 === _b ? void 0 : _b[opt.nameProperty];
 })), data.features);
 //# sourceMappingURL=map.js.map

package/esm/data/transforms/map.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQpD,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAY,EAAE,EAAE;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;;YAC9C,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,CAAC,OAAO,EAAE;gBACf,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;aACxD;iBAAM;gBACL,CAAC,CAAC,IAAI,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX } from '../../constant';\nimport type { GeoSourceType } from '../../typings/geo';\n\nexport interface IMapOpt {\n  nameMap: Record<string, string>;\n  nameProperty: string;\n}\n\nexport const map = (data: GeoSourceType, opt: IMapOpt) => {\n  if (data.features) {\n    data.features.forEach((f: any, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      if (opt.nameMap) {\n        f.name = opt.nameMap[f.properties?.[opt.nameProperty]];\n      } else {\n        f.name = f.properties?.[opt.nameProperty];\n      }\n    });\n  }\n  return data.features;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAQ5D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,MAAM,kBAAkB,CAAC;AAEnE,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAY,EAAE,EAAE;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;;YAC9C,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,IAAI,GAAG,CAAC,OAAO,EAAE;gBACf,CAAC,CAAC,uBAAuB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;aAC5E;iBAAM;gBACL,CAAC,CAAC,uBAAuB,CAAC,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX, PREFIX } from '../../constant';\nimport type { GeoSourceType } from '../../typings/geo';\n\nexport interface IMapOpt {\n  nameMap: Record<string, string>;\n  nameProperty: string;\n}\n\nexport const DEFAULT_MAP_LOOK_UP_KEY = `${PREFIX}_MAP_LOOK_UP_KEY`;\n\nexport const map = (data: GeoSourceType, opt: IMapOpt) => {\n  if (data.features) {\n    data.features.forEach((f: any, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      if (opt.nameMap) {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[f.properties?.[opt.nameProperty]];\n      } else {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = f.properties?.[opt.nameProperty];\n      }\n    });\n  }\n  return data.features;\n};\n"]}

package/esm/event/events/dimension/util/common.js

@@ -30,19 +30,30 @@ export const getDimensionData = (value, axis, coordinate, getDimensionField) =>
         const seriesList = region.getSeries();
         for (const series of seriesList) if (series.coordinate === coordinate) {
             const dimensionField = array(getDimensionField(series)), viewData = null === (_a = series.getViewData()) || void 0 === _a ? void 0 : _a.latestData;
-            dimensionField && viewData && (isDiscreteAxis ? data.push({
+            if (dimensionField && viewData) if (isDiscreteAxis) data.push({
                 series: series,
                 datum: viewData.filter((datum => {
                     var _a;
                     return (null === (_a = datum[dimensionField[0]]) || void 0 === _a ? void 0 : _a.toString()) === (null == value ? void 0 : value.toString());
                 }))
-            }) : data.push({
+            }); else if (isValid(dimensionField[1])) data.push({
                 series: series,
                 datum: viewData.filter((datum => {
                     var _a;
                     return (null === (_a = datum[dimensionField[0]]) || void 0 === _a ? void 0 : _a.toString()) === (null == value ? void 0 : value.toString()) || isValid(datum[dimensionField[0]]) && isValid(datum[dimensionField[1]]) && value >= datum[dimensionField[0]] && value < datum[dimensionField[1]];
                 }))
-            }));
+            }); else {
+                let minDelta = 1 / 0, minDatums = [], deltaSign = 0;
+                viewData.forEach((datum => {
+                    if (isValid(datum[dimensionField[0]])) {
+                        const delta = Math.abs(datum[dimensionField[0]] - value), sign = Math.sign(datum[dimensionField[0]] - value);
+                        delta < minDelta ? (minDelta = delta, minDatums = [ datum ], deltaSign = sign) : delta === minDelta && sign === deltaSign && minDatums.push(datum);
+                    }
+                })), data.push({
+                    series: series,
+                    datum: minDatums
+                });
+            }
         }
     }
     return data;

package/esm/event/events/dimension/util/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/util/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { ILayoutPoint } from '../../../../model/interface';\nimport type { IChart } from '../../../../chart/interface';\nimport type { IDimensionData, IDimensionInfo } from '../interface';\nimport { isNil, array, isValid } from '../../../../util';\nimport type { AxisComponent } from '../../../../component/axis/base-axis';\nimport type { CoordinateType } from '../../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nconst isInBound = (pos: ILayoutPoint, min: ILayoutPoint, max: ILayoutPoint): boolean =>\n  pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;\n\nexport const isInRegionBound = (chart: IChart, axis: AxisComponent, pos: ILayoutPoint) => {\n  const regionList = chart.getRegionsInIds(array(axis.layoutBindRegionID));\n  return regionList?.some(region => {\n    const rect = region.getLayoutRect();\n    const startPoint = region.getLayoutStartPoint();\n    return isInBound(\n      pos,\n      { x: startPoint.x, y: startPoint.y },\n      { x: rect.width + startPoint.x, y: rect.height + startPoint.y }\n    );\n  });\n};\n\nexport const isSameDimensionInfo = (a?: IDimensionInfo, b?: IDimensionInfo): boolean => {\n  if (a === b) {\n    return true;\n  }\n  if (isNil(a) || isNil(b)) {\n    return false;\n  }\n  if (a.value !== b.value) {\n    return false;\n  }\n  if (a.axis?.id !== b.axis?.id) {\n    return false;\n  }\n  return true;\n};\n\n/** 给定维度项的值，获取对应维度数据 */\nexport const getDimensionData = (\n  value: any,\n  axis: AxisComponent,\n  coordinate: CoordinateType,\n  getDimensionField: (series: any) => string | string[]\n): IDimensionData[] => {\n  const scale = axis.getScale();\n  const isDiscreteAxis = isDiscrete(scale.type);\n\n  const data: IDimensionData[] = [];\n  const regions = axis.getRegions(); // TODO: 直接从轴里取系列\n  for (const region of regions) {\n    const seriesList = region.getSeries();\n    for (const series of seriesList) {\n      if (series.coordinate === coordinate) {\n        const dimensionField = array(getDimensionField(series));\n        const viewData = series.getViewData()?.latestData;\n        if (dimensionField && viewData) {\n          if (isDiscreteAxis) {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) => datum[dimensionField[0]]?.toString() === value?.toString() // 获取该维度项所对应的数据\n              )\n            });\n          } else {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) =>\n                  datum[dimensionField[0]]?.toString() === value?.toString() ||\n                  (isValid(datum[dimensionField[0]]) &&\n                    isValid(datum[dimensionField[1]]) &&\n                    value >= datum[dimensionField[0]] &&\n                    value < datum[dimensionField[1]])\n              )\n            });\n          }\n        }\n      }\n    }\n  }\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/event/events/dimension/util/common.ts"],"names":[],"mappings":"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","file":"common.js","sourcesContent":["import type { ILayoutPoint } from '../../../../model/interface';\nimport type { IChart } from '../../../../chart/interface';\nimport type { IDimensionData, IDimensionInfo } from '../interface';\nimport { isNil, array, isValid } from '../../../../util';\nimport type { AxisComponent } from '../../../../component/axis/base-axis';\nimport type { CoordinateType } from '../../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nconst isInBound = (pos: ILayoutPoint, min: ILayoutPoint, max: ILayoutPoint): boolean =>\n  pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;\n\nexport const isInRegionBound = (chart: IChart, axis: AxisComponent, pos: ILayoutPoint) => {\n  const regionList = chart.getRegionsInIds(array(axis.layoutBindRegionID));\n  return regionList?.some(region => {\n    const rect = region.getLayoutRect();\n    const startPoint = region.getLayoutStartPoint();\n    return isInBound(\n      pos,\n      { x: startPoint.x, y: startPoint.y },\n      { x: rect.width + startPoint.x, y: rect.height + startPoint.y }\n    );\n  });\n};\n\nexport const isSameDimensionInfo = (a?: IDimensionInfo, b?: IDimensionInfo): boolean => {\n  if (a === b) {\n    return true;\n  }\n  if (isNil(a) || isNil(b)) {\n    return false;\n  }\n  if (a.value !== b.value) {\n    return false;\n  }\n  if (a.axis?.id !== b.axis?.id) {\n    return false;\n  }\n  return true;\n};\n\n/** 给定维度项的值，获取对应维度数据 */\nexport const getDimensionData = (\n  value: any,\n  axis: AxisComponent,\n  coordinate: CoordinateType,\n  getDimensionField: (series: any) => string | string[]\n): IDimensionData[] => {\n  const scale = axis.getScale();\n  const isDiscreteAxis = isDiscrete(scale.type);\n\n  const data: IDimensionData[] = [];\n  const regions = axis.getRegions(); // TODO: 直接从轴里取系列\n  for (const region of regions) {\n    const seriesList = region.getSeries();\n    for (const series of seriesList) {\n      if (series.coordinate === coordinate) {\n        const dimensionField = array(getDimensionField(series));\n        const viewData = series.getViewData()?.latestData;\n        if (dimensionField && viewData) {\n          if (isDiscreteAxis) {\n            data.push({\n              series,\n              datum: viewData.filter(\n                (datum: any) => datum[dimensionField[0]]?.toString() === value?.toString() // 获取该维度项所对应的数据\n              )\n            });\n          } else {\n            if (isValid(dimensionField[1])) {\n              // 根据范围取 datum\n              data.push({\n                series,\n                datum: viewData.filter((datum: any) => {\n                  if (datum[dimensionField[0]]?.toString() === value?.toString()) {\n                    return true;\n                  }\n                  return (\n                    isValid(datum[dimensionField[0]]) &&\n                    isValid(datum[dimensionField[1]]) &&\n                    value >= datum[dimensionField[0]] &&\n                    value < datum[dimensionField[1]]\n                  );\n                })\n              });\n            } else {\n              // 根据最近距离取 datum\n              let minDelta = Infinity;\n              let minDatums: any[] = [];\n              let deltaSign = 0;\n              viewData.forEach((datum: any) => {\n                if (isValid(datum[dimensionField[0]])) {\n                  const delta = Math.abs(datum[dimensionField[0]] - value);\n                  const sign = Math.sign(datum[dimensionField[0]] - value);\n                  if (delta < minDelta) {\n                    minDelta = delta;\n                    minDatums = [datum];\n                    deltaSign = sign;\n                  } else if (delta === minDelta && sign === deltaSign) {\n                    minDatums.push(datum);\n                  }\n                }\n              });\n              data.push({\n                series,\n                datum: minDatums\n              });\n            }\n          }\n        }\n      }\n    }\n  }\n  return data;\n};\n"]}

package/esm/event/interface.d.ts

@@ -125,6 +125,7 @@ export type EventParamsDefinition = {
     dimension: DimensionEventParams;
     tooltipShow: TooltipEventParams;
     tooltipHide: TooltipEventParams;
+    tooltipRelease: TooltipEventParams;
     [key: string]: ExtendEventParam;
 };
 export interface IEventDispatcher {

package/esm/event/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { INode } from '@visactor/vrender';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { IChart } from '../chart/interface';\nimport type { IModel } from '../model/interface';\nimport type { IMark, MarkType } from '../mark/interface';\nimport type { VChart } from '../core/vchart';\nimport type { DimensionEventParams } from './events/dimension/interface';\nimport type { Datum, IPoint, StringOrNumber } from '../typings';\nimport type { ChartEvent, Event_Bubble_Level, Event_Source_Type, VGRAMMAR_HOOK_EVENT } from '../constant';\nimport type { SeriesType } from '../series/interface';\nimport type { TooltipEventParams } from '../component/tooltip/interface/event';\n\nexport type EventType =\n  | 'pointerdown'\n  | 'pointerup'\n  | 'pointerupoutside'\n  | 'pointertap'\n  | 'pointerover'\n  | 'pointermove'\n  | 'pointerenter'\n  | 'pointerleave'\n  | 'pointerout'\n  | 'mousedown'\n  | 'mouseup'\n  | 'mouseupoutside'\n  | 'rightdown'\n  | 'rightup'\n  | 'rightupoutside'\n  | 'click'\n  | 'dblclick'\n  | 'mousemove'\n  | 'mouseover'\n  | 'mouseout'\n  | 'mouseenter'\n  | 'mouseleave'\n  | 'wheel'\n  | 'touchstart'\n  | 'touchend'\n  | 'touchendoutside'\n  | 'touchmove'\n  | 'touchcancel'\n  | 'tap'\n  | 'dragstart'\n  | 'drag'\n  | 'dragenter'\n  | 'dragleave'\n  | 'dragover'\n  | 'dragend'\n  | 'drop'\n  | 'pan'\n  | 'panstart'\n  | 'panend'\n  | 'press'\n  | 'pressup'\n  | 'pressend'\n  | 'pinch'\n  | 'pinchstart'\n  | 'pinchend'\n  | 'swipe'\n  | keyof typeof ChartEvent\n  | keyof typeof VGRAMMAR_HOOK_EVENT\n  | string;\n\nexport type EventBubbleLevel = keyof typeof Event_Bubble_Level;\n\nexport type ComponentType =\n  | 'axis'\n  | 'dataZoom'\n  | 'indicator'\n  | 'legend'\n  | 'mapLabel'\n  | 'markLine'\n  | 'tooltip'\n  | 'title';\nexport type EventTargetType = MarkType | ComponentType | SeriesType;\n\nexport type EventSourceType = keyof typeof Event_Source_Type;\n\n/**\n * 事件 API 中的事件筛选配置\n */\nexport type EventQuery = {\n  /**\n   * 事件的冒泡层级配置，其中 model 指的是图表的内部模型，包括 region、series 以及 component\n   */\n  level?: EventBubbleLevel;\n  /**\n   * 事件来源配置。\n   * - `window`: window 事件\n   * - `chart`: 图表事件\n   */\n  source?: EventSourceType;\n\n  /**\n   * vrender 图形节点名称\n   */\n  nodeName?: string;\n  /**\n   * mark 图元名称\n   */\n  markName?: string;\n  /**\n   * 仅在 level 为 'mark' 或者 'model' 的场景下使用，用于筛选 mark 类型或者图表组成元素模型类型\n   */\n  type?: EventTargetType;\n  /**\n   * 用户在 spec 上配置的 id\n   */\n  id?: StringOrNumber;\n  /**\n   * 自定义过滤函数\n   * @param params\n   * @returns\n   */\n  filter?: (params: Partial<BaseEventParams>) => boolean;\n\n  throttle?: number;\n  debounce?: number;\n\n  consume?: boolean;\n};\n\nexport type EventParams = {\n  /**\n   * 事件对象\n   */\n  event?: SuperEvent;\n  /**\n   * 供不同的事件用于存储期望携带的数据\n   */\n  value?: any;\n  /**\n   * 事件来源的 mark\n   */\n  mark?: IMark;\n  /**\n   * 事件来源的 model\n   */\n  model?: IModel;\n  /**\n   * 事件来源的 chart\n   */\n  chart?: IChart;\n  /**\n   * 事件拾取到的图元的数据\n   */\n  datum?: Datum;\n  /**\n   * 拾取到的图形节点\n   */\n  node?: INode;\n};\n\ntype SuperEvent = Event & {\n  [key: string]: any;\n};\n\nexport type BaseEventParams = EventParams & {\n  /**\n   * 事件对象\n   */\n  event: SuperEvent;\n  item: IElement;\n  datum: Datum;\n  source: EventSourceType;\n  itemMap: Map<string, any>;\n};\n\nexport type EventCallback<Params extends EventParams> = (params: Params) => boolean | void;\n\n/**\n * 内部事件分发中所应用的事件筛选配置\n */\nexport type EventFilter = {\n  source: EventSourceType;\n  level: EventBubbleLevel;\n  type: string | null;\n  markName: string | null;\n  nodeName: string | null;\n  userId: StringOrNumber | null;\n  filter: (params: Partial<BaseEventParams>) => boolean | null;\n};\n\nexport type EventHandler<Params extends EventParams> = {\n  callback: EventCallback<Params>;\n  query: EventQuery | null;\n  // 如果有 debounce/throttle 配置则需要封装原始回调函数\n  wrappedCallback?: EventCallback<Params>;\n  // 转换后的事件筛选配置\n  filter?: EventFilter;\n};\n\nexport type ExtendEventParam = EventParams & {\n  event?: Event;\n  item?: any;\n  datum?: Datum;\n  source?: EventSourceType;\n  itemMap?: Map<string, any>;\n};\n\nexport type PanEventParam = ExtendEventParam & {\n  // x/y方向上的偏移值\n  delta: [number, number];\n};\n\nexport type ZoomEventParam = ExtendEventParam & {\n  // 缩放值\n  scale: number;\n  // 缩放中心\n  scaleCenter: IPoint;\n};\n\nexport type EventParamsDefinition = {\n  // 基础事件回调参数\n  pointerdown: BaseEventParams;\n  pointerup: BaseEventParams;\n  pointerupoutside: BaseEventParams;\n  pointertap: BaseEventParams;\n  pointerover: BaseEventParams;\n  pointermove: BaseEventParams;\n  pointerenter: BaseEventParams;\n  pointerleave: BaseEventParams;\n  pointerout: BaseEventParams;\n  mousedown: BaseEventParams;\n  mouseup: BaseEventParams;\n  mouseupoutside: BaseEventParams;\n  rightdown: BaseEventParams;\n  rightup: BaseEventParams;\n  rightupoutside: BaseEventParams;\n  click: BaseEventParams;\n  dblclick: BaseEventParams;\n  mousemove: BaseEventParams;\n  mouseover: BaseEventParams;\n  mouseout: BaseEventParams;\n  mouseenter: BaseEventParams;\n  mouseleave: BaseEventParams;\n  wheel: BaseEventParams;\n  touchstart: BaseEventParams;\n  touchend: BaseEventParams;\n  touchendoutside: BaseEventParams;\n  touchmove: BaseEventParams;\n  touchcancel: BaseEventParams;\n\n  dragstart: BaseEventParams;\n  drag: BaseEventParams;\n  dragenter: BaseEventParams;\n  dragleave: BaseEventParams;\n  dragover: BaseEventParams;\n  dragend: BaseEventParams;\n  drop: BaseEventParams;\n\n  tap: BaseEventParams;\n  pan: BaseEventParams;\n  panstart: BaseEventParams;\n  panend: BaseEventParams;\n  press: BaseEventParams;\n  pressup: BaseEventParams;\n  pressend: BaseEventParams;\n  pinch: BaseEventParams;\n  pinchstart: BaseEventParams;\n  pinchend: BaseEventParams;\n  swipe: BaseEventParams;\n\n  // VChart 内置的扩展组合事件\n  dimension: DimensionEventParams;\n  tooltipShow: TooltipEventParams;\n  tooltipHide: TooltipEventParams;\n\n  // 扩展事件参数\n  [key: string]: ExtendEventParam;\n};\n\nexport interface IEventDispatcher {\n  globalInstance: VChart;\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => this;\n  unregister: <Evt extends EventType>(eType: Evt, handler?: EventHandler<EventParamsDefinition[Evt]>) => this;\n  dispatch: <Evt extends EventType>(eType: Evt, params?: EventParamsDefinition[Evt], level?: EventBubbleLevel) => this;\n  release: () => void;\n}\n\nexport interface IEvent {\n  on: (<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  off: (<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  emit: <Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel) => void;\n  release: () => void;\n\n  getComposedEventMap: () => Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }>;\n}\n\nexport interface IComposedEvent {\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => void;\n  unregister: () => void;\n  dispatch: (v: unknown, opt: unknown) => unknown;\n}\n"]}
+{"version":3,"sources":["../src/event/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { INode } from '@visactor/vrender';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { IChart } from '../chart/interface';\nimport type { IModel } from '../model/interface';\nimport type { IMark, MarkType } from '../mark/interface';\nimport type { VChart } from '../core/vchart';\nimport type { DimensionEventParams } from './events/dimension/interface';\nimport type { Datum, IPoint, StringOrNumber } from '../typings';\nimport type { ChartEvent, Event_Bubble_Level, Event_Source_Type, VGRAMMAR_HOOK_EVENT } from '../constant';\nimport type { SeriesType } from '../series/interface';\nimport type { TooltipEventParams } from '../component/tooltip/interface/event';\n\nexport type EventType =\n  | 'pointerdown'\n  | 'pointerup'\n  | 'pointerupoutside'\n  | 'pointertap'\n  | 'pointerover'\n  | 'pointermove'\n  | 'pointerenter'\n  | 'pointerleave'\n  | 'pointerout'\n  | 'mousedown'\n  | 'mouseup'\n  | 'mouseupoutside'\n  | 'rightdown'\n  | 'rightup'\n  | 'rightupoutside'\n  | 'click'\n  | 'dblclick'\n  | 'mousemove'\n  | 'mouseover'\n  | 'mouseout'\n  | 'mouseenter'\n  | 'mouseleave'\n  | 'wheel'\n  | 'touchstart'\n  | 'touchend'\n  | 'touchendoutside'\n  | 'touchmove'\n  | 'touchcancel'\n  | 'tap'\n  | 'dragstart'\n  | 'drag'\n  | 'dragenter'\n  | 'dragleave'\n  | 'dragover'\n  | 'dragend'\n  | 'drop'\n  | 'pan'\n  | 'panstart'\n  | 'panend'\n  | 'press'\n  | 'pressup'\n  | 'pressend'\n  | 'pinch'\n  | 'pinchstart'\n  | 'pinchend'\n  | 'swipe'\n  | keyof typeof ChartEvent\n  | keyof typeof VGRAMMAR_HOOK_EVENT\n  | string;\n\nexport type EventBubbleLevel = keyof typeof Event_Bubble_Level;\n\nexport type ComponentType =\n  | 'axis'\n  | 'dataZoom'\n  | 'indicator'\n  | 'legend'\n  | 'mapLabel'\n  | 'markLine'\n  | 'tooltip'\n  | 'title';\nexport type EventTargetType = MarkType | ComponentType | SeriesType;\n\nexport type EventSourceType = keyof typeof Event_Source_Type;\n\n/**\n * 事件 API 中的事件筛选配置\n */\nexport type EventQuery = {\n  /**\n   * 事件的冒泡层级配置，其中 model 指的是图表的内部模型，包括 region、series 以及 component\n   */\n  level?: EventBubbleLevel;\n  /**\n   * 事件来源配置。\n   * - `window`: window 事件\n   * - `chart`: 图表事件\n   */\n  source?: EventSourceType;\n\n  /**\n   * vrender 图形节点名称\n   */\n  nodeName?: string;\n  /**\n   * mark 图元名称\n   */\n  markName?: string;\n  /**\n   * 仅在 level 为 'mark' 或者 'model' 的场景下使用，用于筛选 mark 类型或者图表组成元素模型类型\n   */\n  type?: EventTargetType;\n  /**\n   * 用户在 spec 上配置的 id\n   */\n  id?: StringOrNumber;\n  /**\n   * 自定义过滤函数\n   * @param params\n   * @returns\n   */\n  filter?: (params: Partial<BaseEventParams>) => boolean;\n\n  throttle?: number;\n  debounce?: number;\n\n  consume?: boolean;\n};\n\nexport type EventParams = {\n  /**\n   * 事件对象\n   */\n  event?: SuperEvent;\n  /**\n   * 供不同的事件用于存储期望携带的数据\n   */\n  value?: any;\n  /**\n   * 事件来源的 mark\n   */\n  mark?: IMark;\n  /**\n   * 事件来源的 model\n   */\n  model?: IModel;\n  /**\n   * 事件来源的 chart\n   */\n  chart?: IChart;\n  /**\n   * 事件拾取到的图元的数据\n   */\n  datum?: Datum;\n  /**\n   * 拾取到的图形节点\n   */\n  node?: INode;\n};\n\ntype SuperEvent = Event & {\n  [key: string]: any;\n};\n\nexport type BaseEventParams = EventParams & {\n  /**\n   * 事件对象\n   */\n  event: SuperEvent;\n  item: IElement;\n  datum: Datum;\n  source: EventSourceType;\n  itemMap: Map<string, any>;\n};\n\nexport type EventCallback<Params extends EventParams> = (params: Params) => boolean | void;\n\n/**\n * 内部事件分发中所应用的事件筛选配置\n */\nexport type EventFilter = {\n  source: EventSourceType;\n  level: EventBubbleLevel;\n  type: string | null;\n  markName: string | null;\n  nodeName: string | null;\n  userId: StringOrNumber | null;\n  filter: (params: Partial<BaseEventParams>) => boolean | null;\n};\n\nexport type EventHandler<Params extends EventParams> = {\n  callback: EventCallback<Params>;\n  query: EventQuery | null;\n  // 如果有 debounce/throttle 配置则需要封装原始回调函数\n  wrappedCallback?: EventCallback<Params>;\n  // 转换后的事件筛选配置\n  filter?: EventFilter;\n};\n\nexport type ExtendEventParam = EventParams & {\n  event?: Event;\n  item?: any;\n  datum?: Datum;\n  source?: EventSourceType;\n  itemMap?: Map<string, any>;\n};\n\nexport type PanEventParam = ExtendEventParam & {\n  // x/y方向上的偏移值\n  delta: [number, number];\n};\n\nexport type ZoomEventParam = ExtendEventParam & {\n  // 缩放值\n  scale: number;\n  // 缩放中心\n  scaleCenter: IPoint;\n};\n\nexport type EventParamsDefinition = {\n  // 基础事件回调参数\n  pointerdown: BaseEventParams;\n  pointerup: BaseEventParams;\n  pointerupoutside: BaseEventParams;\n  pointertap: BaseEventParams;\n  pointerover: BaseEventParams;\n  pointermove: BaseEventParams;\n  pointerenter: BaseEventParams;\n  pointerleave: BaseEventParams;\n  pointerout: BaseEventParams;\n  mousedown: BaseEventParams;\n  mouseup: BaseEventParams;\n  mouseupoutside: BaseEventParams;\n  rightdown: BaseEventParams;\n  rightup: BaseEventParams;\n  rightupoutside: BaseEventParams;\n  click: BaseEventParams;\n  dblclick: BaseEventParams;\n  mousemove: BaseEventParams;\n  mouseover: BaseEventParams;\n  mouseout: BaseEventParams;\n  mouseenter: BaseEventParams;\n  mouseleave: BaseEventParams;\n  wheel: BaseEventParams;\n  touchstart: BaseEventParams;\n  touchend: BaseEventParams;\n  touchendoutside: BaseEventParams;\n  touchmove: BaseEventParams;\n  touchcancel: BaseEventParams;\n\n  dragstart: BaseEventParams;\n  drag: BaseEventParams;\n  dragenter: BaseEventParams;\n  dragleave: BaseEventParams;\n  dragover: BaseEventParams;\n  dragend: BaseEventParams;\n  drop: BaseEventParams;\n\n  tap: BaseEventParams;\n  pan: BaseEventParams;\n  panstart: BaseEventParams;\n  panend: BaseEventParams;\n  press: BaseEventParams;\n  pressup: BaseEventParams;\n  pressend: BaseEventParams;\n  pinch: BaseEventParams;\n  pinchstart: BaseEventParams;\n  pinchend: BaseEventParams;\n  swipe: BaseEventParams;\n\n  // VChart 内置的扩展组合事件\n  dimension: DimensionEventParams;\n  tooltipShow: TooltipEventParams;\n  tooltipHide: TooltipEventParams;\n  tooltipRelease: TooltipEventParams;\n\n  // 扩展事件参数\n  [key: string]: ExtendEventParam;\n};\n\nexport interface IEventDispatcher {\n  globalInstance: VChart;\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => this;\n  unregister: <Evt extends EventType>(eType: Evt, handler?: EventHandler<EventParamsDefinition[Evt]>) => this;\n  dispatch: <Evt extends EventType>(eType: Evt, params?: EventParamsDefinition[Evt], level?: EventBubbleLevel) => this;\n  release: () => void;\n}\n\nexport interface IEvent {\n  on: (<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  off: (<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>) => this) &\n    (<Evt extends EventType>(\n      eType: Evt,\n      query: EventQuery,\n      callback: EventCallback<EventParamsDefinition[Evt]>\n    ) => this);\n  emit: <Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel) => void;\n  release: () => void;\n\n  getComposedEventMap: () => Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }>;\n}\n\nexport interface IComposedEvent {\n  register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => void;\n  unregister: () => void;\n  dispatch: (v: unknown, opt: unknown) => unknown;\n}\n"]}

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

@@ -7,8 +7,17 @@ import { isXAxis } from "../../component/axis/cartesian/util/common";
 import { peek } from "../../util";
 
 function labelFlush(axisLabels, axis) {
-    const {width: width, height: height} = axis.getLayoutRect(), isX = isXAxis(axis.layoutOrient), first = axisLabels[0], last = peek(axisLabels);
-    if (isX) {
+    const {width: width, height: height} = axis.getLayoutRect(), isX = isXAxis(axis.layoutOrient), isInverse = !0 === axis.getSpec().inverse, first = axisLabels[0], last = 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,
@@ -17,6 +26,15 @@ function labelFlush(axisLabels, axis) {
             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({

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

@@ -1 +1 @@
-{"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 first = axisLabels[0];\n  const last = peek(axisLabels);\n\n  if (isX) {\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  } 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\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"]}
+{"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/series/map/map.js

@@ -14,7 +14,7 @@ import { isValid, isValidNumber } from "../../util";
 
 import { GeoSeries } from "../geo/geo";
 
-import { map } from "../../data/transforms/map";
+import { DEFAULT_MAP_LOOK_UP_KEY, map } from "../../data/transforms/map";
 
 import { copyDataView } from "../../data/transforms/copy-data-view";
 
@@ -22,7 +22,7 @@ import { registerDataSetInstanceTransform } from "../../data/register";
 
 import { MapSeriesTooltipHelper } from "./tooltip-helper";
 
-import { AttributeLevel, DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY, DEFAULT_DATA_INDEX } from "../../constant/index";
+import { AttributeLevel, DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_INDEX } from "../../constant/index";
 
 import { SeriesMarkNameEnum, SeriesTypeEnum } from "../interface";
 
@@ -60,7 +60,7 @@ export class MapSeries extends GeoSeries {
         geoSourceMap.get(this.map) || this._option.onError(`'${this.map}' data is not registered !`);
     }
     initData() {
-        var _a, _b, _c;
+        var _a;
         super.initData(), registerDataSetInstanceTransform(this._dataSet, "copyDataView", copyDataView), 
         registerDataSetInstanceTransform(this._dataSet, "map", map), registerDataSetInstanceTransform(this._dataSet, "lookup", lookup);
         const features = geoSourceMap.get(this.map);
@@ -86,12 +86,15 @@ export class MapSeries extends GeoSeries {
                     var _a;
                     return null === (_a = this._data) || void 0 === _a ? void 0 : _a.getLatestData();
                 },
-                key: "name",
+                key: DEFAULT_MAP_LOOK_UP_KEY,
                 fields: this._nameField,
-                values: [ this.nameField, this.valueField, null !== (_a = this._seriesField) && void 0 !== _a ? _a : DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY ],
-                as: [ this.nameField, this.valueField, null !== (_b = this._seriesField) && void 0 !== _b ? _b : DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY ]
+                set: (feature, datum) => {
+                    datum && Object.keys(datum).forEach((key => {
+                        key in feature || (feature[key] = datum[key]);
+                    }));
+                }
             }
-        }), null === (_c = this._data) || void 0 === _c || _c.getDataView().target.addListener("change", mapData.reRunAllTransform), 
+        }), null === (_a = this._data) || void 0 === _a || _a.getDataView().target.addListener("change", mapData.reRunAllTransform), 
         this._mapViewData = new SeriesData(this._option, mapData);
     }
     initMark() {

package/esm/series/map/map.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/map/map.ts"],"names":[],"mappings":"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","file":"map.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { registerGrammar } from '@visactor/vgrammar';\nimport type { IElement } from '@visactor/vgrammar';\nimport { Projection } from '@visactor/vgrammar-projection';\nimport { DataView } from '@visactor/vdataset';\nimport type { IPathMark } from '../../mark/path';\nimport { geoSourceMap } from './geo-source';\nimport { lookup } from '../../data/transforms/lookup';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport { isValid, isValidNumber } from '../../util';\nimport { GeoSeries } from '../geo/geo';\nimport { map } from '../../data/transforms/map';\nimport { copyDataView } from '../../data/transforms/copy-data-view';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { MapSeriesTooltipHelper } from './tooltip-helper';\nimport type { ITextMark } from '../../mark/text';\nimport { AttributeLevel, DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY, DEFAULT_DATA_INDEX } from '../../constant/index';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IMapSeriesSpec, IMapSeriesTheme } from './interface';\nimport { SeriesData } from '../base/series-data';\nimport type { PanEventParam, ZoomEventParam } from '../../event/interface';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { BaseSeries } from '../base/base-series';\nimport { VChart } from '../../core/vchart';\nimport { PathMark } from '../../mark/path';\nimport { TextMark } from '../../mark/text';\n\nVChart.useMark([PathMark, TextMark]);\n\n// 注册语法元素\nregisterGrammar('projection', Projection, 'projections');\n\nexport class MapSeries extends GeoSeries<IMapSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.map;\n  type = SeriesTypeEnum.map;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.path }\n  };\n\n  map!: string;\n\n  protected _nameMap!: { [key: StringOrNumber]: StringOrNumber };\n  getNameMap() {\n    return this._nameMap;\n  }\n\n  protected _nameProperty: string = 'name';\n  getNameProperty() {\n    return this._nameProperty;\n  }\n\n  protected declare _theme: Maybe<IMapSeriesTheme>;\n\n  private _areaCache: Map<string, { shape: string }> = new Map();\n\n  private _pathMark: IPathMark;\n  private _labelMark: ITextMark;\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.map = this._spec.map;\n    this._nameMap = this._spec.nameMap;\n    this._nameField = this._spec.nameField;\n    this._valueField = this._spec.valueField;\n    this._spec.nameProperty && (this._nameProperty = this._spec.nameProperty);\n    if (!this.map) {\n      this._option.onError(`map type '${this.map}' is not specified !`);\n    }\n\n    if (!geoSourceMap.get(this.map)) {\n      this._option.onError(`'${this.map}' data is not registered !`);\n    }\n  }\n\n  // data\n  initData(): void {\n    super.initData();\n\n    registerDataSetInstanceTransform(this._dataSet, 'copyDataView', copyDataView);\n    registerDataSetInstanceTransform(this._dataSet, 'map', map);\n    registerDataSetInstanceTransform(this._dataSet, 'lookup', lookup);\n\n    // 初始化地图数据\n    const features = geoSourceMap.get(this.map);\n    if (!features) {\n      this._option.onError('no valid map data found!');\n    }\n    const mapData = new DataView(this._dataSet);\n\n    mapData\n      .parse([features], {\n        type: 'dataview'\n      })\n      .transform({ type: 'copyDataView', options: { deep: true } })\n      .transform({\n        type: 'map',\n        options: {\n          nameMap: this._nameMap,\n          nameProperty: this._nameProperty\n        }\n      })\n      .transform({\n        type: 'lookup',\n        options: {\n          from: () => this._data?.getLatestData(),\n          key: 'name',\n          fields: this._nameField,\n          values: [this.nameField, this.valueField, this._seriesField ?? DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY],\n          as: [this.nameField, this.valueField, this._seriesField ?? DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY]\n        }\n      });\n    this._data?.getDataView().target.addListener('change', mapData.reRunAllTransform);\n    this._mapViewData = new SeriesData(this._option, mapData);\n  }\n\n  // mark\n  initMark() {\n    this._pathMark = this._createMark(MapSeries.mark.area, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('area', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      skipBeforeLayouted: true,\n      dataView: this._mapViewData.getDataView(),\n      dataProductId: this._mapViewData.getProductId()\n    }) as IPathMark;\n\n    if (this._spec.label?.visible) {\n      this._labelMark = this._createMark(MapSeries.mark.label, {\n        // map zoom/scale need to be transformed in path.group\n        // so label mark cannot be in the same groupMark\n        parent: this.getRegion().getGroupMark(),\n        skipBeforeLayouted: true,\n        dataView: this._mapViewData.getDataView(),\n        dataProductId: this._mapViewData.getProductId()\n      }) as ITextMark;\n    }\n  }\n\n  initMarkStyle() {\n    const pathMark = this._pathMark;\n    if (pathMark) {\n      this.setMarkStyle(\n        pathMark,\n        {\n          fill: (datum: any) => {\n            if (isValid(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD])) {\n              return (this._option.globalScale.getScale('color') ?? this.getDefaultColorScale()).scale(\n                datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD]\n              );\n            }\n            return this._spec?.defaultFillColor;\n          },\n          path: this.getPath.bind(this)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      pathMark.setPostProcess('fill', result => {\n        if (!isValid(result)) {\n          return this._spec.defaultFillColor;\n        }\n        return result;\n      });\n\n      this.setMarkStyle(\n        pathMark,\n        {\n          smoothScale: true\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(pathMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(pathMark);\n    }\n\n    const labelMark = this._labelMark;\n    if (labelMark) {\n      this.setMarkStyle(labelMark, {\n        text: (datum: Datum) => {\n          return this._getDatumName(datum);\n        },\n        x: (datum: Datum) => this.dataToPosition(datum)?.x,\n        y: (datum: Datum) => this.dataToPosition(datum)?.y\n      });\n    }\n  }\n\n  initAnimation() {\n    this._pathMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.path(), userAnimationConfig(SeriesMarkNameEnum.area, this._spec))\n    );\n\n    if (this._labelMark) {\n      this._labelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec))\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new MapSeriesTooltipHelper(this);\n  }\n\n  protected getPath(datum: any) {\n    const area = this._areaCache.get(datum[DEFAULT_DATA_INDEX]);\n    if (area) {\n      return area.shape;\n    }\n    const shape = this._coordinateHelper?.shape(datum);\n    this._areaCache.set(datum[DEFAULT_DATA_INDEX], {\n      shape\n    });\n    return shape;\n  }\n\n  // life cycle\n  onEvaluateEnd() {\n    this._mapViewData.updateData();\n  }\n\n  getDimensionField(): string[] {\n    return [this.nameField];\n  }\n\n  getMeasureField(): string[] {\n    return [this.valueField];\n  }\n\n  release() {\n    super.release();\n    this._areaCache.clear();\n    this._nameMap = {};\n    this._trigger = this._mapViewData = null as any;\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { map, nameMap, valueField, nameProperty } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (\n      spec?.map !== map ||\n      spec?.nameMap !== nameMap ||\n      spec?.valueField !== valueField ||\n      spec?.nameProperty !== nameProperty\n    ) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  handleZoom(e: ZoomEventParam) {\n    const { scale, scaleCenter } = e;\n    if (scale === 1) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  handlePan(e: PanEventParam) {\n    const { delta } = e;\n    if (delta[0] === 0 && delta[1] === 0) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement, i: number) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  protected _getDatumCenter(datum: any): [number, number] {\n    if (isValidNumber(datum.centroidX * datum.centroidY)) {\n      return [datum.centroidX, datum.centroidY];\n    }\n\n    if (datum.properties?.center) {\n      return datum.properties.center;\n    }\n\n    if (datum.properties?.centroid) {\n      return datum.properties.centroid;\n    }\n\n    return [Number.NaN, Number.NaN];\n  }\n\n  protected _getDatumName(datum: any): string {\n    if (datum[this.nameField]) {\n      return datum[this.nameField];\n    }\n    if (datum.properties?.[this._nameProperty]) {\n      if (this._spec.nameMap) {\n        return this._spec.nameMap[datum.properties[this._nameProperty]] ?? '';\n      }\n      return datum.properties[this._nameProperty] ?? '';\n    }\n    return '';\n  }\n\n  dataToPositionX(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n  dataToPositionY(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n\n  viewDataUpdate(d: DataView): void {\n    super.viewDataUpdate(d);\n    this._mapViewData?.getDataView()?.reRunAllTransform();\n    this._mapViewData?.updateData();\n  }\n\n  protected _getDataIdKey() {\n    return DEFAULT_DATA_INDEX;\n  }\n}\n"]}
+{"version":3,"sources":["../src/series/map/map.ts"],"names":[],"mappings":"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","file":"map.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { registerGrammar } from '@visactor/vgrammar';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { FeatureData } from '@visactor/vgrammar-projection';\nimport { Projection } from '@visactor/vgrammar-projection';\nimport { DataView } from '@visactor/vdataset';\nimport type { IPathMark } from '../../mark/path';\nimport { geoSourceMap } from './geo-source';\nimport { lookup } from '../../data/transforms/lookup';\nimport type { Maybe, Datum, StringOrNumber } from '../../typings';\nimport { isValid, isValidNumber } from '../../util';\nimport { GeoSeries } from '../geo/geo';\nimport { DEFAULT_MAP_LOOK_UP_KEY, map } from '../../data/transforms/map';\nimport { copyDataView } from '../../data/transforms/copy-data-view';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport { MapSeriesTooltipHelper } from './tooltip-helper';\nimport type { ITextMark } from '../../mark/text';\nimport { AttributeLevel, DEFAULT_DATA_SERIES_FIELD, DEFAULT_DATA_KEY, DEFAULT_DATA_INDEX } from '../../constant/index';\nimport type { SeriesMarkMap } from '../interface';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface';\nimport type { IMapSeriesSpec, IMapSeriesTheme } from './interface';\nimport { SeriesData } from '../base/series-data';\nimport type { PanEventParam, ZoomEventParam } from '../../event/interface';\nimport { animationConfig, shouldDoMorph, userAnimationConfig } from '../../animation/utils';\nimport { DEFAULT_MARK_ANIMATION } from '../../animation/config';\nimport { BaseSeries } from '../base/base-series';\nimport { VChart } from '../../core/vchart';\nimport { PathMark } from '../../mark/path';\nimport { TextMark } from '../../mark/text';\n\nVChart.useMark([PathMark, TextMark]);\n\n// 注册语法元素\nregisterGrammar('projection', Projection, 'projections');\n\nexport class MapSeries extends GeoSeries<IMapSeriesSpec> {\n  static readonly type: string = SeriesTypeEnum.map;\n  type = SeriesTypeEnum.map;\n\n  static readonly mark: SeriesMarkMap = {\n    ...BaseSeries.mark,\n    [SeriesMarkNameEnum.area]: { name: SeriesMarkNameEnum.area, type: MarkTypeEnum.path }\n  };\n\n  map!: string;\n\n  protected _nameMap!: { [key: StringOrNumber]: StringOrNumber };\n  getNameMap() {\n    return this._nameMap;\n  }\n\n  protected _nameProperty: string = 'name';\n  getNameProperty() {\n    return this._nameProperty;\n  }\n\n  protected declare _theme: Maybe<IMapSeriesTheme>;\n\n  private _areaCache: Map<string, { shape: string }> = new Map();\n\n  private _pathMark: IPathMark;\n  private _labelMark: ITextMark;\n\n  setAttrFromSpec() {\n    super.setAttrFromSpec();\n    this.map = this._spec.map;\n    this._nameMap = this._spec.nameMap;\n    this._nameField = this._spec.nameField;\n    this._valueField = this._spec.valueField;\n    this._spec.nameProperty && (this._nameProperty = this._spec.nameProperty);\n    if (!this.map) {\n      this._option.onError(`map type '${this.map}' is not specified !`);\n    }\n\n    if (!geoSourceMap.get(this.map)) {\n      this._option.onError(`'${this.map}' data is not registered !`);\n    }\n  }\n\n  // data\n  initData(): void {\n    super.initData();\n\n    registerDataSetInstanceTransform(this._dataSet, 'copyDataView', copyDataView);\n    registerDataSetInstanceTransform(this._dataSet, 'map', map);\n    registerDataSetInstanceTransform(this._dataSet, 'lookup', lookup);\n\n    // 初始化地图数据\n    const features = geoSourceMap.get(this.map);\n    if (!features) {\n      this._option.onError('no valid map data found!');\n    }\n    const mapData = new DataView(this._dataSet);\n\n    mapData\n      .parse([features], {\n        type: 'dataview'\n      })\n      .transform({ type: 'copyDataView', options: { deep: true } })\n      .transform({\n        type: 'map',\n        options: {\n          nameMap: this._nameMap,\n          nameProperty: this._nameProperty\n        }\n      })\n      .transform({\n        type: 'lookup',\n        options: {\n          from: () => this._data?.getLatestData(),\n          key: DEFAULT_MAP_LOOK_UP_KEY,\n          fields: this._nameField,\n          set: (feature: FeatureData, datum: Datum) => {\n            if (datum) {\n              Object.keys(datum).forEach(key => {\n                if (!(key in feature)) {\n                  feature[key] = datum[key];\n                }\n              });\n            }\n          }\n        }\n      });\n    this._data?.getDataView().target.addListener('change', mapData.reRunAllTransform);\n    this._mapViewData = new SeriesData(this._option, mapData);\n  }\n\n  // mark\n  initMark() {\n    this._pathMark = this._createMark(MapSeries.mark.area, {\n      morph: shouldDoMorph(this._spec.animation, this._spec.morph, userAnimationConfig('area', this._spec)),\n      defaultMorphElementKey: this.getDimensionField()[0],\n      groupKey: this.getDimensionField()[0],\n      isSeriesMark: true,\n      skipBeforeLayouted: true,\n      dataView: this._mapViewData.getDataView(),\n      dataProductId: this._mapViewData.getProductId()\n    }) as IPathMark;\n\n    if (this._spec.label?.visible) {\n      this._labelMark = this._createMark(MapSeries.mark.label, {\n        // map zoom/scale need to be transformed in path.group\n        // so label mark cannot be in the same groupMark\n        parent: this.getRegion().getGroupMark(),\n        skipBeforeLayouted: true,\n        dataView: this._mapViewData.getDataView(),\n        dataProductId: this._mapViewData.getProductId()\n      }) as ITextMark;\n    }\n  }\n\n  initMarkStyle() {\n    const pathMark = this._pathMark;\n    if (pathMark) {\n      this.setMarkStyle(\n        pathMark,\n        {\n          fill: (datum: any) => {\n            if (isValid(datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD])) {\n              return (this._option.globalScale.getScale('color') ?? this.getDefaultColorScale()).scale(\n                datum[this._seriesField ?? DEFAULT_DATA_SERIES_FIELD]\n              );\n            }\n            return this._spec?.defaultFillColor;\n          },\n          path: this.getPath.bind(this)\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n\n      pathMark.setPostProcess('fill', result => {\n        if (!isValid(result)) {\n          return this._spec.defaultFillColor;\n        }\n        return result;\n      });\n\n      this.setMarkStyle(\n        pathMark,\n        {\n          smoothScale: true\n        },\n        'normal',\n        AttributeLevel.Built_In\n      );\n      this._trigger.registerMark(pathMark);\n      this._tooltipHelper?.activeTriggerSet.mark.add(pathMark);\n    }\n\n    const labelMark = this._labelMark;\n    if (labelMark) {\n      this.setMarkStyle(labelMark, {\n        text: (datum: Datum) => {\n          return this._getDatumName(datum);\n        },\n        x: (datum: Datum) => this.dataToPosition(datum)?.x,\n        y: (datum: Datum) => this.dataToPosition(datum)?.y\n      });\n    }\n  }\n\n  initAnimation() {\n    this._pathMark.setAnimationConfig(\n      animationConfig(DEFAULT_MARK_ANIMATION.path(), userAnimationConfig(SeriesMarkNameEnum.area, this._spec))\n    );\n\n    if (this._labelMark) {\n      this._labelMark.setAnimationConfig(\n        animationConfig(DEFAULT_MARK_ANIMATION.label(), userAnimationConfig(SeriesMarkNameEnum.label, this._spec))\n      );\n    }\n  }\n\n  protected initTooltip() {\n    this._tooltipHelper = new MapSeriesTooltipHelper(this);\n  }\n\n  protected getPath(datum: any) {\n    const area = this._areaCache.get(datum[DEFAULT_DATA_INDEX]);\n    if (area) {\n      return area.shape;\n    }\n    const shape = this._coordinateHelper?.shape(datum);\n    this._areaCache.set(datum[DEFAULT_DATA_INDEX], {\n      shape\n    });\n    return shape;\n  }\n\n  // life cycle\n  onEvaluateEnd() {\n    this._mapViewData.updateData();\n  }\n\n  getDimensionField(): string[] {\n    return [this.nameField];\n  }\n\n  getMeasureField(): string[] {\n    return [this.valueField];\n  }\n\n  release() {\n    super.release();\n    this._areaCache.clear();\n    this._nameMap = {};\n    this._trigger = this._mapViewData = null as any;\n  }\n\n  updateSpec(spec: any) {\n    const originalSpec = this._originalSpec;\n    const { map, nameMap, valueField, nameProperty } = originalSpec;\n    const result = super.updateSpec(spec);\n    if (\n      spec?.map !== map ||\n      spec?.nameMap !== nameMap ||\n      spec?.valueField !== valueField ||\n      spec?.nameProperty !== nameProperty\n    ) {\n      result.change = true;\n      result.reRender = true;\n      result.reMake = true;\n    }\n    return result;\n  }\n\n  handleZoom(e: ZoomEventParam) {\n    const { scale, scaleCenter } = e;\n    if (scale === 1) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().scale(scale, scale, scaleCenter);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  handlePan(e: PanEventParam) {\n    const { delta } = e;\n    if (delta[0] === 0 && delta[1] === 0) {\n      return;\n    }\n\n    this.getMarksWithoutRoot().forEach(mark => {\n      const vGrammarMark = mark.getProduct();\n\n      if (!vGrammarMark || !vGrammarMark.elements || !vGrammarMark.elements.length) {\n        return;\n      }\n      const elements = vGrammarMark.elements;\n\n      if (mark.type === MarkTypeEnum.path) {\n        vGrammarMark.group.getGroupGraphicItem().translate(delta[0], delta[1]);\n      } else {\n        // label Mark 的定位，需要通过 dataToPosition 来计算\n        elements.forEach((el: IElement, i: number) => {\n          const graphicItem = el.getGraphicItem();\n          const datum = el.getDatum();\n          const newPosition = this.dataToPosition(datum);\n          if (newPosition && graphicItem) {\n            graphicItem.translateTo(newPosition.x, newPosition.y);\n          }\n        });\n      }\n    });\n  }\n\n  protected _getDatumCenter(datum: any): [number, number] {\n    if (isValidNumber(datum.centroidX * datum.centroidY)) {\n      return [datum.centroidX, datum.centroidY];\n    }\n\n    if (datum.properties?.center) {\n      return datum.properties.center;\n    }\n\n    if (datum.properties?.centroid) {\n      return datum.properties.centroid;\n    }\n\n    return [Number.NaN, Number.NaN];\n  }\n\n  protected _getDatumName(datum: any): string {\n    if (datum[this.nameField]) {\n      return datum[this.nameField];\n    }\n    if (datum.properties?.[this._nameProperty]) {\n      if (this._spec.nameMap) {\n        return this._spec.nameMap[datum.properties[this._nameProperty]] ?? '';\n      }\n      return datum.properties[this._nameProperty] ?? '';\n    }\n    return '';\n  }\n\n  dataToPositionX(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n  dataToPositionY(data: any): number {\n    this._option.onError('Method not implemented.');\n    return 0;\n  }\n\n  viewDataUpdate(d: DataView): void {\n    super.viewDataUpdate(d);\n    this._mapViewData?.getDataView()?.reRunAllTransform();\n    this._mapViewData?.updateData();\n  }\n\n  protected _getDataIdKey() {\n    return DEFAULT_DATA_INDEX;\n  }\n}\n"]}

package/esm/typings/tooltip/handler.d.ts

@@ -3,7 +3,6 @@ import type { IDimensionData, IDimensionInfo } from '../../event/events/dimensio
 export interface ITooltipHandler extends ITooltipHandlerSpec {
     getTooltipContainer?: () => any;
     reInit?: () => any;
-    isTooltipShown?: () => boolean;
 }
 export type TooltipData = IDimensionInfo[] | IDimensionData[];
 export type TooltipActiveType = 'mark' | 'dimension';

package/esm/typings/tooltip/handler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/tooltip/handler.ts"],"names":[],"mappings":"","file":"handler.js","sourcesContent":["import type { ITooltipHandlerSpec } from '../../component/tooltip/interface';\nimport type { IDimensionData, IDimensionInfo } from '../../event/events/dimension/interface';\n\nexport interface ITooltipHandler extends ITooltipHandlerSpec {\n  /** 可选，获取 tooltip 所在容器 */\n  getTooltipContainer?: () => any;\n  /** 可选，更新 tooltip spec 或主题后执行的回调 */\n  reInit?: () => any;\n  /** 可选，判断 tooltip 是否正在显示 */\n  isTooltipShown?: () => boolean;\n}\n\nexport type TooltipData = IDimensionInfo[] | IDimensionData[];\n\nexport type TooltipActiveType = 'mark' | 'dimension';\n"]}
+{"version":3,"sources":["../src/typings/tooltip/handler.ts"],"names":[],"mappings":"","file":"handler.js","sourcesContent":["import type { ITooltipHandlerSpec } from '../../component/tooltip/interface';\nimport type { IDimensionData, IDimensionInfo } from '../../event/events/dimension/interface';\n\nexport interface ITooltipHandler extends ITooltipHandlerSpec {\n  /** 可选，获取 tooltip 所在容器 */\n  getTooltipContainer?: () => any;\n  /** 可选，更新 tooltip spec 或主题后执行的回调 */\n  reInit?: () => any;\n}\n\nexport type TooltipData = IDimensionInfo[] | IDimensionData[];\n\nexport type TooltipActiveType = 'mark' | 'dimension';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.2.0-beta.5",
+  "version": "1.2.0-beta.6",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -68,8 +68,8 @@
     "node-fetch": "2.6.7",
     "form-data": "~4.0.0",
     "canvas": "2.11.2",
-    "@internal/bundler": "0.0.1",
     "@internal/typescript-json-schema": "0.0.1",
+    "@internal/bundler": "0.0.1",
     "@internal/eslint-config": "0.0.1",
     "@internal/ts-config": "0.0.1"
   },