@visactor/vchart 1.1.0-beta.3 → 1.1.0-beta.5

package/esm/event/interface.d.ts

@@ -136,9 +136,14 @@ export interface IEvent {
     off: (<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>) => this) & (<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>) => this);
     emit: <Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel) => void;
     release: () => void;
+    getComposedEventMap: () => Map<EventCallback<EventParams>, {
+        eventType: EventType;
+        event: IComposedEvent;
+    }>;
 }
 export interface IComposedEvent {
     register: <Evt extends EventType>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>) => void;
     unregister: () => void;
+    dispatch: (v: unknown, opt: unknown) => unknown;
 }
 export {};

package/esm/event/interface.js.map

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

package/esm/interaction/dimension-trigger.js

@@ -2,8 +2,6 @@ import { isEmpty, isArray } from "@visactor/vutils";
 
 import { DimensionEventEnum } from "../event/events/dimension/interface";
 
-import { Event } from "../event/event";
-
 import { MarkSet } from "../mark/mark-set";
 
 import { STATE_VALUE_ENUM } from "../compile/mark/interface";
@@ -34,7 +32,7 @@ export class DimensionTrigger {
                 params = null;
             }
             this._lastDimensionEvent = params;
-        }, this._option = option, this.event = new Event(option.eventDispatcher, option.mode), 
+        }, this._option = option, this.event = this._option.model.getOption().getChart().getEvent(), 
         this.interaction = option.interaction, this.initConfig(option.mode);
     }
     setStateKeys(fields) {}
