@visactor/vchart 1.7.0-alpha.0 → 1.7.0-alpha.1

package/esm/data/transforms/aggregation.js

@@ -1,6 +1,6 @@
-import { isValid, isFunction } from "@visactor/vutils";
+import { isFunction, isPlainObject, isValid } from "@visactor/vutils";
 
-import { average, sum, standardDeviation, variance, median, min, max } from "../../util/math";
+import { variance, average, min, max, sum, standardDeviation, median } from "../../util/math";
 
 export const markerMin = (_data, opt) => {
     const data = _data[0].latestData;
@@ -55,22 +55,22 @@ export function markerAggregation(_data, options) {
         if (isValid(option.x)) {
             let x = option.x;
             if (isFunction(x) && (x = x(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData)), 
-            "string" == typeof x || "number" == typeof x) result.x = x; else {
+            isPlainObject(x)) {
                 const {aggrType: aggrType, field: field} = x;
                 result.x = aggrMap[aggrType](_data, {
                     field: field
                 });
-            }
+            } else result.x = x;
         }
         if (isValid(option.y)) {
             let y = option.y;
             if (isFunction(y) && (y = y(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData)), 
-            "string" == typeof y || "number" == typeof y) result.y = y; else {
+            isPlainObject(y)) {
                 const {aggrType: aggrType, field: field} = y;
                 result.y = aggrMap[aggrType](_data, {
                     field: field
                 });
-            }
+            } else result.y = y;
         }
         option.getRefRelativeSeries && (result.getRefRelativeSeries = option.getRefRelativeSeries), 
         results.push(result);

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/aggregation.ts"],"names":[],"mappings":"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","file":"aggregation.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IAggrType } from '../../component/marker/interface';\nimport type { ICartesianSeries } from '../../series/interface';\n\nimport { isValid, isFunction } from '@visactor/vutils';\nimport { average, sum, standardDeviation, variance, median, min, max } from '../../util/math';\nimport type { Datum } from '../../typings';\n\nexport type IOption = {\n  field: string;\n};\n\nexport type IOptionAggrField = {\n  field: string;\n  aggrType: IAggrType;\n};\n\nexport type IOptionPos = IOptionAggrField | string | number;\n\nexport type IOptionSeries = {\n  getRelativeSeries: () => ICartesianSeries;\n  getStartRelativeSeries: () => ICartesianSeries;\n  getEndRelativeSeries: () => ICartesianSeries;\n};\n\nexport type IOptionCallback = (\n  relativeSeriesData: any,\n  startRelativeSeriesData: any,\n  endRelativeSeriesData: any\n) => IOptionPos;\n\nexport type IOptionAggr = {\n  x?: IOptionPos | IOptionCallback;\n  y?: IOptionPos | IOptionCallback;\n  getRefRelativeSeries?: () => ICartesianSeries;\n} & IOptionSeries;\n\nexport const markerMin = (_data: Array<DataView>, opt: IOption) => {\n  const data = _data[0].latestData as Datum[];\n\n  return min(data, opt.field);\n};\nexport const markerMax = (_data: Array<DataView>, opt: IOption) => {\n  const data = _data[0].latestData as Datum[];\n\n  return max(data, opt.field);\n};\n\nexport function markerSum(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return sum(data, opt.field);\n}\nexport function markerAverage(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return average(data, opt.field);\n}\n\nexport function markerVariance(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return variance(data, opt.field);\n}\n\nexport function markerStandardDeviation(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return standardDeviation(data, opt.field);\n}\n\nexport function markerMedian(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return median(data, opt.field);\n}\n\nexport function markerAggregation(_data: Array<DataView>, options: IOptionAggr[]) {\n  const aggrMap = {\n    min: markerMin,\n    max: markerMax,\n    sum: markerSum,\n    average: markerAverage,\n    variance: markerVariance,\n    standardDeviation: markerStandardDeviation,\n    median: markerMedian\n  };\n  const results: {\n    x: string | number | null;\n    y: string | number | null;\n  }[] = [];\n\n  options.forEach(option => {\n    const result: {\n      x: string | number | null;\n      y: string | number | null;\n      getRefRelativeSeries?: () => ICartesianSeries;\n    } = { x: null, y: null };\n\n    const relativeSeriesData = option.getRelativeSeries().getData().getLatestData();\n    const startRelativeSeriesData = option.getStartRelativeSeries().getData().getLatestData();\n    const endRelativeSeriesData = option.getEndRelativeSeries().getData().getLatestData();\n\n    if (isValid(option.x)) {\n      let x = option.x;\n      if (isFunction(x)) {\n        x = x(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData);\n      }\n      if (typeof x === 'string' || typeof x === 'number') {\n        result.x = x;\n      } else {\n        const { aggrType, field } = x;\n        result.x = aggrMap[aggrType](_data, { field: field });\n      }\n    }\n    if (isValid(option.y)) {\n      let y = option.y;\n      if (isFunction(y)) {\n        y = y(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData);\n      }\n      if (typeof y === 'string' || typeof y === 'number') {\n        result.y = y;\n      } else {\n        const { aggrType, field } = y;\n        result.y = aggrMap[aggrType](_data, { field: field });\n      }\n    }\n    if (option.getRefRelativeSeries) {\n      result.getRefRelativeSeries = option.getRefRelativeSeries;\n    }\n    results.push(result);\n  });\n\n  return results;\n}\n"]}
+{"version":3,"sources":["../src/data/transforms/aggregation.ts"],"names":[],"mappings":"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","file":"aggregation.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IAggrType } from '../../component/marker/interface';\nimport type { ICartesianSeries } from '../../series/interface';\nimport type { Datum, StringOrNumber } from '../../typings';\n\nimport { isFunction, isPlainObject, isValid } from '@visactor/vutils';\nimport { variance, average, min, max, sum, standardDeviation, median } from '../../util/math';\n\nexport type IOption = {\n  field: string;\n};\n\nexport type IOptionAggrField = {\n  field: string;\n  aggrType: IAggrType;\n};\n\nexport type IOptionPos = IOptionAggrField | string | number | StringOrNumber[];\n\nexport type IOptionSeries = {\n  getRelativeSeries: () => ICartesianSeries;\n  getStartRelativeSeries: () => ICartesianSeries;\n  getEndRelativeSeries: () => ICartesianSeries;\n};\n\nexport type IOptionCallback = (\n  relativeSeriesData: any,\n  startRelativeSeriesData: any,\n  endRelativeSeriesData: any\n) => IOptionPos;\n\nexport type IOptionAggr = {\n  x?: IOptionPos | IOptionCallback;\n  y?: IOptionPos | IOptionCallback;\n  getRefRelativeSeries?: () => ICartesianSeries;\n} & IOptionSeries;\n\nexport const markerMin = (_data: Array<DataView>, opt: IOption) => {\n  const data = _data[0].latestData as Datum[];\n\n  return min(data, opt.field);\n};\nexport const markerMax = (_data: Array<DataView>, opt: IOption) => {\n  const data = _data[0].latestData as Datum[];\n\n  return max(data, opt.field);\n};\n\nexport function markerSum(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return sum(data, opt.field);\n}\nexport function markerAverage(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return average(data, opt.field);\n}\n\nexport function markerVariance(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return variance(data, opt.field);\n}\n\nexport function markerStandardDeviation(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return standardDeviation(data, opt.field);\n}\n\nexport function markerMedian(_data: Array<DataView>, opt: IOption) {\n  const data = _data[0].latestData;\n\n  return median(data, opt.field);\n}\n\nexport function markerAggregation(_data: Array<DataView>, options: IOptionAggr[]) {\n  const aggrMap = {\n    min: markerMin,\n    max: markerMax,\n    sum: markerSum,\n    average: markerAverage,\n    variance: markerVariance,\n    standardDeviation: markerStandardDeviation,\n    median: markerMedian\n  };\n  const results: {\n    x: StringOrNumber[] | StringOrNumber | null;\n    y: StringOrNumber[] | StringOrNumber | null;\n  }[] = [];\n\n  options.forEach(option => {\n    const result: {\n      x: StringOrNumber[] | StringOrNumber | null;\n      y: StringOrNumber[] | StringOrNumber | null;\n      getRefRelativeSeries?: () => ICartesianSeries;\n    } = { x: null, y: null };\n\n    const relativeSeriesData = option.getRelativeSeries().getData().getLatestData();\n    const startRelativeSeriesData = option.getStartRelativeSeries().getData().getLatestData();\n    const endRelativeSeriesData = option.getEndRelativeSeries().getData().getLatestData();\n\n    if (isValid(option.x)) {\n      let x = option.x;\n      if (isFunction(x)) {\n        x = x(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData);\n      }\n      if (isPlainObject(x)) {\n        const { aggrType, field } = x as IOptionAggrField;\n        result.x = aggrMap[aggrType](_data, { field: field });\n      } else {\n        result.x = x;\n      }\n    }\n    if (isValid(option.y)) {\n      let y = option.y;\n      if (isFunction(y)) {\n        y = y(relativeSeriesData, startRelativeSeriesData, endRelativeSeriesData);\n      }\n\n      if (isPlainObject(y)) {\n        const { aggrType, field } = y as IOptionAggrField;\n        result.y = aggrMap[aggrType](_data, { field: field });\n      } else {\n        result.y = y;\n      }\n    }\n    if (option.getRefRelativeSeries) {\n      result.getRefRelativeSeries = option.getRefRelativeSeries;\n    }\n    results.push(result);\n  });\n\n  return results;\n}\n"]}

