@visactor/vgrammar-core 0.9.3 → 0.9.5-alpha.0

package/es/interactions/element-active-by-legend.js

@@ -6,14 +6,18 @@ import { LegendEvent } from "@visactor/vrender-components";
 
 import { isNil } from "@visactor/vutils";
 
+import { generateFilterValue } from "./utils";
+
 export class ElementActiveByLegend extends BaseInteraction {
     constructor(view, options) {
         super(view, options), this.type = ElementActiveByLegend.type, this.handleStart = (e, element) => {
             var _a, _b;
             const itemKey = null === (_b = null === (_a = e.detail) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b.id;
-            isNil(itemKey) || this._marks.forEach((mark => {
+            if (isNil(itemKey)) return;
+            const filterValue = generateFilterValue(this.options);
+            this._marks.forEach((mark => {
                 mark.elements.forEach((el => {
-                    el[this.options.filterType] === itemKey ? el.addState(this.options.state) : el.removeState(this.options.state);
+                    filterValue(el) === itemKey ? el.addState(this.options.state) : el.removeState(this.options.state);
                 }));
             }));
         }, this.handleReset = e => {

package/es/interactions/element-active-by-legend.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-active-by-legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,OAAO,qBAAsB,SAAQ,eAA6C;IAWtF,YAAY,IAAW,EAAE,OAAsC;QAC7D,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAVvB,SAAI,GAAW,qBAAqB,CAAC,IAAI,CAAC;QA6B1C,gBAAW,GAAG,CAAC,CAAmB,EAAE,OAAiC,EAAE,EAAE;;YACvE,MAAM,OAAO,GAAG,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,0CAAE,EAAE,CAAC;YAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;gBAClB,OAAO;aACR;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC;oBAEzD,IAAI,QAAQ,EAAE;wBACZ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACjC;yBAAM;wBACL,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACnC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QA9CA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEhF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAES,SAAS;QACjB,OAAO;YACL;gBACE,IAAI,EAAE,WAAW,CAAC,eAAe;gBACjC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;YACD;gBACE,IAAI,EAAE,WAAW,CAAC,iBAAiB;gBACnC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;SACF,CAAC;IACJ,CAAC;;AA5BM,0BAAI,GAAW,0BAA0B,CAAC;AAG1C,oCAAc,GAAiC;IACpD,KAAK,EAAE,oBAAoB,CAAC,MAAM;IAClC,UAAU,EAAE,UAAU;CACvB,CAAC","file":"element-active-by-legend.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementActiveByLegendOptions, IElement, IGlyphElement, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\nimport { LegendEvent } from '@visactor/vrender-components';\nimport { isNil } from '@visactor/vutils';\n\nexport class ElementActiveByLegend extends BaseInteraction<ElementActiveByLegendOptions> {\n  static type: string = 'element-active-by-legend';\n  type: string = ElementActiveByLegend.type;\n\n  static defaultOptions: ElementActiveByLegendOptions = {\n    state: InteractionStateEnum.active,\n    filterType: 'groupKey'\n  };\n  options: ElementActiveByLegendOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementActiveByLegendOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementActiveByLegend.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: LegendEvent.legendItemHover,\n        handler: this.handleStart\n      },\n      {\n        type: LegendEvent.legendItemUnHover,\n        handler: this.handleReset\n      }\n    ];\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const itemKey = e.detail?.data?.id;\n\n    if (isNil(itemKey)) {\n      return;\n    }\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        const isActive = el[this.options.filterType] === itemKey;\n\n        if (isActive) {\n          el.addState(this.options.state);\n        } else {\n          el.removeState(this.options.state);\n        }\n      });\n    });\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (el.hasState(this.options.state)) {\n          el.removeState(this.options.state);\n        }\n      });\n    });\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-active-by-legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,OAAO,qBAAsB,SAAQ,eAA6C;IAWtF,YAAY,IAAW,EAAE,OAAsC;QAC7D,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAVvB,SAAI,GAAW,qBAAqB,CAAC,IAAI,CAAC;QA6B1C,gBAAW,GAAG,CAAC,CAAmB,EAAE,OAAiC,EAAE,EAAE;;YACvE,MAAM,OAAO,GAAG,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,0CAAE,EAAE,CAAC;YAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;gBAClB,OAAO;aACR;YAED,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;oBAE7C,IAAI,QAAQ,EAAE;wBACZ,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACjC;yBAAM;wBACL,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACnC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAhDA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEhF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAES,SAAS;QACjB,OAAO;YACL;gBACE,IAAI,EAAE,WAAW,CAAC,eAAe;gBACjC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;YACD;gBACE,IAAI,EAAE,WAAW,CAAC,iBAAiB;gBACnC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;SACF,CAAC;IACJ,CAAC;;AA5BM,0BAAI,GAAW,0BAA0B,CAAC;AAG1C,oCAAc,GAAiC;IACpD,KAAK,EAAE,oBAAoB,CAAC,MAAM;IAClC,UAAU,EAAE,UAAU;CACvB,CAAC","file":"element-active-by-legend.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementActiveByLegendOptions, IElement, IGlyphElement, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\nimport { LegendEvent } from '@visactor/vrender-components';\nimport { isNil } from '@visactor/vutils';\nimport { generateFilterValue } from './utils';\n\nexport class ElementActiveByLegend extends BaseInteraction<ElementActiveByLegendOptions> {\n  static type: string = 'element-active-by-legend';\n  type: string = ElementActiveByLegend.type;\n\n  static defaultOptions: ElementActiveByLegendOptions = {\n    state: InteractionStateEnum.active,\n    filterType: 'groupKey'\n  };\n  options: ElementActiveByLegendOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementActiveByLegendOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementActiveByLegend.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: LegendEvent.legendItemHover,\n        handler: this.handleStart\n      },\n      {\n        type: LegendEvent.legendItemUnHover,\n        handler: this.handleReset\n      }\n    ];\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const itemKey = e.detail?.data?.id;\n\n    if (isNil(itemKey)) {\n      return;\n    }\n\n    const filterValue = generateFilterValue(this.options);\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        const isActive = filterValue(el) === itemKey;\n\n        if (isActive) {\n          el.addState(this.options.state);\n        } else {\n          el.removeState(this.options.state);\n        }\n      });\n    });\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (el.hasState(this.options.state)) {\n          el.removeState(this.options.state);\n        }\n      });\n    });\n  };\n}\n"]}

package/es/interactions/element-active.d.ts

@@ -8,7 +8,7 @@ export declare class ElementActive extends BaseInteraction<ElementActiveOptions>
     protected _marks?: IMark[];
     constructor(view: IView, options?: ElementActiveOptions);
     protected getEvents(): {
-        type: import("../types").EventType;
+        type: import("../types").EventType | import("../types").EventType[];
         handler: (e: InteractionEvent) => void;
     }[];
     handleStart: (e: InteractionEvent) => void;

package/es/interactions/element-highlight-by-legend.js

@@ -6,15 +6,18 @@ import { LegendEvent } from "@visactor/vrender-components";
 
 import { isNil } from "@visactor/vutils";
 
