@visactor/vchart 1.9.0-alpha.0 → 1.9.0-alpha.2

package/esm/interaction/config.js

@@ -6,8 +6,8 @@ export function getDefaultInteractionConfigByMode(mode) {
     return mode === RenderModeEnum["desktop-browser"] || mode === RenderModeEnum["desktop-miniApp"] ? {
         hover: {
             enable: !0,
-            trigger: "pointermove",
-            triggerOff: "pointerleave"
+            trigger: "pointerover",
+            triggerOff: "pointerout"
         },
         select: {
             enable: !0,
@@ -16,8 +16,8 @@ export function getDefaultInteractionConfigByMode(mode) {
     } : isMobileLikeMode(mode) || isMiniAppLikeMode(mode) ? {
         hover: {
             enable: !0,
-            trigger: [ "pointerdown", "pointermove" ],
-            triggerOff: "pointerleave"
+            trigger: [ "pointerdown", "pointerover" ],
+            triggerOff: "pointerout"
         },
         select: {
             enable: !0,

package/esm/interaction/config.js.map

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

package/esm/interaction/drill/drillable.d.ts

@@ -17,7 +17,7 @@ export interface IDrillable {
 export declare class Drillable implements IDrillable {
     private _drillParams;
     private _drillInfo;
-    private _getTriggerEvent;
+    private _getDrillTriggerEvent;
     private _hideTooltip;
     initDrillable(params: DrillParams): void;
     initDrillableData(dataSet: DataSet): void;

package/esm/interaction/drill/drillable.js

@@ -13,13 +13,13 @@ import { registerDataSetInstanceTransform } from "../../data/register";
 import { ComponentTypeEnum } from "../../component/interface/type";
 
 export class Drillable {
-    _getTriggerEvent(type) {
+    _getDrillTriggerEvent(type) {
         var _a;
         const {mode: mode} = this._drillParams;
         return null === (_a = getDefaultTriggerEventByMode(mode)) || void 0 === _a ? void 0 : _a[type];
     }
     _hideTooltip() {
-        const tooltip = this.getChart().getAllComponents().find((c => c.type === ComponentTypeEnum.tooltip));
+        const tooltip = this.getChart().getComponentsByType(ComponentTypeEnum.tooltip)[0];
         tooltip && tooltip.hideTooltip();
     }
     initDrillable(params) {
@@ -37,7 +37,7 @@ export class Drillable {
     }
     bindDrillEvent() {
         const {event: event, getRawData: getRawData, drillField: drillField} = this._drillParams, keyField = drillField();
-        this._getTriggerEvent("start") && event.on(this._getTriggerEvent("start"), (e => {
+        this._getDrillTriggerEvent("start") && event.on(this._getDrillTriggerEvent("start"), (e => {
             var _a, _b, _c;
             if (isNil(e.datum) || isNil(null === (_a = e.datum) || void 0 === _a ? void 0 : _a[keyField])) return void this.drillUp();
             this._hideTooltip();

package/esm/interaction/drill/drillable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/drill/drillable.ts"],"names":[],"mappings":"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","file":"drillable.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { isArray, isEmpty, isNil } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\n\nimport type { DrillInfo } from '../../data/transforms/drill';\nimport { drillFilter, DrillEnum } from '../../data/transforms/drill';\nimport type { EventType, IEvent } from '../../event/interface';\nimport type { RenderMode } from '../../typings/spec';\nimport { getDefaultTriggerEventByMode } from '../../component/common/trigger/config';\nimport { findHierarchyPath } from '../../util/hierarchy';\nimport { ChartEvent } from '../../constant';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport type { IModel } from '../../model/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport { ComponentTypeEnum } from '../../component/interface/type';\nimport type { Tooltip } from '../../component/tooltip';\n\ninterface DrillParams {\n  event: IEvent;\n  mode: RenderMode;\n  drillField: () => string;\n  getRawData: () => DataView;\n}\n\nexport interface IDrillable {\n  /**\n   * 初始化钻取设置\n   */\n  initDrillable: (params: DrillParams) => void;\n\n  /**\n   * 初始化钻取数据\n   */\n  initDrillableData: (dataSet: DataSet) => void;\n\n  /**\n   * 绑定钻取事件\n   */\n  bindDrillEvent: () => void;\n\n  /**\n   * 上卷\n   */\n  drillUp: () => void;\n\n  /**\n   * 下钻\n   * @param drillPath 钻取路径\n   */\n  drillDown: (drillPath: string[]) => string[];\n}\n\nexport class Drillable implements IDrillable {\n  private _drillParams: DrillParams;\n  private _drillInfo: DrillInfo;\n\n  private _getTriggerEvent(type: string): EventType {\n    const { mode } = this._drillParams;\n\n    return getDefaultTriggerEventByMode(mode)?.[type];\n  }\n\n  private _hideTooltip() {\n    const tooltip = (this as unknown as BaseSeries<null>)\n      .getChart()\n      .getAllComponents()\n      .find(c => c.type === ComponentTypeEnum.tooltip) as Tooltip;\n    tooltip && tooltip.hideTooltip();\n  }\n\n  initDrillable(params: DrillParams) {\n    this._drillParams = params;\n  }\n\n  initDrillableData(dataSet: DataSet) {\n    const { getRawData } = this._drillParams;\n    // 注册筛选方法\n    registerDataSetInstanceTransform(dataSet, 'drillFilter', drillFilter);\n\n    // 调用筛选数据, 用于上卷下钻\n    getRawData().transform({\n      type: 'drillFilter',\n      options: {\n        info: () => this._drillInfo,\n        keyField: () => this._drillParams.drillField()\n      }\n    });\n  }\n\n  bindDrillEvent() {\n    const { event, getRawData, drillField } = this._drillParams;\n    const keyField = drillField();\n    if (this._getTriggerEvent('start')) {\n      event.on(this._getTriggerEvent('start'), e => {\n        if (isNil(e.datum) || isNil(e.datum?.[keyField])) {\n          this.drillUp();\n          return;\n        }\n\n        // Drill交互后, 隐藏Tooltip\n        this._hideTooltip();\n        // 获取数据key\n        const dataKey = e.datum[keyField];\n        // 已钻取的路径\n        const selectPath = this._drillInfo?.path ?? [];\n        // 用户点击的路径\n        const clickedPath = findHierarchyPath(getRawData().rawData, dataKey, keyField, 'children');\n        // 已钻取过, 则一定上卷\n        if (selectPath[selectPath.length - 1] === clickedPath[clickedPath.length - 1]) {\n          this.drillUp();\n        } else {\n          this.drillDown(clickedPath);\n        }\n      });\n    }\n  }\n\n  /**\n   * 下钻接口\n   * @param drillPath 下钻后的路径\n   * @returns 当然路径\n   * @description 根据传入的path, 向指定层级下钻.\n   */\n  drillDown(drillPath: string[] = []): string[] {\n    const { getRawData, event } = this._drillParams;\n    if (!isArray(drillPath) || isEmpty(drillPath)) {\n      return drillPath;\n    }\n\n    // 根据钻取路径, 获得当前需要展示的层级\n    const dataKey = drillPath[drillPath.length - 1];\n\n    this._drillInfo = {\n      key: dataKey,\n      path: drillPath,\n      type: DrillEnum.DrillDown\n    };\n\n    getRawData().reRunAllTransform();\n    event.emit(ChartEvent.drill, {\n      value: { path: drillPath, type: DrillEnum.DrillDown },\n      model: this as unknown as IModel\n    });\n    return drillPath;\n  }\n\n  /**\n   * 上卷接口\n   * @returns 上卷后的路径\n   * @description 根据path信息, 向父层级上卷.\n   */\n  drillUp() {\n    const { getRawData, event } = this._drillParams;\n\n    const path = this._drillInfo?.path ?? [];\n    if (!isArray(path) || isEmpty(path)) {\n      return path;\n    }\n\n    const dataKey = path.pop();\n\n    this._drillInfo = {\n      key: dataKey,\n      path: path,\n      type: DrillEnum.DrillUp\n    };\n\n    getRawData().reRunAllTransform();\n    event.emit(ChartEvent.drill, {\n      value: { path, type: DrillEnum.DrillUp },\n      model: this as unknown as IModel\n    });\n    return path;\n  }\n}\n"]}
+{"version":3,"sources":["../src/interaction/drill/drillable.ts"],"names":[],"mappings":"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","file":"drillable.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { isArray, isEmpty, isNil } from '@visactor/vutils';\nimport type { DataSet, DataView } from '@visactor/vdataset';\n\nimport type { DrillInfo } from '../../data/transforms/drill';\nimport { drillFilter, DrillEnum } from '../../data/transforms/drill';\nimport type { EventType, IEvent } from '../../event/interface';\nimport type { RenderMode } from '../../typings/spec';\nimport { getDefaultTriggerEventByMode } from '../../component/common/trigger/config';\nimport { findHierarchyPath } from '../../util/hierarchy';\nimport { ChartEvent } from '../../constant';\nimport { registerDataSetInstanceTransform } from '../../data/register';\nimport type { IModel } from '../../model/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport { ComponentTypeEnum } from '../../component/interface/type';\nimport type { Tooltip } from '../../component/tooltip';\n\ninterface DrillParams {\n  event: IEvent;\n  mode: RenderMode;\n  drillField: () => string;\n  getRawData: () => DataView;\n}\n\nexport interface IDrillable {\n  /**\n   * 初始化钻取设置\n   */\n  initDrillable: (params: DrillParams) => void;\n\n  /**\n   * 初始化钻取数据\n   */\n  initDrillableData: (dataSet: DataSet) => void;\n\n  /**\n   * 绑定钻取事件\n   */\n  bindDrillEvent: () => void;\n\n  /**\n   * 上卷\n   */\n  drillUp: () => void;\n\n  /**\n   * 下钻\n   * @param drillPath 钻取路径\n   */\n  drillDown: (drillPath: string[]) => string[];\n}\n\nexport class Drillable implements IDrillable {\n  private _drillParams: DrillParams;\n  private _drillInfo: DrillInfo;\n\n  private _getDrillTriggerEvent(type: string): EventType {\n    const { mode } = this._drillParams;\n\n    return getDefaultTriggerEventByMode(mode)?.[type];\n  }\n\n  private _hideTooltip() {\n    const tooltip = (this as unknown as BaseSeries<null>)\n      .getChart()\n      .getComponentsByType(ComponentTypeEnum.tooltip)[0] as Tooltip;\n    tooltip && tooltip.hideTooltip();\n  }\n\n  initDrillable(params: DrillParams) {\n    this._drillParams = params;\n  }\n\n  initDrillableData(dataSet: DataSet) {\n    const { getRawData } = this._drillParams;\n    // 注册筛选方法\n    registerDataSetInstanceTransform(dataSet, 'drillFilter', drillFilter);\n\n    // 调用筛选数据, 用于上卷下钻\n    getRawData().transform({\n      type: 'drillFilter',\n      options: {\n        info: () => this._drillInfo,\n        keyField: () => this._drillParams.drillField()\n      }\n    });\n  }\n\n  bindDrillEvent() {\n    const { event, getRawData, drillField } = this._drillParams;\n    const keyField = drillField();\n    if (this._getDrillTriggerEvent('start')) {\n      event.on(this._getDrillTriggerEvent('start'), e => {\n        if (isNil(e.datum) || isNil(e.datum?.[keyField])) {\n          this.drillUp();\n          return;\n        }\n\n        // Drill交互后, 隐藏Tooltip\n        this._hideTooltip();\n        // 获取数据key\n        const dataKey = e.datum[keyField];\n        // 已钻取的路径\n        const selectPath = this._drillInfo?.path ?? [];\n        // 用户点击的路径\n        const clickedPath = findHierarchyPath(getRawData().rawData, dataKey, keyField, 'children');\n        // 已钻取过, 则一定上卷\n        if (selectPath[selectPath.length - 1] === clickedPath[clickedPath.length - 1]) {\n          this.drillUp();\n        } else {\n          this.drillDown(clickedPath);\n        }\n      });\n    }\n  }\n\n  /**\n   * 下钻接口\n   * @param drillPath 下钻后的路径\n   * @returns 当然路径\n   * @description 根据传入的path, 向指定层级下钻.\n   */\n  drillDown(drillPath: string[] = []): string[] {\n    const { getRawData, event } = this._drillParams;\n    if (!isArray(drillPath) || isEmpty(drillPath)) {\n      return drillPath;\n    }\n\n    // 根据钻取路径, 获得当前需要展示的层级\n    const dataKey = drillPath[drillPath.length - 1];\n\n    this._drillInfo = {\n      key: dataKey,\n      path: drillPath,\n      type: DrillEnum.DrillDown\n    };\n\n    getRawData().reRunAllTransform();\n    event.emit(ChartEvent.drill, {\n      value: { path: drillPath, type: DrillEnum.DrillDown },\n      model: this as unknown as IModel\n    });\n    return drillPath;\n  }\n\n  /**\n   * 上卷接口\n   * @returns 上卷后的路径\n   * @description 根据path信息, 向父层级上卷.\n   */\n  drillUp() {\n    const { getRawData, event } = this._drillParams;\n\n    const path = this._drillInfo?.path ?? [];\n    if (!isArray(path) || isEmpty(path)) {\n      return path;\n    }\n\n    const dataKey = path.pop();\n\n    this._drillInfo = {\n      key: dataKey,\n      path: path,\n      type: DrillEnum.DrillUp\n    };\n\n    getRawData().reRunAllTransform();\n    event.emit(ChartEvent.drill, {\n      value: { path, type: DrillEnum.DrillUp },\n      model: this as unknown as IModel\n    });\n    return path;\n  }\n}\n"]}

package/esm/interaction/interface.d.ts

@@ -1,9 +1,10 @@
-import type { IElement } from '@visactor/vgrammar-core';
+import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement } from '@visactor/vgrammar-core';
 import type { IMark } from '../mark/interface';
 import type { RenderMode } from '../typings/spec/common';
 import type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface';
 import type { IModel } from '../model/interface';
 import type { StateValue } from '../compile/mark';
+import type { StringOrNumber } from '../typings/common';
 export interface IInteraction {
     registerMark: (state: StateValue, mark: IMark) => void;
     filterEventMark: (params: BaseEventParams, state: StateValue) => boolean;
@@ -41,10 +42,31 @@ export type ISelectSpec = {
     enable?: boolean;
     mode?: 'single' | 'multiple';
     trigger?: Trigger;
-    triggerOff?: Trigger;
+    triggerOff?: Trigger | number;
 };
 export interface ITriggerSpec {
     hover?: IHoverSpec | boolean;
     select?: ISelectSpec | boolean;
 }
+interface IBaseInteractionSpec {
+    markIds?: StringOrNumber[];
+    markNames?: StringOrNumber[];
+}
+export type IElementActiveSpec = IBaseInteractionSpec & Pick<ElementActiveSpec, 'type' | 'trigger' | 'triggerOff' | 'state'>;
+export type IElementSelectSpec = IBaseInteractionSpec & Pick<ElementSelectSpec, 'type' | 'trigger' | 'triggerOff' | 'state' | 'isMultiple' | 'reverseState'>;
+export type IElementHighlightSpec = IBaseInteractionSpec & Pick<ElementHighlightSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;
+export type IElementHighlightByKeySpec = IBaseInteractionSpec & Pick<ElementHighlightByKeySpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;
+export type IElementHighlightByGroup = IBaseInteractionSpec & Pick<ElementHighlightByGroupSpec, 'type' | 'blurState' | 'highlightState' | 'triggerOff' | 'trigger'>;
+export type IElementActiveByLegend = IBaseInteractionSpec & Pick<ElementActiveByLegendSpec, 'type' | 'filterType' | 'state'>;
+export type IElementHighlightByLegend = IBaseInteractionSpec & Pick<ElementHighlightByLegendSpec, 'type' | 'filterType' | 'blurState' | 'highlightState'>;
+export type IElementHighlightByName = IBaseInteractionSpec & Pick<ElementHighlightByNameSpec, 'type' | 'blurState' | 'highlightState' | 'graphicName' | 'parseData'>;
+export interface ICustomInteraction extends IBaseInteractionSpec {
+    type: string;
+}
+export type IInteractionItemSpec = IElementActiveSpec | IElementSelectSpec | IElementHighlightSpec | IElementHighlightByKeySpec | IElementHighlightByGroup | IElementActiveByLegend | IElementHighlightByLegend | IElementHighlightByName;
+export interface IInteractionSpec {
+    hover?: IHoverSpec | boolean;
+    select?: ISelectSpec | boolean;
+    interactions?: IInteractionItemSpec[];
+}
 export {};

package/esm/interaction/interface.js.map

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

package/esm/interaction/zoom/zoomable.d.ts

@@ -50,8 +50,10 @@ export declare class Zoomable implements IZoomable {
     private _zoomableTrigger;
     private _eventObj;
     private _renderMode;
+    private _gestureController;
+    private _isGestureListener;
     initZoomable(evt: IEvent, mode?: RenderMode): void;
-    private _getTriggerEvent;
+    private _getZoomTriggerEvent;
     private _zoomEventDispatch;
     private _getRegionOrSeriesLayout;
     private _bindZoomEventAsRegion;

package/esm/interaction/zoom/zoomable.js

@@ -6,22 +6,28 @@ import { getDefaultTriggerEventByMode } from "../../component/common/trigger/con
 
 import { Event_Bubble_Level, Event_Source_Type } from "../../constant";
 
+import { isMiniAppLikeMode, isMobileLikeMode } from "../../util";
+
 const delayMap = {
     debounce: debounce,
     throttle: throttle
 };
 
 export class Zoomable {
+    constructor() {
+        this._isGestureListener = !1;
+    }
     initZoomable(evt, mode = RenderModeEnum["desktop-browser"]) {
-        this._eventObj = evt, this._renderMode = mode, getDefaultTriggerEventByMode(this._renderMode) && (this._clickEnable = !0, 
-        this._zoomableTrigger = new (this._getTriggerEvent("trigger")));
+        this._eventObj = evt, this._renderMode = mode, this._gestureController = this._option.getChart().getVGrammarView().renderer._gestureController, 
+        this._isGestureListener = isMobileLikeMode(this._renderMode) || isMiniAppLikeMode(this._renderMode), 
+        getDefaultTriggerEventByMode(this._renderMode) && (this._clickEnable = !0, this._zoomableTrigger = new (this._getZoomTriggerEvent("trigger")));
     }
-    _getTriggerEvent(type) {
+    _getZoomTriggerEvent(type) {
         return getDefaultTriggerEventByMode(this._renderMode)[type];
     }
     _zoomEventDispatch(params, regionOrSeries, callback) {
-        if (!params.event) return;
-        const event = params.event.clone();
+        if (!this._isGestureListener && !params.event) return;
+        const event = this._isGestureListener ? params : params.event.clone();
         this._zoomableTrigger.parserZoomEvent(event);
         const {zoomDelta: zoomDelta, zoomX: zoomX, zoomY: zoomY} = event;
         isNil(zoomDelta) || pointInRect({
@@ -53,16 +59,16 @@ export class Zoomable {
     }
     _bindZoomEventAsRegion(eventObj, regionOrSeries, callback, option) {
         var _a, _b;
-        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0;
-        eventObj.on(this._getTriggerEvent("scrollEnd"), {
+        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0, event = this._isGestureListener ? this._gestureController : eventObj, zoomParams = this._isGestureListener ? [ this._getZoomTriggerEvent("zoom") ] : [ this._getZoomTriggerEvent("zoom"), {
+            level: Event_Bubble_Level.chart,
+            consume: !0
+        } ], zoomEndParams = this._isGestureListener ? [ this._getZoomTriggerEvent("zoomEnd") ] : [ this._getZoomTriggerEvent("zoomEnd"), {
             level: Event_Bubble_Level.chart,
             consume: !1
-        }, delayMap[delayType]((params => {
+        } ];
+        event.on(...zoomEndParams, delayMap[delayType]((params => {
             this._zoomableTrigger.clearZoom();
-        }), delayTime)), eventObj.on(this._getTriggerEvent("scroll"), {
-            level: Event_Bubble_Level.chart,
-            consume: !0
-        }, delayMap[delayType]((params => {
+        }), delayTime)), event.on(...zoomParams, delayMap[delayType]((params => {
             this._zoomEventDispatch(params, regionOrSeries, callback);
         }), delayTime));
     }
@@ -77,37 +83,36 @@ export class Zoomable {
         }));
     }
     _scrollEventDispatch(params, regionOrSeries, callback) {
-        if (!params.event || this._option.disableTriggerEvent) return;
-        const {event: event} = params;
+        let stopBubble = !1;
+        if (!this._isGestureListener && (!params.event || this._option.disableTriggerEvent)) return stopBubble;
+        const event = this._isGestureListener ? params : params.event;
         this._zoomableTrigger.parserScrollEvent(event);
-        const {scrollX: scrollX, scrollY: scrollY} = event;
-        isNil(scrollX) && isNil(scrollY) || pointInRect({
-            x: event.canvasX,
-            y: event.canvasY
-        }, this._getRegionOrSeriesLayout(regionOrSeries), !1) && (this._clickEnable = !1, 
-        callback && callback({
+        const {scrollX: scrollX, scrollY: scrollY, canvasX: canvasX, canvasY: canvasY} = event;
+        return isNil(scrollX) && isNil(scrollY) ? stopBubble : pointInRect({
+            x: canvasX,
+            y: canvasY
+        }, this._getRegionOrSeriesLayout(regionOrSeries), !1) ? (this._clickEnable = !1, 
+        callback && (stopBubble = callback({
             scrollX: scrollX,
             scrollY: scrollY
-        }, event), this._eventObj.emit("scroll", {
+        }, event)), this._eventObj.emit("scroll", {
             scrollX: scrollX,
             scrollY: scrollY,
             model: this
-        }));
+        }), stopBubble) : stopBubble;
     }
     _bindScrollEventAsRegion(eventObj, regionOrSeries, callback, option) {
         var _a, _b;
-        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0;
-        eventObj.on(this._getTriggerEvent("scrollEnd"), {
+        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0, event = this._isGestureListener ? this._gestureController : eventObj, scrollParams = this._isGestureListener ? [ this._getZoomTriggerEvent("scroll") ] : [ this._getZoomTriggerEvent("scroll"), {
+            level: Event_Bubble_Level.chart,
+            consume: !0
+        } ], scrollEndParams = this._isGestureListener ? [ this._getZoomTriggerEvent("scrollEnd") ] : [ this._getZoomTriggerEvent("scrollEnd"), {
             level: Event_Bubble_Level.chart,
             consume: !1
-        }, delayMap[delayType]((params => {
+        } ];
+        event.on(...scrollEndParams, delayMap[delayType]((params => {
             this._zoomableTrigger.clearScroll();
-        }), delayTime)), eventObj.on(this._getTriggerEvent("scroll"), {
-            level: Event_Bubble_Level.chart,
-            consume: !0
-        }, delayMap[delayType]((params => {
-            this._scrollEventDispatch(params, regionOrSeries, callback);
-        }), delayTime));
+        }), delayTime)), event.on(...scrollParams, delayMap[delayType]((params => this._scrollEventDispatch(params, regionOrSeries, callback)), delayTime));
     }
     initScrollEventOfSeries(s, callback, option) {
         getDefaultTriggerEventByMode(this._renderMode) && this._bindScrollEventAsRegion(s.event, s, callback, option);
@@ -120,7 +125,7 @@ export class Zoomable {
         }));
     }
     _bindDragEventAsRegion(eventObj, regionOrSeries, callback, option) {
-        eventObj.on(this._getTriggerEvent("start"), {
+        eventObj.on(this._getZoomTriggerEvent("start"), {
             level: Event_Bubble_Level.chart
         }, (params => {
             if (!params.event) return;
@@ -134,7 +139,7 @@ export class Zoomable {
         }, (() => !this._clickEnable));
     }
     initDragEventOfSeries(s, callback, option) {
-        this._option.disableTriggerEvent || getDefaultTriggerEventByMode(this._renderMode) && s.event.on(this._getTriggerEvent("start"), {
+        this._option.disableTriggerEvent || getDefaultTriggerEventByMode(this._renderMode) && s.event.on(this._getZoomTriggerEvent("start"), {
             level: Event_Bubble_Level.model,
             filter: ({model: model}) => (null == model ? void 0 : model.id) === s.id
         }, (params => {
@@ -144,7 +149,7 @@ export class Zoomable {
     initDragEventOfRegions(regions, filter, callback, option) {
         this._option.disableTriggerEvent || getDefaultTriggerEventByMode(this._renderMode) && regions.forEach((r => {
             filter ? r.getSeries().forEach((s => {
-                filter(s) && (s.event.on(this._getTriggerEvent("start"), {
+                filter(s) && (s.event.on(this._getZoomTriggerEvent("start"), {
                     level: Event_Bubble_Level.model,
                     filter: ({model: model}) => (null == model ? void 0 : model.id) === s.id
                 }, (params => {
@@ -160,7 +165,7 @@ export class Zoomable {
         var _a, _b, _c;
         if (this._option.disableTriggerEvent) return;
         if (this._clickEnable = !0, !this._zoomableTrigger.parserDragEvent(params.event)) return;
-        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0, realTime = null === (_c = null == option ? void 0 : option.realTime) || void 0 === _c || _c, move = this._getTriggerEvent("move"), end = this._getTriggerEvent("end"), event = params.event;
+        const delayType = null !== (_a = null == option ? void 0 : option.delayType) && void 0 !== _a ? _a : "throttle", delayTime = null !== (_b = null == option ? void 0 : option.delayTime) && void 0 !== _b ? _b : 0, realTime = null === (_c = null == option ? void 0 : option.realTime) || void 0 === _c || _c, move = this._getZoomTriggerEvent("move"), end = this._getZoomTriggerEvent("end"), event = params.event;
         let moveX = event.canvasX, moveY = event.canvasY, upX = event.canvasX, upY = event.canvasY;
         const mouseup = delayMap[delayType]((params => {
             this._clickEnable = !1;

package/esm/interaction/zoom/zoomable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interaction/zoom/zoomable.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAGrF,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGvE,MAAM,QAAQ,GAAG;IACf,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAmDF,MAAM,OAAO,QAAQ;IAWnB,YAAY,CAAC,GAAW,EAAE,OAAmB,cAAc,CAAC,iBAAiB,CAAC;QAC5E,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAElD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,gBAAgB,GAAG,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAS,GAAE,CAAC;SACzE;IACH,CAAC;IAGO,gBAAgB,CAAC,IAAY;QACnC,OAAO,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEO,kBAAkB,CACxB,MAAuB,EACvB,cAAiC,EACjC,QAA6G;QAE7G,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,OAAO;SACR;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE7C,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAY,CAAC;QACjD,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE;YACpB,OAAO;SACR;QACD,IACE,CAAC,WAAW,CACV;YACE,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,KAAK;SACT,EACD,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAC7C,KAAK,CACN,EACD;YACA,OAAO;SACR;QACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,IAAI,QAAQ,EAAE;YAEZ,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE;YAC1B,KAAK,EAAE,KAAK,CAAC,SAAS;YACtB,WAAW,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE;YAC/C,KAAK,EAAE,IAAI;SACmB,CAAC,CAAC;IACpC,CAAC;IAEO,wBAAwB,CAAC,EAAqB;QACpD,IAAI,EAAE,CAAC,IAAI,KAAK,QAAQ,EAAE;YACxB,EAAE,GAAa,EAAG,CAAC,SAAS,EAAE,CAAC;SAChC;QACD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACtD,OAAO;YACL,EAAE,EAAE,CAAC;YACL,EAAE,EAAE,CAAC;YACL,EAAE,EAAE,CAAC,GAAG,KAAK;YACb,EAAE,EAAE,CAAC,GAAG,MAAM;SACf,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAC5B,QAAgB,EAChB,cAAiC,EACjC,QAA6G,EAC7G,MAAuB;;QAEvB,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,UAAU,CAAC;QAClD,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,CAAC,CAAC;QAGzC,QAAQ,CAAC,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAClC,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EACnD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAuB,EAAE,EAAE;YAC9C,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QACpC,CAAC,EAAE,SAAS,CAAQ,CACrB,CAAC;QAEF,QAAQ,CAAC,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAC/B,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAClD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAuB,EAAE,EAAE;YAE9C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QAE5D,CAAC,EAAE,SAAS,CAAQ,CACrB,CAAC;IACJ,CAAC;IAED,qBAAqB,CACnB,CAAU,EACV,QAA6G,EAC7G,MAAuB;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC3D;IACH,CAAC;IAED,sBAAsB,CACpB,OAAkB,EAClB,MAAgC,EAChC,QAA6G,EAC7G,MAAuB;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,IAAI,MAAM,EAAE;oBACV,CAAC,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACxB,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;4BACb,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;yBAC3D;oBACH,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAClE;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAEO,oBAAoB,CAC1B,MAAuB,EACvB,cAAiC,EACjC,QAA8F;QAE9F,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACrD,OAAO;SACR;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAY,CAAC;QAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO;SACR;QACD,IACE,CAAC,WAAW,CACV;YACE,CAAC,EAAE,KAAK,CAAC,OAAO;YAChB,CAAC,EAAE,KAAK,CAAC,OAAO;SACjB,EACD,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAC7C,KAAK,CACN,EACD;YACA,OAAO;SACR;QACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,OAAO;YACP,OAAO;YACP,KAAK,EAAE,IAAI;SACmB,CAAC,CAAC;IACpC,CAAC;IAEO,wBAAwB,CAC9B,QAAgB,EAChB,cAAiC,EACjC,QAA8F,EAC9F,MAAuB;;QAEvB,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,UAAU,CAAC;QAClD,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,CAAC,CAAC;QAGzC,QAAQ,CAAC,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAClC,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EACnD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAW,EAAE,EAAE;YAClC,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QACtC,CAAC,EAAE,SAAS,CAAC,CACd,CAAC;QAEF,QAAQ,CAAC,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAC/B,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAClD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAW,EAAE,EAAE;YAElC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QAE9D,CAAC,EAAE,SAAS,CAAC,CACd,CAAC;IACJ,CAAC;IAED,uBAAuB,CACrB,CAAU,EACV,QAA8F,EAC9F,MAAuB;QAEvB,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,wBAAwB,CACtB,OAAkB,EAClB,MAAgC,EAChC,QAA8F,EAC9F,MAAuB;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,IAAI,MAAM,EAAE;oBACV,CAAC,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACxB,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;4BACb,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;yBAC7D;oBACH,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBACpE;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAEO,sBAAsB,CAC5B,QAAgB,EAChB,cAAiC,EACjC,QAAyE,EACzE,MAAuB;QAEvB,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,EAAE,CAAC,MAAW,EAAE,EAAE;YAC/F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,OAAO;aACR;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YACzB,MAAM,aAAa,GAAG,WAAW,CAC/B;gBACE,CAAC,EAAE,KAAK,CAAC,OAAO;gBAChB,CAAC,EAAE,KAAK,CAAC,OAAO;aACjB,EACD,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAC7C,KAAK,CACN,CAAC;YACF,IAAI,aAAa,EAAE;gBACjB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QAGH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE;YAC7D,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CACnB,CAAU,EACV,QAAyE,EACzE,MAAuB;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,CAAC,CAAC,KAAK,CAAC,EAAE,CACR,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAC9B,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,EAAE,MAAK,CAAC,CAAC,EAAE,EAAE,EAC9E,MAAM,CAAC,EAAE;gBACP,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC7C,CAAC,CACF,CAAC;SACH;IACH,CAAC;IAED,sBAAsB,CACpB,OAAkB,EAClB,MAAgC,EAChC,QAAyE,EACzE,MAAuB;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,4BAA4B,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAClD,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,IAAI,MAAM,EAAE;oBACV,CAAC,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACxB,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;4BACb,CAAC,CAAC,KAAK,CAAC,EAAE,CACR,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAC9B,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,EAAE,MAAK,CAAC,CAAC,EAAE,EAAE,EAC9E,MAAM,CAAC,EAAE;gCACP,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;4BACrC,CAAC,CACF,CAAC;4BAIF,CAAC,CAAC,KAAK,CAAC,EAAE,CACR,OAAO,EACP,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,EAAE,MAAK,CAAC,CAAC,EAAE,EAAE,EAC9E,GAAG,EAAE;gCACH,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC;4BAC5B,CAAC,CACF,CAAC;yBACH;oBACH,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAClE;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAES,WAAW,CACnB,MAAwB,EACxB,QAAyE,EACzE,MAAuB;;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpC,OAAO;SACR;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACxD,OAAO;SACR;QACD,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,UAAU,CAAC;QAClD,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,mCAAI,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,mCAAI,IAAI,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;QAC1B,IAAI,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;QAC1B,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;QACxB,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;QAExB,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAuB,EAAE,EAAE;YAC9D,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAY,CAAC;YAClC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC;YAC/B,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC;YAC/B,MAAM,KAAK,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAEzC,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;YACpB,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;YAEpB,IAAI,CAAC,QAAQ,IAAI,QAAQ,EAAE;gBACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;aAC/B;YAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC5B,KAAK;gBACL,KAAK,EAAE,IAAI;aACkB,CAAC,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,IAAI,CAAC;YACvC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,SAAgB,CAAC,CAAC;YACjH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAE,EAAE,OAAc,CAAC,CAAC;QACjH,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,MAAuB,EAAE,EAAE;YAChE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACxD,OAAO;aACR;YACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACjC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACjC,MAAM,KAAK,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAEzC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YACtB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;YAEtB,IAAI,QAAQ,IAAI,QAAQ,EAAE;gBACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;aAC/B;YACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE;gBAC7B,KAAK;gBACL,KAAK,EAAE,IAAI;aACmB,CAAC,CAAC;QACpC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,SAAgB,CAAC,CAAC;QAChH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,OAAc,CAAC,CAAC;IAC/G,CAAC;CACF","file":"zoomable.js","sourcesContent":["import type { IModelOption } from './../../model/interface';\n/* eslint-disable no-duplicate-imports */\nimport { debounce, isNil, pointInRect, throttle } from '@visactor/vutils';\nimport type { BaseEventParams, EventType, ExtendEventParam, IEvent } from '../../event/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { RenderMode } from '../../typings/spec';\nimport { RenderModeEnum } from '../../typings/spec/common';\nimport { getDefaultTriggerEventByMode } from '../../component/common/trigger/config';\nimport type { IZoomTrigger } from '../../component/common/trigger/interface';\nimport type { ISeries } from '../../series/interface';\nimport { Event_Bubble_Level, Event_Source_Type } from '../../constant';\nimport type { IDelayType } from '../../typings/event';\n\nconst delayMap = {\n  debounce: debounce,\n  throttle: throttle\n};\n\nexport interface ITriggerOption {\n  delayType: IDelayType;\n  delayTime: number;\n  realTime: boolean;\n}\nexport interface IZoomEventOptions {\n  shouldZoom?: boolean;\n  zoomCallback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void;\n  shouldScroll?: boolean;\n  scrollCallback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void;\n}\nexport interface IZoomable {\n  initZoomable: (evt: IEvent, mode?: RenderMode) => void;\n  initZoomEventOfSeries: (\n    s: ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void\n  ) => any;\n  initZoomEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n\n  initScrollEventOfSeries: (\n    s: ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void\n  ) => any;\n  initScrollEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n\n  initDragEventOfSeries: (\n    s: ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => any;\n\n  initDragEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n}\n\nexport class Zoomable implements IZoomable {\n  private _clickEnable: boolean;\n\n  private _option: IModelOption;\n\n  private _zoomableTrigger: IZoomTrigger;\n\n  private _eventObj: IEvent;\n\n  private _renderMode: RenderMode;\n\n  initZoomable(evt: IEvent, mode: RenderMode = RenderModeEnum['desktop-browser']) {\n    this._eventObj = evt;\n    this._renderMode = mode;\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n      this._clickEnable = true;\n      this._zoomableTrigger = new (this._getTriggerEvent('trigger') as any)();\n    }\n  }\n\n  // event\n  private _getTriggerEvent(type: string): EventType {\n    return getDefaultTriggerEventByMode(this._renderMode)[type];\n  }\n\n  private _zoomEventDispatch(\n    params: BaseEventParams,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void\n  ) {\n    if (!params.event) {\n      return;\n    }\n    const event = params.event.clone();\n    this._zoomableTrigger.parserZoomEvent(event);\n    // FIXME: event类型目前不全\n    const { zoomDelta, zoomX, zoomY } = event as any;\n    if (isNil(zoomDelta)) {\n      return;\n    }\n    if (\n      !pointInRect(\n        {\n          x: zoomX,\n          y: zoomY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      )\n    ) {\n      return;\n    }\n    this._clickEnable = false;\n\n    if (callback) {\n      // zoomDelta, zoomX, zoomY can be changed in the callback\n      callback({ zoomDelta, zoomX, zoomY }, event);\n    }\n    this._eventObj.emit('zoom', {\n      scale: event.zoomDelta,\n      scaleCenter: { x: event.zoomX, y: event.zoomY },\n      model: this\n    } as unknown as ExtendEventParam);\n  }\n\n  private _getRegionOrSeriesLayout(rs: IRegion | ISeries) {\n    if (rs.type !== 'region') {\n      rs = (<ISeries>rs).getRegion();\n    }\n    const { x, y, width, height } = rs.layout.getLayout();\n    return {\n      x1: x,\n      y1: y,\n      x2: x + width,\n      y2: y + height\n    };\n  }\n\n  private _bindZoomEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n\n    // pc端没有scrollEnd事件，所以漫游模式下scroll仅支持realTime\n    eventObj.on(\n      this._getTriggerEvent('scrollEnd'),\n      { level: Event_Bubble_Level.chart, consume: false },\n      delayMap[delayType]((params: BaseEventParams) => {\n        this._zoomableTrigger.clearZoom();\n      }, delayTime) as any\n    );\n\n    eventObj.on(\n      this._getTriggerEvent('scroll'),\n      { level: Event_Bubble_Level.chart, consume: true },\n      delayMap[delayType]((params: BaseEventParams) => {\n        // if (realTime) {\n        this._zoomEventDispatch(params, regionOrSeries, callback);\n        // }\n      }, delayTime) as any\n    );\n  }\n\n  initZoomEventOfSeries(\n    s: ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      this._bindZoomEventAsRegion(s.event, s, callback, option);\n    }\n  }\n\n  initZoomEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              this._bindZoomEventAsRegion(s.event, s, callback, option);\n            }\n          });\n        } else {\n          this._bindZoomEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  private _scrollEventDispatch(\n    params: BaseEventParams,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void\n  ) {\n    if (!params.event || this._option.disableTriggerEvent) {\n      return;\n    }\n    const { event } = params;\n    this._zoomableTrigger.parserScrollEvent(event);\n    // FIXME: event类型目前不全\n    const { scrollX, scrollY } = event as any;\n    if (isNil(scrollX) && isNil(scrollY)) {\n      return;\n    }\n    if (\n      !pointInRect(\n        {\n          x: event.canvasX,\n          y: event.canvasY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      )\n    ) {\n      return;\n    }\n    this._clickEnable = false;\n\n    if (callback) {\n      callback({ scrollX, scrollY }, event);\n    }\n    this._eventObj.emit('scroll', {\n      scrollX,\n      scrollY,\n      model: this\n    } as unknown as ExtendEventParam);\n  }\n\n  private _bindScrollEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n\n    // pc端没有scrollEnd事件，所以漫游模式下scroll仅支持realTime\n    eventObj.on(\n      this._getTriggerEvent('scrollEnd'),\n      { level: Event_Bubble_Level.chart, consume: false },\n      delayMap[delayType]((params: any) => {\n        this._zoomableTrigger.clearScroll();\n      }, delayTime)\n    );\n\n    eventObj.on(\n      this._getTriggerEvent('scroll'),\n      { level: Event_Bubble_Level.chart, consume: true },\n      delayMap[delayType]((params: any) => {\n        // if (realTime) {\n        this._scrollEventDispatch(params, regionOrSeries, callback);\n        // }\n      }, delayTime)\n    );\n  }\n\n  initScrollEventOfSeries(\n    s: ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      this._bindScrollEventAsRegion(s.event, s, callback, option);\n    }\n  }\n\n  initScrollEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              this._bindScrollEventAsRegion(s.event, s, callback, option);\n            }\n          });\n        } else {\n          this._bindScrollEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  private _bindDragEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    eventObj.on(this._getTriggerEvent('start'), { level: Event_Bubble_Level.chart }, (params: any) => {\n      if (!params.event) {\n        return;\n      }\n\n      const { event } = params;\n      const shouldTrigger = pointInRect(\n        {\n          x: event.canvasX,\n          y: event.canvasY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      );\n      if (shouldTrigger) {\n        this._handleDrag(params, callback, option);\n      }\n    });\n    // click 事件需要在drag和zoom时被屏蔽\n    // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n    eventObj.on('click', { level: Event_Bubble_Level.chart }, () => {\n      return !this._clickEnable;\n    });\n  }\n\n  initDragEventOfSeries(\n    s: ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      s.event.on(\n        this._getTriggerEvent('start'),\n        { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n        params => {\n          this._handleDrag(params, callback, option);\n        }\n      );\n    }\n  }\n\n  initDragEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              s.event.on(\n                this._getTriggerEvent('start'),\n                { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n                params => {\n                  this._handleDrag(params, callback);\n                }\n              );\n\n              // click 事件需要在drag和zoom时被屏蔽\n              // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n              s.event.on(\n                'click',\n                { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n                () => {\n                  return !this._clickEnable;\n                }\n              );\n            }\n          });\n        } else {\n          this._bindDragEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  protected _handleDrag(\n    params: ExtendEventParam,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    this._clickEnable = true;\n    if (!this._zoomableTrigger.parserDragEvent(params.event)) {\n      return;\n    }\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n    const realTime = option?.realTime ?? true;\n    const move = this._getTriggerEvent('move');\n    const end = this._getTriggerEvent('end');\n    const event = params.event;\n    let moveX = event.canvasX;\n    let moveY = event.canvasY;\n    let upX = event.canvasX;\n    let upY = event.canvasY;\n\n    const mouseup = delayMap[delayType]((params: BaseEventParams) => {\n      this._clickEnable = false;\n      const event = params.event as any;\n      const dx = event.canvasX - upX;\n      const dy = event.canvasY - upY;\n      const delta: [number, number] = [dx, dy];\n\n      upX = event.canvasX;\n      upY = event.canvasY;\n\n      if (!realTime && callback) {\n        callback(delta, params.event);\n      }\n\n      this._eventObj.emit('panend', {\n        delta,\n        model: this\n      } as unknown as BaseEventParams);\n      this._zoomableTrigger.pointerId = null;\n      this._eventObj.off(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove as any);\n      this._eventObj.off(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.window }, mouseup as any);\n    }, delayTime);\n    const mousemove = delayMap[delayType]((params: BaseEventParams) => {\n      if (!this._zoomableTrigger.parserDragEvent(params.event)) {\n        return;\n      }\n      this._clickEnable = false;\n      const event = params.event;\n      const dx = event.canvasX - moveX;\n      const dy = event.canvasY - moveY;\n      const delta: [number, number] = [dx, dy];\n\n      moveX = event.canvasX;\n      moveY = event.canvasY;\n\n      if (realTime && callback) {\n        callback(delta, params.event);\n      }\n      this._eventObj.emit('panmove', {\n        delta,\n        model: this\n      } as unknown as ExtendEventParam);\n    }, delayTime);\n\n    this._eventObj.on(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove as any);\n    this._eventObj.on(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mouseup as any);\n  }\n}\n"]}
+{"version":3,"sources":["../src/interaction/zoom/zoomable.ts"],"names":[],"mappings":"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","file":"zoomable.js","sourcesContent":["import type { IModelOption } from './../../model/interface';\n/* eslint-disable no-duplicate-imports */\nimport { debounce, isNil, pointInRect, throttle } from '@visactor/vutils';\nimport type { BaseEventParams, EventQuery, EventType, ExtendEventParam, IEvent } from '../../event/interface';\nimport type { IRegion } from '../../region/interface';\nimport type { RenderMode } from '../../typings/spec';\nimport { RenderModeEnum } from '../../typings/spec/common';\nimport { getDefaultTriggerEventByMode } from '../../component/common/trigger/config';\nimport type { IZoomTrigger } from '../../component/common/trigger/interface';\nimport type { ISeries } from '../../series/interface';\nimport { Event_Bubble_Level, Event_Source_Type } from '../../constant';\nimport type { IDelayType } from '../../typings/event';\nimport { isMiniAppLikeMode, isMobileLikeMode } from '../../util';\nimport type { Gesture } from '@visactor/vrender-kits';\n\nconst delayMap = {\n  debounce: debounce,\n  throttle: throttle\n};\n\nexport interface ITriggerOption {\n  delayType: IDelayType;\n  delayTime: number;\n  realTime: boolean;\n}\nexport interface IZoomEventOptions {\n  shouldZoom?: boolean;\n  zoomCallback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void;\n  shouldScroll?: boolean;\n  scrollCallback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void;\n}\nexport interface IZoomable {\n  initZoomable: (evt: IEvent, mode?: RenderMode) => void;\n  initZoomEventOfSeries: (\n    s: ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void\n  ) => any;\n  initZoomEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n\n  initScrollEventOfSeries: (\n    s: ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void\n  ) => any;\n  initScrollEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n\n  initDragEventOfSeries: (\n    s: ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => any;\n\n  initDragEventOfRegions: (\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) => void;\n}\n\nexport class Zoomable implements IZoomable {\n  private _clickEnable: boolean;\n\n  private _option: IModelOption;\n\n  private _zoomableTrigger: IZoomTrigger;\n\n  private _eventObj: IEvent;\n\n  private _renderMode: RenderMode;\n\n  private _gestureController!: Gesture | null;\n\n  private _isGestureListener: boolean = false;\n\n  initZoomable(evt: IEvent, mode: RenderMode = RenderModeEnum['desktop-browser']) {\n    this._eventObj = evt;\n    this._renderMode = mode;\n    this._gestureController = (this._option.getChart().getVGrammarView().renderer as any)._gestureController;\n    this._isGestureListener = isMobileLikeMode(this._renderMode) || isMiniAppLikeMode(this._renderMode);\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n      this._clickEnable = true;\n      this._zoomableTrigger = new (this._getZoomTriggerEvent('trigger') as any)();\n    }\n  }\n\n  // event\n  private _getZoomTriggerEvent(type: string): EventType {\n    return getDefaultTriggerEventByMode(this._renderMode)[type];\n  }\n\n  private _zoomEventDispatch(\n    params: BaseEventParams,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void\n  ) {\n    if (!this._isGestureListener && !params.event) {\n      return;\n    }\n    const event = this._isGestureListener ? params : params.event.clone();\n    this._zoomableTrigger.parserZoomEvent(event);\n    // FIXME: event类型目前不全\n    const { zoomDelta, zoomX, zoomY } = event as any;\n    if (isNil(zoomDelta)) {\n      return;\n    }\n    if (\n      !pointInRect(\n        {\n          x: zoomX,\n          y: zoomY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      )\n    ) {\n      return;\n    }\n    this._clickEnable = false;\n\n    if (callback) {\n      // zoomDelta, zoomX, zoomY can be changed in the callback\n      callback({ zoomDelta, zoomX, zoomY }, event);\n    }\n    this._eventObj.emit('zoom', {\n      scale: event.zoomDelta,\n      scaleCenter: { x: event.zoomX, y: event.zoomY },\n      model: this\n    } as unknown as ExtendEventParam);\n  }\n\n  private _getRegionOrSeriesLayout(rs: IRegion | ISeries) {\n    if (rs.type !== 'region') {\n      rs = (<ISeries>rs).getRegion();\n    }\n    const { x, y, width, height } = rs.layout.getLayout();\n    return {\n      x1: x,\n      y1: y,\n      x2: x + width,\n      y2: y + height\n    };\n  }\n\n  private _bindZoomEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n\n    const event = this._isGestureListener ? this._gestureController : eventObj;\n    const zoomParams = this._isGestureListener\n      ? [this._getZoomTriggerEvent('zoom')]\n      : [this._getZoomTriggerEvent('zoom'), { level: Event_Bubble_Level.chart, consume: true }];\n    const zoomEndParams: [string] | [string, EventQuery] = this._isGestureListener\n      ? [this._getZoomTriggerEvent('zoomEnd')]\n      : [this._getZoomTriggerEvent('zoomEnd'), { level: Event_Bubble_Level.chart, consume: false }];\n\n    // pc端没有scrollEnd事件，所以漫游模式下scroll仅支持realTime\n    (event as any).on(\n      ...zoomEndParams,\n      delayMap[delayType]((params: BaseEventParams) => {\n        this._zoomableTrigger.clearZoom();\n      }, delayTime) as any\n    );\n\n    (event as any).on(\n      ...zoomParams,\n      delayMap[delayType]((params: BaseEventParams) => {\n        // if (realTime) {\n        this._zoomEventDispatch(params, regionOrSeries, callback);\n        // }\n      }, delayTime) as any\n    );\n  }\n\n  initZoomEventOfSeries(\n    s: ISeries,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      this._bindZoomEventAsRegion(s.event, s, callback, option);\n    }\n  }\n\n  initZoomEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { zoomDelta: number; zoomX: number; zoomY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              this._bindZoomEventAsRegion(s.event, s, callback, option);\n            }\n          });\n        } else {\n          this._bindZoomEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  private _scrollEventDispatch(\n    params: BaseEventParams,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => any\n  ) {\n    let stopBubble: boolean | undefined = false;\n    if (!this._isGestureListener && (!params.event || this._option.disableTriggerEvent)) {\n      return stopBubble;\n    }\n    const event = this._isGestureListener ? params : params.event;\n    this._zoomableTrigger.parserScrollEvent(event);\n    // FIXME: event类型目前不全\n    const { scrollX, scrollY, canvasX, canvasY } = event as any;\n    if (isNil(scrollX) && isNil(scrollY)) {\n      return stopBubble;\n    }\n    if (\n      !pointInRect(\n        {\n          x: canvasX,\n          y: canvasY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      )\n    ) {\n      return stopBubble;\n    }\n    this._clickEnable = false;\n\n    if (callback) {\n      stopBubble = callback({ scrollX, scrollY }, event as any);\n    }\n    this._eventObj.emit('scroll', {\n      scrollX,\n      scrollY,\n      model: this\n    } as unknown as ExtendEventParam);\n\n    return stopBubble;\n  }\n\n  private _bindScrollEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => any,\n    option?: ITriggerOption\n  ) {\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n\n    const event = this._isGestureListener ? this._gestureController : eventObj;\n    const scrollParams = this._isGestureListener\n      ? [this._getZoomTriggerEvent('scroll')]\n      : [this._getZoomTriggerEvent('scroll'), { level: Event_Bubble_Level.chart, consume: true }];\n    const scrollEndParams = this._isGestureListener\n      ? [this._getZoomTriggerEvent('scrollEnd')]\n      : [this._getZoomTriggerEvent('scrollEnd'), { level: Event_Bubble_Level.chart, consume: false }];\n\n    // pc端没有scrollEnd事件，所以漫游模式下scroll仅支持realTime\n    (event as any).on(\n      ...scrollEndParams,\n      delayMap[delayType]((params: any) => {\n        this._zoomableTrigger.clearScroll();\n      }, delayTime)\n    );\n\n    (event as any).on(\n      ...scrollParams,\n      delayMap[delayType]((params: any) => {\n        // if (realTime) {\n        return this._scrollEventDispatch(params, regionOrSeries, callback);\n        // }\n      }, delayTime)\n    );\n  }\n\n  initScrollEventOfSeries(\n    s: ISeries,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      this._bindScrollEventAsRegion(s.event, s, callback, option);\n    }\n  }\n\n  initScrollEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (params: { scrollX: number; scrollY: number }, e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              this._bindScrollEventAsRegion(s.event, s, callback, option);\n            }\n          });\n        } else {\n          this._bindScrollEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  private _bindDragEventAsRegion(\n    eventObj: IEvent,\n    regionOrSeries: IRegion | ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    eventObj.on(this._getZoomTriggerEvent('start'), { level: Event_Bubble_Level.chart }, (params: any) => {\n      if (!params.event) {\n        return;\n      }\n\n      const { event } = params;\n      const shouldTrigger = pointInRect(\n        {\n          x: event.canvasX,\n          y: event.canvasY\n        },\n        this._getRegionOrSeriesLayout(regionOrSeries),\n        false\n      );\n      if (shouldTrigger) {\n        this._handleDrag(params, callback, option);\n      }\n    });\n    // click 事件需要在drag和zoom时被屏蔽\n    // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n    eventObj.on('click', { level: Event_Bubble_Level.chart }, () => {\n      return !this._clickEnable;\n    });\n  }\n\n  initDragEventOfSeries(\n    s: ISeries,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      s.event.on(\n        this._getZoomTriggerEvent('start'),\n        { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n        params => {\n          this._handleDrag(params, callback, option);\n        }\n      );\n    }\n  }\n\n  initDragEventOfRegions(\n    regions: IRegion[],\n    filter?: (s: ISeries) => boolean,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    if (getDefaultTriggerEventByMode(this._renderMode)) {\n      regions.forEach(r => {\n        if (filter) {\n          r.getSeries().forEach(s => {\n            if (filter(s)) {\n              s.event.on(\n                this._getZoomTriggerEvent('start'),\n                { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n                params => {\n                  this._handleDrag(params, callback);\n                }\n              );\n\n              // click 事件需要在drag和zoom时被屏蔽\n              // hack 应该由事件系统做？或者事件系统有更好的方式处理这种交互冲突场景\n              s.event.on(\n                'click',\n                { level: Event_Bubble_Level.model, filter: ({ model }) => model?.id === s.id },\n                () => {\n                  return !this._clickEnable;\n                }\n              );\n            }\n          });\n        } else {\n          this._bindDragEventAsRegion(this._eventObj, r, callback, option);\n        }\n      });\n    }\n  }\n\n  protected _handleDrag(\n    params: ExtendEventParam,\n    callback?: (delta: [number, number], e: BaseEventParams['event']) => void,\n    option?: ITriggerOption\n  ) {\n    if (this._option.disableTriggerEvent) {\n      return;\n    }\n    this._clickEnable = true;\n    if (!this._zoomableTrigger.parserDragEvent(params.event)) {\n      return;\n    }\n    const delayType = option?.delayType ?? 'throttle';\n    const delayTime = option?.delayTime ?? 0;\n    const realTime = option?.realTime ?? true;\n    const move = this._getZoomTriggerEvent('move');\n    const end = this._getZoomTriggerEvent('end');\n    const event = params.event;\n    let moveX = event.canvasX;\n    let moveY = event.canvasY;\n    let upX = event.canvasX;\n    let upY = event.canvasY;\n\n    const mouseup = delayMap[delayType]((params: BaseEventParams) => {\n      this._clickEnable = false;\n      const event = params.event as any;\n      const dx = event.canvasX - upX;\n      const dy = event.canvasY - upY;\n      const delta: [number, number] = [dx, dy];\n\n      upX = event.canvasX;\n      upY = event.canvasY;\n\n      if (!realTime && callback) {\n        callback(delta, params.event);\n      }\n\n      this._eventObj.emit('panend', {\n        delta,\n        model: this\n      } as unknown as BaseEventParams);\n      this._zoomableTrigger.pointerId = null;\n      this._eventObj.off(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove as any);\n      this._eventObj.off(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.window }, mouseup as any);\n    }, delayTime);\n    const mousemove = delayMap[delayType]((params: BaseEventParams) => {\n      if (!this._zoomableTrigger.parserDragEvent(params.event)) {\n        return;\n      }\n      this._clickEnable = false;\n      const event = params.event;\n      const dx = event.canvasX - moveX;\n      const dy = event.canvasY - moveY;\n      const delta: [number, number] = [dx, dy];\n\n      moveX = event.canvasX;\n      moveY = event.canvasY;\n\n      if (realTime && callback) {\n        callback(delta, params.event);\n      }\n      this._eventObj.emit('panmove', {\n        delta,\n        model: this\n      } as unknown as ExtendEventParam);\n    }, delayTime);\n\n    this._eventObj.on(move, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mousemove as any);\n    this._eventObj.on(end, { level: Event_Bubble_Level.chart, source: Event_Source_Type.chart }, mouseup as any);\n  }\n}\n"]}

package/esm/layout/base-layout.d.ts

@@ -2,7 +2,24 @@ import type { utilFunctionCtx } from '../typings/params';
 import type { IChart } from '../chart/interface/chart';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IBaseLayout, ILayoutItem } from './interface';
-import type { IPadding, IRect } from '../typings/space';
+import type { IOrientType, IPadding, IRect } from '../typings/space';
+import type { ILayoutRect } from '../typings/layout';
+export type LayoutSideType = {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+};
+export interface IOffset {
+    offsetLeft: number;
+    offsetRight: number;
+    offsetTop: number;
+    offsetBottom: number;
+}
+type overlapInfo = {
+    items: ILayoutItem[];
+    rect: ILayoutRect;
+};
 export declare class Layout implements IBaseLayout {
     static type: string;
     leftCurrent: number;
@@ -13,10 +30,36 @@ export declare class Layout implements IBaseLayout {
     _chartViewBox: IBoundsLike;
     protected _onError: (msg: string) => void;
     constructor(_spec?: unknown, ctx?: utilFunctionCtx);
+    protected _layoutInit(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void;
+    protected _layoutNormalItems(items: ILayoutItem[]): void;
+    protected _groupItems(items: ILayoutItem[]): {
+        regionItems: ILayoutItem[];
+        relativeItems: ILayoutItem[];
+        relativeOverlapItems: ILayoutItem[];
+        allRelatives: ILayoutItem[];
+        overlapItems: {
+            left: overlapInfo;
+            top: overlapInfo;
+            right: overlapInfo;
+            bottom: overlapInfo;
+            z: overlapInfo;
+        };
+    };
     layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void;
+    protected _processAutoIndent(regionItems: ILayoutItem[], relativeItems: ILayoutItem[], relativeOverlapItems: ILayoutItem[], overlapItems: {
+        [key in IOrientType]: overlapInfo;
+    }, allRelatives: ILayoutItem[], layoutTemp: LayoutSideType): void;
     protected layoutNormalItems(normalItems: ILayoutItem[]): void;
     protected layoutNormalInlineItems(normalItems: ILayoutItem[]): void;
-    protected layoutRegionItems(regionItems: ILayoutItem[], regionRelativeItems: ILayoutItem[]): void;
+    protected _layoutRelativeOverlap(orient: IOrientType, info: overlapInfo): void;
+    protected _layoutRelativeItem(item: ILayoutItem, layoutRect: ILayoutRect): void;
+    protected _layoutRegionItem(regionItems: ILayoutItem[], regionRelativeTotalWidth: number, regionRelativeTotalHeight: number): {
+        regionHeight: number;
+        regionWidth: number;
+    };
+    protected layoutRegionItems(regionItems: ILayoutItem[], regionRelativeItems: ILayoutItem[], regionRelativeOverlapItems: ILayoutItem[], overlapItems?: {
+        [key in IOrientType]: overlapInfo;
+    }): void;
     protected layoutAbsoluteItems(absoluteItems: ILayoutItem[]): void;
     filterRegionsWithID(items: ILayoutItem[], id: number): ILayoutItem;
     getItemComputeLayoutRect(item: ILayoutItem): {
@@ -31,3 +74,4 @@ export declare class Layout implements IBaseLayout {
     }): IPadding;
     private _getOutInLayout;
 }
+export {};