@visactor/vchart 1.9.4 → 1.9.5

package/esm/component/label/total-label.js

@@ -128,8 +128,21 @@ export class TotalLabel extends BaseLabelComponent {
 TotalLabel.type = ComponentTypeEnum.totalLabel, TotalLabel.specKey = "totalLabel";
 
 export function totalLabelPosition(series, type) {
+    var _a, _b;
     let position;
-    if ("rect" === type) position = "horizontal" === series.direction ? "right" : "top"; else position = "top";
+    const {direction: direction} = series, positionMap = {
+        vertical: [ "top", "bottom" ],
+        horizontal: [ "right", "left" ]
+    }, index = ("horizontal" === direction ? null === (_a = series.getXAxisHelper()) || void 0 === _a ? void 0 : _a.isInverse() : null === (_b = series.getYAxisHelper()) || void 0 === _b ? void 0 : _b.isInverse()) ? 1 : 0;
+    switch (type) {
+      case "rect":
+      case "symbol":
+        position = positionMap[direction][index];
+        break;
+
+      default:
+        position = "top";
+    }
     return position;
 }
 

package/esm/component/label/total-label.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/label/total-label.ts"],"names":[],"mappings":"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","file":"total-label.js","sourcesContent":["import type { ILabelMark } from '../../mark/label';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerLabelMark } from '../../mark/label';\n// eslint-disable-next-line no-duplicate-imports\nimport { ComponentTypeEnum } from '../interface/type';\nimport { AttributeLevel, LayoutZIndex, STACK_FIELD_TOTAL, STACK_FIELD_TOTAL_TOP } from '../../constant';\nimport type { IMark, MarkType } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport type { ICartesianSeries, ISeries } from '../../series/interface';\nimport type { IGroupMark, IView } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerLabel as registerVGrammarLabel } from '@visactor/vgrammar-core';\nimport { textAttribute } from './util';\nimport { BaseLabelComponent } from './base-label';\nimport type { IModelInitOption, IModelSpecInfo } from '../../model/interface';\nimport type { Datum, Maybe } from '../../typings';\nimport { Factory } from '../../core/factory';\nimport { registerComponentMark } from '../../mark/component';\nimport type { IChartSpecInfo } from '../../chart/interface';\n\nexport class TotalLabel extends BaseLabelComponent {\n  static type = ComponentTypeEnum.totalLabel;\n  type = ComponentTypeEnum.totalLabel;\n  name: string = ComponentTypeEnum.totalLabel;\n\n  static specKey = 'totalLabel';\n  specKey = 'totalLabel';\n\n  layoutZIndex: number = LayoutZIndex.Label;\n\n  private _textMark?: ILabelMark;\n  private _baseMark?: IMark;\n\n  static getSpecInfo(chartSpec: any, chartSpecInfo?: IChartSpecInfo): Maybe<IModelSpecInfo[]> {\n    const specInfo: IModelSpecInfo[] = [];\n    chartSpecInfo?.region?.forEach((regionInfo, regionIndex) => {\n      regionInfo.seriesIndexes?.forEach(seriesIndex => {\n        const { spec } = chartSpecInfo.series[seriesIndex];\n        const labelSpec = spec[this.specKey];\n        if (labelSpec?.visible) {\n          specInfo.push({\n            spec: labelSpec,\n            type: ComponentTypeEnum.totalLabel,\n            specPath: ['series', seriesIndex, this.specKey],\n            specInfoPath: ['component', this.specKey, seriesIndex],\n            regionIndexes: [regionIndex],\n            seriesIndexes: [seriesIndex]\n          });\n        }\n      });\n    });\n    return specInfo;\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    this._initTextMark();\n    this._initLabelComponent();\n  }\n\n  protected _initTextMark() {\n    const series = this._getSeries();\n    if (series.getSpec().totalLabel?.visible) {\n      const mark = series.getMarksInType([MarkTypeEnum.rect, MarkTypeEnum.symbol])[0];\n      const textMark = this._createMark({ type: MarkTypeEnum.label, name: `${mark.name}-total-label` }) as ILabelMark;\n      this._baseMark = mark;\n      this._textMark = textMark;\n      this._initTextMarkStyle();\n    }\n  }\n\n  _initTextMarkStyle() {\n    super.initMarkStyleWithSpec(this._textMark, this._spec);\n    this.setMarkStyle(\n      this._textMark,\n      {\n        text: (datum: Datum) => {\n          return datum[STACK_FIELD_TOTAL];\n        }\n      },\n      'normal',\n      AttributeLevel.Default\n    );\n  }\n\n  protected _initLabelComponent() {\n    const series = this._getSeries();\n    const component = this._createMark(\n      { type: MarkTypeEnum.component, name: `${series.name}-total-label-component` },\n      {\n        componentType: 'label',\n        noSeparateStyle: true,\n        support3d: this._spec.support3d\n      }\n    );\n    if (component) {\n      this._marks.addMark(component);\n    }\n  }\n\n  updateLayoutAttribute(): void {\n    super.updateLayoutAttribute();\n    const series = this._getSeries();\n    this._marks.forEach((componentMark, index) => {\n      const component = componentMark.getProduct() as ReturnType<IView['label']>;\n      component\n        .target(this._baseMark.getProduct())\n        .configure({ interactive: false })\n        .labelStyle(() => {\n          if (this._baseMark) {\n            const { offset, animation, overlap } = this._spec;\n            const interactive = this._interactiveConfig(this._spec);\n            return mergeSpec(\n              {\n                textStyle: { pickable: this._spec.interactive === true },\n                position: totalLabelPosition(series, this._baseMark.type),\n                x: 0,\n                y: 0\n              },\n              {\n                offset,\n                animation,\n                overlap,\n                dataFilter: (data: any) => {\n                  return data.filter((d: any) => d.data[STACK_FIELD_TOTAL_TOP]);\n                },\n                ...interactive\n              }\n            );\n          }\n        })\n        .encode(datum => {\n          return textAttribute(\n            {\n              baseMark: this._baseMark,\n              labelMark: this._textMark,\n              series,\n              labelSpec: series.getSpec().totalLabel\n            },\n            datum,\n            this._spec.formatMethod\n          );\n        })\n        .size(() => this._regions[0].getLayoutRect());\n    });\n  }\n\n  compileMarks() {\n    this.getMarks().forEach(m => {\n      const group = this._regions[0].getGroupMark().getProduct() as IGroupMark;\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  getVRenderComponents() {\n    const labels: any[] = [];\n    this.getMarks().forEach(m => {\n      const graphicItem = m.getProduct().getGroupGraphicItem();\n      if (graphicItem) {\n        labels.push(graphicItem);\n      }\n    });\n    return labels;\n  }\n\n  protected _getSeries() {\n    return this._option.getSeriesInIndex([this.getSpecPath()[1] as number])[0];\n  }\n}\n\nexport function totalLabelPosition(series: ISeries, type: MarkType) {\n  let position;\n  switch (type) {\n    case 'rect':\n      position = (series as ICartesianSeries).direction === 'horizontal' ? 'right' : 'top';\n      break;\n    case 'symbol':\n    default:\n      position = 'top';\n  }\n  return position;\n}\n\nexport const registerTotalLabel = () => {\n  registerVGrammarLabel();\n  registerLabelMark();\n  registerComponentMark();\n  Factory.registerComponent(TotalLabel.type, TotalLabel, true);\n};\n"]}
+{"version":3,"sources":["../src/component/label/total-label.ts"],"names":[],"mappings":"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","file":"total-label.js","sourcesContent":["import type { ILabelMark } from '../../mark/label';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerLabelMark } from '../../mark/label';\n// eslint-disable-next-line no-duplicate-imports\nimport { ComponentTypeEnum } from '../interface/type';\nimport { AttributeLevel, LayoutZIndex, STACK_FIELD_TOTAL, STACK_FIELD_TOTAL_TOP } from '../../constant';\nimport type { IMark, MarkType } from '../../mark/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from '../../mark/interface';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport type { ICartesianSeries, ISeries } from '../../series/interface';\nimport type { IGroupMark, IView } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerLabel as registerVGrammarLabel } from '@visactor/vgrammar-core';\nimport { textAttribute } from './util';\nimport { BaseLabelComponent } from './base-label';\nimport type { IModelInitOption, IModelSpecInfo } from '../../model/interface';\nimport type { Datum, Maybe } from '../../typings';\nimport { Factory } from '../../core/factory';\nimport { registerComponentMark } from '../../mark/component';\nimport type { IChartSpecInfo } from '../../chart/interface';\n\nexport class TotalLabel extends BaseLabelComponent {\n  static type = ComponentTypeEnum.totalLabel;\n  type = ComponentTypeEnum.totalLabel;\n  name: string = ComponentTypeEnum.totalLabel;\n\n  static specKey = 'totalLabel';\n  specKey = 'totalLabel';\n\n  layoutZIndex: number = LayoutZIndex.Label;\n\n  private _textMark?: ILabelMark;\n  private _baseMark?: IMark;\n\n  static getSpecInfo(chartSpec: any, chartSpecInfo?: IChartSpecInfo): Maybe<IModelSpecInfo[]> {\n    const specInfo: IModelSpecInfo[] = [];\n    chartSpecInfo?.region?.forEach((regionInfo, regionIndex) => {\n      regionInfo.seriesIndexes?.forEach(seriesIndex => {\n        const { spec } = chartSpecInfo.series[seriesIndex];\n        const labelSpec = spec[this.specKey];\n        if (labelSpec?.visible) {\n          specInfo.push({\n            spec: labelSpec,\n            type: ComponentTypeEnum.totalLabel,\n            specPath: ['series', seriesIndex, this.specKey],\n            specInfoPath: ['component', this.specKey, seriesIndex],\n            regionIndexes: [regionIndex],\n            seriesIndexes: [seriesIndex]\n          });\n        }\n      });\n    });\n    return specInfo;\n  }\n\n  init(option: IModelInitOption): void {\n    super.init(option);\n    this._initTextMark();\n    this._initLabelComponent();\n  }\n\n  protected _initTextMark() {\n    const series = this._getSeries();\n    if (series.getSpec().totalLabel?.visible) {\n      const mark = series.getMarksInType([MarkTypeEnum.rect, MarkTypeEnum.symbol])[0];\n      const textMark = this._createMark({ type: MarkTypeEnum.label, name: `${mark.name}-total-label` }) as ILabelMark;\n      this._baseMark = mark;\n      this._textMark = textMark;\n      this._initTextMarkStyle();\n    }\n  }\n\n  _initTextMarkStyle() {\n    super.initMarkStyleWithSpec(this._textMark, this._spec);\n    this.setMarkStyle(\n      this._textMark,\n      {\n        text: (datum: Datum) => {\n          return datum[STACK_FIELD_TOTAL];\n        }\n      },\n      'normal',\n      AttributeLevel.Default\n    );\n  }\n\n  protected _initLabelComponent() {\n    const series = this._getSeries();\n    const component = this._createMark(\n      { type: MarkTypeEnum.component, name: `${series.name}-total-label-component` },\n      {\n        componentType: 'label',\n        noSeparateStyle: true,\n        support3d: this._spec.support3d\n      }\n    );\n    if (component) {\n      this._marks.addMark(component);\n    }\n  }\n\n  updateLayoutAttribute(): void {\n    super.updateLayoutAttribute();\n    const series = this._getSeries();\n    this._marks.forEach((componentMark, index) => {\n      const component = componentMark.getProduct() as ReturnType<IView['label']>;\n      component\n        .target(this._baseMark.getProduct())\n        .configure({ interactive: false })\n        .labelStyle(() => {\n          if (this._baseMark) {\n            const { offset, animation, overlap } = this._spec;\n            const interactive = this._interactiveConfig(this._spec);\n            return mergeSpec(\n              {\n                textStyle: { pickable: this._spec.interactive === true },\n                position: totalLabelPosition(series, this._baseMark.type),\n                x: 0,\n                y: 0\n              },\n              {\n                offset,\n                animation,\n                overlap,\n                dataFilter: (data: any) => {\n                  return data.filter((d: any) => d.data[STACK_FIELD_TOTAL_TOP]);\n                },\n                ...interactive\n              }\n            );\n          }\n        })\n        .encode(datum => {\n          return textAttribute(\n            {\n              baseMark: this._baseMark,\n              labelMark: this._textMark,\n              series,\n              labelSpec: series.getSpec().totalLabel\n            },\n            datum,\n            this._spec.formatMethod\n          );\n        })\n        .size(() => this._regions[0].getLayoutRect());\n    });\n  }\n\n  compileMarks() {\n    this.getMarks().forEach(m => {\n      const group = this._regions[0].getGroupMark().getProduct() as IGroupMark;\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  getVRenderComponents() {\n    const labels: any[] = [];\n    this.getMarks().forEach(m => {\n      const graphicItem = m.getProduct().getGroupGraphicItem();\n      if (graphicItem) {\n        labels.push(graphicItem);\n      }\n    });\n    return labels;\n  }\n\n  protected _getSeries() {\n    return this._option.getSeriesInIndex([this.getSpecPath()[1] as number])[0];\n  }\n}\n\nexport function totalLabelPosition(series: ISeries, type: MarkType) {\n  let position;\n  const { direction } = series as ICartesianSeries;\n  const isInverse =\n    direction === 'horizontal'\n      ? (series as ICartesianSeries).getXAxisHelper()?.isInverse()\n      : (series as ICartesianSeries).getYAxisHelper()?.isInverse();\n  const positionMap = { vertical: ['top', 'bottom'], horizontal: ['right', 'left'] };\n  const index = isInverse ? 1 : 0;\n  switch (type) {\n    case 'rect':\n    case 'symbol':\n      position = positionMap[direction][index];\n      break;\n    default:\n      position = 'top';\n  }\n  return position;\n}\n\nexport const registerTotalLabel = () => {\n  registerVGrammarLabel();\n  registerLabelMark();\n  registerComponentMark();\n  Factory.registerComponent(TotalLabel.type, TotalLabel, true);\n};\n"]}