+import { generateFilterValue } from "./utils";
+
 export class ElementHighlightByLegend extends BaseInteraction {
     constructor(view, options) {
         super(view, options), this.type = ElementHighlightByLegend.type, this.handleStart = (e, element) => {
             var _a, _b;
             const itemKey = null === (_b = null === (_a = e.detail) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b.id;
-            isNil(itemKey) || this._marks.forEach((mark => {
+            if (isNil(itemKey)) return;
+            const filterValue = generateFilterValue(this.options);
+            this._marks.forEach((mark => {
                 mark.elements.forEach((el => {
-                    el[this.options.filterType] === itemKey ? (el.removeState(this.options.blurState), 
-                    el.addState(this.options.highlightState)) : (el.removeState(this.options.highlightState), 
+                    filterValue(el) === itemKey ? (el.removeState(this.options.blurState), el.addState(this.options.highlightState)) : (el.removeState(this.options.highlightState), 
                     el.addState(this.options.blurState));
                 }));
             }));

package/es/interactions/element-highlight-by-legend.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-highlight-by-legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAStD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,OAAO,wBAAyB,SAAQ,eAAgD;IAY5F,YAAY,IAAW,EAAE,OAAyC;QAChE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAXvB,SAAI,GAAW,wBAAwB,CAAC,IAAI,CAAC;QA2B7C,gBAAW,GAAG,CAAC,CAAmB,EAAE,OAAiC,EAAE,EAAE;;YACvE,MAAM,OAAO,GAAG,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,0CAAE,EAAE,CAAC;YAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;gBAClB,OAAO;aACR;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,MAAM,WAAW,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC;oBAE5D,IAAI,WAAW,EAAE;wBACf,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBACvC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;qBAC1C;yBAAM;wBACL,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;wBAC5C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;qBACrC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACvC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QA5CA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wBAAwB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEnF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAES,SAAS;QACjB,OAAO;YACL;gBACE,IAAI,EAAE,WAAW,CAAC,eAAe;gBACjC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;YACD,EAAE,IAAI,EAAE,WAAW,CAAC,iBAAiB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE;SACnE,CAAC;IACJ,CAAC;;AA1BM,6BAAI,GAAW,6BAA6B,CAAC;AAG7C,uCAAc,GAAoC;IACvD,cAAc,EAAE,oBAAoB,CAAC,SAAS;IAC9C,SAAS,EAAE,oBAAoB,CAAC,IAAI;IACpC,UAAU,EAAE,UAAU;CACvB,CAAC","file":"element-highlight-by-legend.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementHighlightByLegendOptions,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { BaseInteraction } from './base';\nimport { LegendEvent } from '@visactor/vrender-components';\nimport { isNil } from '@visactor/vutils';\n\nexport class ElementHighlightByLegend extends BaseInteraction<ElementHighlightByLegendOptions> {\n  static type: string = 'element-highlight-by-legend';\n  type: string = ElementHighlightByLegend.type;\n\n  static defaultOptions: ElementHighlightByLegendOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    filterType: 'groupKey'\n  };\n  options: ElementHighlightByLegendOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementHighlightByLegendOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlightByLegend.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: LegendEvent.legendItemHover,\n        handler: this.handleStart\n      },\n      { type: LegendEvent.legendItemUnHover, handler: this.handleReset }\n    ];\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const itemKey = e.detail?.data?.id;\n\n    if (isNil(itemKey)) {\n      return;\n    }\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        const isHighlight = el[this.options.filterType] === itemKey;\n\n        if (isHighlight) {\n          el.removeState(this.options.blurState);\n          el.addState(this.options.highlightState);\n        } else {\n          el.removeState(this.options.highlightState);\n          el.addState(this.options.blurState);\n        }\n      });\n    });\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        el.removeState(this.options.blurState);\n        el.removeState(this.options.highlightState);\n      });\n    });\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-highlight-by-legend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAStD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,OAAO,wBAAyB,SAAQ,eAAgD;IAY5F,YAAY,IAAW,EAAE,OAAyC;QAChE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAXvB,SAAI,GAAW,wBAAwB,CAAC,IAAI,CAAC;QA2B7C,gBAAW,GAAG,CAAC,CAAmB,EAAE,OAAiC,EAAE,EAAE;;YACvE,MAAM,OAAO,GAAG,MAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,IAAI,0CAAE,EAAE,CAAC;YAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;gBAClB,OAAO;aACR;YACD,MAAM,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,MAAM,WAAW,GAAG,WAAW,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC;oBAEhD,IAAI,WAAW,EAAE;wBACf,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBACvC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;qBAC1C;yBAAM;wBACL,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;wBAC5C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;qBACrC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,CAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACzB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACzB,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACvC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QA7CA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wBAAwB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEnF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAES,SAAS;QACjB,OAAO;YACL;gBACE,IAAI,EAAE,WAAW,CAAC,eAAe;gBACjC,OAAO,EAAE,IAAI,CAAC,WAAW;aAC1B;YACD,EAAE,IAAI,EAAE,WAAW,CAAC,iBAAiB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE;SACnE,CAAC;IACJ,CAAC;;AA1BM,6BAAI,GAAW,6BAA6B,CAAC;AAG7C,uCAAc,GAAoC;IACvD,cAAc,EAAE,oBAAoB,CAAC,SAAS;IAC9C,SAAS,EAAE,oBAAoB,CAAC,IAAI;IACpC,UAAU,EAAE,UAAU;CACvB,CAAC","file":"element-highlight-by-legend.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementHighlightByLegendOptions,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { BaseInteraction } from './base';\nimport { LegendEvent } from '@visactor/vrender-components';\nimport { isNil } from '@visactor/vutils';\nimport { generateFilterValue } from './utils';\n\nexport class ElementHighlightByLegend extends BaseInteraction<ElementHighlightByLegendOptions> {\n  static type: string = 'element-highlight-by-legend';\n  type: string = ElementHighlightByLegend.type;\n\n  static defaultOptions: ElementHighlightByLegendOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    filterType: 'groupKey'\n  };\n  options: ElementHighlightByLegendOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementHighlightByLegendOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlightByLegend.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: LegendEvent.legendItemHover,\n        handler: this.handleStart\n      },\n      { type: LegendEvent.legendItemUnHover, handler: this.handleReset }\n    ];\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const itemKey = e.detail?.data?.id;\n\n    if (isNil(itemKey)) {\n      return;\n    }\n    const filterValue = generateFilterValue(this.options);\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        const isHighlight = filterValue(el) === itemKey;\n\n        if (isHighlight) {\n          el.removeState(this.options.blurState);\n          el.addState(this.options.highlightState);\n        } else {\n          el.removeState(this.options.highlightState);\n          el.addState(this.options.blurState);\n        }\n      });\n    });\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        el.removeState(this.options.blurState);\n        el.removeState(this.options.highlightState);\n      });\n    });\n  };\n}\n"]}

package/es/interactions/element-highlight-by-name.js

@@ -4,16 +4,18 @@ import { BaseInteraction } from "./base";
 
 import { array, isNil } from "@visactor/vutils";
 