package/esm/data/transforms/dimension-statistics.js

@@ -27,16 +27,26 @@ export const dimensionStatistics = (data, op) => {
 
 export const dimensionStatisticsOfSimpleData = (latestData, fields, dataFields) => {
     const result = {};
+    let fValues = [], nextFValues = [];
     return fields.forEach((f => {
         const key = f.key;
         result[key] = {};
         const dataFieldInKey = null == dataFields ? void 0 : dataFields[key], operations = f.operations, isNumberField = operations.some((op => "min" === op || "max" === op || "allValid" === op));
-        let allValid = !0, fValues = latestData.reduce(((res, d) => (d && res.push(d[key]), 
-        res)), []);
+        let allValid = !0;
+        fValues.length = 0, latestData.forEach((d => {
+            d && fValues.push(d[key]);
+        }));
         const len = fValues.length;
-        isNumberField ? (fValues = fValues.filter(couldBeValidNumber), allValid = fValues.length === len) : fValues = operations.some((op => "array-min" === op || "array-max" === op)) ? fValues.reduce(((res, entry) => (entry && entry.forEach((d => {
+        if (isNumberField) {
+            nextFValues.length = 0, fValues.forEach(((item, i) => {
+                couldBeValidNumber(item) && nextFValues.push(item);
+            }));
+            const t = fValues;
+            fValues = nextFValues, nextFValues = t, allValid = fValues.length === len;
+        } else fValues = operations.some((op => "array-min" === op || "array-max" === op)) ? fValues.reduce(((res, entry) => (entry && entry.forEach((d => {
             couldBeValidNumber(d) && res.push(d);
-        })), res)), []) : fValues.filter((entry => void 0 !== entry)), operations.forEach((op => {
+        })), res)), []) : fValues.filter((entry => void 0 !== entry));
+        operations.forEach((op => {
             if (f.customize) result[key][op] = f.customize; else {
                 if (dataFieldInKey && dataFieldInKey.lockStatisticsByDomain && !isNil(dataFieldInKey.domain)) {
                     if ("values" === op) return void (result[key][op] = [ ...dataFieldInKey.domain ]);

package/esm/data/transforms/dimension-statistics.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/dimension-statistics.ts"],"names":[],"mappings":"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","file":"dimension-statistics.js","sourcesContent":["import { isNil, isFunction } from '@visactor/vutils';\nimport type { IFieldsMeta } from '../../typings/spec';\nimport { couldBeValidNumber } from '../../util/type';\nimport { mergeFields } from '../../util/data';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum } from '../../typings';\n\nconst methods = {\n  min: (arr: any[]) => {\n    return arr.length ? Math.min.apply(null, arr) : 0;\n  },\n  max: (arr: any[]) => {\n    return arr.length ? Math.max.apply(null, arr) : 0;\n  },\n  'array-min': (arr: any[]) => {\n    return arr.length ? Math.min.apply(null, arr) : 0;\n  },\n  'array-max': (arr: any[]) => {\n    return arr.length ? Math.max.apply(null, arr) : 0;\n  },\n  values: (arr: any[]) => {\n    const map = {};\n    const res: any[] = [];\n\n    for (const entry of arr) {\n      if (!map[entry]) {\n        res.push(entry);\n        map[entry] = 1;\n      }\n    }\n\n    return res;\n  }\n};\n\nexport type StatisticOperations = Array<'max' | 'min' | 'values' | 'array-max' | 'array-min' | 'allValid'>;\n\nexport interface IStatisticsOption {\n  fields: {\n    key: string;\n    operations: StatisticOperations;\n    customize?: { max: number; min: number } | any[];\n  }[];\n  // operations: Array<'max' | 'min' | 'values'>;\n  target?: 'parser' | 'latest';\n}\n\n/**\n * 聚合统计主要用于处理数据(诸如统计平均值,求和等),并返回计算后的数据结果\n * @param data\n * @param options\n * @returns\n */\nexport const dimensionStatistics = (data: Array<DataView>, op: IStatisticsOption) => {\n  // const operations = op.operations;\n  let fields = op.fields;\n  if (isFunction(fields)) {\n    fields = fields();\n  }\n  if (!fields?.length || !data?.length) {\n    return {};\n  }\n\n  // merge same key\n  fields = mergeFields([], fields);\n\n  const dataKey = op.target === 'parser' ? 'parserData' : 'latestData';\n  const latestData = data[0][dataKey] ? data[0][dataKey] : data || [];\n  const dataFields = data[0].getFields?.() as Record<\n    /** 字段key */\n    string,\n    IFieldsMeta\n  >;\n\n  return dimensionStatisticsOfSimpleData(latestData, fields, dataFields);\n};\n\n/**\n * 聚合统计主要用于处理数据(诸如统计平均值,求和等),并返回计算后的数据结果\n * @param data\n * @param options\n * @returns\n */\nexport const dimensionStatisticsOfSimpleData = (\n  latestData: Datum[],\n  fields: {\n    key: string;\n    operations: StatisticOperations;\n    customize?: { max: number; min: number } | any[];\n  }[],\n  dataFields?: Record<\n    /** 字段key */\n    string,\n    IFieldsMeta\n  >\n) => {\n  const result = {};\n\n  fields.forEach(f => {\n    const key = f.key;\n    // NOTE: the same key in fields has been merge already\n    result[key] = {};\n    const dataFieldInKey = dataFields?.[key];\n    const operations: StatisticOperations = f.operations;\n    const isNumberField = operations.some(op => op === 'min' || op === 'max' || op === 'allValid');\n    let allValid = true;\n    let fValues: any[] = latestData.reduce((res: any[], d: Datum) => {\n      if (d) {\n        res.push(d[key]);\n      }\n      return res;\n    }, []);\n    const len = fValues.length;\n\n    if (isNumberField) {\n      fValues = fValues.filter(couldBeValidNumber);\n      allValid = fValues.length === len;\n    } else if (operations.some(op => op === 'array-min' || op === 'array-max')) {\n      fValues = fValues.reduce((res, entry) => {\n        if (entry) {\n          entry.forEach((d: any) => {\n            if (couldBeValidNumber(d)) {\n              res.push(d);\n            }\n          });\n        }\n\n        return res;\n      }, []);\n    } else {\n      fValues = fValues.filter((entry: any) => entry !== undefined);\n    }\n\n    operations.forEach(op => {\n      // @chensij 如果指定了计算的domain结果，则忽略计算（目前该逻辑仅在dot series中维护，因为dot series期望在filter data之后x轴改变domain，y轴不改变domain）\n      if (f.customize) {\n        result[key][op] = f.customize;\n      } else {\n        if (dataFieldInKey && dataFieldInKey.lockStatisticsByDomain && !isNil(dataFieldInKey.domain)) {\n          if (op === 'values') {\n            result[key][op] = [...dataFieldInKey.domain];\n            return;\n          }\n        } else if (op === 'allValid') {\n          return;\n        }\n\n        result[key][op] = methods[op](fValues);\n\n        if (op === 'array-max') {\n          result[key].max = result[key][op];\n        }\n        if (op === 'array-min') {\n          result[key].min = result[key][op];\n        }\n      }\n    });\n\n    if (isNumberField) {\n      result[key].allValid = allValid;\n    }\n  });\n\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/dimension-statistics.ts"],"names":[],"mappings":"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","file":"dimension-statistics.js","sourcesContent":["import { isNil, isFunction } from '@visactor/vutils';\nimport type { IFieldsMeta } from '../../typings/spec';\nimport { couldBeValidNumber } from '../../util/type';\nimport { mergeFields } from '../../util/data';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum } from '../../typings';\n\nconst methods = {\n  min: (arr: any[]) => {\n    return arr.length ? Math.min.apply(null, arr) : 0;\n  },\n  max: (arr: any[]) => {\n    return arr.length ? Math.max.apply(null, arr) : 0;\n  },\n  'array-min': (arr: any[]) => {\n    return arr.length ? Math.min.apply(null, arr) : 0;\n  },\n  'array-max': (arr: any[]) => {\n    return arr.length ? Math.max.apply(null, arr) : 0;\n  },\n  values: (arr: any[]) => {\n    const map = {};\n    const res: any[] = [];\n\n    for (const entry of arr) {\n      if (!map[entry]) {\n        res.push(entry);\n        map[entry] = 1;\n      }\n    }\n\n    return res;\n  }\n};\n\nexport type StatisticOperations = Array<'max' | 'min' | 'values' | 'array-max' | 'array-min' | 'allValid'>;\n\nexport interface IStatisticsOption {\n  fields: {\n    key: string;\n    operations: StatisticOperations;\n    customize?: { max: number; min: number } | any[];\n  }[];\n  // operations: Array<'max' | 'min' | 'values'>;\n  target?: 'parser' | 'latest';\n}\n\n/**\n * 聚合统计主要用于处理数据(诸如统计平均值,求和等),并返回计算后的数据结果\n * @param data\n * @param options\n * @returns\n */\nexport const dimensionStatistics = (data: Array<DataView>, op: IStatisticsOption) => {\n  // const operations = op.operations;\n  let fields = op.fields;\n  if (isFunction(fields)) {\n    fields = fields();\n  }\n  if (!fields?.length || !data?.length) {\n    return {};\n  }\n\n  // merge same key\n  fields = mergeFields([], fields);\n\n  const dataKey = op.target === 'parser' ? 'parserData' : 'latestData';\n  const latestData = data[0][dataKey] ? data[0][dataKey] : data || [];\n  const dataFields = data[0].getFields?.() as Record<\n    /** 字段key */\n    string,\n    IFieldsMeta\n  >;\n\n  return dimensionStatisticsOfSimpleData(latestData, fields, dataFields);\n};\n\n/**\n * 聚合统计主要用于处理数据(诸如统计平均值,求和等),并返回计算后的数据结果\n * @param data\n * @param options\n * @returns\n */\nexport const dimensionStatisticsOfSimpleData = (\n  latestData: Datum[],\n  fields: {\n    key: string;\n    operations: StatisticOperations;\n    customize?: { max: number; min: number } | any[];\n  }[],\n  dataFields?: Record<\n    /** 字段key */\n    string,\n    IFieldsMeta\n  >\n) => {\n  const result = {};\n\n  let fValues: any[] = [];\n  let nextFValues: any[] = [];\n  fields.forEach(f => {\n    const key = f.key;\n    // NOTE: the same key in fields has been merge already\n    result[key] = {};\n    const dataFieldInKey = dataFields?.[key];\n    const operations: StatisticOperations = f.operations;\n    const isNumberField = operations.some(op => op === 'min' || op === 'max' || op === 'allValid');\n    let allValid = true;\n    fValues.length = 0;\n\n    latestData.forEach((d: Datum) => {\n      if (d) {\n        fValues.push(d[key]);\n      }\n    });\n    const len = fValues.length;\n\n    if (isNumberField) {\n      nextFValues.length = 0;\n      fValues.forEach((item, i) => {\n        if (couldBeValidNumber(item)) {\n          nextFValues.push(item);\n        }\n      });\n      const t = fValues;\n      fValues = nextFValues;\n      nextFValues = t;\n      // fValues = fValues.filter(couldBeValidNumber);\n      allValid = fValues.length === len;\n    } else if (operations.some(op => op === 'array-min' || op === 'array-max')) {\n      fValues = fValues.reduce((res, entry) => {\n        if (entry) {\n          entry.forEach((d: any) => {\n            if (couldBeValidNumber(d)) {\n              res.push(d);\n            }\n          });\n        }\n\n        return res;\n      }, []);\n    } else {\n      fValues = fValues.filter((entry: any) => entry !== undefined);\n    }\n\n    operations.forEach(op => {\n      // @chensij 如果指定了计算的domain结果，则忽略计算（目前该逻辑仅在dot series中维护，因为dot series期望在filter data之后x轴改变domain，y轴不改变domain）\n      if (f.customize) {\n        result[key][op] = f.customize;\n      } else {\n        if (dataFieldInKey && dataFieldInKey.lockStatisticsByDomain && !isNil(dataFieldInKey.domain)) {\n          if (op === 'values') {\n            result[key][op] = [...dataFieldInKey.domain];\n            return;\n          }\n        } else if (op === 'allValid') {\n          return;\n        }\n\n        result[key][op] = methods[op](fValues);\n\n        if (op === 'array-max') {\n          result[key].max = result[key][op];\n        }\n        if (op === 'array-min') {\n          result[key].min = result[key][op];\n        }\n      }\n    });\n\n    if (isNumberField) {\n      result[key].allValid = allValid;\n    }\n  });\n\n  return result;\n};\n"]}

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

@@ -10,12 +10,9 @@ export interface ISankeyOpt extends SankeyOptions {
         y1: number;
     };
 }
-export declare const sankey: (data: SankeyData, op: ISankeyOpt) => {
-    nodes?: import("@visactor/vgrammar-sankey").SankeyNodeDatum[];
-    links: import("@visactor/vgrammar-sankey").SankeyLinkDatum[];
-} | {
-    nodes: import("@visactor/vgrammar-sankey").HierarchyNodeDatum[];
-} | {
+export declare const collectHierarchyField: (set: Set<any>, data: any[], field: string) => void;
+export declare const sankeyFormat: (data: any[]) => SankeyData[];
+export declare const sankeyLayout: (data: SankeyData[], op: ISankeyOpt) => {
     nodes: import("@visactor/vgrammar-sankey").SankeyNodeElement[];
     links: import("@visactor/vgrammar-sankey").SankeyLinkElement[];
     columns: import("@visactor/vgrammar-sankey").SankeyNodeElement[][];

package/esm/data/transforms/sankey.js

@@ -1,43 +1,57 @@
 import { SankeyLayout } from "@visactor/vgrammar-sankey";
 
-import { isArray, isString } from "@visactor/vutils";
+import { isArray, isNil, isString } from "@visactor/vutils";
 
-export const sankey = (data, op) => {
-    var _a, _b, _c;
-    if (!data || !(null == op ? void 0 : op.view) || !isArray(data)) return data;
-    const view = op.view();
-    if (view.x1 - view.x0 == 0 || view.y1 - view.y0 == 0 || view.x1 - view.x0 == -1 / 0 || view.x1 - view.x0 == 1 / 0 || view.y1 - view.y0 == -1 / 0 || view.y1 - view.y0 == 1 / 0) return data;
+export const collectHierarchyField = (set, data, field) => {
+    data.forEach((obj => {
+        isNil(obj[field]) || set.add(obj[field]), obj.children && obj.children.length > 0 && collectHierarchyField(set, obj.children, field);
+    }));
+};
+
+const convertValuesToNumbers = data => {
+    data.forEach((obj => {
+        obj.value = isString(obj.value) ? +obj.value : obj.value, obj.children && obj.children.length > 0 && convertValuesToNumbers(obj.children);
+    }));
+};
+
+export const sankeyFormat = data => {
+    var _a;
+    if (!data || !isArray(data)) return [];
     if (data.length > 1) {
         const updateData = {
             links: [],
             nodes: []
         };
-        data.forEach((datum => {
+        return data.forEach((datum => {
             "links" !== datum.id && "nodes" !== datum.id || (updateData[datum.id] = datum.values);
-        })), data = updateData;
-    } else data = (null === (_a = data[0]) || void 0 === _a ? void 0 : _a.latestData) ? data[0].latestData[0] : data[0];
-    if ("source" !== op.sourceField || "target" !== op.targetField || "value" !== op.valueField) for (const key in data) if ("links" === key) {
+        })), [ updateData ];
+    }
+    return (null === (_a = data[0]) || void 0 === _a ? void 0 : _a.latestData) ? data[0].latestData : data;
+};
+
+export const sankeyLayout = (data, op) => {
+    var _a, _b;
+    if (!data || !(null == op ? void 0 : op.view) || !data.length) return [];
+    const view = op.view();
+    if (view.x1 - view.x0 == 0 || view.y1 - view.y0 == 0 || view.x1 - view.x0 == -1 / 0 || view.x1 - view.x0 == 1 / 0 || view.y1 - view.y0 == -1 / 0 || view.y1 - view.y0 == 1 / 0) return [];
+    const originalData = data[0];
+    if (("source" !== op.sourceField || "target" !== op.targetField || "value" !== op.valueField) && originalData.links) {
         const updatedData = [];
-        data[key].forEach((datum => {
+        originalData.links.forEach((datum => {
             const updatedDatum = {};
             for (const key in datum) key === op.sourceField ? updatedDatum.source = datum[op.sourceField] : key === op.targetField ? updatedDatum.target = datum[op.targetField] : key === op.valueField ? updatedDatum.value = datum[op.valueField] : updatedDatum[key] = datum[key];
             updatedData.push(updatedDatum);
-        })), data[key] = updatedData;
+        })), originalData.links = updatedData;
     }
-    const convertValuesToNumbers = data => {
-        data.forEach((obj => {
-            obj.value = isString(obj.value) ? +obj.value : obj.value, obj.children && obj.children.length > 0 && convertValuesToNumbers(obj.children);
-        }));
-    };
-    for (const key in data) if ("links" === key) {
+    if (originalData.links) {
         const updatedData = [];
-        data[key].forEach((datum => {
+        originalData.links.forEach((datum => {
             const updatedDatum = {};
             for (const key in datum) "value" === key ? updatedDatum.value = isString(datum.value) ? +datum.value : datum.value : updatedDatum[key] = datum[key];
             updatedData.push(updatedDatum);
-        })), data[key] = updatedData;
-    } else "nodes" === key && (null === (_c = null === (_b = data.nodes) || void 0 === _b ? void 0 : _b[0]) || void 0 === _c ? void 0 : _c.children) && convertValuesToNumbers(data.nodes);
+        })), originalData.links = updatedData;
+    } else (null === (_b = null === (_a = originalData.nodes) || void 0 === _a ? void 0 : _a[0]) || void 0 === _b ? void 0 : _b.children) && convertValuesToNumbers(originalData.nodes);
     const layout = new SankeyLayout(op), result = [];
-    return result.push(layout.layout(data, view)), result;
+    return result.push(layout.layout(originalData, view)), result;
 };
 //# sourceMappingURL=sankey.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/sankey.ts"],"names":[],"mappings":"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","file":"sankey.js","sourcesContent":["import type { SankeyOptions, SankeyData } from '@visactor/vgrammar-sankey';\nimport { SankeyLayout } from '@visactor/vgrammar-sankey';\nimport { isArray, isString } from '@visactor/vutils';\n\nexport interface ISankeyOpt extends SankeyOptions {\n  targetField: string;\n  sourceField: string;\n  valueField: string;\n  view: () => { x0: number; x1: number; y0: number; y1: number };\n}\n\nexport const sankey = (data: SankeyData, op: ISankeyOpt) => {\n  if (!data || !op?.view || !isArray(data)) {\n    return data;\n  }\n\n  const view = op.view();\n\n  if (\n    view.x1 - view.x0 === 0 ||\n    view.y1 - view.y0 === 0 ||\n    view.x1 - view.x0 === -Infinity ||\n    view.x1 - view.x0 === Infinity ||\n    view.y1 - view.y0 === -Infinity ||\n    view.y1 - view.y0 === Infinity\n  ) {\n    return data;\n  }\n\n  if (data.length > 1) {\n    /**\n     * data structure for Fengshen:\n     * [{id:’nodes’, values:[xxx]},{id:’links’, values:[xxx]}]\n     */\n    const updateData: SankeyData = {\n      links: [],\n      nodes: []\n    };\n    data.forEach((datum: any) => {\n      if (datum.id === 'links' || datum.id === 'nodes') {\n        updateData[datum.id] = datum.values;\n      }\n    });\n    data = updateData;\n  } else {\n    /**\n     * data structure:\n     * [{nodes: [xxx], links: [xxx]}]\n     */\n    if (data[0]?.latestData) {\n      data = data[0].latestData[0];\n    } else {\n      data = data[0];\n    }\n  }\n\n  if (op.sourceField !== 'source' || op.targetField !== 'target' || op.valueField !== 'value') {\n    for (const key in data) {\n      if (key === 'links') {\n        const updatedData: {}[] = [];\n        data[key].forEach((datum: any) => {\n          const updatedDatum: any = {};\n          for (const key in datum) {\n            if (key === op.sourceField) {\n              updatedDatum.source = datum[op.sourceField];\n            } else if (key === op.targetField) {\n              updatedDatum.target = datum[op.targetField];\n            } else if (key === op.valueField) {\n              updatedDatum.value = datum[op.valueField];\n            } else {\n              updatedDatum[key] = datum[key];\n            }\n          }\n          updatedData.push(updatedDatum);\n        });\n        data[key] = updatedData;\n      }\n    }\n  }\n\n  const convertValuesToNumbers = (data: any) => {\n    data.forEach((obj: any) => {\n      obj.value = isString(obj.value) ? +obj.value : obj.value; // 将字符串转换为数值类型\n      if (obj.children && obj.children.length > 0) {\n        convertValuesToNumbers(obj.children); // 递归处理子节点\n      }\n    });\n  };\n\n  //Convert value from string to number\n  for (const key in data) {\n    //node-link型数据\n    if (key === 'links') {\n      const updatedData: {}[] = [];\n      data[key].forEach((datum: any) => {\n        const updatedDatum: any = {};\n        for (const key in datum) {\n          if (key === 'value') {\n            updatedDatum.value = isString(datum.value) ? +datum.value : datum.value; // 将字符串转换为数值类型\n          } else {\n            updatedDatum[key] = datum[key];\n          }\n        }\n        updatedData.push(updatedDatum);\n      });\n      data[key] = updatedData;\n      //层级型数据\n    } else if (key === 'nodes') {\n      if ((data.nodes?.[0] as any)?.children) {\n        convertValuesToNumbers(data.nodes);\n      }\n    }\n  }\n\n  const layout = new SankeyLayout(op);\n\n  const result = [];\n\n  result.push(layout.layout(data, view));\n\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/sankey.ts"],"names":[],"mappings":"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","file":"sankey.js","sourcesContent":["import type { SankeyOptions, SankeyData } from '@visactor/vgrammar-sankey';\nimport { SankeyLayout } from '@visactor/vgrammar-sankey';\nimport { isArray, isNil, isString } from '@visactor/vutils';\n\nexport interface ISankeyOpt extends SankeyOptions {\n  targetField: string;\n  sourceField: string;\n  valueField: string;\n  view: () => { x0: number; x1: number; y0: number; y1: number };\n}\n\nexport const collectHierarchyField = (set: Set<any>, data: any[], field: string) => {\n  data.forEach((obj: any) => {\n    if (!isNil(obj[field])) {\n      set.add(obj[field]);\n    }\n\n    if (obj.children && obj.children.length > 0) {\n      collectHierarchyField(set, obj.children, field); // 递归处理子节点\n    }\n  });\n};\n\nconst convertValuesToNumbers = (data: any) => {\n  data.forEach((obj: any) => {\n    obj.value = isString(obj.value) ? +obj.value : obj.value; // 将字符串转换为数值类型\n    if (obj.children && obj.children.length > 0) {\n      convertValuesToNumbers(obj.children); // 递归处理子节点\n    }\n  });\n};\n\nexport const sankeyFormat = (data: any[]): SankeyData[] => {\n  if (!data || !isArray(data)) {\n    return [] as SankeyData[];\n  }\n\n  if (data.length > 1) {\n    /**\n     * data structure for Fengshen:\n     * [{id:’nodes’, values:[xxx]},{id:’links’, values:[xxx]}]\n     */\n    const updateData: SankeyData = {\n      links: [],\n      nodes: []\n    };\n    data.forEach((datum: any) => {\n      if (datum.id === 'links' || datum.id === 'nodes') {\n        updateData[datum.id] = datum.values;\n      }\n    });\n    return [updateData];\n  }\n  /**\n   * data structure:\n   * [{nodes: [xxx], links: [xxx]}]\n   */\n  if (data[0]?.latestData) {\n    return data[0].latestData;\n  }\n  return data;\n};\n\nexport const sankeyLayout = (data: SankeyData[], op: ISankeyOpt) => {\n  if (!data || !op?.view || !data.length) {\n    return [];\n  }\n\n  const view = op.view();\n\n  if (\n    view.x1 - view.x0 === 0 ||\n    view.y1 - view.y0 === 0 ||\n    view.x1 - view.x0 === -Infinity ||\n    view.x1 - view.x0 === Infinity ||\n    view.y1 - view.y0 === -Infinity ||\n    view.y1 - view.y0 === Infinity\n  ) {\n    return [];\n  }\n\n  const originalData = data[0];\n\n  if (op.sourceField !== 'source' || op.targetField !== 'target' || op.valueField !== 'value') {\n    if ((originalData as any).links) {\n      const updatedData: {}[] = [];\n\n      (originalData as any).links.forEach((datum: any) => {\n        const updatedDatum: any = {};\n        for (const key in datum) {\n          if (key === op.sourceField) {\n            updatedDatum.source = datum[op.sourceField];\n          } else if (key === op.targetField) {\n            updatedDatum.target = datum[op.targetField];\n          } else if (key === op.valueField) {\n            updatedDatum.value = datum[op.valueField];\n          } else {\n            updatedDatum[key] = datum[key];\n          }\n        }\n        updatedData.push(updatedDatum);\n      });\n      (originalData as any).links = updatedData;\n    }\n  }\n\n  if ((originalData as any).links) {\n    //node-link型数据\n    const updatedData: {}[] = [];\n    (originalData as any).links.forEach((datum: any) => {\n      const updatedDatum: any = {};\n      for (const key in datum) {\n        if (key === 'value') {\n          updatedDatum.value = isString(datum.value) ? +datum.value : datum.value; // 将字符串转换为数值类型\n        } else {\n          updatedDatum[key] = datum[key];\n        }\n      }\n      updatedData.push(updatedDatum);\n    });\n    (originalData as any).links = updatedData;\n  } else if ((originalData as any).nodes?.[0]?.children) {\n    //层级型数据\n    //Convert value from string to number\n    convertValuesToNumbers((originalData as any).nodes);\n  }\n\n  const layout = new SankeyLayout(op);\n\n  const result = [];\n\n  result.push(layout.layout(originalData, view));\n\n  return result;\n};\n"]}

package/esm/event/bubble.js

@@ -33,5 +33,4 @@ export class Bubble {
     release() {
         this._map.clear(), this._levelNodes.clear();
     }
-}
-//# sourceMappingURL=bubble.js.map
+}

package/esm/event/event.js

@@ -53,4 +53,5 @@ export class Event {
     release() {
         this._eventDispatcher.release(), this._composedEventMap.clear();
     }
-}
+}
+//# sourceMappingURL=event.js.map

package/esm/event/events/dimension/base.d.ts

@@ -10,6 +10,7 @@ export declare class DimensionEvent implements IComposedEvent {
     protected _callback: (params: BaseEventParams) => void;
     protected _chart: Maybe<IChart>;
     constructor(eventDispatcher: IEventDispatcher, mode: RenderMode);
+    private get chart();
     register<Evt extends string>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>): void;
     unregister(): void;
     protected getTargetDimensionInfo(x: number, y: number): IDimensionInfo[] | null;

package/esm/event/events/dimension/base.js

@@ -8,23 +8,27 @@ import { isDiscrete } from "@visactor/vscale";
 
 export class DimensionEvent {
     constructor(eventDispatcher, mode) {
+        this._eventDispatcher = eventDispatcher, this._mode = mode;
+    }
+    get chart() {
         var _a, _b;
-        this._eventDispatcher = eventDispatcher, this._mode = mode, this._chart = null === (_b = (_a = this._eventDispatcher.globalInstance).getChart) || void 0 === _b ? void 0 : _b.call(_a);
+        return this._chart || (this._chart = null === (_b = (_a = this._eventDispatcher.globalInstance).getChart) || void 0 === _b ? void 0 : _b.call(_a)), 
+        this._chart;
     }
     register(eType, handler) {
         var _a, _b;
-        (null !== (_b = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getOption().onError) && void 0 !== _b ? _b : error)("Method not implemented.");
+        (null !== (_b = null === (_a = this.chart) || void 0 === _a ? void 0 : _a.getOption().onError) && void 0 !== _b ? _b : error)("Method not implemented.");
     }
     unregister() {
         var _a, _b;
-        (null !== (_b = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getOption().onError) && void 0 !== _b ? _b : error)("Method not implemented.");
+        (null !== (_b = null === (_a = this.chart) || void 0 === _a ? void 0 : _a.getOption().onError) && void 0 !== _b ? _b : error)("Method not implemented.");
     }
     getTargetDimensionInfo(x, y) {
         var _a, _b;
-        const cartesianInfo = null !== (_a = getCartesianDimensionInfo(this._chart, {
+        const cartesianInfo = null !== (_a = getCartesianDimensionInfo(this.chart, {
             x: x,
             y: y
-        })) && void 0 !== _a ? _a : [], polarInfo = null !== (_b = getPolarDimensionInfo(this._chart, {
+        })) && void 0 !== _a ? _a : [], polarInfo = null !== (_b = getPolarDimensionInfo(this.chart, {
             x: x,
             y: y
         })) && void 0 !== _b ? _b : [], result = [].concat(cartesianInfo, polarInfo);
@@ -32,7 +36,7 @@ export class DimensionEvent {
     }
     dispatch(v, opt) {
         var _a;
-        const axis = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => {
+        const axis = null === (_a = this.chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => {
             if ("axes" !== c.specKey) return !1;
             const scale = c.getScale();
             return !!isDiscrete(scale.type) && (!(null == opt ? void 0 : opt.filter) || opt.filter(c));

package/esm/event/events/dimension/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAY5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEtF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,OAAO,cAAc;IAQzB,YAAY,eAAiC,EAAE,IAAgB;;QAC7D,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAC,QAAQ,kDAAI,CAAC;IAClE,CAAC;IAED,QAAQ,CAAqB,KAAU,EAAE,OAAiD;;QACxF,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,GAAG,OAAO,mCAAI,KAAK,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACzE,CAAC;IACD,UAAU;;QACR,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,GAAG,OAAO,mCAAI,KAAK,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACzE,CAAC;IAES,sBAAsB,CAAC,CAAS,EAAE,CAAS;;QACnD,MAAM,aAAa,GAAG,MAAA,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QAC7E,MAAM,SAAS,GAAG,MAAA,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QAErE,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,CAAU,EAAE,GAA0C;;QAE7D,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;YACtD,IAAI,CAAC,CAAC,OAAO,KAAK,MAAM,EAAE;gBACxB,OAAO,KAAK,CAAC;aACd;YACD,MAAM,KAAK,GAAW,CAAE,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAC3B,OAAO,KAAK,CAAC;aACd;YACD,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,EAAE;gBACf,OAAO,GAAG,CAAC,MAAM,CAAQ,CAAC,CAAC,CAAC;aAC7B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAY,CAAC;QACd,MAAM,aAAa,GAAqB,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,MAAM,IAAI,GAAG,uBAAuB,CAAC,CAAmB,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,IAAI,EAAE;gBACR,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;YACxB,MAAM,EAAE,OAAO;YACf,aAAa;SACgB,CAAC,CAAC;QACjC,OAAO,aAAa,CAAC;IACvB,CAAC;CACF","file":"base.js","sourcesContent":["import { error } from '../../../util/debug';\nimport type { IAxis } from '../../../component/axis/interface';\nimport type { RenderMode } from '../../../typings/spec/common';\nimport type {\n  BaseEventParams,\n  EventHandler,\n  EventParamsDefinition,\n  IComposedEvent,\n  IEventDispatcher\n} from '../../interface';\nimport type { IChart } from '../../../chart/interface';\nimport type { IDimensionInfo } from './interface';\nimport { getPolarDimensionInfo } from './util/polar';\nimport { getCartesianDimensionInfo, getDimensionInfoByValue } from './util/cartesian';\nimport type { Maybe } from '../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nexport class DimensionEvent implements IComposedEvent {\n  protected _eventDispatcher: IEventDispatcher;\n  protected _mode: RenderMode;\n\n  protected _callback!: (params: BaseEventParams) => void;\n\n  protected _chart: Maybe<IChart>;\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n\n    this._chart = this._eventDispatcher.globalInstance.getChart?.();\n  }\n\n  register<Evt extends string>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>): void {\n    (this._chart?.getOption().onError ?? error)('Method not implemented.');\n  }\n  unregister(): void {\n    (this._chart?.getOption().onError ?? error)('Method not implemented.');\n  }\n\n  protected getTargetDimensionInfo(x: number, y: number): IDimensionInfo[] | null {\n    const cartesianInfo = getCartesianDimensionInfo(this._chart, { x, y }) ?? [];\n    const polarInfo = getPolarDimensionInfo(this._chart, { x, y }) ?? [];\n\n    const result = [].concat(cartesianInfo, polarInfo);\n    if (result.length === 0) {\n      return null;\n    }\n\n    return result;\n  }\n\n  dispatch(v: unknown, opt: { filter?: (axis: IAxis) => boolean }) {\n    // get all enable axis\n    const axis = this._chart?.getAllComponents().filter(c => {\n      if (c.specKey !== 'axes') {\n        return false;\n      }\n      const scale = (<IAxis>c).getScale();\n      if (!isDiscrete(scale.type)) {\n        return false;\n      }\n      if (opt?.filter) {\n        return opt.filter(<IAxis>c);\n      }\n      return true;\n    }) as IAxis[];\n    const dimensionInfo: IDimensionInfo[] = [];\n    axis.forEach(a => {\n      const info = getDimensionInfoByValue(a as unknown as any, v);\n      if (info) {\n        dimensionInfo.push(info);\n      }\n    });\n    this._callback.call(null, {\n      action: 'enter',\n      dimensionInfo\n    } as unknown as BaseEventParams);\n    return dimensionInfo;\n  }\n}\n"]}
+{"version":3,"sources":["../src/event/events/dimension/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAY5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEtF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,OAAO,cAAc;IAQzB,YAAY,eAAiC,EAAE,IAAgB;QAC7D,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAY,KAAK;;QACf,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAC,QAAQ,kDAAI,CAAC;SACjE;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,QAAQ,CAAqB,KAAU,EAAE,OAAiD;;QACxF,CAAC,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,GAAG,OAAO,mCAAI,KAAK,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACxE,CAAC;IACD,UAAU;;QACR,CAAC,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,GAAG,OAAO,mCAAI,KAAK,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACxE,CAAC;IAES,sBAAsB,CAAC,CAAS,EAAE,CAAS;;QACnD,MAAM,aAAa,GAAG,MAAA,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAA,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QAEpE,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACnD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,CAAU,EAAE,GAA0C;;QAE7D,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE;YACrD,IAAI,CAAC,CAAC,OAAO,KAAK,MAAM,EAAE;gBACxB,OAAO,KAAK,CAAC;aACd;YACD,MAAM,KAAK,GAAW,CAAE,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAC3B,OAAO,KAAK,CAAC;aACd;YACD,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,EAAE;gBACf,OAAO,GAAG,CAAC,MAAM,CAAQ,CAAC,CAAC,CAAC;aAC7B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAY,CAAC;QACd,MAAM,aAAa,GAAqB,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,MAAM,IAAI,GAAG,uBAAuB,CAAC,CAAmB,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,IAAI,EAAE;gBACR,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;YACxB,MAAM,EAAE,OAAO;YACf,aAAa;SACgB,CAAC,CAAC;QACjC,OAAO,aAAa,CAAC;IACvB,CAAC;CACF","file":"base.js","sourcesContent":["import { error } from '../../../util/debug';\nimport type { IAxis } from '../../../component/axis/interface';\nimport type { RenderMode } from '../../../typings/spec/common';\nimport type {\n  BaseEventParams,\n  EventHandler,\n  EventParamsDefinition,\n  IComposedEvent,\n  IEventDispatcher\n} from '../../interface';\nimport type { IChart } from '../../../chart/interface';\nimport type { IDimensionInfo } from './interface';\nimport { getPolarDimensionInfo } from './util/polar';\nimport { getCartesianDimensionInfo, getDimensionInfoByValue } from './util/cartesian';\nimport type { Maybe } from '../../../typings';\nimport { isDiscrete } from '@visactor/vscale';\n\nexport class DimensionEvent implements IComposedEvent {\n  protected _eventDispatcher: IEventDispatcher;\n  protected _mode: RenderMode;\n\n  protected _callback!: (params: BaseEventParams) => void;\n\n  protected _chart: Maybe<IChart>;\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n  }\n\n  private get chart() {\n    if (!this._chart) {\n      this._chart = this._eventDispatcher.globalInstance.getChart?.();\n    }\n    return this._chart;\n  }\n\n  register<Evt extends string>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>): void {\n    (this.chart?.getOption().onError ?? error)('Method not implemented.');\n  }\n  unregister(): void {\n    (this.chart?.getOption().onError ?? error)('Method not implemented.');\n  }\n\n  protected getTargetDimensionInfo(x: number, y: number): IDimensionInfo[] | null {\n    const cartesianInfo = getCartesianDimensionInfo(this.chart, { x, y }) ?? [];\n    const polarInfo = getPolarDimensionInfo(this.chart, { x, y }) ?? [];\n\n    const result = [].concat(cartesianInfo, polarInfo);\n    if (result.length === 0) {\n      return null;\n    }\n\n    return result;\n  }\n\n  dispatch(v: unknown, opt: { filter?: (axis: IAxis) => boolean }) {\n    // get all enable axis\n    const axis = this.chart?.getAllComponents().filter(c => {\n      if (c.specKey !== 'axes') {\n        return false;\n      }\n      const scale = (<IAxis>c).getScale();\n      if (!isDiscrete(scale.type)) {\n        return false;\n      }\n      if (opt?.filter) {\n        return opt.filter(<IAxis>c);\n      }\n      return true;\n    }) as IAxis[];\n    const dimensionInfo: IDimensionInfo[] = [];\n    axis.forEach(a => {\n      const info = getDimensionInfoByValue(a as unknown as any, v);\n      if (info) {\n        dimensionInfo.push(info);\n      }\n    });\n    this._callback.call(null, {\n      action: 'enter',\n      dimensionInfo\n    } as unknown as BaseEventParams);\n    return dimensionInfo;\n  }\n}\n"]}

package/esm/event/interface.d.ts

@@ -12,7 +12,7 @@ import type { TooltipEventParams } from '../component/tooltip/interface/event';
 import type { ILayoutItem } from '../layout/interface';
 export type EventType = 'pointerdown' | 'pointerup' | 'pointerupoutside' | 'pointertap' | 'pointerover' | 'pointermove' | 'pointerenter' | 'pointerleave' | 'pointerout' | 'mousedown' | 'mouseup' | 'mouseupoutside' | 'rightdown' | 'rightup' | 'rightupoutside' | 'click' | 'dblclick' | 'mousemove' | 'mouseover' | 'mouseout' | 'mouseenter' | 'mouseleave' | 'wheel' | 'touchstart' | 'touchend' | 'touchendoutside' | 'touchmove' | 'touchcancel' | 'tap' | 'dragstart' | 'drag' | 'dragenter' | 'dragleave' | 'dragover' | 'dragend' | 'drop' | 'pan' | 'panstart' | 'panend' | 'press' | 'pressup' | 'pressend' | 'pinch' | 'pinchstart' | 'pinchend' | 'swipe' | keyof typeof ChartEvent | keyof typeof VGRAMMAR_HOOK_EVENT | string;
 export type EventBubbleLevel = keyof typeof Event_Bubble_Level;
-export type ComponentType = 'axis' | 'dataZoom' | 'indicator' | 'legend' | 'mapLabel' | 'markLine' | 'tooltip' | 'title' | 'label';
+export type ComponentType = 'axis' | 'dataZoom' | 'indicator' | 'legend' | 'mapLabel' | 'markLine' | 'markArea' | 'markPoint' | 'tooltip' | 'title' | 'label';
 export type EventTargetType = MarkType | ComponentType | SeriesType;
 export type EventSourceType = keyof typeof Event_Source_Type;
 export type EventQuery = {

package/esm/event/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender-core';\nimport type { IElement } from '@visactor/vgrammar-core';\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';\nimport type { ILayoutItem } from '../layout/interface';\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'\n  | 'label';\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   * 是否阻止冒泡\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?: IGraphic;\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 LayoutEventParam = {\n  elements: (ILayoutItem & { type: string })[];\n} & Partial<BaseEventParams>;\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  afterLayout: LayoutEventParam;\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 { IGraphic } from '@visactor/vrender-core';\nimport type { IElement } from '@visactor/vgrammar-core';\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';\nimport type { ILayoutItem } from '../layout/interface';\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  | 'markArea'\n  | 'markPoint'\n  | 'tooltip'\n  | 'title'\n  | 'label';\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   * 是否阻止冒泡\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?: IGraphic;\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 LayoutEventParam = {\n  elements: (ILayoutItem & { type: string })[];\n} & Partial<BaseEventParams>;\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  afterLayout: LayoutEventParam;\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/index-wx-simple.d.ts

@@ -0,0 +1,4 @@
+import { VChart } from './core';
+export * from './core';
+export { VChart };
+export default VChart;

package/esm/index-wx-simple.js

@@ -0,0 +1,35 @@
+import { VChart } from "./core";
+
+import { registerLineChart } from "./chart/line/line";
+
+import { registerBarChart } from "./chart/bar/bar";
+
+import { registerAreaChart } from "./chart/area/area";
+
+import { registerPieChart } from "./chart/pie/pie";
+
+import { registerCommonChart } from "./chart/common/common";
+
+import { registerLabel } from "./component/label/label";
+
+import { registerCartesianCrossHair } from "./component/crosshair/cartesian";
+
+import { registerTooltip } from "./component/tooltip/tooltip";
+
+import { registerDiscreteLegend } from "./component/legend/discrete/legend";
+
+import { registerCartesianBandAxis } from "./component/axis/cartesian/band-axis";
+
+import { registerCartesianLinearAxis } from "./component/axis/cartesian/linear-axis";
+
+import { registerWXEnv } from "./env";
+
+export * from "./core";
+
+VChart.useRegisters([ registerLineChart, registerAreaChart, registerBarChart, registerPieChart, registerCommonChart, registerCartesianLinearAxis, registerCartesianBandAxis, registerDiscreteLegend, registerTooltip, registerCartesianCrossHair, registerLabel ]), 
+VChart.useRegisters([ registerWXEnv ]);
+
+export { VChart };
+
+export default VChart;
+//# sourceMappingURL=index-wx-simple.js.map

package/esm/index-wx-simple.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index-wx-simple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,cAAc,QAAQ,CAAC;AAEvB,MAAM,CAAC,YAAY,CAAC;IAElB,iBAAiB;IACjB,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;IAChB,mBAAmB;IAGnB,2BAA2B;IAC3B,yBAAyB;IACzB,sBAAsB;IACtB,eAAe;IACf,0BAA0B;IAC1B,aAAa;CACd,CAAC,CAAC;AAEH,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAe,MAAM,CAAC","file":"index-wx-simple.js","sourcesContent":["/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { registerLineChart } from './chart/line/line';\nimport { registerBarChart } from './chart/bar/bar';\nimport { registerAreaChart } from './chart/area/area';\nimport { registerPieChart } from './chart/pie/pie';\nimport { registerCommonChart } from './chart/common/common';\n\nimport { registerLabel } from './component/label/label';\nimport { registerCartesianCrossHair } from './component/crosshair/cartesian';\nimport { registerTooltip } from './component/tooltip/tooltip';\nimport { registerDiscreteLegend } from './component/legend/discrete/legend';\nimport { registerCartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { registerCartesianLinearAxis } from './component/axis/cartesian/linear-axis';\nimport { registerWXEnv } from './env';\n\nexport * from './core';\n\nVChart.useRegisters([\n  // charts\n  registerLineChart,\n  registerAreaChart,\n  registerBarChart,\n  registerPieChart,\n  registerCommonChart,\n\n  // components\n  registerCartesianLinearAxis,\n  registerCartesianBandAxis,\n  registerDiscreteLegend,\n  registerTooltip,\n  registerCartesianCrossHair,\n  registerLabel\n]);\n\nVChart.useRegisters([registerWXEnv]);\n\nexport { VChart };\n\nexport default VChart;\n"]}

package/esm/interaction/config.d.ts

@@ -3,7 +3,7 @@ export declare function getDefaultInteractionConfigByMode(mode: RenderMode): {
     hover: {
         enable: boolean;
         trigger: string;
-        triggerOff: string[];
+        triggerOff: string;
     };
     select: {
         enable: boolean;
@@ -13,7 +13,7 @@ export declare function getDefaultInteractionConfigByMode(mode: RenderMode): {
     hover: {
         enable: boolean;
         trigger: string[];
-        triggerOff: string[];
+        triggerOff: string;
     };
     select: {
         enable: boolean;

package/esm/interaction/config.js

@@ -7,7 +7,7 @@ export function getDefaultInteractionConfigByMode(mode) {
         hover: {
             enable: !0,
             trigger: "pointermove",
-            triggerOff: [ "pointermove", "pointerleave" ]
+            triggerOff: "pointerleave"
         },
         select: {
             enable: !0,
@@ -17,7 +17,7 @@ export function getDefaultInteractionConfigByMode(mode) {
         hover: {
             enable: !0,
             trigger: [ "pointerdown", "pointermove" ],
-            triggerOff: [ "pointermove", "pointerleave" ]
+            triggerOff: "pointerleave"
         },
         select: {
             enable: !0,

package/esm/interaction/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE9D,MAAM,UAAU,iCAAiC,CAAC,IAAgB;IAChE,IAAI,IAAI,KAAK,cAAc,CAAC,iBAAiB,CAAC,IAAI,IAAI,KAAK,cAAc,CAAC,iBAAiB,CAAC,EAAE;QAC5F,OAAO;YACL,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,aAAa;gBACtB,UAAU,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;aAC5C;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,YAAY;aACtB;SACF,CAAC;KACH;IAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO;YACL,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC;gBACvC,UAAU,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;aAC5C;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,KAAK;aACf;SACF,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC","file":"config.js","sourcesContent":["import type { RenderMode } from '../typings/spec/common';\nimport { RenderModeEnum } from '../typings/spec/common';\nimport { isMiniAppLikeMode, isMobileLikeMode } from '../util';\n\nexport function getDefaultInteractionConfigByMode(mode: RenderMode) {\n  if (mode === RenderModeEnum['desktop-browser'] || mode === RenderModeEnum['desktop-miniApp']) {\n    return {\n      hover: {\n        enable: true,\n        trigger: 'pointermove',\n        triggerOff: ['pointermove', 'pointerleave']\n      },\n      select: {\n        enable: true,\n        trigger: 'pointertap'\n      }\n    };\n  }\n\n  if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {\n    return {\n      hover: {\n        enable: true,\n        trigger: ['pointerdown', 'pointermove'],\n        triggerOff: ['pointermove', 'pointerleave']\n      },\n      select: {\n        enable: true,\n        trigger: 'tap'\n      }\n    };\n  }\n\n  return null;\n}\n"]}
+{"version":3,"sources":["../src/interaction/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE9D,MAAM,UAAU,iCAAiC,CAAC,IAAgB;IAChE,IAAI,IAAI,KAAK,cAAc,CAAC,iBAAiB,CAAC,IAAI,IAAI,KAAK,cAAc,CAAC,iBAAiB,CAAC,EAAE;QAC5F,OAAO;YACL,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,aAAa;gBACtB,UAAU,EAAE,cAAc;aAC3B;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,YAAY;aACtB;SACF,CAAC;KACH;IAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO;YACL,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC;gBACvC,UAAU,EAAE,cAAc;aAC3B;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,KAAK;aACf;SACF,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC","file":"config.js","sourcesContent":["import type { RenderMode } from '../typings/spec/common';\nimport { RenderModeEnum } from '../typings/spec/common';\nimport { isMiniAppLikeMode, isMobileLikeMode } from '../util';\n\nexport function getDefaultInteractionConfigByMode(mode: RenderMode) {\n  if (mode === RenderModeEnum['desktop-browser'] || mode === RenderModeEnum['desktop-miniApp']) {\n    return {\n      hover: {\n        enable: true,\n        trigger: 'pointermove',\n        triggerOff: 'pointerleave'\n      },\n      select: {\n        enable: true,\n        trigger: 'pointertap'\n      }\n    };\n  }\n\n  if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {\n    return {\n      hover: {\n        enable: true,\n        trigger: ['pointerdown', 'pointermove'],\n        triggerOff: 'pointerleave'\n      },\n      select: {\n        enable: true,\n        trigger: 'tap'\n      }\n    };\n  }\n\n  return null;\n}\n"]}

package/esm/interaction/trigger.js

@@ -22,7 +22,7 @@ export class Trigger {
     constructor(spec, option) {
         this._fields = null, this._marks = new MarkSet, this._markReverse = new MarkSet, 
         this.onHover = params => {
-            this.filterEventMark(params) && this.hoverItem(params);
+            this.filterEventMark(params) ? this.hoverItem(params) : this.unhoverItem();
         }, this.onUnHover = params => {
             this.filterEventMark(params) || this.interaction.filterEventMark(params, STATE_VALUE_ENUM.STATE_HOVER) || this.interaction.getEventElement(STATE_VALUE_ENUM.STATE_HOVER)[0] && this.unhoverItem();
         }, this.onSelect = params => {
@@ -137,4 +137,4 @@ export class Trigger {
         return (this._fields ? this._fields : Object.keys(datumA)).every((f => datumA[f] === datumB[f]));
     }
 }
-//# sourceMappingURL=trigger.js.map
+//# sourceMappingURL=trigger.js.map