package/esm/component/util.js

@@ -2,5 +2,4 @@ import { get } from "@visactor/vutils";
 
 export function getComponentThemeFromOption(type, chartTheme) {
     return get(chartTheme, `component.${type}`);
-}
-//# sourceMappingURL=util.js.map
+}

package/esm/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.9.4";
+export declare const version = "1.9.5";
 export type { IVChart } from './interface';
 export type { IStateSpec, StateValueType } from '../compile/mark';
 export * from '../typings/spec/common';

package/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "1.9.4";
+export const version = "1.9.5";
 
 export * from "../typings/spec/common";
 

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAM/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,cAAc,WAAW,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.9.4\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\nexport * from './interface';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n\n// plugin\nexport * from '../plugin';\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAM/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,cAAc,WAAW,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.9.5\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\nexport * from './interface';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n\n// plugin\nexport * from '../plugin';\n"]}

package/esm/data/transforms/waterfall.js

@@ -1,10 +1,12 @@
-import { isNil, precisionAdd } from "@visactor/vutils";
+import { isNil, precisionAdd, precisionSub } from "@visactor/vutils";
 
 import { WaterfallDefaultSeriesField } from "../../constant/waterfall";
 
+import { warn } from "../../util/debug";
+
 export const waterfall = (lastData, op) => {
     if (!lastData || 0 === lastData.length) return lastData;
-    const {indexField: indexField, valueField: valueField, startAs: startAs, endAs: endAs, total: totalSpec, seriesField: seriesField, seriesFieldName: seriesFieldName, groupData: groupData} = op, totalData = [], {dimensionValues: dimensionValues, dimensionData: dimensionData} = groupData().latestData, indexValues = Array.from(dimensionValues[indexField]);
+    const {indexField: indexField, total: totalSpec, groupData: groupData} = op, totalData = [], {dimensionValues: dimensionValues, dimensionData: dimensionData} = groupData().latestData, indexValues = Array.from(dimensionValues[indexField]);
     let temp = {
         start: 0,
         end: 0,
@@ -18,36 +20,110 @@ export const waterfall = (lastData, op) => {
             lastEnd: temp.end,
             index: key,
             isTotal: !1
-        };
-        dimensionData[key].forEach((d => {
-            let isTotalTag = !1;
-            if (totalSpec && "end" !== totalSpec.type) {
-                if ("field" === totalSpec.type || "custom" === totalSpec.type) {
-                    if (d[totalSpec.tagField]) if (isTotalTag = !0, "custom" === totalSpec.type) {
-                        const {start: start, end: end} = totalSpec.product(d, temp);
-                        d[startAs] = start, d[endAs] = end, total.end = end, total.start = start;
-                    } else {
-                        let start = 0, end = total.end;
-                        if (totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField])) {
-                            const startIndex = totalData.length - +d[totalSpec.collectCountField], endIndex = totalData.length - 1;
-                            startIndex < 0 ? console.warn("total.collectCountField error") : start = totalData[startIndex].start, 
-                            endIndex < 0 ? console.warn("total.collectCountField error") : end = totalData[endIndex].end;
-                        } else totalSpec.startField && !isNil(d[totalSpec.startField]) && (start = +d[totalSpec.startField]), 
-                        totalSpec.valueField && !isNil(d[totalSpec.valueField]) && (end = precisionAdd(start, +d[totalSpec.valueField]));
-                        d[startAs] = start, d[endAs] = end, d[valueField] = end - start, total.start = start, 
-                        total.end = end;
+        }, indexData = dimensionData[key];
+        if (indexData.length > 1) {
+            const isTotalCheck = d => {
+                if (totalSpec && "end" !== totalSpec.type) {
+                    if ("field" === totalSpec.type || "custom" === totalSpec.type) {
+                        return !!d[totalSpec.tagField];
                     }
-                }
-            } else index === indexValues.length - 1 && (total.start = 0, d[startAs] = total.start, 
-            d[endAs] = total.end, isTotalTag = !0);
-            isTotalTag || (d[startAs] = +total.end, d[endAs] = precisionAdd(d[startAs], +d[valueField]), 
-            total.end = d[endAs]), total.isTotal = isTotalTag, (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) && (d[WaterfallDefaultSeriesField] = isTotalTag ? seriesFieldName.total : +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease);
-        })), temp = Object.assign(Object.assign({}, total), {
-            lastIndex: key
-        }), totalData.push(total);
+                } else if (index === indexValues.length - 1) return !0;
+                return !1;
+            };
+            if (indexData.some((d => isTotalCheck(d)))) return temp = computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, op, isTotalCheck), 
+            void totalData.push(total);
+        }
+        temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op), 
+        totalData.push(total);
     })), totalData;
 };
 