+import { generateFilterValue } from "./utils";
+
 export class ElementHighlightByName extends BaseInteraction {
     constructor(view, options) {
         super(view, options), this.type = ElementHighlightByName.type, this.handleStart = (e, element) => {
             if (this.options.shouldStart ? this.options.shouldStart(e) : this._filterByName(e)) {
                 const itemKey = this._parseTargetKey(e, element);
                 if (isNil(itemKey)) return;
+                const filterValue = generateFilterValue(this.options);
                 this._marks.forEach((mark => {
                     mark.elements.forEach((el => {
-                        el[this.options.filterType] === itemKey ? (el.removeState(this.options.blurState), 
-                        el.addState(this.options.highlightState)) : (el.removeState(this.options.highlightState), 
+                        filterValue(el) === itemKey ? (el.removeState(this.options.blurState), el.addState(this.options.highlightState)) : (el.removeState(this.options.highlightState), 
                         el.addState(this.options.blurState));
                     }));
                 }));
@@ -38,7 +40,7 @@ export class ElementHighlightByName extends BaseInteraction {
     }
     _filterByName(e) {
         var _a;
-        const names = array(this.options.name);
+        const names = array(this.options.graphicName);
         return (null === (_a = null == e ? void 0 : e.target) || void 0 === _a ? void 0 : _a.name) && names.includes(e.target.name);
     }
     _parseTargetKey(e, element) {

package/es/interactions/element-highlight-by-name.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-highlight-by-name.ts"],"names":[],"mappings":"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","file":"element-highlight-by-name.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementHighlightByNameOptions, IElement, IGlyphElement, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\nimport { array, isNil } from '@visactor/vutils';\n\nexport class ElementHighlightByName extends BaseInteraction<ElementHighlightByNameOptions> {\n  static type: string = 'element-highlight-by-name';\n  type: string = ElementHighlightByName.type;\n\n  static defaultOptions: ElementHighlightByNameOptions = {\n    trigger: 'pointerover',\n    resetTrigger: 'pointerout',\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    filterType: 'groupKey'\n  };\n  options: ElementHighlightByNameOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementHighlightByNameOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlightByName.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      },\n      { type: this.options.resetTrigger, handler: this.handleReset }\n    ];\n  }\n\n  protected _filterByName(e: InteractionEvent) {\n    const names = array(this.options.name);\n    return e?.target?.name && names.includes(e.target.name);\n  }\n\n  protected _parseTargetKey(e: InteractionEvent, element: IElement | IGlyphElement) {\n    return this.options.parseData\n      ? this.options.parseData(e)\n      : e.target.type === 'text'\n      ? (e.target.attribute as any).text\n      : null;\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const shoudStart = this.options.shouldStart ? this.options.shouldStart(e) : this._filterByName(e);\n    if (shoudStart) {\n      const itemKey = this._parseTargetKey(e, element);\n\n      if (isNil(itemKey)) {\n        return;\n      }\n\n      this._marks.forEach(mark => {\n        mark.elements.forEach(el => {\n          const isHighlight = el[this.options.filterType] === itemKey;\n          if (isHighlight) {\n            el.removeState(this.options.blurState);\n            el.addState(this.options.highlightState);\n          } else {\n            el.removeState(this.options.highlightState);\n            el.addState(this.options.blurState);\n          }\n        });\n      });\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const shoudReset = this.options.shouldReset ? this.options.shouldReset(e) : this._filterByName(e);\n\n    if (shoudReset) {\n      this._marks.forEach(mark => {\n        mark.elements.forEach(el => {\n          el.removeState(this.options.blurState);\n          el.removeState(this.options.highlightState);\n        });\n      });\n    }\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-highlight-by-name.ts"],"names":[],"mappings":"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","file":"element-highlight-by-name.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementHighlightByNameOptions, IElement, IGlyphElement, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\nimport { array, isNil } from '@visactor/vutils';\nimport { generateFilterValue } from './utils';\n\nexport class ElementHighlightByName extends BaseInteraction<ElementHighlightByNameOptions> {\n  static type: string = 'element-highlight-by-name';\n  type: string = ElementHighlightByName.type;\n\n  static defaultOptions: ElementHighlightByNameOptions = {\n    trigger: 'pointerover',\n    resetTrigger: 'pointerout',\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    filterType: 'groupKey'\n  };\n  options: ElementHighlightByNameOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementHighlightByNameOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlightByName.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      },\n      { type: this.options.resetTrigger, handler: this.handleReset }\n    ];\n  }\n\n  protected _filterByName(e: InteractionEvent) {\n    const names = array(this.options.graphicName);\n    return e?.target?.name && names.includes(e.target.name);\n  }\n\n  protected _parseTargetKey(e: InteractionEvent, element: IElement | IGlyphElement) {\n    return this.options.parseData\n      ? this.options.parseData(e)\n      : e.target.type === 'text'\n      ? (e.target.attribute as any).text\n      : null;\n  }\n\n  handleStart = (e: InteractionEvent, element: IElement | IGlyphElement) => {\n    const shoudStart = this.options.shouldStart ? this.options.shouldStart(e) : this._filterByName(e);\n    if (shoudStart) {\n      const itemKey = this._parseTargetKey(e, element);\n\n      if (isNil(itemKey)) {\n        return;\n      }\n\n      const filterValue = generateFilterValue(this.options);\n\n      this._marks.forEach(mark => {\n        mark.elements.forEach(el => {\n          const isHighlight = filterValue(el) === itemKey;\n          if (isHighlight) {\n            el.removeState(this.options.blurState);\n            el.addState(this.options.highlightState);\n          } else {\n            el.removeState(this.options.highlightState);\n            el.addState(this.options.blurState);\n          }\n        });\n      });\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const shoudReset = this.options.shouldReset ? this.options.shouldReset(e) : this._filterByName(e);\n\n    if (shoudReset) {\n      this._marks.forEach(mark => {\n        mark.elements.forEach(el => {\n          el.removeState(this.options.blurState);\n          el.removeState(this.options.highlightState);\n        });\n      });\n    }\n  };\n}\n"]}

package/es/interactions/element-highlight.d.ts

@@ -1,4 +1,4 @@
-import type { ElementHighlightOptions, IMark, IView, InteractionEvent } from '../types';
+import type { ElementHighlightOptions, IElement, IMark, IView, InteractionEvent } from '../types';
 import { BaseInteraction } from './base';
 export declare class ElementHighlight extends BaseInteraction<ElementHighlightOptions> {
     static type: string;
@@ -6,6 +6,8 @@ export declare class ElementHighlight extends BaseInteraction<ElementHighlightOp
     static defaultOptions: ElementHighlightOptions;
     options: ElementHighlightOptions;
     protected _marks?: IMark[];
+    protected _lastElement?: IElement;
+    protected _hasBlur?: boolean;
     constructor(view: IView, options?: ElementHighlightOptions);
     protected getEvents(): {
         type: import("../types").EventType;

package/es/interactions/element-highlight.js

@@ -5,12 +5,21 @@ import { BaseInteraction } from "./base";
 export class ElementHighlight extends BaseInteraction {
     constructor(view, options) {
         super(view, options), this.type = ElementHighlight.type, this.handleStart = e => {
-            e.element && this._marks && this._marks.includes(e.element.mark) && this._marks.forEach((mark => {
-                mark.elements.forEach((el => {
-                    el === e.element ? (el.removeState(this.options.blurState), el.addState(this.options.highlightState)) : (el.removeState(this.options.highlightState), 
-                    el.addState(this.options.blurState));
-                }));
-            }));
+            if (e.element && this._marks && this._marks.includes(e.element.mark)) {
+                const {highlightState: highlightState, blurState: blurState} = this.options;
+                if (this._lastElement === e.element) return;
+                if (this._lastElement && this._hasBlur) this._lastElement.removeState(highlightState), 
+                this._lastElement.addState(blurState), e.element.removeState(blurState), e.element.addState(highlightState); else {
+                    let hasBlur = !1;
+                    this._marks.forEach((mark => {
+                        mark.elements.forEach((el => {
+                            el === e.element ? (el.removeState(blurState), el.addState(highlightState)) : (el.removeState(highlightState), 
+                            hasBlur = el.addState(blurState), hasBlur && (this._hasBlur = !0));
+                        }));
+                    }));
+                }
+                this._lastElement = e.element;
+            } else this._lastElement && this.clearPrevElements();
         }, this.handleReset = e => {
             e.element && this._marks && this._marks.includes(e.element.mark) && this.clearPrevElements();
         }, this.options = Object.assign({}, ElementHighlight.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
@@ -25,12 +34,13 @@ export class ElementHighlight extends BaseInteraction {
         } ];
     }
     clearPrevElements() {
+        const {highlightState: highlightState, blurState: blurState} = this.options;
         this._marks.forEach((mark => {
             mark.elements.forEach((el => {
-                el.hasState(this.options.highlightState) && el.removeState(this.options.highlightState), 
-                el.hasState(this.options.blurState) && el.removeState(this.options.blurState);
+                highlightState && el.hasState(highlightState) && el.removeState(highlightState), 
+                blurState && el.hasState(blurState) && el.removeState(blurState);
             }));
-        }));
+        })), this._lastElement = null, this._hasBlur = !1;
     }
 }
 

package/es/interactions/element-highlight.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-highlight.ts"],"names":[],"mappings":"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","file":"element-highlight.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementHighlightOptions, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\n\nexport class ElementHighlight extends BaseInteraction<ElementHighlightOptions> {\n  static type: string = 'element-highlight';\n  type: string = ElementHighlight.type;\n\n  static defaultOptions: ElementHighlightOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    trigger: 'pointerover',\n    resetTrigger: 'pointerout'\n  };\n  options: ElementHighlightOptions;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementHighlightOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlight.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      },\n      { type: this.options.resetTrigger, handler: this.handleReset }\n    ];\n  }\n\n  clearPrevElements() {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (el.hasState(this.options.highlightState)) {\n          el.removeState(this.options.highlightState);\n        }\n\n        if (el.hasState(this.options.blurState)) {\n          el.removeState(this.options.blurState);\n        }\n      });\n    });\n  }\n\n  handleStart = (e: InteractionEvent) => {\n    if (e.element && this._marks && this._marks.includes(e.element.mark)) {\n      this._marks.forEach(mark => {\n        mark.elements.forEach(el => {\n          const isHighlight = el === e.element;\n\n          if (isHighlight) {\n            el.removeState(this.options.blurState);\n            el.addState(this.options.highlightState);\n          } else {\n            el.removeState(this.options.highlightState);\n            el.addState(this.options.blurState);\n          }\n        });\n      });\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const hasActiveElement = e.element && this._marks && this._marks.includes(e.element.mark);\n\n    if (hasActiveElement) {\n      this.clearPrevElements();\n    }\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-highlight.ts"],"names":[],"mappings":"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","file":"element-highlight.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementHighlightOptions, IElement, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\n\nexport class ElementHighlight extends BaseInteraction<ElementHighlightOptions> {\n  static type: string = 'element-highlight';\n  type: string = ElementHighlight.type;\n\n  static defaultOptions: ElementHighlightOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    trigger: 'pointerover',\n    resetTrigger: 'pointerout'\n  };\n  options: ElementHighlightOptions;\n  protected _marks?: IMark[];\n  protected _lastElement?: IElement;\n  protected _hasBlur?: boolean;\n\n  constructor(view: IView, options?: ElementHighlightOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlight.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    return [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      },\n      { type: this.options.resetTrigger, handler: this.handleReset }\n    ];\n  }\n\n  clearPrevElements() {\n    const { highlightState, blurState } = this.options;\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (highlightState && el.hasState(highlightState)) {\n          el.removeState(highlightState);\n        }\n\n        if (blurState && el.hasState(blurState)) {\n          el.removeState(blurState);\n        }\n      });\n    });\n\n    this._lastElement = null;\n    this._hasBlur = false;\n  }\n\n  handleStart = (e: InteractionEvent) => {\n    if (e.element && this._marks && this._marks.includes(e.element.mark)) {\n      const { highlightState, blurState } = this.options;\n\n      if (this._lastElement === e.element) {\n        return;\n      }\n\n      if (this._lastElement && this._hasBlur) {\n        this._lastElement.removeState(highlightState);\n        this._lastElement.addState(blurState);\n\n        e.element.removeState(blurState);\n        e.element.addState(highlightState);\n      } else {\n        let hasBlur = false;\n        this._marks.forEach(mark => {\n          mark.elements.forEach(el => {\n            const isHighlight = el === e.element;\n\n            if (isHighlight) {\n              el.removeState(blurState);\n              el.addState(highlightState);\n            } else {\n              el.removeState(highlightState);\n              hasBlur = el.addState(blurState);\n\n              if (hasBlur) {\n                this._hasBlur = true;\n              }\n            }\n          });\n        });\n      }\n\n      this._lastElement = e.element;\n    } else if (this._lastElement) {\n      this.clearPrevElements();\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const hasActiveElement = e.element && this._marks && this._marks.includes(e.element.mark);\n\n    if (hasActiveElement) {\n      this.clearPrevElements();\n    }\n  };\n}\n"]}

package/es/interactions/element-select.d.ts

@@ -5,14 +5,15 @@ export declare class ElementSelect extends BaseInteraction<ElementSelectOptions>
     type: string;
     static defaultOptions: ElementSelectOptions;
     options: ElementSelectOptions;
-    protected _isToggle?: boolean;
+    protected _resetType?: 'view' | 'self' | 'timeout';
     protected _marks?: IMark[];
+    private _timer?;
     constructor(view: IView, options?: ElementSelectOptions);
     protected getEvents(): {
-        type: EventType;
+        type: EventType | EventType[];
         handler: (e: InteractionEvent) => void;
     }[];
-    clearPrevElements(): void;
+    clearPrevElements: (isMultiple?: boolean, isActive?: boolean) => void;
     handleStart: (e: InteractionEvent) => void;
     handleReset: (e: InteractionEvent) => void;
 }

package/es/interactions/element-select.js

