@visactor/vchart 2.0.13-alpha.9 → 2.0.13

package/cjs/event/event-dispatcher.js

@@ -213,4 +213,4 @@ class EventDispatcher {
 }
 
 exports.EventDispatcher = EventDispatcher;
-//# sourceMappingURL=event-dispatcher.js.map
+//# sourceMappingURL=event-dispatcher.js.map

package/cjs/event/event.js

@@ -23,7 +23,7 @@ class Event {
         }, ComposedEventCtor = factory_1.Factory.getComposedEvent(eType);
         if (ComposedEventCtor) {
             const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode);
-            composedEvent.register(eType, handler), this._composedEventMap.set(handler.callback, {
+            composedEvent.register(eType, handler), this._composedEventMap.set(callback, {
                 eventType: eType,
                 event: composedEvent
             });
@@ -68,4 +68,4 @@ class Event {
 }
 
 exports.Event = Event;
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/cjs/event/event.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["/*eslint no-dupe-class-members: \"off\"*/\n\nimport { Factory } from '../core/factory';\nimport type { RenderMode } from '../typings/spec/common';\nimport type {\n  EventType,\n  EventQuery,\n  EventCallback,\n  EventParamsDefinition,\n  IEvent,\n  IEventDispatcher,\n  IComposedEvent,\n  EventParams,\n  EventHandler,\n  EventBubbleLevel\n} from './interface';\n\nexport class Event implements IEvent {\n  private _eventDispatcher: IEventDispatcher;\n  private _mode: RenderMode;\n\n  private _composedEventMap: Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }> =\n    new Map();\n  getComposedEventMap() {\n    return this._composedEventMap;\n  }\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n  }\n\n  on<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(\n    eType: Evt,\n    query: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    callback?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const handler =\n      typeof query === 'function'\n        ? { query: null, callback: query }\n        : {\n            query,\n            callback: callback as EventCallback<EventParamsDefinition[Evt]>\n          };\n\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n    if (ComposedEventCtor) {\n      const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode) as IComposedEvent;\n      composedEvent.register(eType, handler);\n      this._composedEventMap.set(handler.callback as EventCallback<EventParamsDefinition[Evt]>, {\n        eventType: eType,\n        event: composedEvent\n      });\n    } else {\n      this._eventDispatcher.register(eType, handler);\n    }\n\n    return this;\n  }\n\n  off<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(\n    eType: Evt,\n    query?: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    cb?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const callback = (cb ?? query) as EventCallback<EventParamsDefinition[Evt]>;\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n\n    if (!!ComposedEventCtor) {\n      if (callback) {\n        this._composedEventMap.get(callback)?.event.unregister();\n        this._composedEventMap.delete(callback);\n      } else {\n        for (const entry of this._composedEventMap.entries()) {\n          if (entry[1].eventType === eType) {\n            this._composedEventMap.get(entry[0])?.event.unregister();\n            this._composedEventMap.delete(entry[0]);\n          }\n        }\n      }\n    } else {\n      if (callback) {\n        const handler: EventHandler<EventParamsDefinition[Evt]> = {\n          callback,\n          query: null,\n          // 卸载事件时无需处理 source 以外的参数\n          filter: {\n            nodeName: null,\n            type: eType,\n            level: null,\n            source: (query as EventQuery).source,\n            markName: null,\n            filter: null,\n            userId: null\n          }\n        };\n        this._eventDispatcher.unregister(eType, handler);\n      } else {\n        this._eventDispatcher.unregister(eType);\n      }\n    }\n    return this;\n  }\n\n  emit<Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel): this {\n    this._eventDispatcher.dispatch(eType, params, level);\n    return this;\n  }\n\n  prevent<Evt extends EventType>(\n    eType: Evt,\n    except?: {\n      handler: EventCallback<EventParamsDefinition[Evt]>;\n      level: EventBubbleLevel;\n    }\n  ): this {\n    this._eventDispatcher.prevent(eType, except);\n    return this;\n  }\n\n  allow<Evt extends EventType>(eType: Evt) {\n    this._eventDispatcher.allow(eType);\n    return this;\n  }\n\n  release(): void {\n    this._eventDispatcher.clear();\n    this._composedEventMap.clear();\n  }\n}\n"]}
+{"version":3,"sources":["../src/event/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["/*eslint no-dupe-class-members: \"off\"*/\n\nimport { Factory } from '../core/factory';\nimport type { RenderMode } from '../typings/spec/common';\nimport type {\n  EventType,\n  EventQuery,\n  EventCallback,\n  EventParamsDefinition,\n  IEvent,\n  IEventDispatcher,\n  IComposedEvent,\n  EventParams,\n  EventHandler,\n  EventBubbleLevel\n} from './interface';\n\nexport class Event implements IEvent {\n  private _eventDispatcher: IEventDispatcher;\n  private _mode: RenderMode;\n\n  private _composedEventMap: Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }> =\n    new Map();\n  getComposedEventMap() {\n    return this._composedEventMap;\n  }\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n  }\n\n  on<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(\n    eType: Evt,\n    query: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    callback?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const handler =\n      typeof query === 'function'\n        ? { query: null, callback: query }\n        : {\n            query,\n            callback: callback as EventCallback<EventParamsDefinition[Evt]>\n          };\n\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n    if (ComposedEventCtor) {\n      const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode) as IComposedEvent;\n      composedEvent.register(eType, handler);\n      this._composedEventMap.set(callback as EventCallback<EventParamsDefinition[Evt]>, {\n        eventType: eType,\n        event: composedEvent\n      });\n    } else {\n      this._eventDispatcher.register(eType, handler);\n    }\n\n    return this;\n  }\n\n  off<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(\n    eType: Evt,\n    query?: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    cb?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const callback = (cb ?? query) as EventCallback<EventParamsDefinition[Evt]>;\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n\n    if (!!ComposedEventCtor) {\n      if (callback) {\n        this._composedEventMap.get(callback)?.event.unregister();\n        this._composedEventMap.delete(callback);\n      } else {\n        for (const entry of this._composedEventMap.entries()) {\n          if (entry[1].eventType === eType) {\n            this._composedEventMap.get(entry[0])?.event.unregister();\n            this._composedEventMap.delete(entry[0]);\n          }\n        }\n      }\n    } else {\n      if (callback) {\n        const handler: EventHandler<EventParamsDefinition[Evt]> = {\n          callback,\n          query: null,\n          // 卸载事件时无需处理 source 以外的参数\n          filter: {\n            nodeName: null,\n            type: eType,\n            level: null,\n            source: (query as EventQuery).source,\n            markName: null,\n            filter: null,\n            userId: null\n          }\n        };\n        this._eventDispatcher.unregister(eType, handler);\n      } else {\n        this._eventDispatcher.unregister(eType);\n      }\n    }\n    return this;\n  }\n\n  emit<Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel): this {\n    this._eventDispatcher.dispatch(eType, params, level);\n    return this;\n  }\n\n  prevent<Evt extends EventType>(\n    eType: Evt,\n    except?: {\n      handler: EventCallback<EventParamsDefinition[Evt]>;\n      level: EventBubbleLevel;\n    }\n  ): this {\n    this._eventDispatcher.prevent(eType, except);\n    return this;\n  }\n\n  allow<Evt extends EventType>(eType: Evt) {\n    this._eventDispatcher.allow(eType);\n    return this;\n  }\n\n  release(): void {\n    this._eventDispatcher.clear();\n    this._composedEventMap.clear();\n  }\n}\n"]}

package/cjs/event/events/dimension/dimension-hover.js

@@ -9,8 +9,7 @@ const env_1 = require("../../../util/env"), base_1 = require("./base"), common_1
 class DimensionHoverEvent extends base_1.DimensionEvent {
     constructor() {
         super(...arguments), this._cacheDimensionInfo = null, this.onMouseMove = params => {
-            var _a, _b, _c, _d;
-            if (!params || (null === (_d = null === (_c = null === (_b = null === (_a = params.chart) || void 0 === _a ? void 0 : _a.getOption()) || void 0 === _b ? void 0 : _b.globalInstance) || void 0 === _c ? void 0 : _c.disableDimensionHoverEvent) || void 0 === _d ? void 0 : _d.call(_c))) return;
+            if (!params) return;
             const x = params.event.viewX, y = params.event.viewY, targetDimensionInfo = this.getTargetDimensionInfo(x, y);
             null === targetDimensionInfo && null !== this._cacheDimensionInfo ? (this._callback.call(null, Object.assign(Object.assign({}, params), {
                 action: "leave",
@@ -24,8 +23,7 @@ class DimensionHoverEvent extends base_1.DimensionEvent {
                 dimensionInfo: targetDimensionInfo.slice()
             })), this._cacheDimensionInfo = targetDimensionInfo);
         }, this.onMouseOut = params => {
-            var _a, _b, _c, _d;
-            params && !(null === (_d = null === (_c = null === (_b = null === (_a = params.chart) || void 0 === _a ? void 0 : _a.getOption()) || void 0 === _b ? void 0 : _b.globalInstance) || void 0 === _c ? void 0 : _c.disableDimensionHoverEvent) || void 0 === _d ? void 0 : _d.call(_c)) && (this._callback.call(null, Object.assign(Object.assign({}, params), {
+            params && (this._callback.call(null, Object.assign(Object.assign({}, params), {
                 action: "leave",
                 dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : []
             })), this._cacheDimensionInfo = null);

package/cjs/event/events/dimension/dimension-hover.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/events/dimension/dimension-hover.ts"],"names":[],"mappings":"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","file":"dimension-hover.js","sourcesContent":["import { isMobileLikeMode } from '../../../util/env';\nimport type { BaseEventParams, EventHandler, EventParamsDefinition, EventType } from '../../interface';\nimport { DimensionEvent } from './base';\nimport { isSameDimensionInfo } from './util/common';\nimport { Event_Source_Type } from '../../../constant/event';\nimport type { IDimensionInfo } from './interface';\n\nexport class DimensionHoverEvent extends DimensionEvent {\n  private _cacheDimensionInfo: IDimensionInfo[] | null = null;\n\n  register<Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) {\n    this._callback = handler.callback;\n\n    this._eventDispatcher.register<'pointermove'>('pointermove', {\n      query: { ...handler.query, source: Event_Source_Type.chart },\n      callback: this.onMouseMove\n    });\n\n    this._eventDispatcher.register<'pointerout'>('pointerout', {\n      query: { ...handler.query, source: Event_Source_Type.canvas },\n      callback: this.onMouseOut\n    });\n\n    if (isMobileLikeMode(this._mode)) {\n      // 移动端点按也触发 hover\n      this._eventDispatcher.register<'pointerdown'>('pointerdown', {\n        query: { ...handler.query, source: Event_Source_Type.chart },\n        callback: this.onMouseMove\n      });\n    }\n  }\n\n  unregister() {\n    this._eventDispatcher.unregister('pointermove', {\n      query: null,\n      callback: this.onMouseMove\n    });\n\n    if (isMobileLikeMode(this._mode)) {\n      // 移动端点按也出发 hover\n      this._eventDispatcher.unregister('pointerdown', {\n        query: null,\n        callback: this.onMouseMove\n      });\n    }\n  }\n\n  private onMouseMove = (params: BaseEventParams) => {\n    if (!params || params.chart?.getOption()?.globalInstance?.disableDimensionHoverEvent?.()) {\n      return;\n    }\n    const x = (params.event as any).viewX;\n    const y = (params.event as any).viewY;\n    const targetDimensionInfo = this.getTargetDimensionInfo(x, y);\n    if (targetDimensionInfo === null && this._cacheDimensionInfo !== null) {\n      // 鼠标移出某维度\n      this._callback.call(null, {\n        ...params,\n        action: 'leave',\n        dimensionInfo: this._cacheDimensionInfo.slice()\n      });\n      this._cacheDimensionInfo = targetDimensionInfo;\n    } else if (\n      targetDimensionInfo !== null &&\n      (this._cacheDimensionInfo === null ||\n        targetDimensionInfo.length !== this._cacheDimensionInfo.length ||\n        targetDimensionInfo.some((info, i) => !isSameDimensionInfo(info, this._cacheDimensionInfo![i])))\n    ) {\n      // 鼠标移入某维度\n      this._callback.call(null, {\n        ...params,\n        action: 'enter',\n        dimensionInfo: targetDimensionInfo.slice()\n      });\n      this._cacheDimensionInfo = targetDimensionInfo;\n    } else if (targetDimensionInfo !== null) {\n      // 鼠标在某维度上滑动\n      this._callback.call(null, {\n        ...params,\n        action: 'move',\n        dimensionInfo: targetDimensionInfo.slice()\n      });\n    }\n  };\n\n  private onMouseOut = (params: BaseEventParams) => {\n    if (!params || params.chart?.getOption()?.globalInstance?.disableDimensionHoverEvent?.()) {\n      return;\n    }\n    // 鼠标移出某维度\n    this._callback.call(null, {\n      ...params,\n      action: 'leave',\n      dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : []\n    });\n    this._cacheDimensionInfo = null;\n  };\n}\n"]}
+{"version":3,"sources":["../src/event/events/dimension/dimension-hover.ts"],"names":[],"mappings":"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","file":"dimension-hover.js","sourcesContent":["import { isMobileLikeMode } from '../../../util/env';\nimport type { BaseEventParams, EventHandler, EventParamsDefinition, EventType } from '../../interface';\nimport { DimensionEvent } from './base';\nimport { isSameDimensionInfo } from './util/common';\nimport { Event_Source_Type } from '../../../constant/event';\nimport type { IDimensionInfo } from './interface';\n\nexport class DimensionHoverEvent extends DimensionEvent {\n  private _cacheDimensionInfo: IDimensionInfo[] | null = null;\n\n  register<Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) {\n    this._callback = handler.callback;\n\n    this._eventDispatcher.register<'pointermove'>('pointermove', {\n      query: { ...handler.query, source: Event_Source_Type.chart },\n      callback: this.onMouseMove\n    });\n\n    this._eventDispatcher.register<'pointerout'>('pointerout', {\n      query: { ...handler.query, source: Event_Source_Type.canvas },\n      callback: this.onMouseOut\n    });\n\n    if (isMobileLikeMode(this._mode)) {\n      // 移动端点按也触发 hover\n      this._eventDispatcher.register<'pointerdown'>('pointerdown', {\n        query: { ...handler.query, source: Event_Source_Type.chart },\n        callback: this.onMouseMove\n      });\n    }\n  }\n\n  unregister() {\n    this._eventDispatcher.unregister('pointermove', {\n      query: null,\n      callback: this.onMouseMove\n    });\n\n    if (isMobileLikeMode(this._mode)) {\n      // 移动端点按也出发 hover\n      this._eventDispatcher.unregister('pointerdown', {\n        query: null,\n        callback: this.onMouseMove\n      });\n    }\n  }\n\n  private onMouseMove = (params: BaseEventParams) => {\n    if (!params) {\n      return;\n    }\n    const x = (params.event as any).viewX;\n    const y = (params.event as any).viewY;\n    const targetDimensionInfo = this.getTargetDimensionInfo(x, y);\n    if (targetDimensionInfo === null && this._cacheDimensionInfo !== null) {\n      // 鼠标移出某维度\n      this._callback.call(null, {\n        ...params,\n        action: 'leave',\n        dimensionInfo: this._cacheDimensionInfo.slice()\n      });\n      this._cacheDimensionInfo = targetDimensionInfo;\n    } else if (\n      targetDimensionInfo !== null &&\n      (this._cacheDimensionInfo === null ||\n        targetDimensionInfo.length !== this._cacheDimensionInfo.length ||\n        targetDimensionInfo.some((info, i) => !isSameDimensionInfo(info, this._cacheDimensionInfo![i])))\n    ) {\n      // 鼠标移入某维度\n      this._callback.call(null, {\n        ...params,\n        action: 'enter',\n        dimensionInfo: targetDimensionInfo.slice()\n      });\n      this._cacheDimensionInfo = targetDimensionInfo;\n    } else if (targetDimensionInfo !== null) {\n      // 鼠标在某维度上滑动\n      this._callback.call(null, {\n        ...params,\n        action: 'move',\n        dimensionInfo: targetDimensionInfo.slice()\n      });\n    }\n  };\n\n  private onMouseOut = (params: BaseEventParams) => {\n    if (!params) {\n      return;\n    }\n    // 鼠标移出某维度\n    this._callback.call(null, {\n      ...params,\n      action: 'leave',\n      dimensionInfo: this._cacheDimensionInfo ? this._cacheDimensionInfo.slice() : []\n    });\n    this._cacheDimensionInfo = null;\n  };\n}\n"]}

package/cjs/event/index.js

@@ -38,4 +38,4 @@ Object.defineProperty(exports, "getCartesianDimensionInfo", {
         return util_1.getDimensionInfoByValue;
     }
 });
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/event/interface.js

@@ -2,5 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-});
-//# sourceMappingURL=interface.js.map
+});

package/cjs/interaction/config.js

@@ -46,4 +46,4 @@ const parseHoverSelect = (mode, hoverSpec, selectSpec) => {
 };
 
 exports.parseHoverSelect = parseHoverSelect;
-//# sourceMappingURL=config.js.map
+//# sourceMappingURL=config.js.map

package/cjs/interaction/index.js

@@ -94,4 +94,4 @@ Object.defineProperty(exports, "registerElementHighlightByName", {
         return element_highlight_by_name_1.registerElementHighlightByName;
     }
 });
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/interaction/interaction.js

@@ -133,4 +133,4 @@ class Interaction {
 }
 
 exports.Interaction = Interaction;
-//# sourceMappingURL=interaction.js.map
+//# sourceMappingURL=interaction.js.map

package/cjs/mark/base/base-mark.js

@@ -616,7 +616,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
         }));
         const graphicCount = allGraphics.length;
         allGraphics.forEach(((g, index) => {
-            g.context.graphicCount = graphicCount, g.context.graphicIndex = index;
+            g.context.graphicCount = graphicCount, g.context.graphicIndex = index, g.stateSort = this._stateSort;
         })), this._dataByKey = newGroupedData, this._graphics = allGraphics, this.needClear = !0;
     }
     _runEncoderOfGraphic(styles, g, attrs = {}) {
@@ -648,9 +648,13 @@ class BaseMark extends grammar_item_1.GrammarItem {
         var _a;
         const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.group);
         graphics.forEach(((g, index) => {
-            var _a;
-            const attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
-            (0, vutils_1.isNil)(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
+            var _a, _b;
+            let attrs = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a.update, g);
+            null === (_b = g.currentStates) || void 0 === _b || _b.forEach((_state => {
+                var _a;
+                const stateAttr = this._runEncoderOfGraphic(null === (_a = this._encoderOfState) || void 0 === _a ? void 0 : _a[_state], g);
+                attrs = Object.assign(Object.assign({}, attrs), stateAttr);
+            })), (0, vutils_1.isNil)(this._markConfig.interactive) || (attrs.pickable = this._markConfig.interactive);
             const finalAttrs = this._transformGraphicAttributes(g, attrs, null == attrsByGroup ? void 0 : attrsByGroup[g.context.groupKey]);
             g.context.finalAttrs = finalAttrs;
         }));
@@ -668,7 +672,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
             } else {
                 const mockGraphic = g;
                 g = this._createGraphic(finalAttrs), hasAnimation && (null === (_a = g.setFinalAttributes) || void 0 === _a || _a.call(g, finalAttrs)), 
-                g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs;
+                g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs, g.stateSort = this._stateSort;
                 const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
                 if (gIndex >= 0 && (this._graphics[gIndex] = g), null === (_b = this.renderContext) || void 0 === _b ? void 0 : _b.progressive) {
                     const groupIndex = this._dataByGroup ? this._dataByGroup.keys.indexOf(g.context.groupKey) : 0, group = groupIndex >= 0 ? this._product.getChildAt(groupIndex) : null;