+function computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, op, isTotalCheck) {
+    total.isTotal = !0;
+    const {valueField: valueField, startAs: startAs, endAs: endAs, total: totalSpec} = op, _normalTemp = [], _totalTemp = [];
+    if (indexData.forEach((d => {
+        isTotalCheck(d) ? _totalTemp.push(d) : _normalTemp.push(d);
+    })), _totalTemp.length === indexData.length) {
+        const result = computeNormalData([ indexData[0] ], key, total, totalData, temp, indexValues, index, op);
+        return _totalTemp.forEach((d => {
+            d[startAs] = indexData[0][startAs], d[endAs] = indexData[0][endAs], d[valueField] = indexData[0][valueField];
+        })), result;
+    }
+    const totalConfigData = _totalTemp[0];
+    let {start: start, end: end} = getTotalStartEnd(totalConfigData, total, totalData, temp, totalSpec);
+    total.start = start, total.end = end;
+    let valueTemp = end - start;
+    return _normalTemp.forEach((d => {
+        d[startAs] = +start, d[endAs] = precisionAdd(d[startAs], +d[valueField]), start = d[endAs], 
+        valueTemp = precisionSub(valueTemp, +d[valueField]);
+    })), _totalTemp.forEach((d => {
+        d[startAs] = +start, d[endAs] = precisionAdd(d[startAs], valueTemp), d[valueField] = valueTemp;
+    })), Object.assign(Object.assign({}, total), {
+        lastIndex: key
+    });
+}
+
+function computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op) {
+    const {valueField: valueField, startAs: startAs, endAs: endAs, total: totalSpec, seriesField: seriesField, seriesFieldName: seriesFieldName} = op;
+    return indexData.forEach((d => {
+        let isTotalTag = !1;
+        if (totalSpec && "end" !== totalSpec.type) {
+            if ("field" === totalSpec.type || "custom" === totalSpec.type) {
+                if (d[totalSpec.tagField]) {
+                    isTotalTag = !0;
+                    const {start: start, end: end} = getTotalStartEnd(d, total, totalData, temp, totalSpec);
+                    d[startAs] = start, d[endAs] = end, d[valueField] = end - start, total.start = start, 
+                    total.end = end;
+                }
+            }
+        } else index === indexValues.length - 1 && (total.start = 0, d[startAs] = total.start, 
+        d[endAs] = total.end, isTotalTag = !0);
+        isTotalTag || (d[startAs] = +total.end, d[endAs] = precisionAdd(d[startAs], +d[valueField]), 
+        total.end = d[endAs]), total.isTotal = isTotalTag, (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) && (d[WaterfallDefaultSeriesField] = isTotalTag ? seriesFieldName.total : +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease);
+    })), Object.assign(Object.assign({}, total), {
+        lastIndex: key
+    });
+}
+
+function getTotalStartEnd(d, total, totalData, temp, totalSpec) {
+    return totalSpec && "end" !== totalSpec.type ? "field" === totalSpec.type || "custom" === totalSpec.type ? "custom" === totalSpec.type ? getTotalInCustomType(d, temp, totalSpec) : totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField]) ? getTotalInCollectField(d, totalData, total, totalSpec) : getTotalInField(d, total, totalSpec) : {
+        start: 0,
+        end: 0
+    } : getTotalInEndType(total);
+}
+
+function getTotalInEndType(total) {
+    return {
+        start: 0,
+        end: total.end
+    };
+}
+
+function getTotalInCustomType(d, temp, totalSpec) {
+    return totalSpec.product(d, temp);
+}
+
+function getTotalInCollectField(d, totalData, total, totalSpec) {
+    let start = 0, end = total.end;
+    const startIndex = totalData.length - +d[totalSpec.collectCountField], endIndex = totalData.length - 1;
+    return startIndex < 0 ? warn("total.collectCountField error") : start = totalData[startIndex].start, 
+    endIndex < 0 ? warn("total.collectCountField error") : end = totalData[endIndex].end, 
+    {
+        start: start,
+        end: end
+    };
+}
+
+function getTotalInField(d, total, totalSpec) {
+    let start = 0, end = total.end;
+    return totalSpec.startField && !isNil(d[totalSpec.startField]) && (start = +d[totalSpec.startField]), 
+    totalSpec.valueField && !isNil(d[totalSpec.valueField]) && (end = precisionAdd(start, +d[totalSpec.valueField])), 
+    {
+        start: start,
+        end: end
+    };
+}
+
 export const waterfallFillTotal = (data, op) => {
     if (!data) return data;
     const {indexField: indexField, valueField: valueField, total: total, seriesField: seriesField} = op, totalData = {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/waterfall.ts"],"names":[],"mappings":"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","file":"waterfall.js","sourcesContent":["// import { isNil, precisionAdd } from '@visactor/vutils';\nimport { isNil, precisionAdd } from '@visactor/vutils';\n\nimport type { DataView } from '@visactor/vdataset';\nimport type { IWaterfallSeriesSpec } from '../../series/waterfall/interface';\nimport type { Datum } from '../../typings';\nimport { WaterfallDefaultSeriesField } from '../../constant/waterfall';\n\nexport interface IWaterfallOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  startAs: string;\n  endAs: string;\n  total: IWaterfallSeriesSpec['total'];\n  seriesFieldName: {\n    total: string;\n    increase: string;\n    decrease: string;\n  };\n  groupData: () => DataView;\n}\n\nexport const waterfall = (lastData: Array<Datum>, op: IWaterfallOpt) => {\n  if (!lastData || lastData.length === 0) {\n    return lastData;\n  }\n  const { indexField, valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName, groupData } = op;\n  const totalData: {\n    start: number;\n    end: number;\n    lastIndex: string;\n    lastEnd: number;\n    index: string;\n    isTotal: boolean;\n  }[] = [];\n  const { dimensionValues, dimensionData } = groupData().latestData as {\n    dimensionValues: { [key in string]: Set<string> };\n    dimensionData: { [key in string]: Datum[] };\n  };\n  const indexValues = Array.from(dimensionValues[indexField]);\n  let temp: { start: number; end: number; lastIndex: string } = { start: 0, end: 0, lastIndex: null };\n  indexValues.forEach((key, index) => {\n    const total = {\n      start: temp.end,\n      end: temp.end,\n      lastIndex: temp.lastIndex,\n      lastEnd: temp.end,\n      index: key,\n      isTotal: false\n    };\n\n    const indexData = dimensionData[key];\n    indexData.forEach(d => {\n      let isTotalTag = false;\n      if (!totalSpec || totalSpec.type === 'end') {\n        if (index === indexValues.length - 1) {\n          total.start = 0;\n          d[startAs] = total.start;\n          d[endAs] = total.end;\n          isTotalTag = true;\n        }\n      } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n        const tag = d[totalSpec.tagField];\n        if (tag) {\n          isTotalTag = true;\n          if (totalSpec.type === 'custom') {\n            const { start, end } = totalSpec.product(d, temp);\n            d[startAs] = start;\n            d[endAs] = end;\n            total.end = end;\n            total.start = start;\n          } else {\n            let start = 0;\n            let end = total.end;\n            // 如果有设置count， valueField 和 startField 无效\n            if (totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField])) {\n              const startIndex = totalData.length - +d[totalSpec.collectCountField];\n              const endIndex = totalData.length - 1;\n              if (startIndex < 0) {\n                console.warn('total.collectCountField error');\n              } else {\n                start = totalData[startIndex].start;\n              }\n              if (endIndex < 0) {\n                console.warn('total.collectCountField error');\n              } else {\n                end = totalData[endIndex].end;\n              }\n            } else {\n              if (totalSpec.startField && !isNil(d[totalSpec.startField])) {\n                start = +d[totalSpec.startField];\n              }\n              if (totalSpec.valueField && !isNil(d[totalSpec.valueField])) {\n                end = precisionAdd(start, +d[totalSpec.valueField]);\n              }\n            }\n            d[startAs] = start;\n            d[endAs] = end;\n            d[valueField] = end - start;\n            total.start = start;\n            total.end = end;\n          }\n        }\n      }\n      if (!isTotalTag) {\n        d[startAs] = +total.end;\n        d[endAs] = precisionAdd(d[startAs], +d[valueField]);\n        total.end = d[endAs];\n      }\n      total.isTotal = isTotalTag;\n\n      if (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) {\n        if (isTotalTag) {\n          d[WaterfallDefaultSeriesField] = seriesFieldName.total;\n        } else {\n          d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;\n        }\n      }\n    });\n    temp = { ...total, lastIndex: key };\n    totalData.push(total);\n  });\n  return totalData;\n};\n\nexport interface IWaterfallFillEndOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  total: IWaterfallSeriesSpec['total'];\n}\n\nexport const waterfallFillTotal = (data: Array<Datum>, op: IWaterfallFillEndOpt) => {\n  if (!data) {\n    return data;\n  }\n  const { indexField, valueField, total, seriesField } = op;\n  const totalData = {\n    [indexField]: total?.text || 'total',\n    [valueField]: data.reduce((pre, cur) => precisionAdd(pre, +cur[valueField]), 0)\n  };\n  if (seriesField) {\n    totalData[seriesField] = 'total';\n  }\n  data.push(totalData);\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/waterfall.ts"],"names":[],"mappings":"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","file":"waterfall.js","sourcesContent":["import { isNil, precisionAdd, precisionSub } from '@visactor/vutils';\n\nimport type { DataView } from '@visactor/vdataset';\nimport type {\n  IWaterfallSeriesSpec,\n  IWaterfallTotalCustom,\n  IWaterfallTotalField\n} from '../../series/waterfall/interface';\nimport type { Datum } from '../../typings';\nimport { WaterfallDefaultSeriesField } from '../../constant/waterfall';\nimport { warn } from '../../util/debug';\n\ntype TotalInfo = {\n  start: number;\n  end: number;\n  lastIndex: string;\n  lastEnd: number;\n  index: string;\n  isTotal: boolean;\n};\n\nexport interface IWaterfallOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  startAs: string;\n  endAs: string;\n  total: IWaterfallSeriesSpec['total'];\n  seriesFieldName: {\n    total: string;\n    increase: string;\n    decrease: string;\n  };\n  groupData: () => DataView;\n}\n\nexport const waterfall = (lastData: Array<Datum>, op: IWaterfallOpt) => {\n  if (!lastData || lastData.length === 0) {\n    return lastData;\n  }\n  const { indexField, total: totalSpec, groupData } = op;\n  const totalData: {\n    start: number;\n    end: number;\n    lastIndex: string;\n    lastEnd: number;\n    index: string;\n    isTotal: boolean;\n  }[] = [];\n  const { dimensionValues, dimensionData } = groupData().latestData as {\n    dimensionValues: { [key in string]: Set<string> };\n    dimensionData: { [key in string]: Datum[] };\n  };\n  const indexValues = Array.from(dimensionValues[indexField]);\n  // 上一次的计算结果\n  let temp: { start: number; end: number; lastIndex: string } = { start: 0, end: 0, lastIndex: null };\n  indexValues.forEach((key, index) => {\n    const total = {\n      start: temp.end,\n      end: temp.end,\n      lastIndex: temp.lastIndex,\n      lastEnd: temp.end,\n      index: key,\n      isTotal: false\n    };\n\n    const indexData = dimensionData[key];\n    // 1.9.5 新增能力\n    // 当前 key 对应的数据中有一个总计数据，并且还有其他的分组数据时。总计的计算逻辑需要将总计值拆分\n    if (indexData.length > 1) {\n      const isTotalCheck = (d: Datum) => {\n        if (!totalSpec || totalSpec.type === 'end') {\n          if (index === indexValues.length - 1) {\n            return true;\n          }\n        } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n          const tag = d[totalSpec.tagField];\n          return !!tag;\n        }\n        return false;\n      };\n      const isTotalTag = indexData.some(d => isTotalCheck(d));\n      if (isTotalTag) {\n        temp = computeTotalWithMultipleData(\n          indexData,\n          key,\n          total,\n          totalData,\n          temp,\n          indexValues,\n          index,\n          op,\n          isTotalCheck\n        );\n        totalData.push(total);\n        return;\n      }\n    }\n    temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op);\n    totalData.push(total);\n  });\n  return totalData;\n};\n\nfunction computeTotalWithMultipleData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt,\n  isTotalCheck: (d: Datum) => boolean\n) {\n  total.isTotal = true;\n  const { valueField, startAs, endAs, total: totalSpec } = op;\n  // 先将数据分为总计数据与常规数据\n  const _normalTemp: Datum[] = [];\n  const _totalTemp: Datum[] = [];\n  indexData.forEach(d => {\n    if (isTotalCheck(d)) {\n      _totalTemp.push(d);\n    } else {\n      _normalTemp.push(d);\n    }\n  });\n  // 1. 不可能全都不是总计数据\n  // 2. 如果全都是总计数据，让它们都是同一个值\n  if (_totalTemp.length === indexData.length) {\n    const result = computeNormalData([indexData[0]], key, total, totalData, temp, indexValues, index, op);\n    _totalTemp.forEach(d => {\n      d[startAs] = indexData[0][startAs];\n      d[endAs] = indexData[0][endAs];\n      d[valueField] = indexData[0][valueField];\n    });\n    return result;\n  }\n\n  // 3. 其他常规情况\n  // 先获取当前的起始值/结束值应当是多少\n  // 按照第一个总计数据的配置来决定\n  const totalConfigData = _totalTemp[0];\n  // eslint-disable-next-line prefer-const\n  let { start, end } = getTotalStartEnd(totalConfigData, total, totalData, temp, totalSpec);\n  total.start = start;\n  total.end = end;\n  // 当前剩余的总计值\n  let valueTemp = end - start;\n  // 将非总计数据进行堆叠\n  _normalTemp.forEach(d => {\n    d[startAs] = +start;\n    d[endAs] = precisionAdd(d[startAs], +d[valueField]);\n    start = d[endAs];\n    valueTemp = precisionSub(valueTemp, +d[valueField]);\n  });\n  // 先在的start end 就是 total 的\n  _totalTemp.forEach(d => {\n    d[startAs] = +start;\n    d[endAs] = precisionAdd(d[startAs], valueTemp);\n    d[valueField] = valueTemp;\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction computeNormalData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt\n) {\n  const { valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName } = op;\n  indexData.forEach(d => {\n    let isTotalTag = false;\n    if (!totalSpec || totalSpec.type === 'end') {\n      if (index === indexValues.length - 1) {\n        total.start = 0;\n        d[startAs] = total.start;\n        d[endAs] = total.end;\n        isTotalTag = true;\n      }\n    } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n      const tag = d[totalSpec.tagField];\n      if (tag) {\n        isTotalTag = true;\n        const { start, end } = getTotalStartEnd(d, total, totalData, temp, totalSpec);\n        d[startAs] = start;\n        d[endAs] = end;\n        d[valueField] = end - start;\n        total.start = start;\n        total.end = end;\n      }\n    }\n    if (!isTotalTag) {\n      d[startAs] = +total.end;\n      d[endAs] = precisionAdd(d[startAs], +d[valueField]);\n      total.end = d[endAs];\n    }\n    total.isTotal = isTotalTag;\n\n    if (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) {\n      if (isTotalTag) {\n        d[WaterfallDefaultSeriesField] = seriesFieldName.total;\n      } else {\n        d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;\n      }\n    }\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction getTotalStartEnd(\n  d: Datum,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string },\n  totalSpec: IWaterfallOpt['total']\n) {\n  if (!totalSpec || totalSpec.type === 'end') {\n    return getTotalInEndType(total);\n  } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n    if (totalSpec.type === 'custom') {\n      return getTotalInCustomType(d, temp, totalSpec);\n    }\n    // 如果有设置count， valueField 和 startField 无效\n    if (totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField])) {\n      return getTotalInCollectField(d, totalData, total, totalSpec);\n    }\n    return getTotalInField(d, total, totalSpec);\n  }\n  return { start: 0, end: 0 };\n}\n\nfunction getTotalInEndType(total: TotalInfo) {\n  return { start: 0, end: total.end };\n}\n\nfunction getTotalInCustomType(\n  d: Datum,\n  temp: { start: number; end: number; lastIndex: string },\n  totalSpec: IWaterfallOpt['total']\n) {\n  return (<IWaterfallTotalCustom>totalSpec).product(d, temp);\n}\n\nfunction getTotalInCollectField(d: Datum, totalData: TotalInfo[], total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  const startIndex = totalData.length - +d[totalSpec.collectCountField];\n  const endIndex = totalData.length - 1;\n  if (startIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    start = totalData[startIndex].start;\n  }\n  if (endIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    end = totalData[endIndex].end;\n  }\n  return { start, end };\n}\n\nfunction getTotalInField(d: Datum, total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  if (totalSpec.startField && !isNil(d[totalSpec.startField])) {\n    start = +d[totalSpec.startField];\n  }\n  if (totalSpec.valueField && !isNil(d[totalSpec.valueField])) {\n    end = precisionAdd(start, +d[totalSpec.valueField]);\n  }\n  return { start, end };\n}\n\nexport interface IWaterfallFillEndOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  total: IWaterfallSeriesSpec['total'];\n}\n\nexport const waterfallFillTotal = (data: Array<Datum>, op: IWaterfallFillEndOpt) => {\n  if (!data) {\n    return data;\n  }\n  const { indexField, valueField, total, seriesField } = op;\n  const totalData = {\n    [indexField]: total?.text || 'total',\n    [valueField]: data.reduce((pre, cur) => precisionAdd(pre, +cur[valueField]), 0)\n  };\n  if (seriesField) {\n    totalData[seriesField] = 'total';\n  }\n  data.push(totalData);\n  return data;\n};\n"]}

package/esm/interaction/interaction.d.ts

@@ -3,9 +3,12 @@ import type { IElement } from '@visactor/vgrammar-core';
 import type { BaseEventParams } from '../event/interface';
 import type { IMark } from '../mark/interface';
 import type { IInteraction } from './interface';
+import type { IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core';
 export declare class Interaction implements IInteraction {
     private _stateMarks;
     private _stateElements;
+    private _vgrammarInteractions;
+    addVgrammarInteraction(state: StateValue, i: IVGrammarInteraction): void;
     static markStateEnable(mark: IMark, state: string): boolean;
     private _disableTriggerEvent;
     setDisableActiveEffect(disable: boolean): void;
@@ -19,4 +22,6 @@ export declare class Interaction implements IInteraction {
     addEventElement(stateValue: StateValue, element: IElement): void;
     clearEventElement(stateValue: StateValue, clearReverse: boolean): void;
     reverseEventElement(stateValue: StateValue): void;
+    startInteraction(stateValue: StateValue, element: IElement): void;
+    resetInteraction(stateValue: StateValue, element: IElement): void;
 }

package/esm/interaction/interaction.js

@@ -4,7 +4,11 @@ import { stateToReverse } from "../compile/mark/util";
 
 export class Interaction {
     constructor() {
-        this._stateMarks = new Map, this._stateElements = new Map, this._disableTriggerEvent = !1;
+        this._stateMarks = new Map, this._stateElements = new Map, this._vgrammarInteractions = new Map, 
+        this._disableTriggerEvent = !1;
+    }
+    addVgrammarInteraction(state, i) {
+        this._vgrammarInteractions.get(state) ? this._vgrammarInteractions.get(state).push(i) : this._vgrammarInteractions.set(state, [ i ]);
     }
     static markStateEnable(mark, state) {
         return !isEmpty(mark.stateStyle[state]);
@@ -82,5 +86,17 @@ export class Interaction {
             }));
         })));
     }