@@ -59,7 +57,7 @@ export class DimensionTrigger {
         const items = [];
         return params.dimensionInfo.forEach((df => {
             df.data.forEach((dd => {
-                (reverse ? this._markReverse : this._marks).getMarks().filter((m => m.model === dd.series)).forEach((m => {
+                (reverse ? this._markReverse : this._marks).getMarks().filter((m => m.model === dd.series && m.getVisible())).forEach((m => {
                     const elements = m.getProduct().elements.filter((e => {
                         const datum = e.getDatum();
                         let c;

package/esm/interaction/dimension-trigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/dimension-trigger.ts"],"names":[],"mappings":"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","file":"dimension-trigger.js","sourcesContent":["import { isEmpty, isArray } from '@visactor/vutils';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { DimensionEventParams } from '../event/events/dimension/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { DimensionEventEnum } from '../event/events/dimension/interface';\nimport { Event } from '../event/event';\n\nimport type { IMark } from '../mark/interface';\nimport type { EventCallback, EventParams, IEvent } from '../event/interface';\nimport type { IHoverSpec, IInteraction, ISelectSpec, ITrigger, ITriggerOption } from './interface';\nimport type { RenderMode } from '../typings/spec';\nimport { MarkSet } from '../mark/mark-set';\nimport { STATE_VALUE_ENUM } from '../compile/mark/interface';\n\nexport class DimensionTrigger implements ITrigger {\n  // 事件\n  readonly event: IEvent;\n\n  protected readonly interaction: IInteraction;\n\n  protected _option: ITriggerOption;\n  protected _marks: MarkSet = new MarkSet();\n  protected _markReverse: MarkSet = new MarkSet();\n\n  protected _lastDimensionEvent: DimensionEventParams = null;\n\n  private _hover: IHoverSpec;\n  get hover() {\n    return this._hover;\n  }\n  private _select: ISelectSpec;\n  get select() {\n    return this._select;\n  }\n\n  constructor(option: ITriggerOption) {\n    this._option = option;\n    this.event = new Event(option.eventDispatcher, option.mode);\n    this.interaction = option.interaction;\n    this.initConfig(option.mode);\n  }\n\n  setStateKeys(fields: string[]): void {\n    // do nothing\n  }\n\n  registerMark(mark: IMark): void {\n    // do nothing\n    if (!isEmpty(mark.stateStyle[STATE_VALUE_ENUM.STATE_DIMENSION_HOVER])) {\n      this._marks.addMark(mark);\n    }\n    if (!isEmpty(mark.stateStyle[STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE])) {\n      this._markReverse.addMark(mark);\n    }\n  }\n\n  init(): void {\n    this.initEvent();\n  }\n\n  release(): void {\n    this.releaseEvent();\n  }\n\n  // event\n  protected initEvent() {\n    const event = this.event;\n    event.on(DimensionEventEnum.dimensionHover, this.onHover as EventCallback<EventParams>);\n  }\n\n  protected releaseEvent(): void {\n    this.event.release();\n  }\n\n  private initConfig(mode: RenderMode): void {\n    // do nothing\n  }\n\n  protected getEventElement(params: DimensionEventParams, reverse: boolean = false): { el: IElement; mark: IMark }[] {\n    // items 修改遍历方法从 mark\n\n    const items: { el: IElement; mark: IMark }[] = [] as unknown as { el: IElement; mark: IMark }[];\n    params.dimensionInfo.forEach(df => {\n      df.data.forEach(dd => {\n        const seriesMark = (reverse ? this._markReverse : this._marks).getMarks().filter(m => m.model === dd.series);\n        seriesMark.forEach(m => {\n          const elements = m\n            .getProduct()\n            .elements.filter(e => {\n              const datum = e.getDatum();\n              let c;\n              if (isArray(datum)) {\n                c = datum.every((oneData, i) => oneData === dd.datum[i]);\n              } else {\n                c = dd.datum.some(dd_d => dd_d === datum);\n              }\n              return reverse ? !c : c;\n            })\n            .map(el => {\n              return {\n                el,\n                mark: m\n              };\n            });\n          items.push(...elements);\n        });\n      });\n    });\n    return items;\n  }\n\n  protected dimensionDataEqual(params: DimensionEventParams) {\n    if (this._lastDimensionEvent === params) {\n      return true;\n    }\n    if (!this._lastDimensionEvent || !params) {\n      return false;\n    }\n    if (this._lastDimensionEvent.dimensionInfo.length !== params.dimensionInfo.length) {\n      return false;\n    }\n    for (let i = 0; i < this._lastDimensionEvent.dimensionInfo.length; i++) {\n      const last = this._lastDimensionEvent.dimensionInfo[i];\n      const current = params.dimensionInfo[i];\n      if (last.value !== current.value) {\n        return false;\n      }\n      if (last.axis !== current.axis) {\n        return false;\n      }\n      if (last.data.length !== current.data.length) {\n        return false;\n      }\n      for (let j = 0; j < last.data.length; j++) {\n        const lastData = last.data[j];\n        const currentData = current.data[j];\n        if (lastData.series !== currentData.series) {\n          return false;\n        }\n        if (lastData.datum.length !== currentData.datum.length) {\n          return false;\n        }\n        for (let k = 0; k < lastData.datum.length; k++) {\n          if (lastData.datum[k] !== currentData.datum[k]) {\n            return false;\n          }\n        }\n      }\n    }\n    return true;\n  }\n\n  private onHover = (params: DimensionEventParams) => {\n    const elements = this.getEventElement(params);\n    switch (params.action) {\n      case 'enter':\n        // clear last hover\n        // eslint-disable-next-line no-case-declarations\n        const lastHover = this.interaction.getEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER);\n        lastHover.forEach(e => {\n          this.interaction.addEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE, e);\n        });\n        this.interaction.clearEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, false);\n        // add new\n        elements.forEach(({ el, mark }) => {\n          this.interaction.addEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, el);\n        });\n        this.interaction.reverseEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER);\n        break;\n      case 'leave':\n        // clear all\n        this.interaction.clearEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, true);\n        params = null;\n        break;\n      case 'click':\n      case 'move':\n      default:\n        break;\n    }\n    this._lastDimensionEvent = params;\n  };\n}\n"]}
+{"version":3,"sources":["../src/interaction/dimension-trigger.ts"],"names":[],"mappings":"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","file":"dimension-trigger.js","sourcesContent":["import { isEmpty, isArray } from '@visactor/vutils';\nimport type { IElement } from '@visactor/vgrammar';\nimport type { DimensionEventParams } from '../event/events/dimension/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { DimensionEventEnum } from '../event/events/dimension/interface';\nimport { Event } from '../event/event';\n\nimport type { IMark } from '../mark/interface';\nimport type { EventCallback, EventParams, IEvent } from '../event/interface';\nimport type { IHoverSpec, IInteraction, ISelectSpec, ITrigger, ITriggerOption } from './interface';\nimport type { RenderMode } from '../typings/spec';\nimport { MarkSet } from '../mark/mark-set';\nimport { STATE_VALUE_ENUM } from '../compile/mark/interface';\n\nexport class DimensionTrigger implements ITrigger {\n  // 事件\n  readonly event: IEvent;\n\n  protected readonly interaction: IInteraction;\n\n  protected _option: ITriggerOption;\n  protected _marks: MarkSet = new MarkSet();\n  protected _markReverse: MarkSet = new MarkSet();\n\n  protected _lastDimensionEvent: DimensionEventParams = null;\n\n  private _hover: IHoverSpec;\n  get hover() {\n    return this._hover;\n  }\n  private _select: ISelectSpec;\n  get select() {\n    return this._select;\n  }\n\n  constructor(option: ITriggerOption) {\n    this._option = option;\n    this.event = this._option.model.getOption().getChart().getEvent(); //  new Event(option.eventDispatcher, option.mode);\n    this.interaction = option.interaction;\n    this.initConfig(option.mode);\n  }\n\n  setStateKeys(fields: string[]): void {\n    // do nothing\n  }\n\n  registerMark(mark: IMark): void {\n    // do nothing\n    if (!isEmpty(mark.stateStyle[STATE_VALUE_ENUM.STATE_DIMENSION_HOVER])) {\n      this._marks.addMark(mark);\n    }\n    if (!isEmpty(mark.stateStyle[STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE])) {\n      this._markReverse.addMark(mark);\n    }\n  }\n\n  init(): void {\n    this.initEvent();\n  }\n\n  release(): void {\n    this.releaseEvent();\n  }\n\n  // event\n  protected initEvent() {\n    const event = this.event;\n    event.on(DimensionEventEnum.dimensionHover, this.onHover as EventCallback<EventParams>);\n  }\n\n  protected releaseEvent(): void {\n    this.event.release();\n  }\n\n  private initConfig(mode: RenderMode): void {\n    // do nothing\n  }\n\n  protected getEventElement(params: DimensionEventParams, reverse: boolean = false): { el: IElement; mark: IMark }[] {\n    // items 修改遍历方法从 mark\n\n    const items: { el: IElement; mark: IMark }[] = [] as unknown as { el: IElement; mark: IMark }[];\n    params.dimensionInfo.forEach(df => {\n      df.data.forEach(dd => {\n        const seriesMark = (reverse ? this._markReverse : this._marks)\n          .getMarks()\n          .filter(m => m.model === dd.series && m.getVisible());\n        seriesMark.forEach(m => {\n          const elements = m\n            .getProduct()\n            .elements.filter(e => {\n              const datum = e.getDatum();\n              let c;\n              if (isArray(datum)) {\n                c = datum.every((oneData, i) => oneData === dd.datum[i]);\n              } else {\n                c = dd.datum.some(dd_d => dd_d === datum);\n              }\n              return reverse ? !c : c;\n            })\n            .map(el => {\n              return {\n                el,\n                mark: m\n              };\n            });\n          items.push(...elements);\n        });\n      });\n    });\n    return items;\n  }\n\n  protected dimensionDataEqual(params: DimensionEventParams) {\n    if (this._lastDimensionEvent === params) {\n      return true;\n    }\n    if (!this._lastDimensionEvent || !params) {\n      return false;\n    }\n    if (this._lastDimensionEvent.dimensionInfo.length !== params.dimensionInfo.length) {\n      return false;\n    }\n    for (let i = 0; i < this._lastDimensionEvent.dimensionInfo.length; i++) {\n      const last = this._lastDimensionEvent.dimensionInfo[i];\n      const current = params.dimensionInfo[i];\n      if (last.value !== current.value) {\n        return false;\n      }\n      if (last.axis !== current.axis) {\n        return false;\n      }\n      if (last.data.length !== current.data.length) {\n        return false;\n      }\n      for (let j = 0; j < last.data.length; j++) {\n        const lastData = last.data[j];\n        const currentData = current.data[j];\n        if (lastData.series !== currentData.series) {\n          return false;\n        }\n        if (lastData.datum.length !== currentData.datum.length) {\n          return false;\n        }\n        for (let k = 0; k < lastData.datum.length; k++) {\n          if (lastData.datum[k] !== currentData.datum[k]) {\n            return false;\n          }\n        }\n      }\n    }\n    return true;\n  }\n\n  private onHover = (params: DimensionEventParams) => {\n    const elements = this.getEventElement(params);\n    switch (params.action) {\n      case 'enter':\n        // clear last hover\n        // eslint-disable-next-line no-case-declarations\n        const lastHover = this.interaction.getEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER);\n        lastHover.forEach(e => {\n          this.interaction.addEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER_REVERSE, e);\n        });\n        this.interaction.clearEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, false);\n        // add new\n        elements.forEach(({ el, mark }) => {\n          this.interaction.addEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, el);\n        });\n        this.interaction.reverseEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER);\n        break;\n      case 'leave':\n        // clear all\n        this.interaction.clearEventElement(STATE_VALUE_ENUM.STATE_DIMENSION_HOVER, true);\n        params = null;\n        break;\n      case 'click':\n      case 'move':\n      default:\n        break;\n    }\n    this._lastDimensionEvent = params;\n  };\n}\n"]}

package/esm/util/env.d.ts

@@ -1,5 +1,6 @@
 import type { RenderMode } from '../typings/spec';
 export declare const isBrowser: boolean;
+export declare const domDocument: Document;
 export declare function isTrueBrowser(mode: RenderMode): boolean;
 export declare function isPcLikeMode(mode: RenderMode): boolean;
 export declare function isMobileLikeMode(mode: RenderMode): boolean;

package/esm/util/env.js

@@ -1,5 +1,7 @@
 export const isBrowser = "undefined" != typeof window && void 0 !== window.document;
 
+export const domDocument = isBrowser && globalThis.document;
+
 export function isTrueBrowser(mode) {
     return ("desktop-browser" === mode || "mobile-browser" === mode) && isBrowser;
 }

package/esm/util/env.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/env.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC;AAGjG,MAAM,UAAU,aAAa,CAAC,IAAgB;IAC5C,OAAO,CAAC,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,gBAAgB,CAAC,IAAI,SAAS,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,OAAO,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,iBAAiB,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,gBAAgB,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAChD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC;AACrD,CAAC","file":"env.js","sourcesContent":["import type { RenderMode } from '../typings/spec';\n\nexport const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';\n\n// Taro 会模拟实现 DOM，所以还是加上 mode 的判断\nexport function isTrueBrowser(mode: RenderMode): boolean {\n  return (mode === 'desktop-browser' || mode === 'mobile-browser') && isBrowser;\n}\n\nexport function isPcLikeMode(mode: RenderMode) {\n  return mode === 'desktop-miniApp' || mode === 'desktop-browser';\n}\n\nexport function isMobileLikeMode(mode: RenderMode) {\n  return mode === 'miniApp' || mode === 'mobile-browser';\n}\n\nexport function isMiniAppLikeMode(mode: RenderMode) {\n  return mode.includes('miniApp') || mode === 'lynx';\n}\n"]}
+{"version":3,"sources":["../src/util/env.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,WAAW,CAAC;AACjG,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,IAAI,UAAU,CAAC,QAAQ,CAAC;AAG5D,MAAM,UAAU,aAAa,CAAC,IAAgB;IAC5C,OAAO,CAAC,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,gBAAgB,CAAC,IAAI,SAAS,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,OAAO,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,iBAAiB,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAgB;IAC/C,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,gBAAgB,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAgB;IAChD,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC;AACrD,CAAC","file":"env.js","sourcesContent":["import type { RenderMode } from '../typings/spec';\n\nexport const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';\nexport const domDocument = isBrowser && globalThis.document;\n\n// Taro 会模拟实现 DOM，所以还是加上 mode 的判断\nexport function isTrueBrowser(mode: RenderMode): boolean {\n  return (mode === 'desktop-browser' || mode === 'mobile-browser') && isBrowser;\n}\n\nexport function isPcLikeMode(mode: RenderMode) {\n  return mode === 'desktop-miniApp' || mode === 'desktop-browser';\n}\n\nexport function isMobileLikeMode(mode: RenderMode) {\n  return mode === 'miniApp' || mode === 'mobile-browser';\n}\n\nexport function isMiniAppLikeMode(mode: RenderMode) {\n  return mode.includes('miniApp') || mode === 'lynx';\n}\n"]}

package/esm/util/text.d.ts

@@ -1,5 +1,9 @@
 import type { ITextMeasureOption } from '@visactor/vutils';
 import { TextMeasure, TestTextMeasure } from '@visactor/vutils';
+import type { IRichTextAttribute } from '@visactor/vrender';
 import type { ITextMarkSpec } from '../typings';
 export declare const initTextMeasure: (textSpec?: Partial<ITextMarkSpec>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextMarkSpec>;
 export declare const testTextMeasure: (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean) => TestTextMeasure<any>;
+type IRichTextBoundsParams = Partial<IRichTextAttribute>;
+export declare function getRichTextBounds(params: IRichTextBoundsParams): import("@visactor/vutils").IBounds;
+export {};

package/esm/util/text.js

@@ -1,6 +1,6 @@
 import { TextMeasure, TestTextMeasure } from "@visactor/vutils";
 
-import { getTextBounds } from "@visactor/vrender";
+import { createRichText, getTextBounds } from "@visactor/vrender";
 
 import { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from "../theme";
 
@@ -20,4 +20,10 @@ export const testTextMeasure = (textSpec, useVRender) => new TestTextMeasure({
     },
     getTextBounds: useVRender ? getTextBounds : void 0
 }, textSpec);
+
+const richText = createRichText({});
+
+export function getRichTextBounds(params) {
+    return richText.setAttributes(params), richText.AABBBounds;
+}
 //# sourceMappingURL=text.js.map

package/esm/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,WAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EACzD,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAE,UAAoB,EAAwB,EAAE;IAC/G,OAAO,IAAI,eAAe,CACxB;QACE,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC;QACD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;KACtD,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport { getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n/** 测试方法 */\nexport const testTextMeasure = (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean): TestTextMeasure<any> => {\n  return new TestTextMeasure(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useVRender ? getTextBounds : undefined\n    },\n    textSpec\n  );\n};\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGhE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAE5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,WAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EACzD,cAAc,EAAE,cAAc,GAAG,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAE,UAAoB,EAAwB,EAAE;IAC/G,OAAO,IAAI,eAAe,CACxB;QACE,iBAAiB,EAAE;YACjB,UAAU,EAAE,wBAAwB;YACpC,QAAQ,EAAE,sBAAsB;SACjC;QACD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS;KACtD,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAKF,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;AACpC,MAAM,UAAU,iBAAiB,CAAC,MAA6B;IAC7D,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC,UAAU,CAAC;AAC7B,CAAC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport type { IRichTextAttribute } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createRichText, getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n/** 测试方法 */\nexport const testTextMeasure = (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean): TestTextMeasure<any> => {\n  return new TestTextMeasure(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useVRender ? getTextBounds : undefined\n    },\n    textSpec\n  );\n};\n\n/** 测量富文本 */\n// FIXME: 等 vrender 支持后删掉\ntype IRichTextBoundsParams = Partial<IRichTextAttribute>;\nconst richText = createRichText({});\nexport function getRichTextBounds(params: IRichTextBoundsParams) {\n  richText.setAttributes(params);\n  return richText.AABBBounds;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.1.0-beta.3",
+  "version": "1.1.0-beta.5",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -85,12 +85,12 @@
     "@visactor/vutils": "~0.11.1",
     "@visactor/vdataset": "~0.11.1",
     "@visactor/vscale": "~0.11.1",
-    "@visactor/vgrammar": "~0.3.2",
-    "@visactor/vgrammar-projection": "~0.3.2",
-    "@visactor/vgrammar-wordcloud": "~0.3.2",
-    "@visactor/vgrammar-wordcloud-shape": "~0.3.2",
-    "@visactor/vgrammar-hierarchy": "~0.3.2",
-    "@visactor/vgrammar-sankey": "~0.3.2",
+    "@visactor/vgrammar": "0.3.4-alpha.0",
+    "@visactor/vgrammar-projection": "0.3.4-alpha.0",
+    "@visactor/vgrammar-wordcloud": "0.3.4-alpha.0",
+    "@visactor/vgrammar-wordcloud-shape": "0.3.4-alpha.0",
+    "@visactor/vgrammar-hierarchy": "0.3.4-alpha.0",
+    "@visactor/vgrammar-sankey": "0.3.4-alpha.0",
     "@visactor/vgrammar-util": "~0.3.1",
     "@visactor/vrender": "~0.12.0",
     "@visactor/vrender-components": "~0.12.0"