@@ -1,33 +1,44 @@
+import { isNumber, isString } from "@visactor/vutils";
+
 import { InteractionStateEnum } from "../graph/enums";
 
 import { BaseInteraction } from "./base";
 
 export class ElementSelect extends BaseInteraction {
     constructor(view, options) {
-        super(view, options), this.type = ElementSelect.type, this.handleStart = e => {
-            e.element && this._marks && this._marks.includes(e.element.mark) ? (this.options.isMultiple || this.clearPrevElements(), 
-            e.element.hasState(this.options.state) ? this.options.resetTrigger === this.options.trigger && e.element.removeState(this.options.state) : e.element.addState(this.options.state)) : this._isToggle && ("empty" === this.options.resetTrigger || this.options.resetTrigger.includes("view:")) && this.clearPrevElements();
+        super(view, options), this.type = ElementSelect.type, this.clearPrevElements = (isMultiple, isActive) => {
+            const {state: state, reverseState: reverseState} = this.options;
+            this._marks.forEach((mark => {
+                mark.elements.forEach((el => {
+                    !isMultiple && el.hasState(state) && el.removeState(state), reverseState && (isActive ? el.addState(reverseState) : el.removeState(reverseState));
+                }));
+            }));
+        }, this.handleStart = e => {
+            const {state: state, reverseState: reverseState} = this.options;
+            e.element && this._marks && this._marks.includes(e.element.mark) ? (this.clearPrevElements(this.options.isMultiple, !0), 
+            e.element.hasState(state) ? "self" === this._resetType && (e.element.removeState(state), 
+            reverseState && e.element.addState(reverseState)) : (this._timer && clearTimeout(this._timer), 
+            reverseState && e.element.removeState(reverseState), e.element.addState(state), 
+            "timeout" === this._resetType && (this._timer = setTimeout((() => {
+                this.clearPrevElements();
+            }), this.options.resetTrigger)))) : "view" === this._resetType && this.clearPrevElements();
         }, this.handleReset = e => {
             const hasActiveElement = e.element && this._marks && this._marks.includes(e.element.mark);
-            "empty" === this.options.resetTrigger || this.options.resetTrigger.includes("view:") ? hasActiveElement || this.clearPrevElements() : hasActiveElement && this.clearPrevElements();
+            "view" !== this._resetType || hasActiveElement ? "self" === this._resetType && hasActiveElement && this.clearPrevElements() : this.clearPrevElements();
         }, this.options = Object.assign({}, ElementSelect.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
     }
     getEvents() {
-        const events = [ {
-            type: this.options.trigger,
+        const resetTrigger = this.options.resetTrigger, trigger = this.options.trigger, events = [ {
+            type: trigger,
             handler: this.handleStart
-        } ], eventName = "empty" === this.options.resetTrigger ? this.options.trigger : this.options.resetTrigger.includes("view:") ? this.options.resetTrigger.replace("view:", "") : this.options.resetTrigger;
-        return eventName !== this.options.trigger ? (events.push({
+        } ];
+        let eventName = resetTrigger;
+        return "empty" === resetTrigger ? (eventName = trigger, this._resetType = "view") : isString(resetTrigger) ? resetTrigger.includes("view:") ? (eventName = resetTrigger.replace("view:", ""), 
+        this._resetType = "view") : (eventName = resetTrigger, this._resetType = "self") : isNumber(resetTrigger) ? (eventName = null, 
+        this._resetType = "timeout") : this._resetType = null, eventName && eventName !== trigger && events.push({
             type: eventName,
             handler: this.handleReset
-        }), this._isToggle = !1) : this._isToggle = !0, events;
-    }
-    clearPrevElements() {
-        this._marks.forEach((mark => {
-            mark.elements.forEach((el => {
-                el.hasState(this.options.state) && el.removeState(this.options.state);
-            }));
-        }));
+        }), events;
     }
 }
 

package/es/interactions/element-select.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-select.ts"],"names":[],"mappings":"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","file":"element-select.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type { ElementSelectOptions, EventType, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\n\nexport class ElementSelect extends BaseInteraction<ElementSelectOptions> {\n  static type: string = 'element-select';\n  type: string = ElementSelect.type;\n\n  static defaultOptions: ElementSelectOptions = {\n    state: InteractionStateEnum.selected,\n    trigger: 'click'\n  };\n  options: ElementSelectOptions;\n  protected _isToggle?: boolean;\n  protected _marks?: IMark[];\n\n  constructor(view: IView, options?: ElementSelectOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementSelect.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    const events = [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    const eventName =\n      this.options.resetTrigger === 'empty'\n        ? this.options.trigger\n        : this.options.resetTrigger.includes('view:')\n        ? this.options.resetTrigger.replace('view:', '')\n        : this.options.resetTrigger;\n\n    if (eventName !== this.options.trigger) {\n      events.push({ type: eventName as EventType, handler: this.handleReset });\n      this._isToggle = false;\n    } else {\n      this._isToggle = true;\n    }\n\n    return events;\n  }\n\n  clearPrevElements() {\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (el.hasState(this.options.state)) {\n          el.removeState(this.options.state);\n        }\n      });\n    });\n  }\n\n  handleStart = (e: InteractionEvent) => {\n    if (e.element && this._marks && this._marks.includes(e.element.mark)) {\n      if (!this.options.isMultiple) {\n        this.clearPrevElements();\n      }\n\n      if (e.element.hasState(this.options.state)) {\n        if (this.options.resetTrigger === this.options.trigger) {\n          e.element.removeState(this.options.state);\n        }\n      } else {\n        e.element.addState(this.options.state);\n      }\n    } else if (\n      this._isToggle &&\n      (this.options.resetTrigger === 'empty' || this.options.resetTrigger.includes('view:'))\n    ) {\n      this.clearPrevElements();\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const hasActiveElement = e.element && this._marks && this._marks.includes(e.element.mark);\n\n    if (this.options.resetTrigger === 'empty' || this.options.resetTrigger.includes('view:')) {\n      if (!hasActiveElement) {\n        this.clearPrevElements();\n      }\n    } else if (hasActiveElement) {\n      this.clearPrevElements();\n    }\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-select.ts"],"names":[],"mappings":"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","file":"element-select.js","sourcesContent":["import { isNumber, isString } from '@visactor/vutils';\nimport { InteractionStateEnum } from '../graph/enums';\nimport type { ElementSelectOptions, EventType, IMark, IView, InteractionEvent } from '../types';\nimport { BaseInteraction } from './base';\n\nexport class ElementSelect extends BaseInteraction<ElementSelectOptions> {\n  static type: string = 'element-select';\n  type: string = ElementSelect.type;\n\n  static defaultOptions: ElementSelectOptions = {\n    state: InteractionStateEnum.selected,\n    trigger: 'click'\n  };\n  options: ElementSelectOptions;\n  protected _resetType?: 'view' | 'self' | 'timeout';\n  protected _marks?: IMark[];\n  private _timer?: number;\n\n  constructor(view: IView, options?: ElementSelectOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementSelect.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n  }\n\n  protected getEvents() {\n    const resetTrigger = this.options.resetTrigger;\n    const trigger = this.options.trigger;\n\n    const events = [\n      {\n        type: trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    let eventName = resetTrigger;\n\n    if (resetTrigger === 'empty') {\n      eventName = trigger as EventType;\n\n      this._resetType = 'view';\n    } else if (isString(resetTrigger)) {\n      if (resetTrigger.includes('view:')) {\n        eventName = resetTrigger.replace('view:', '') as EventType;\n\n        this._resetType = 'view';\n      } else {\n        eventName = resetTrigger;\n\n        this._resetType = 'self';\n      }\n    } else if (isNumber(resetTrigger)) {\n      eventName = null;\n      this._resetType = 'timeout';\n    } else {\n      this._resetType = null;\n    }\n\n    if (eventName && eventName !== trigger) {\n      events.push({ type: eventName as EventType, handler: this.handleReset });\n    }\n\n    return events;\n  }\n\n  clearPrevElements = (isMultiple?: boolean, isActive?: boolean) => {\n    const { state, reverseState } = this.options;\n\n    this._marks.forEach(mark => {\n      mark.elements.forEach(el => {\n        if (!isMultiple && el.hasState(state)) {\n          el.removeState(state);\n        }\n\n        if (reverseState) {\n          if (isActive) {\n            el.addState(reverseState);\n          } else {\n            el.removeState(reverseState);\n          }\n        }\n      });\n    });\n  };\n\n  handleStart = (e: InteractionEvent) => {\n    const { state, reverseState } = this.options;\n\n    if (e.element && this._marks && this._marks.includes(e.element.mark)) {\n      this.clearPrevElements(this.options.isMultiple, true);\n\n      if (e.element.hasState(state)) {\n        if (this._resetType === 'self') {\n          e.element.removeState(state);\n\n          reverseState && e.element.addState(reverseState);\n        }\n      } else {\n        if (this._timer) {\n          clearTimeout(this._timer);\n        }\n\n        reverseState && e.element.removeState(reverseState);\n        e.element.addState(state);\n\n        if (this._resetType === 'timeout') {\n          this._timer = setTimeout(() => {\n            this.clearPrevElements();\n          }, this.options.resetTrigger as number) as unknown as number;\n        }\n      }\n    } else if (this._resetType === 'view') {\n      this.clearPrevElements();\n    }\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    const hasActiveElement = e.element && this._marks && this._marks.includes(e.element.mark);\n\n    if (this._resetType === 'view' && !hasActiveElement) {\n      this.clearPrevElements();\n    } else if (this._resetType === 'self' && hasActiveElement) {\n      this.clearPrevElements();\n    }\n  };\n}\n"]}

package/es/interactions/utils.d.ts

@@ -0,0 +1,2 @@
+import type { ElementFilterOptions, IElement } from '../types';
+export declare const generateFilterValue: (options: ElementFilterOptions) => (el: IElement) => any;

package/es/interactions/utils.js

@@ -0,0 +1,5 @@
+export const generateFilterValue = options => options.filterField ? el => {
+    var _a;
+    return null === (_a = el.getDatum()) || void 0 === _a ? void 0 : _a[options.filterField];
+} : el => el[options.filterType];
+//# sourceMappingURL=utils.js.map

package/es/interactions/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/interactions/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAA6B,EAAE,EAAE;IACnE,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,OAAO,CAAC,EAAY,EAAE,EAAE;;YACtB,OAAO,MAAA,EAAE,CAAC,QAAQ,EAAE,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAC;KACH;IAED,OAAO,CAAC,EAAY,EAAE,EAAE;QACtB,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC,CAAC","file":"utils.js","sourcesContent":["import type { ElementFilterOptions, IElement } from '../types';\n\nexport const generateFilterValue = (options: ElementFilterOptions) => {\n  if (options.filterField) {\n    return (el: IElement) => {\n      return el.getDatum()?.[options.filterField];\n    };\n  }\n\n  return (el: IElement) => {\n    return el[options.filterType];\n  };\n};\n"]}

package/es/types/element.d.ts

@@ -90,9 +90,9 @@ export interface IElement {
     getStates: () => string[];
     hasState: (state: string) => boolean;
     clearStates: (noAnimation?: boolean) => void;
-    addState: (state: string | string[], attrs?: any) => void;
-    removeState: (state: string | string[]) => void;
-    useStates: (states: string[], noAnimation?: boolean) => void;
+    addState: (state: string | string[], attrs?: any) => boolean;
+    removeState: (state: string | string[]) => boolean;
+    useStates: (states: string[], noAnimation?: boolean) => boolean;
 }
 export interface IGlyphElement<P = any> extends IElement {
     mark: IGlyphMark;

package/es/types/element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/element.ts"],"names":[],"mappings":"","file":"element.js","sourcesContent":["import type {\n  IArc,\n  IArc3d,\n  IArea,\n  ICircle,\n  IGlyph,\n  IGraphic,\n  IGroup,\n  IImage,\n  ILine,\n  IPath,\n  IPolygon,\n  IPyramid3d,\n  IRect,\n  IRect3d,\n  IRichText,\n  ISymbol,\n  IText\n} from '@visactor/vrender-core';\nimport type { DiffState } from '../graph/enums';\nimport type { IMark, IGlyphMark } from './grammar';\nimport type { BaseEncodeSpec, IMarkConfig, MarkFunctionType, MarkKeySpec, MarkType } from './mark';\n\nexport interface ElementGraphicMap {\n  circle: ICircle;\n  arc: IArc;\n  area: IArea;\n  image: IImage;\n  line: ILine;\n  path: IPath;\n  rule: ILine;\n  shape: IPath;\n  symbol: ISymbol;\n  text: IText;\n  richtext: IRichText;\n  polygon: IPolygon;\n  cell: ISymbol;\n  interval: IGraphic;\n  rect: IRect;\n  rect3d: IRect3d;\n  arc3d: IArc3d;\n  pyramid3d: IPyramid3d;\n  group: IGroup;\n  glyph: IGlyph;\n  linkPath: IGlyph;\n  treePath: IGlyph;\n  wave: IGlyph;\n  ripplePoint: IGlyph;\n  barBoxplot: IGlyph;\n  boxPlot: IGlyph;\n  component: IGroup;\n  axis: IGroup;\n  legend: IGroup;\n  corsshair: IGroup;\n  slider: IGroup;\n  datazoom: IGroup;\n  label: IGroup;\n  player: IGroup;\n}\n\nexport type GetGraphicByType<T> = T extends keyof ElementGraphicMap ? ElementGraphicMap[T] : IGraphic;\n\n/**\n * 保存graphicItem状态\n */\nexport interface MarkElementItem {\n  /** 唯一key */\n  key: string;\n  /** 原始数据 */\n  datum: any;\n  /** VGrammar view */\n  view: any;\n  /** 当前渲染帧下graphicItem对应的最新属性 */\n  nextAttrs?: any;\n  /** 是否初始化过，用于解决collection mark对应的item，可能跳过enter状态的问题 */\n  // hasEntered: boolean;\n}\nexport interface IElement {\n  mark: IMark;\n  isReserved: boolean;\n  diffState: DiffState;\n  key: string;\n  groupKey?: string;\n  data?: any[];\n  /**\n   * 不推荐使用，但是collection图元暂时可能回涉及到相关修改\n   */\n  items: MarkElementItem[];\n\n  initGraphicItem: (attrs?: any) => void;\n  updateGraphicItem: (config: IMarkConfig) => void;\n\n  getDatum: () => any;\n  getBounds: () => any;\n  getGraphicItem: () => IGraphic;\n  removeGraphicItem: () => void;\n  resetGraphicItem: () => void;\n\n  /**\n   * 获取 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param prev 是否从之前的 graphic 属性上获取，默认为 false\n   * @returns 视觉通道值\n   */\n  getGraphicAttribute: (channel: string, prev?: boolean) => any;\n  /**\n   * 设置 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param value 视觉通道属性\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttribute: (channel: string, value: any, final?: boolean) => void;\n  /**\n   * 设置一系列 graphic 视觉通道属性\n   * @param attributes 视觉通道键值对\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean) => void;\n\n  /**\n   * 【慎重使用】获取 VGrammar 自身的视觉通道属性\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   */\n  getItemAttribute: (channel?: string) => any;\n  /**\n   * 【慎重使用】设置 VGrammar 自身的视觉通道\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   * @param attributes\n   * @returns\n   */\n  setItemAttributes: (attributes: { [channel: string]: any } | any[]) => void;\n\n  // element 执行流程相关接口\n  updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec, view: any) => void;\n  state: (markState: MarkFunctionType<string | string[]>, parameters?: any) => void;\n  encodeItems: (items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any) => void;\n  encodeGraphic: (attributes?: any) => void;\n  transformElementItems: (items: MarkElementItem[], markType: MarkType, computePoints?: boolean) => Record<string, any>;\n  remove: () => void;\n  release: () => void;\n\n  // 动画相关接口\n\n  getFinalGraphicAttributes: () => { [key: string]: any };\n  getPrevGraphicAttributes: () => { [key: string]: any };\n  getNextGraphicAttributes: () => { [key: string]: any };\n  clearChangedGraphicAttributes: () => void;\n  clearGraphicAttributes: () => void;\n\n  // state相关接口\n  getStates: () => string[];\n  hasState: (state: string) => boolean;\n  clearStates: (noAnimation?: boolean) => void;\n  addState: (state: string | string[], attrs?: any) => void;\n  removeState: (state: string | string[]) => void;\n  useStates: (states: string[], noAnimation?: boolean) => void;\n}\n\nexport interface IGlyphElement<P = any> extends IElement {\n  mark: IGlyphMark;\n\n  getGlyphGraphicItems: () => { [markName: string]: any };\n\n  getGraphicAttribute: (channel: string, prev?: boolean, markName?: any) => any;\n  setGraphicAttribute: (channel: string, value: any, final?: boolean, markName?: any) => void;\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean, markName?: any) => void;\n\n  getFinalGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getPrevGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getNextGraphicAttributes: (markName?: string) => { [key: string]: any };\n\n  encodeCustom: (nextAttrs?: any) => { [markName: string]: any };\n}\n"]}
+{"version":3,"sources":["../src/types/element.ts"],"names":[],"mappings":"","file":"element.js","sourcesContent":["import type {\n  IArc,\n  IArc3d,\n  IArea,\n  ICircle,\n  IGlyph,\n  IGraphic,\n  IGroup,\n  IImage,\n  ILine,\n  IPath,\n  IPolygon,\n  IPyramid3d,\n  IRect,\n  IRect3d,\n  IRichText,\n  ISymbol,\n  IText\n} from '@visactor/vrender-core';\nimport type { DiffState } from '../graph/enums';\nimport type { IMark, IGlyphMark } from './grammar';\nimport type { BaseEncodeSpec, IMarkConfig, MarkFunctionType, MarkKeySpec, MarkType } from './mark';\n\nexport interface ElementGraphicMap {\n  circle: ICircle;\n  arc: IArc;\n  area: IArea;\n  image: IImage;\n  line: ILine;\n  path: IPath;\n  rule: ILine;\n  shape: IPath;\n  symbol: ISymbol;\n  text: IText;\n  richtext: IRichText;\n  polygon: IPolygon;\n  cell: ISymbol;\n  interval: IGraphic;\n  rect: IRect;\n  rect3d: IRect3d;\n  arc3d: IArc3d;\n  pyramid3d: IPyramid3d;\n  group: IGroup;\n  glyph: IGlyph;\n  linkPath: IGlyph;\n  treePath: IGlyph;\n  wave: IGlyph;\n  ripplePoint: IGlyph;\n  barBoxplot: IGlyph;\n  boxPlot: IGlyph;\n  component: IGroup;\n  axis: IGroup;\n  legend: IGroup;\n  corsshair: IGroup;\n  slider: IGroup;\n  datazoom: IGroup;\n  label: IGroup;\n  player: IGroup;\n}\n\nexport type GetGraphicByType<T> = T extends keyof ElementGraphicMap ? ElementGraphicMap[T] : IGraphic;\n\n/**\n * 保存graphicItem状态\n */\nexport interface MarkElementItem {\n  /** 唯一key */\n  key: string;\n  /** 原始数据 */\n  datum: any;\n  /** VGrammar view */\n  view: any;\n  /** 当前渲染帧下graphicItem对应的最新属性 */\n  nextAttrs?: any;\n  /** 是否初始化过，用于解决collection mark对应的item，可能跳过enter状态的问题 */\n  // hasEntered: boolean;\n}\nexport interface IElement {\n  mark: IMark;\n  isReserved: boolean;\n  diffState: DiffState;\n  key: string;\n  groupKey?: string;\n  data?: any[];\n  /**\n   * 不推荐使用，但是collection图元暂时可能回涉及到相关修改\n   */\n  items: MarkElementItem[];\n\n  initGraphicItem: (attrs?: any) => void;\n  updateGraphicItem: (config: IMarkConfig) => void;\n\n  getDatum: () => any;\n  getBounds: () => any;\n  getGraphicItem: () => IGraphic;\n  removeGraphicItem: () => void;\n  resetGraphicItem: () => void;\n\n  /**\n   * 获取 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param prev 是否从之前的 graphic 属性上获取，默认为 false\n   * @returns 视觉通道值\n   */\n  getGraphicAttribute: (channel: string, prev?: boolean) => any;\n  /**\n   * 设置 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param value 视觉通道属性\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttribute: (channel: string, value: any, final?: boolean) => void;\n  /**\n   * 设置一系列 graphic 视觉通道属性\n   * @param attributes 视觉通道键值对\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean) => void;\n\n  /**\n   * 【慎重使用】获取 VGrammar 自身的视觉通道属性\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   */\n  getItemAttribute: (channel?: string) => any;\n  /**\n   * 【慎重使用】设置 VGrammar 自身的视觉通道\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   * @param attributes\n   * @returns\n   */\n  setItemAttributes: (attributes: { [channel: string]: any } | any[]) => void;\n\n  // element 执行流程相关接口\n  updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec, view: any) => void;\n  state: (markState: MarkFunctionType<string | string[]>, parameters?: any) => void;\n  encodeItems: (items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any) => void;\n  encodeGraphic: (attributes?: any) => void;\n  transformElementItems: (items: MarkElementItem[], markType: MarkType, computePoints?: boolean) => Record<string, any>;\n  remove: () => void;\n  release: () => void;\n\n  // 动画相关接口\n\n  getFinalGraphicAttributes: () => { [key: string]: any };\n  getPrevGraphicAttributes: () => { [key: string]: any };\n  getNextGraphicAttributes: () => { [key: string]: any };\n  clearChangedGraphicAttributes: () => void;\n  clearGraphicAttributes: () => void;\n\n  // state相关接口\n  getStates: () => string[];\n  hasState: (state: string) => boolean;\n  clearStates: (noAnimation?: boolean) => void;\n  addState: (state: string | string[], attrs?: any) => boolean;\n  removeState: (state: string | string[]) => boolean;\n  useStates: (states: string[], noAnimation?: boolean) => boolean;\n}\n\nexport interface IGlyphElement<P = any> extends IElement {\n  mark: IGlyphMark;\n\n  getGlyphGraphicItems: () => { [markName: string]: any };\n\n  getGraphicAttribute: (channel: string, prev?: boolean, markName?: any) => any;\n  setGraphicAttribute: (channel: string, value: any, final?: boolean, markName?: any) => void;\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean, markName?: any) => void;\n\n  getFinalGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getPrevGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getNextGraphicAttributes: (markName?: string) => { [key: string]: any };\n\n  encodeCustom: (nextAttrs?: any) => { [markName: string]: any };\n}\n"]}

package/es/types/grammar.d.ts

@@ -138,8 +138,8 @@ export interface IMark extends IGrammarBase, IProgressiveGrammar {
     join: (data: IData | string | Nil, key?: MarkKeySpec, sort?: MarkSortSpec, groupBy?: MarkKeySpec, groupSort?: MarkSortSpec) => this;
     coordinate: (coordinate: ICoordinate | string | Nil) => this;
     state: (state: MarkFunctionType<string | string[]> | Nil) => this;
-    encode: ((encoders: BaseSignleEncodeSpec) => this) & ((channel: string, value: ChannelEncodeType) => this);
-    encodeState: ((state: string, channel: string, value: ChannelEncodeType) => this) & ((state: string, encoders: BaseSignleEncodeSpec) => this);
+    encode: ((encoders: BaseSignleEncodeSpec, clear?: boolean) => this) & ((channel: string, value: ChannelEncodeType, clear?: boolean) => this);
+    encodeState: ((state: string, channel: string, value: ChannelEncodeType, clear?: boolean) => this) & ((state: string, encoders: BaseSignleEncodeSpec, clear?: boolean) => this);
     animation: (animationConfig: MarkAnimationSpec | Nil) => this;
     animationState: (animationState: MarkFunctionType<string> | Nil) => this;
     layout: (layout: MarkLayoutSpec | MarkLayoutCallback | Nil) => this;

package/es/types/grammar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/grammar.ts"],"names":[],"mappings":"","file":"grammar.js","sourcesContent":["import type { EventEmitter, IBounds, IPointLike } from '@visactor/vutils';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport type { IBaseScale, ScaleFishEyeOptions, TickData } from '@visactor/vscale';\nimport type { ITransform, TransformSpec } from './transform';\nimport type { DataFormatSpec, IDataFilter } from './data';\nimport type { ParameterFunctionType, SignalFunctionType } from './signal';\nimport type { IAnimate } from './animate';\nimport type { IGlyphMeta } from './glyph';\nimport type { GrammarTypeEnum } from '../graph/enums';\nimport type { Nil } from './base';\nimport type { CoordinateFunctionType } from './coordinate';\nimport type { IElement } from './element';\nimport type {\n  MarkFunctionType,\n  MarkAnimationSpec,\n  MarkType,\n  MarkLayoutSpec,\n  MarkLayoutCallback,\n  MarkSortSpec,\n  MarkKeySpec,\n  IMarkConfig,\n  ChannelEncodeType,\n  AttributeTransform,\n  BaseSignleEncodeSpec\n} from './mark';\nimport type { ScaleConfigureSpec, ScaleData, ScaleFunctionType, GrammarScaleType, MultiScaleData } from './scale';\nimport type { IView } from './view';\nimport type { BaseEventHandler } from './event';\nimport type { ICartesianCoordinate, IPolarCoordinate } from '@visactor/vgrammar-coordinate';\n\nexport type BuiltInGrammarType = keyof typeof GrammarTypeEnum;\nexport type GrammarType = BuiltInGrammarType | string;\n\n/** 语法元素内置运行的任务 */\nexport interface IGrammarTask extends ITransform {\n  /**\n   * 参数依赖\n   * 只做一级解析\n   */\n  options?: Record<string, any | IGrammarBase> | (IGrammarBase | any)[];\n  /**\n   * 依赖的语法元素\n   */\n  references?: IGrammarBase[];\n  /**\n   * 是否只支持简单的options配置，不支持在options引用语法元素\n   */\n  isRawOptions?: boolean;\n}\n\nexport interface GrammarSpec {\n  id?: string;\n  dependency?: IGrammarBase[] | IGrammarBase | string[] | string;\n}\n\nexport interface IGrammarBase {\n  readonly grammarType: GrammarType;\n  readonly view: IView;\n  readonly uid: number;\n  /**\n   * 执行的上游节点\n   */\n  grammarSource: IGrammarBase;\n  /**\n   * 影响的下游节点\n   */\n  targets: IGrammarBase[];\n  /**\n   * 依赖的上游节点，由于不同 spec 配置项中可能引用同一个节点，需要进行计数\n   */\n  references: Map<IGrammarBase, number>;\n\n  depend: (grammar: IGrammarBase[] | IGrammarBase | string[] | string) => this;\n\n  addEventListener: (type: string, handler: BaseEventHandler, options?: any) => this;\n  removeEventListener: (type: string, handler: BaseEventHandler) => this;\n\n  // extended from EventEmitter\n  emit: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n  emitGrammarEvent: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n\n  tasks?: IGrammarTask[];\n  // value?: any;\n  /** FIXME: operator执行顺序，改造后，dataflow执行元素，应该抽象出来 */\n  rank?: number;\n  // todo\n  set: (value: any) => boolean;\n  id: (() => string) & ((id: string) => this);\n  name: (() => string) & ((name: string) => this);\n  attach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detachAll: () => void;\n  commit: () => void;\n  output: () => any;\n  parse: (spec: any) => this;\n  parameters: () => { [key: string]: any };\n  evaluateSync?: (upstream: any, parameters: any) => this;\n  getSpec: () => any;\n  reuse: (grammar: IGrammarBase) => this;\n  /** clear references */\n  clear: () => void;\n  /** release all memory storage */\n  release: () => void;\n}\n\nexport interface IData extends IGrammarBase {\n  values: (values: any | Nil, format?: ParameterFunctionType<DataFormatSpec>, load?: boolean) => this;\n  url: (\n    url: ParameterFunctionType<string> | Nil,\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  source: (\n    source: string | string[] | IData | IData[],\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  // only used in VGrammar\n  addDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n  removeDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n\n  // data util methods\n  field: (field: string) => any[];\n  getValue: () => any[];\n  getInput: () => any[];\n  getDataIDKey: () => string;\n}\n\n/** 语法元素,TODO */\nexport interface ISignal<T> extends IGrammarBase {\n  value: (value: T | Nil) => this;\n  update: (update: SignalFunctionType<T> | Nil) => this;\n\n  getValue: () => T;\n}\n\n/** 语法元素,TODO */\nexport interface IScale extends IGrammarBase {\n  domain: (domain: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  range: (range: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  configure: (config: ScaleConfigureSpec | Nil) => this;\n  tickCount: (tickCount: ScaleFunctionType<number> | Nil) => this;\n\n  // only used in VGrammar\n  getRangeFactor: () => [number, number] | Nil;\n  setRangeFactor: (range?: [number, number]) => this;\n  getFishEye: () => ScaleFishEyeOptions | Nil;\n  setFishEye: (option?: ScaleFishEyeOptions) => this;\n\n  // scale util methods\n  getScaleType: () => GrammarScaleType;\n  getScale: () => IBaseScale;\n  ticks: (count?: number) => TickData[];\n  getCoordinateAxisPoints: (baseValue?: number) => [IPointLike, IPointLike];\n  getCoordinate: () => IPolarCoordinate | ICartesianCoordinate;\n  getCoordinateAxisPosition: () => 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'outside' | 'start' | 'end';\n}\n\nexport interface ICoordinate extends IGrammarBase {\n  start: (start: CoordinateFunctionType<[number, number]> | Nil) => this;\n  end: (end: CoordinateFunctionType<[number, number]> | Nil) => this;\n  origin: (origin: CoordinateFunctionType<[number, number]> | Nil) => this;\n\n  translate: (offset: CoordinateFunctionType<[number, number]> | Nil) => this;\n  rotate: (angle: CoordinateFunctionType<number> | Nil) => this;\n  scale: (ratio: CoordinateFunctionType<[number, number]> | Nil) => this;\n  transpose: (isTransposed: CoordinateFunctionType<boolean> | Nil) => this;\n\n  // coordinate util methods\n}\n\n/** 语法元素,TODO */\n\n/** group mark */\nexport interface IGroupMark extends IMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  appendChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  removeChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  includesChild: (mark: IMark, descendant?: boolean) => boolean;\n\n  updateLayoutChildren: () => this;\n}\n\nexport interface IGlyphMark extends IMark {\n  glyphType: string;\n  getGlyphMeta: () => IGlyphMeta;\n  configureGlyph: (config: any) => this;\n  getGlyphConfig: () => any;\n}\n\nexport interface IComponent extends IMark {\n  componentType: string;\n  configureComponent: (config: any) => this;\n}\n\nexport interface IProgressiveGrammar {\n  /** 是否启动了增量渲染模式 */\n  isProgressive: () => boolean;\n  /** 是否正在执行增量渲染 */\n  isDoingProgressive: () => boolean;\n  /** 清除增量渲染相关状态 */\n  clearProgressive: () => void;\n  /** 从第一帧开始增量计算 */\n  restartProgressive: () => void;\n  /** 分片执行 */\n  evaluateProgressive: () => void;\n}\n\nexport interface IMark extends IGrammarBase, IProgressiveGrammar {\n  group?: IGroupMark;\n\n  markType: MarkType;\n  coord: ICoordinate;\n  /**\n   * disable coordinate transform when need\n   */\n  disableCoordinateTransform?: boolean;\n  elements: IElement[];\n  elementMap: Map<string, IElement>;\n  graphicIndex: number;\n  graphicItem?: IGroup;\n  animate?: IAnimate;\n\n  join: (\n    data: IData | string | Nil,\n    key?: MarkKeySpec,\n    sort?: MarkSortSpec,\n    groupBy?: MarkKeySpec,\n    groupSort?: MarkSortSpec\n  ) => this;\n  coordinate: (coordinate: ICoordinate | string | Nil) => this;\n  state: (state: MarkFunctionType<string | string[]> | Nil) => this;\n  encode: ((encoders: BaseSignleEncodeSpec) => this) & ((channel: string, value: ChannelEncodeType) => this);\n  encodeState: ((state: string, channel: string, value: ChannelEncodeType) => this) &\n    ((state: string, encoders: BaseSignleEncodeSpec) => this);\n  animation: (animationConfig: MarkAnimationSpec | Nil) => this;\n  animationState: (animationState: MarkFunctionType<string> | Nil) => this;\n  layout: (layout: MarkLayoutSpec | MarkLayoutCallback | Nil) => this;\n  configure: (config: IMarkConfig | Nil) => this;\n  context: (context: any) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  needAnimate: () => boolean;\n  getBounds: () => IBounds;\n  isCollectionMark: () => boolean;\n  getAllElements: () => IElement[];\n  getContext: () => any;\n\n  // position: () => this;\n  // color: () => this;\n  // shape: () => this;\n\n  // mark 执行流程相关接口\n\n  isUpdated: boolean;\n  getGroupGraphicItem: () => any;\n  cleanExitElements: () => void;\n  addGraphicItem: (attrs: any, groupKey?: string) => IGraphic;\n  getMorphConfig: () => { morph: boolean; morphKey: string | undefined; morphElementKey: string | undefined };\n  prepareRelease: () => void;\n\n  layoutBounds?: IBounds;\n  relativePosition?: { top?: number; bottom?: number; left?: number; right?: number };\n  needLayout: () => boolean;\n  handleLayoutEnd: () => void;\n  handleRenderEnd: () => void;\n  isLargeMode: () => boolean;\n  getAttributeTransforms: () => AttributeTransform[];\n\n  getScalesByChannel: () => Record<string, IBaseScale> | undefined;\n  getFieldsByChannel: () => Record<string, string> | undefined;\n  getScales: () => Record<string, IBaseScale> | undefined;\n}\n\nexport interface IGrammarBaseConstructor {\n  new (view: IView): IGrammarBase;\n}\n\nexport interface ProgressiveContext {\n  currentIndex: number;\n  totalStep: number;\n  step: number;\n  data: any[];\n  groupKeys?: string[];\n  groupedData?: Map<string, any[]>;\n}\n"]}
+{"version":3,"sources":["../src/types/grammar.ts"],"names":[],"mappings":"","file":"grammar.js","sourcesContent":["import type { EventEmitter, IBounds, IPointLike } from '@visactor/vutils';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport type { IBaseScale, ScaleFishEyeOptions, TickData } from '@visactor/vscale';\nimport type { ITransform, TransformSpec } from './transform';\nimport type { DataFormatSpec, IDataFilter } from './data';\nimport type { ParameterFunctionType, SignalFunctionType } from './signal';\nimport type { IAnimate } from './animate';\nimport type { IGlyphMeta } from './glyph';\nimport type { GrammarTypeEnum } from '../graph/enums';\nimport type { Nil } from './base';\nimport type { CoordinateFunctionType } from './coordinate';\nimport type { IElement } from './element';\nimport type {\n  MarkFunctionType,\n  MarkAnimationSpec,\n  MarkType,\n  MarkLayoutSpec,\n  MarkLayoutCallback,\n  MarkSortSpec,\n  MarkKeySpec,\n  IMarkConfig,\n  ChannelEncodeType,\n  AttributeTransform,\n  BaseSignleEncodeSpec\n} from './mark';\nimport type { ScaleConfigureSpec, ScaleData, ScaleFunctionType, GrammarScaleType, MultiScaleData } from './scale';\nimport type { IView } from './view';\nimport type { BaseEventHandler } from './event';\nimport type { ICartesianCoordinate, IPolarCoordinate } from '@visactor/vgrammar-coordinate';\n\nexport type BuiltInGrammarType = keyof typeof GrammarTypeEnum;\nexport type GrammarType = BuiltInGrammarType | string;\n\n/** 语法元素内置运行的任务 */\nexport interface IGrammarTask extends ITransform {\n  /**\n   * 参数依赖\n   * 只做一级解析\n   */\n  options?: Record<string, any | IGrammarBase> | (IGrammarBase | any)[];\n  /**\n   * 依赖的语法元素\n   */\n  references?: IGrammarBase[];\n  /**\n   * 是否只支持简单的options配置，不支持在options引用语法元素\n   */\n  isRawOptions?: boolean;\n}\n\nexport interface GrammarSpec {\n  id?: string;\n  dependency?: IGrammarBase[] | IGrammarBase | string[] | string;\n}\n\nexport interface IGrammarBase {\n  readonly grammarType: GrammarType;\n  readonly view: IView;\n  readonly uid: number;\n  /**\n   * 执行的上游节点\n   */\n  grammarSource: IGrammarBase;\n  /**\n   * 影响的下游节点\n   */\n  targets: IGrammarBase[];\n  /**\n   * 依赖的上游节点，由于不同 spec 配置项中可能引用同一个节点，需要进行计数\n   */\n  references: Map<IGrammarBase, number>;\n\n  depend: (grammar: IGrammarBase[] | IGrammarBase | string[] | string) => this;\n\n  addEventListener: (type: string, handler: BaseEventHandler, options?: any) => this;\n  removeEventListener: (type: string, handler: BaseEventHandler) => this;\n\n  // extended from EventEmitter\n  emit: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n  emitGrammarEvent: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n\n  tasks?: IGrammarTask[];\n  // value?: any;\n  /** FIXME: operator执行顺序，改造后，dataflow执行元素，应该抽象出来 */\n  rank?: number;\n  // todo\n  set: (value: any) => boolean;\n  id: (() => string) & ((id: string) => this);\n  name: (() => string) & ((name: string) => this);\n  attach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detachAll: () => void;\n  commit: () => void;\n  output: () => any;\n  parse: (spec: any) => this;\n  parameters: () => { [key: string]: any };\n  evaluateSync?: (upstream: any, parameters: any) => this;\n  getSpec: () => any;\n  reuse: (grammar: IGrammarBase) => this;\n  /** clear references */\n  clear: () => void;\n  /** release all memory storage */\n  release: () => void;\n}\n\nexport interface IData extends IGrammarBase {\n  values: (values: any | Nil, format?: ParameterFunctionType<DataFormatSpec>, load?: boolean) => this;\n  url: (\n    url: ParameterFunctionType<string> | Nil,\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  source: (\n    source: string | string[] | IData | IData[],\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  // only used in VGrammar\n  addDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n  removeDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n\n  // data util methods\n  field: (field: string) => any[];\n  getValue: () => any[];\n  getInput: () => any[];\n  getDataIDKey: () => string;\n}\n\n/** 语法元素,TODO */\nexport interface ISignal<T> extends IGrammarBase {\n  value: (value: T | Nil) => this;\n  update: (update: SignalFunctionType<T> | Nil) => this;\n\n  getValue: () => T;\n}\n\n/** 语法元素,TODO */\nexport interface IScale extends IGrammarBase {\n  domain: (domain: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  range: (range: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  configure: (config: ScaleConfigureSpec | Nil) => this;\n  tickCount: (tickCount: ScaleFunctionType<number> | Nil) => this;\n\n  // only used in VGrammar\n  getRangeFactor: () => [number, number] | Nil;\n  setRangeFactor: (range?: [number, number]) => this;\n  getFishEye: () => ScaleFishEyeOptions | Nil;\n  setFishEye: (option?: ScaleFishEyeOptions) => this;\n\n  // scale util methods\n  getScaleType: () => GrammarScaleType;\n  getScale: () => IBaseScale;\n  ticks: (count?: number) => TickData[];\n  getCoordinateAxisPoints: (baseValue?: number) => [IPointLike, IPointLike];\n  getCoordinate: () => IPolarCoordinate | ICartesianCoordinate;\n  getCoordinateAxisPosition: () => 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'outside' | 'start' | 'end';\n}\n\nexport interface ICoordinate extends IGrammarBase {\n  start: (start: CoordinateFunctionType<[number, number]> | Nil) => this;\n  end: (end: CoordinateFunctionType<[number, number]> | Nil) => this;\n  origin: (origin: CoordinateFunctionType<[number, number]> | Nil) => this;\n\n  translate: (offset: CoordinateFunctionType<[number, number]> | Nil) => this;\n  rotate: (angle: CoordinateFunctionType<number> | Nil) => this;\n  scale: (ratio: CoordinateFunctionType<[number, number]> | Nil) => this;\n  transpose: (isTransposed: CoordinateFunctionType<boolean> | Nil) => this;\n\n  // coordinate util methods\n}\n\n/** 语法元素,TODO */\n\n/** group mark */\nexport interface IGroupMark extends IMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  appendChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  removeChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  includesChild: (mark: IMark, descendant?: boolean) => boolean;\n\n  updateLayoutChildren: () => this;\n}\n\nexport interface IGlyphMark extends IMark {\n  glyphType: string;\n  getGlyphMeta: () => IGlyphMeta;\n  configureGlyph: (config: any) => this;\n  getGlyphConfig: () => any;\n}\n\nexport interface IComponent extends IMark {\n  componentType: string;\n  configureComponent: (config: any) => this;\n}\n\nexport interface IProgressiveGrammar {\n  /** 是否启动了增量渲染模式 */\n  isProgressive: () => boolean;\n  /** 是否正在执行增量渲染 */\n  isDoingProgressive: () => boolean;\n  /** 清除增量渲染相关状态 */\n  clearProgressive: () => void;\n  /** 从第一帧开始增量计算 */\n  restartProgressive: () => void;\n  /** 分片执行 */\n  evaluateProgressive: () => void;\n}\n\nexport interface IMark extends IGrammarBase, IProgressiveGrammar {\n  group?: IGroupMark;\n\n  markType: MarkType;\n  coord: ICoordinate;\n  /**\n   * disable coordinate transform when need\n   */\n  disableCoordinateTransform?: boolean;\n  elements: IElement[];\n  elementMap: Map<string, IElement>;\n  graphicIndex: number;\n  graphicItem?: IGroup;\n  animate?: IAnimate;\n\n  join: (\n    data: IData | string | Nil,\n    key?: MarkKeySpec,\n    sort?: MarkSortSpec,\n    groupBy?: MarkKeySpec,\n    groupSort?: MarkSortSpec\n  ) => this;\n  coordinate: (coordinate: ICoordinate | string | Nil) => this;\n  state: (state: MarkFunctionType<string | string[]> | Nil) => this;\n  encode: ((encoders: BaseSignleEncodeSpec, clear?: boolean) => this) &\n    ((channel: string, value: ChannelEncodeType, clear?: boolean) => this);\n  encodeState: ((state: string, channel: string, value: ChannelEncodeType, clear?: boolean) => this) &\n    ((state: string, encoders: BaseSignleEncodeSpec, clear?: boolean) => this);\n  animation: (animationConfig: MarkAnimationSpec | Nil) => this;\n  animationState: (animationState: MarkFunctionType<string> | Nil) => this;\n  layout: (layout: MarkLayoutSpec | MarkLayoutCallback | Nil) => this;\n  configure: (config: IMarkConfig | Nil) => this;\n  context: (context: any) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  needAnimate: () => boolean;\n  getBounds: () => IBounds;\n  isCollectionMark: () => boolean;\n  getAllElements: () => IElement[];\n  getContext: () => any;\n\n  // position: () => this;\n  // color: () => this;\n  // shape: () => this;\n\n  // mark 执行流程相关接口\n\n  isUpdated: boolean;\n  getGroupGraphicItem: () => any;\n  cleanExitElements: () => void;\n  addGraphicItem: (attrs: any, groupKey?: string) => IGraphic;\n  getMorphConfig: () => { morph: boolean; morphKey: string | undefined; morphElementKey: string | undefined };\n  prepareRelease: () => void;\n\n  layoutBounds?: IBounds;\n  relativePosition?: { top?: number; bottom?: number; left?: number; right?: number };\n  needLayout: () => boolean;\n  handleLayoutEnd: () => void;\n  handleRenderEnd: () => void;\n  isLargeMode: () => boolean;\n  getAttributeTransforms: () => AttributeTransform[];\n\n  getScalesByChannel: () => Record<string, IBaseScale> | undefined;\n  getFieldsByChannel: () => Record<string, string> | undefined;\n  getScales: () => Record<string, IBaseScale> | undefined;\n}\n\nexport interface IGrammarBaseConstructor {\n  new (view: IView): IGrammarBase;\n}\n\nexport interface ProgressiveContext {\n  currentIndex: number;\n  totalStep: number;\n  step: number;\n  data: any[];\n  groupKeys?: string[];\n  groupedData?: Map<string, any[]>;\n}\n"]}

package/es/types/interaction.d.ts

@@ -14,6 +14,7 @@ export interface FilterDataTarget {
     transform?: (data: any[], filterValues: any[]) => any[];
 }
 export interface IBaseInteractionOptions {
+    id?: string;
     dependencies?: string | string[] | IGrammarBase | IGrammarBase[];
     shouldStart?: (e: any) => boolean;
     shouldUpdate?: (e: any) => boolean;
@@ -24,27 +25,29 @@ export interface IBaseInteractionOptions {
     onEnd?: (e: any) => boolean;
     onReset?: (e: any) => boolean;
 }
-export interface IInteraction {
+export interface IInteraction<T = any> {
+    readonly options: T;
     readonly type: string;
     depend: (grammar: IGrammarBase[] | IGrammarBase | string[] | string) => void;
     bind: () => void;
     unbind: () => void;
 }
-export interface IInteractionConstructor {
+export interface IInteractionConstructor<T = any> {
     readonly type: string;
-    new (view: IView, options?: any): IInteraction;
+    new (view: IView, options?: T): IInteraction<T>;
 }
 export interface ElementActiveOptions extends IBaseInteractionOptions {
     selector?: string | string[] | IMark | IMark[];
-    trigger?: EventType;
-    resetTrigger?: EventType;
+    trigger?: EventType | EventType[];
+    resetTrigger?: EventType | EventType[];
     state?: string;
 }
 export interface ElementSelectOptions extends IBaseInteractionOptions {
     selector?: string | string[] | IMark | IMark[];
-    trigger?: EventType;
+    trigger?: EventType | EventType[];
     state?: string;
-    resetTrigger?: EventType | ViewEventType | 'empty';
+    reverseState?: string;
+    resetTrigger?: EventType | EventType[] | ViewEventType | 'empty' | number;
     isMultiple?: boolean;
 }
 export interface ElementHighlightOptions extends IBaseInteractionOptions {
@@ -54,19 +57,21 @@ export interface ElementHighlightOptions extends IBaseInteractionOptions {
     highlightState?: string;
     blurState?: string;
 }
-export interface ElementActiveByLegendOptions extends IBaseInteractionOptions {
+export interface ElementFilterOptions {
+    filterType?: 'key' | 'groupKey';
+    filterField?: string;
+}
+export interface ElementActiveByLegendOptions extends IBaseInteractionOptions, ElementFilterOptions {
     selector?: string | string[] | IMark | IMark[];
     state?: string;
-    filterType?: 'key' | 'groupKey';
 }
-export interface ElementHighlightByLegendOptions extends IBaseInteractionOptions {
+export interface ElementHighlightByLegendOptions extends IBaseInteractionOptions, ElementFilterOptions {
     selector?: string | string[] | IMark | IMark[];
     highlightState?: string;
     blurState?: string;
-    filterType?: 'key' | 'groupKey';
 }
 export interface ElementHighlightByNameOptions extends ElementHighlightByLegendOptions {
-    name?: string | string[];
+    graphicName?: string | string[];
     trigger?: EventType;
     resetTrigger?: EventType;
     parseData?: (e: InteractionEvent) => any;
@@ -309,7 +314,10 @@ export interface SankeyHighlightSpec extends SankeyHighlightOptions {
 export interface FishEyeSpec extends FishEyeOptions {
     type: 'fish-eye';
 }
-export type InteractionSpec = ElementActiveSpec | ElementSelectSpec | ElementHighlightSpec | ElementHighlightByKeySpec | ElementHighlightByGroupSpec | ElementActiveByLegendSpec | ElementHighlightByLegendSpec | ElementHighlightByNameSpec | BrushHighlightSpec | BrushActiveSpec | BrushFilterSpec | LegendFilterSpec | DatazoomFilterSpec | SliderFilterSpec | PlayerFilterSpec | ScrollbarFilterSpec | DrillDownSpec | RollUpSpec | TooltipSpec | DimensionTooltipSpec | CrosshairSpec | ViewRoamSpec | ViewZoomSpec | ViewScrollSpec | ViewDragSpec | SankeyHighlightSpec | FishEyeSpec;
+export interface CustomizedInteractionSpec extends IBaseInteractionOptions {
+    type: string;
+}
+export type InteractionSpec = ElementActiveSpec | ElementSelectSpec | ElementHighlightSpec | ElementHighlightByKeySpec | ElementHighlightByGroupSpec | ElementActiveByLegendSpec | ElementHighlightByLegendSpec | ElementHighlightByNameSpec | BrushHighlightSpec | BrushActiveSpec | BrushFilterSpec | LegendFilterSpec | DatazoomFilterSpec | SliderFilterSpec | PlayerFilterSpec | ScrollbarFilterSpec | DrillDownSpec | RollUpSpec | TooltipSpec | DimensionTooltipSpec | CrosshairSpec | ViewRoamSpec | ViewZoomSpec | ViewScrollSpec | ViewDragSpec | SankeyHighlightSpec | FishEyeSpec | CustomizedInteractionSpec;
 export interface ViewNavigationRange {
     needUpdate?: boolean;
     x?: [number, number];