+    startInteraction(stateValue, element) {
+        const interactions = this._vgrammarInteractions.get(stateValue);
+        interactions && interactions.forEach((vgInteraction => {
+            vgInteraction.start(element);
+        }));
+    }
+    resetInteraction(stateValue, element) {
+        const interactions = this._vgrammarInteractions.get(stateValue);
+        interactions && interactions.forEach((vgInteraction => {
+            vgInteraction.reset(element);
+        }));
+    }
 }
 //# sourceMappingURL=interaction.js.map

package/esm/interaction/interaction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/interaction.ts"],"names":[],"mappings":"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","file":"interaction.js","sourcesContent":["import { isEmpty } from '@visactor/vutils';\nimport type { StateValue } from '../compile/mark';\nimport type { IElement } from '@visactor/vgrammar-core';\nimport type { BaseEventParams } from '../event/interface';\nimport type { IMark } from '../mark/interface';\nimport type { IInteraction } from './interface';\nimport { stateToReverse } from '../compile/mark/util';\n\nexport class Interaction implements IInteraction {\n  // 数据\n  private _stateMarks: Map<StateValue, IMark[]> = new Map();\n  // active\n  private _stateElements: Map<StateValue, IElement[]> = new Map();\n\n  static markStateEnable(mark: IMark, state: string) {\n    return !isEmpty(mark.stateStyle[state]);\n  }\n\n  private _disableTriggerEvent: boolean = false;\n\n  setDisableActiveEffect(disable: boolean) {\n    this._disableTriggerEvent = disable;\n  }\n\n  registerMark(state: StateValue, mark: IMark): void {\n    if (!this._stateMarks.has(state)) {\n      this._stateMarks.set(state, []);\n    }\n    this._stateMarks.get(state)?.push(mark);\n  }\n\n  getStateMark(state: StateValue): IMark[] | null {\n    return this._stateMarks.get(state);\n  }\n\n  filterEventMark(params: BaseEventParams, state: StateValue): boolean {\n    return !!(params.mark && this._stateMarks.get(state)?.includes(params.mark));\n  }\n\n  getEventElement(stateValue: StateValue) {\n    return this._stateElements.get(stateValue) ?? [];\n  }\n\n  getEventElementData(stateValue: StateValue) {\n    return this.getEventElement(stateValue).map(e => e.getDatum());\n  }\n\n  exchangeEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    // reverse\n    const reState = stateToReverse(stateValue);\n    this._stateElements.get(stateValue)?.forEach(e => {\n      e.removeState(stateValue);\n      if (reState) {\n        this.addEventElement(reState, e);\n      }\n    });\n    if (!element.getStates().includes(stateValue)) {\n      element.addState(stateValue);\n      if (reState) {\n        element.removeState(reState);\n      }\n    }\n    this._stateElements.set(stateValue, [element]);\n  }\n\n  removeEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    element.removeState(stateValue);\n    const list = this._stateElements.get(stateValue)?.filter(e => e !== element) ?? [];\n    this._stateElements.set(stateValue, list);\n    // reverse\n    const reState = stateToReverse(stateValue);\n    if (reState) {\n      if (list.length === 0) {\n        // clear reverse\n        this.clearEventElement(reState, false);\n      } else {\n        // add reverse to element\n        this.addEventElement(reState, element);\n      }\n    }\n  }\n\n  addEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    if (!element.getStates().includes(stateValue)) {\n      element.addState(stateValue);\n    }\n    const list = this._stateElements.get(stateValue) ?? [];\n    list.push(element);\n    this._stateElements.set(stateValue, list);\n  }\n\n  clearEventElement(stateValue: StateValue, clearReverse: boolean) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    this._stateElements.get(stateValue)?.forEach(e => {\n      e.removeState(stateValue);\n    });\n    this._stateElements.set(stateValue, []);\n\n    if (clearReverse) {\n      const reState = stateToReverse(stateValue);\n      if (reState) {\n        this.clearEventElement(reState, false);\n      }\n    }\n  }\n\n  /**\n   * 激活交互元素时 进行反选\n   * 需要先将元素添加到已交互状态再使用此方法反选\n   * @param stateValue\n   * @param activeElement\n   * @returns\n   */\n  reverseEventElement(stateValue: StateValue) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    // TODO:直接加默认后缀？or再增加一个map？\n    const state = stateToReverse(stateValue);\n    if (!state) {\n      return;\n    }\n    const marks = this.getStateMark(state);\n    if (!marks) {\n      return;\n    }\n    const activeElements = this.getEventElement(stateValue);\n    if (!activeElements.length) {\n      return;\n    }\n    const currentReverse = this.getEventElement(state);\n    if (!currentReverse.length) {\n      // all\n      // for performance array.include\n      // FIXME: 也许并没有太大必要\n      if (activeElements.length === 1) {\n        marks.forEach(m => {\n          m.getProduct()\n            .elements.filter(e => e !== activeElements[0])\n            .forEach(e => {\n              this.addEventElement(state, e);\n            });\n        });\n      } else {\n        marks.forEach(m => {\n          m.getProduct()\n            .elements.filter(e => !activeElements.includes(e))\n            .forEach(e => {\n              this.addEventElement(state, e);\n            });\n        });\n      }\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/interaction/interaction.ts"],"names":[],"mappings":"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","file":"interaction.js","sourcesContent":["import { isEmpty } from '@visactor/vutils';\nimport type { StateValue } from '../compile/mark';\nimport type { IElement } from '@visactor/vgrammar-core';\nimport type { BaseEventParams } from '../event/interface';\nimport type { IMark } from '../mark/interface';\nimport type { IInteraction } from './interface';\nimport type { IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core';\n\nimport { stateToReverse } from '../compile/mark/util';\n\nexport class Interaction implements IInteraction {\n  // 数据\n  private _stateMarks: Map<StateValue, IMark[]> = new Map();\n  // active\n  private _stateElements: Map<StateValue, IElement[]> = new Map();\n\n  private _vgrammarInteractions: Map<StateValue, IVGrammarInteraction[]> = new Map();\n  addVgrammarInteraction(state: StateValue, i: IVGrammarInteraction) {\n    if (!this._vgrammarInteractions.get(state)) {\n      !this._vgrammarInteractions.set(state, [i]);\n    } else {\n      this._vgrammarInteractions.get(state).push(i);\n    }\n  }\n\n  static markStateEnable(mark: IMark, state: string) {\n    return !isEmpty(mark.stateStyle[state]);\n  }\n\n  private _disableTriggerEvent: boolean = false;\n\n  setDisableActiveEffect(disable: boolean) {\n    this._disableTriggerEvent = disable;\n  }\n\n  registerMark(state: StateValue, mark: IMark): void {\n    if (!this._stateMarks.has(state)) {\n      this._stateMarks.set(state, []);\n    }\n    this._stateMarks.get(state)?.push(mark);\n  }\n\n  getStateMark(state: StateValue): IMark[] | null {\n    return this._stateMarks.get(state);\n  }\n\n  filterEventMark(params: BaseEventParams, state: StateValue): boolean {\n    return !!(params.mark && this._stateMarks.get(state)?.includes(params.mark));\n  }\n\n  getEventElement(stateValue: StateValue) {\n    return this._stateElements.get(stateValue) ?? [];\n  }\n\n  getEventElementData(stateValue: StateValue) {\n    return this.getEventElement(stateValue).map(e => e.getDatum());\n  }\n\n  exchangeEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    // reverse\n    const reState = stateToReverse(stateValue);\n    this._stateElements.get(stateValue)?.forEach(e => {\n      e.removeState(stateValue);\n      if (reState) {\n        this.addEventElement(reState, e);\n      }\n    });\n    if (!element.getStates().includes(stateValue)) {\n      element.addState(stateValue);\n      if (reState) {\n        element.removeState(reState);\n      }\n    }\n    this._stateElements.set(stateValue, [element]);\n  }\n\n  removeEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    element.removeState(stateValue);\n    const list = this._stateElements.get(stateValue)?.filter(e => e !== element) ?? [];\n    this._stateElements.set(stateValue, list);\n    // reverse\n    const reState = stateToReverse(stateValue);\n    if (reState) {\n      if (list.length === 0) {\n        // clear reverse\n        this.clearEventElement(reState, false);\n      } else {\n        // add reverse to element\n        this.addEventElement(reState, element);\n      }\n    }\n  }\n\n  addEventElement(stateValue: StateValue, element: IElement) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    if (!element.getStates().includes(stateValue)) {\n      element.addState(stateValue);\n    }\n    const list = this._stateElements.get(stateValue) ?? [];\n    list.push(element);\n    this._stateElements.set(stateValue, list);\n  }\n\n  clearEventElement(stateValue: StateValue, clearReverse: boolean) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    this._stateElements.get(stateValue)?.forEach(e => {\n      e.removeState(stateValue);\n    });\n    this._stateElements.set(stateValue, []);\n\n    if (clearReverse) {\n      const reState = stateToReverse(stateValue);\n      if (reState) {\n        this.clearEventElement(reState, false);\n      }\n    }\n  }\n\n  /**\n   * 激活交互元素时 进行反选\n   * 需要先将元素添加到已交互状态再使用此方法反选\n   * @param stateValue\n   * @param activeElement\n   * @returns\n   */\n  reverseEventElement(stateValue: StateValue) {\n    if (this._disableTriggerEvent) {\n      return;\n    }\n    // TODO:直接加默认后缀？or再增加一个map？\n    const state = stateToReverse(stateValue);\n    if (!state) {\n      return;\n    }\n    const marks = this.getStateMark(state);\n    if (!marks) {\n      return;\n    }\n    const activeElements = this.getEventElement(stateValue);\n    if (!activeElements.length) {\n      return;\n    }\n    const currentReverse = this.getEventElement(state);\n    if (!currentReverse.length) {\n      // all\n      // for performance array.include\n      // FIXME: 也许并没有太大必要\n      if (activeElements.length === 1) {\n        marks.forEach(m => {\n          m.getProduct()\n            .elements.filter(e => e !== activeElements[0])\n            .forEach(e => {\n              this.addEventElement(state, e);\n            });\n        });\n      } else {\n        marks.forEach(m => {\n          m.getProduct()\n            .elements.filter(e => !activeElements.includes(e))\n            .forEach(e => {\n              this.addEventElement(state, e);\n            });\n        });\n      }\n    }\n  }\n\n  /**\n   * hover/select 交互通过 vgrammar 代理\n   * @param stateValue\n   * @param activeElement\n   * @returns\n   */\n  startInteraction(stateValue: StateValue, element: IElement) {\n    const interactions = this._vgrammarInteractions.get(stateValue);\n    if (interactions) {\n      interactions.forEach(vgInteraction => {\n        vgInteraction.start(element);\n      });\n    }\n  }\n\n  /**\n   * hover/select 交互通过 vgrammar 代理\n   * @param stateValue\n   * @param activeElement\n   * @returns\n   */\n  resetInteraction(stateValue: StateValue, element: IElement) {\n    const interactions = this._vgrammarInteractions.get(stateValue);\n    if (interactions) {\n      interactions.forEach(vgInteraction => {\n        vgInteraction.reset(element);\n      });\n    }\n  }\n}\n"]}

package/esm/interaction/interface.d.ts

@@ -1,4 +1,4 @@
-import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement } from '@visactor/vgrammar-core';
+import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement, IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core';
 import type { IMark } from '../mark/interface';
 import type { RenderMode } from '../typings/spec/common';
 import type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';
@@ -17,6 +17,9 @@ export interface IInteraction {
     clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;
     reverseEventElement: (stateValue: StateValue) => void;
     setDisableActiveEffect: (disable: boolean) => void;
+    addVgrammarInteraction: (state: StateValue, i: IVGrammarInteraction) => void;
+    startInteraction: (state: StateValue, element: IElement) => void;
+    resetInteraction: (state: StateValue, element: IElement) => void;
 }
 export interface ITrigger {
     init: () => void;

package/esm/interaction/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type {\n  ElementActiveByLegendSpec,\n  ElementActiveSpec,\n  ElementHighlightByGroupSpec,\n  ElementHighlightByKeySpec,\n  ElementHighlightByLegendSpec,\n  ElementHighlightByNameSpec,\n  ElementHighlightSpec,\n  ElementSelectSpec,\n  IElement\n} from '@visactor/vgrammar-core';\nimport type { IMark } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';\nimport type { IModel } from '../model/interface';\nimport type { StateValue } from '../compile/mark';\nimport type { StringOrNumber } from '../typings/common';\n\nexport interface IInteraction {\n  registerMark: (state: StateValue, mark: IMark) => void;\n  filterEventMark: (params: BaseEventParams, state: StateValue) => boolean;\n  getStateMark: (state: StateValue) => IMark[] | null;\n\n  getEventElement: (stateValue: StateValue) => IElement[];\n  getEventElementData: (stateValue: StateValue) => any[];\n  addEventElement: (stateValue: StateValue, element: IElement) => void;\n  removeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  exchangeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;\n  reverseEventElement: (stateValue: StateValue) => void;\n\n  setDisableActiveEffect: (disable: boolean) => void;\n}\n\nexport interface ITrigger {\n  init: () => void;\n  setStateKeys: (fields: string[]) => void;\n  registerMark: (mark: IMark) => void;\n  release: () => void;\n  hover?: IHoverSpec;\n  select?: ISelectSpec;\n}\n\nexport interface ITriggerOption {\n  mode: RenderMode;\n  interaction: IInteraction;\n  eventDispatcher: IEventDispatcher;\n  model: IModel;\n}\n\ntype Trigger = EventType | EventType[];\n\nexport type IHoverSpec = {\n  enable?: boolean;\n  trigger?: Trigger;\n  triggerOff?: Trigger;\n};\n\nexport type ISelectSpec = {\n  enable?: boolean;\n  mode?: 'single' | 'multiple';\n  trigger?: Trigger;\n  triggerOff?: Trigger | number;\n};\n\nexport interface ITriggerSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n}\n\ninterface IBaseInteractionSpec {\n  markIds?: StringOrNumber[];\n  markNames?: StringOrNumber[];\n}\n\nexport type IElementActiveSpec = IBaseInteractionSpec &\n  Pick<ElementActiveSpec, 'type' | 'trigger' | 'triggerOff' | 'state'>;\n\nexport type IElementSelectSpec = IBaseInteractionSpec &\n  Pick<ElementSelectSpec, 'type' | 'trigger' | 'triggerOff' | 'state' | 'isMultiple' | 'reverseState'>;\nexport type IElementHighlightSpec = IBaseInteractionSpec &\n  Pick<ElementHighlightSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByKeySpec = IBaseInteractionSpec &\n  Pick<ElementHighlightByKeySpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByGroup = IBaseInteractionSpec &\n  Pick<ElementHighlightByGroupSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementActiveByLegend = IBaseInteractionSpec &\n  Pick<ElementActiveByLegendSpec, 'type' | 'filterType' | 'state'>;\n\nexport type IElementHighlightByLegend = IBaseInteractionSpec &\n  Pick<ElementHighlightByLegendSpec, 'type' | 'filterType' | 'blurState' | 'highlightState'>;\n\nexport type IElementHighlightByName = IBaseInteractionSpec &\n  Pick<ElementHighlightByNameSpec, 'type' | 'blurState' | 'highlightState' | 'graphicName' | 'parseData'>;\n\nexport interface ICustomInteraction extends IBaseInteractionSpec {\n  type: string;\n}\n\nexport type IInteractionItemSpec =\n  | IElementActiveSpec\n  | IElementSelectSpec\n  | IElementHighlightSpec\n  | IElementHighlightByKeySpec\n  | IElementHighlightByGroup\n  | IElementActiveByLegend\n  | IElementHighlightByLegend\n  | IElementHighlightByName;\n\nexport interface IInteractionSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n  interactions?: IInteractionItemSpec[];\n}\n"]}
+{"version":3,"sources":["../src/interaction/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type {\n  ElementActiveByLegendSpec,\n  ElementActiveSpec,\n  ElementHighlightByGroupSpec,\n  ElementHighlightByKeySpec,\n  ElementHighlightByLegendSpec,\n  ElementHighlightByNameSpec,\n  ElementHighlightSpec,\n  ElementSelectSpec,\n  IElement,\n  IInteraction as IVGrammarInteraction\n} from '@visactor/vgrammar-core';\nimport type { IMark } from '../mark/interface';\nimport type { RenderMode } from '../typings/spec/common';\nimport type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';\nimport type { IModel } from '../model/interface';\nimport type { StateValue } from '../compile/mark';\nimport type { StringOrNumber } from '../typings/common';\n\nexport interface IInteraction {\n  registerMark: (state: StateValue, mark: IMark) => void;\n  filterEventMark: (params: BaseEventParams, state: StateValue) => boolean;\n  getStateMark: (state: StateValue) => IMark[] | null;\n\n  getEventElement: (stateValue: StateValue) => IElement[];\n  getEventElementData: (stateValue: StateValue) => any[];\n  addEventElement: (stateValue: StateValue, element: IElement) => void;\n  removeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  exchangeEventElement: (stateValue: StateValue, elements: IElement) => void;\n  clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void;\n  reverseEventElement: (stateValue: StateValue) => void;\n\n  setDisableActiveEffect: (disable: boolean) => void;\n  addVgrammarInteraction: (state: StateValue, i: IVGrammarInteraction) => void;\n  startInteraction: (state: StateValue, element: IElement) => void;\n  resetInteraction: (state: StateValue, element: IElement) => void;\n}\n\nexport interface ITrigger {\n  init: () => void;\n  setStateKeys: (fields: string[]) => void;\n  registerMark: (mark: IMark) => void;\n  release: () => void;\n  hover?: IHoverSpec;\n  select?: ISelectSpec;\n}\n\nexport interface ITriggerOption {\n  mode: RenderMode;\n  interaction: IInteraction;\n  eventDispatcher: IEventDispatcher;\n  model: IModel;\n}\n\ntype Trigger = EventType | EventType[];\n\nexport type IHoverSpec = {\n  enable?: boolean;\n  trigger?: Trigger;\n  triggerOff?: Trigger;\n};\n\nexport type ISelectSpec = {\n  enable?: boolean;\n  mode?: 'single' | 'multiple';\n  trigger?: Trigger;\n  triggerOff?: Trigger | number;\n};\n\nexport interface ITriggerSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n}\n\ninterface IBaseInteractionSpec {\n  markIds?: StringOrNumber[];\n  markNames?: StringOrNumber[];\n}\n\nexport type IElementActiveSpec = IBaseInteractionSpec &\n  Pick<ElementActiveSpec, 'type' | 'trigger' | 'triggerOff' | 'state'>;\n\nexport type IElementSelectSpec = IBaseInteractionSpec &\n  Pick<ElementSelectSpec, 'type' | 'trigger' | 'triggerOff' | 'state' | 'isMultiple' | 'reverseState'>;\nexport type IElementHighlightSpec = IBaseInteractionSpec &\n  Pick<ElementHighlightSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByKeySpec = IBaseInteractionSpec &\n  Pick<ElementHighlightByKeySpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementHighlightByGroup = IBaseInteractionSpec &\n  Pick<ElementHighlightByGroupSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;\n\nexport type IElementActiveByLegend = IBaseInteractionSpec &\n  Pick<ElementActiveByLegendSpec, 'type' | 'filterType' | 'state'>;\n\nexport type IElementHighlightByLegend = IBaseInteractionSpec &\n  Pick<ElementHighlightByLegendSpec, 'type' | 'filterType' | 'blurState' | 'highlightState'>;\n\nexport type IElementHighlightByName = IBaseInteractionSpec &\n  Pick<ElementHighlightByNameSpec, 'type' | 'blurState' | 'highlightState' | 'graphicName' | 'parseData'>;\n\nexport interface ICustomInteraction extends IBaseInteractionSpec {\n  type: string;\n}\n\nexport type IInteractionItemSpec =\n  | IElementActiveSpec\n  | IElementSelectSpec\n  | IElementHighlightSpec\n  | IElementHighlightByKeySpec\n  | IElementHighlightByGroup\n  | IElementActiveByLegend\n  | IElementHighlightByLegend\n  | IElementHighlightByName;\n\nexport interface IInteractionSpec {\n  hover?: IHoverSpec | boolean;\n  select?: ISelectSpec | boolean;\n  interactions?: IInteractionItemSpec[];\n}\n"]}

package/esm/series/bar/bar.js

@@ -349,7 +349,7 @@ export class BarSeries extends CartesianSeries {
         width;
     }
     _getPosition(direction, datum, scaleDepth, mark) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         let axisHelper, sizeAttribute, dataToPosition;
         "horizontal" === direction ? (axisHelper = this.getYAxisHelper(), sizeAttribute = "height", 
         dataToPosition = "barBackground" === mark ? this.dataToBarBackgroundPositionY.bind(this) : this.dataToPositionY.bind(this)) : (axisHelper = this.getXAxisHelper(), 
@@ -359,7 +359,7 @@ export class BarSeries extends CartesianSeries {
             const groupFields = this._groups.fields, barInGroup = array(this._spec.barGapInGroup);
             let totalWidth = 0, offSet = 0;
             for (let index = groupFields.length - 1; index >= 1; index--) {
-                const groupField = groupFields[index], groupValues = null !== (_f = null === (_e = null === (_d = null === (_c = this.getViewDataStatistics()) || void 0 === _c ? void 0 : _c.latestData) || void 0 === _d ? void 0 : _d[groupField]) || void 0 === _e ? void 0 : _e.values) && void 0 !== _f ? _f : [], groupCount = groupValues.length, gap = getActualNumValue(null !== (_g = barInGroup[index - 1]) && void 0 !== _g ? _g : last(barInGroup), bandWidth), i = groupValues.indexOf(datum[groupField]);
+                const groupField = groupFields[index], groupValues = null !== (_d = null === (_c = axisHelper.getScale(index)) || void 0 === _c ? void 0 : _c.domain()) && void 0 !== _d ? _d : [], groupCount = groupValues.length, gap = getActualNumValue(null !== (_e = barInGroup[index - 1]) && void 0 !== _e ? _e : last(barInGroup), bandWidth), i = groupValues.indexOf(datum[groupField]);
                 index === groupFields.length - 1 ? (totalWidth += groupCount * size + (groupCount - 1) * gap, 
                 offSet += i * (size + gap)) : (offSet += i * (totalWidth + gap), totalWidth += totalWidth + (groupCount - 1) * gap);
             }