@visactor/vchart 1.8.0-beta.0 → 1.8.1

package/esm/plugin/chart/media-query/interface/spec.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentTypeEnum, SimplifiedComponentTypeEnum } from '../../../../component/interface';
-import type { IVChart } from '../../../../core';
+import type { ComponentTypeEnum } from '../../../../component/interface';
+import type { IChartSpec, IVChart } from '../../../../core';
 import type { IModelSpecInfo } from '../../../../model/interface';
 import type { SeriesTypeEnum } from '../../../../series';
 import type { IMediaInfo } from './common';
@@ -18,8 +18,8 @@ export interface IMediaQueryCondition {
 export interface IMediaQueryAction<T extends Record<string, unknown> = any> {
     spec: Partial<T> | ((filteredModelInfo: IModelSpecInfo<T>[], action: IMediaQueryAction<T>, query: IMediaQueryCondition) => Partial<T>);
     filterType?: MediaQueryActionFilterType;
-    filter?: MediaQueryActionFilter<T>;
+    filter?: MediaQueryActionFilter<T> | Array<MediaQueryActionFilter<T>>;
     forceAppend?: boolean;
 }
-export type MediaQueryActionFilterType = 'region' | 'series' | 'chart' | `${SeriesTypeEnum}` | `${ComponentTypeEnum}` | `${SimplifiedComponentTypeEnum}`;
+export type MediaQueryActionFilterType = 'region' | 'series' | 'chart' | `${SeriesTypeEnum}` | `${ComponentTypeEnum}` | keyof IChartSpec;
 export type MediaQueryActionFilter<T extends Record<string, unknown> = any> = Partial<T> | ((modelInfo: IModelSpecInfo<T>, action: IMediaQueryAction<T>, query: IMediaQueryCondition) => boolean);

package/esm/plugin/chart/media-query/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/chart/media-query/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { ComponentTypeEnum, SimplifiedComponentTypeEnum } from '../../../../component/interface';\nimport type { IVChart } from '../../../../core';\nimport type { IModelSpecInfo } from '../../../../model/interface';\nimport type { SeriesTypeEnum } from '../../../../series';\nimport type { IMediaInfo } from './common';\n\n/**\n * 媒体查询配置（包含多项查询）\n * @since 1.8.0\n */\nexport type IMediaQuerySpec = IMediaQueryItem[];\n\n/** 媒体查询配置（表示一项查询）*/\nexport interface IMediaQueryItem {\n  /** 媒体查询条件 */\n  query: IMediaQueryCondition;\n  /** 命中媒体查询条件之后的动作 */\n  action: IMediaQueryAction | IMediaQueryAction[];\n}\n\n/** 媒体查询条件，多个属性之间为“且”关系 */\nexport interface IMediaQueryCondition {\n  /** 最小图表宽度 */\n  minWidth?: number;\n  /** 最大图表宽度 */\n  maxWidth?: number;\n  /** 最小图表高度 */\n  minHeight?: number;\n  /** 最大图表高度 */\n  maxHeight?: number;\n  /** 当图表宽度或高度发生变化时触发的回调，由回调指定是否命中查询条件 */\n  onResize?: (info: IMediaInfo, vchart: IVChart) => boolean;\n}\n\n/** 命中媒体查询条件之后的动作 */\nexport interface IMediaQueryAction<T extends Record<string, unknown> = any> {\n  /**\n   * 需要应用的新 spec\n   * - 如果元素过滤器匹配到了某些图表元素，新 spec 将依次合并到这些元素\n   * - 如果元素过滤器没有匹配到任何图表元素，新 spec 可能会作为新的图表元素添加到图表（forceAppend 为 true 的情况）。\n   *\n   * 有两种配置类型：\n   * - 直接指定新 spec\n   * - 使用回调的方式返回新 spec\n   */\n  spec:\n    | Partial<T>\n    | ((\n        /** filter 匹配到的图表元素信息 */\n        filteredModelInfo: IModelSpecInfo<T>[],\n        /** 当前 action 对象 */\n        action: IMediaQueryAction<T>,\n        /** 当前媒体查询条件 */\n        query: IMediaQueryCondition\n      ) => Partial<T>);\n  /**\n   * 元素过滤器类型\n   * （规定 filter 需要过滤的元素类型，以及新 spec 对应的元素类型）\n   * @default 'chart'\n   */\n  filterType?: MediaQueryActionFilterType;\n  /**\n   * 元素过滤器\n   * （如果不配置，则匹配 filterType 对应的所有元素）\n   *\n   * 有两种配置类型：\n   * - 配置为元素 spec 的一部分，在过滤图表元素时基于此 spec 进行模糊匹配\n   * - 配置为函数回调，依次决定当前 filterType 类型下的每个元素实例是否被匹配\n   */\n  filter?: MediaQueryActionFilter<T>;\n  /**\n   * 元素过滤器匹配不到图表元素时，是否将新 spec 作为新的图表元素添加到图表\n   * （filterType 为 'chart' 时该配置失效）\n   * @default false\n   */\n  forceAppend?: boolean;\n}\n\n/**\n * 元素过滤器类型\n */\nexport type MediaQueryActionFilterType =\n  | 'region'\n  | 'series'\n  | 'chart'\n  | `${SeriesTypeEnum}`\n  | `${ComponentTypeEnum}`\n  | `${SimplifiedComponentTypeEnum}`;\n\n/**\n * 元素过滤器\n *\n * 有两种配置类型：\n * - 配置为元素 spec 的一部分，在过滤图表元素时基于此 spec 进行模糊匹配\n * - 配置为函数回调，依次决定当前 filterType 类型下的每个元素实例是否被匹配\n */\nexport type MediaQueryActionFilter<T extends Record<string, unknown> = any> =\n  | Partial<T>\n  | ((\n      /** 当前图表元素信息 */\n      modelInfo: IModelSpecInfo<T>,\n      /** 当前 action 对象 */\n      action: IMediaQueryAction<T>,\n      /** 当前媒体查询条件 */\n      query: IMediaQueryCondition\n    ) => boolean);\n"]}
+{"version":3,"sources":["../src/plugin/chart/media-query/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { ComponentTypeEnum } from '../../../../component/interface';\nimport type { IChartSpec, IVChart } from '../../../../core';\nimport type { IModelSpecInfo } from '../../../../model/interface';\nimport type { SeriesTypeEnum } from '../../../../series';\nimport type { IMediaInfo } from './common';\n\n/**\n * 媒体查询配置（包含多项查询）\n * @since 1.8.0\n */\nexport type IMediaQuerySpec = IMediaQueryItem[];\n\n/** 媒体查询配置（表示一项查询）*/\nexport interface IMediaQueryItem {\n  /** 媒体查询条件 */\n  query: IMediaQueryCondition;\n  /** 命中媒体查询条件之后的动作 */\n  action: IMediaQueryAction | IMediaQueryAction[];\n}\n\n/** 媒体查询条件，多个属性之间为“且”关系 */\nexport interface IMediaQueryCondition {\n  /** 最小图表宽度 */\n  minWidth?: number;\n  /** 最大图表宽度 */\n  maxWidth?: number;\n  /** 最小图表高度 */\n  minHeight?: number;\n  /** 最大图表高度 */\n  maxHeight?: number;\n  /** 当图表宽度或高度发生变化时触发的回调，由回调指定是否命中查询条件 */\n  onResize?: (info: IMediaInfo, vchart: IVChart) => boolean;\n}\n\n/** 命中媒体查询条件之后的动作 */\nexport interface IMediaQueryAction<T extends Record<string, unknown> = any> {\n  /**\n   * 需要应用的新 spec\n   * - 如果元素过滤器匹配到了某些图表元素，新 spec 将依次合并到这些元素\n   * - 如果元素过滤器没有匹配到任何图表元素，新 spec 可能会作为新的图表元素添加到图表（forceAppend 为 true 的情况）。\n   *\n   * 有两种配置类型：\n   * - 直接指定新 spec\n   * - 使用回调的方式返回新 spec\n   */\n  spec:\n    | Partial<T>\n    | ((\n        /** filter 匹配到的图表元素信息 */\n        filteredModelInfo: IModelSpecInfo<T>[],\n        /** 当前 action 对象 */\n        action: IMediaQueryAction<T>,\n        /** 当前媒体查询条件 */\n        query: IMediaQueryCondition\n      ) => Partial<T>);\n  /**\n   * 元素过滤器类型\n   * （规定 filter 需要过滤的元素类型，以及新 spec 对应的元素类型）\n   * @default 'chart'\n   */\n  filterType?: MediaQueryActionFilterType;\n  /**\n   * 元素过滤器\n   * （如果不配置，则匹配 filterType 对应的所有元素）\n   *\n   * 有两种配置类型：\n   * - 配置为元素 spec 的一部分，在过滤图表元素时基于此 spec 进行模糊匹配\n   * - 配置为函数回调，依次决定当前 filterType 类型下的每个元素实例是否被匹配\n   */\n  filter?: MediaQueryActionFilter<T> | Array<MediaQueryActionFilter<T>>;\n  /**\n   * 元素过滤器匹配不到图表元素时，是否将新 spec 作为新的图表元素添加到图表\n   * （filterType 为 'chart' 时该配置失效）\n   * @default false\n   */\n  forceAppend?: boolean;\n}\n\n/**\n * 元素过滤器类型\n */\nexport type MediaQueryActionFilterType =\n  | 'region'\n  | 'series'\n  | 'chart'\n  | `${SeriesTypeEnum}` // 具体 series 类型，如 'bar'、'line'\n  | `${ComponentTypeEnum}` // 具体 component 类型，如 'cartesianAxis-band'\n  | keyof IChartSpec; // 组件 spec key，可视为简化版 component 类型，如 'axes'、'legends'、'crosshair'\n\n/**\n * 元素过滤器\n *\n * 有两种配置类型：\n * - 配置为元素 spec 的一部分，在过滤图表元素时基于此 spec 进行模糊匹配\n * - 配置为函数回调，依次决定当前 filterType 类型下的每个元素实例是否被匹配\n */\nexport type MediaQueryActionFilter<T extends Record<string, unknown> = any> =\n  | Partial<T>\n  | ((\n      /** 当前图表元素信息 */\n      modelInfo: IModelSpecInfo<T>,\n      /** 当前 action 对象 */\n      action: IMediaQueryAction<T>,\n      /** 当前媒体查询条件 */\n      query: IMediaQueryCondition\n    ) => boolean);\n"]}

package/esm/plugin/chart/media-query/media-query.d.ts

@@ -18,11 +18,11 @@ export declare class MediaQuery extends BasePlugin implements IChartPlugin {
     onBeforeResize(service: IChartPluginService, width: number, height: number): void;
     onAfterChartSpecTransform(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource): void;
     onBeforeInitChart(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource): void;
-    changeSize(width: number, height: number, compile?: boolean, render?: boolean): boolean;
+    protected _changeSize(width: number, height: number, compile?: boolean, render?: boolean): boolean;
     protected _applyQueries(compile?: boolean, render?: boolean): boolean;
-    check(item: IMediaQueryItem): IMediaQueryCheckResult;
-    apply(item: IMediaQueryItem, chartSpec: any): IMediaQueryActionResult;
-    reInit(compile?: boolean, render?: boolean): void;
+    protected _check(item: IMediaQueryItem): IMediaQueryCheckResult;
+    protected _apply(item: IMediaQueryItem, chartSpec: any): IMediaQueryActionResult;
+    protected _reInit(compile?: boolean, render?: boolean): void;
     dispose(): void;
 }
 export declare const registerMediaQuery: () => void;

package/esm/plugin/chart/media-query/media-query.js

@@ -26,12 +26,13 @@ export class MediaQuery extends BasePlugin {
         }, this._spec = chartSpec[MediaQuery.specKey], this._initialized = !0;
     }
     onBeforeResize(service, width, height) {
-        this.changeSize(width, height, !0, !1);
+        this._initialized && this._changeSize(width, height, !0, !1);
     }
     onAfterChartSpecTransform(service, chartSpec, actionSource) {
-        "setCurrentTheme" === actionSource && this.reInit(!1, !1);
+        this._initialized && "setCurrentTheme" === actionSource && this._reInit(!1, !1);
     }
     onBeforeInitChart(service, chartSpec, actionSource) {
+        if (!this._initialized) return;
         let resetMediaQuery, checkMediaQuery;
         switch (actionSource) {
           case "render":
@@ -50,41 +51,41 @@ export class MediaQuery extends BasePlugin {
         if (resetMediaQuery && this.dispose(), this._initialized || this.onInit(service, chartSpec), 
         resetMediaQuery || checkMediaQuery) {
             const {width: width, height: height} = this._option.globalInstance.getCurrentSize();
-            this.changeSize(width, height, !1, !1);
+            this._changeSize(width, height, !1, !1);
         }
     }
-    changeSize(width, height, compile, render) {
+    _changeSize(width, height, compile, render) {
         return (this._currentMediaInfo.width !== width || this._currentMediaInfo.height !== height) && (this._currentMediaInfo.width = width, 
         this._currentMediaInfo.height = height, this._applyQueries(compile, render));
     }
     _applyQueries(compile, render) {
         const changeToActive = [], changeToInactive = [];
         if (this._spec.forEach((item => {
-            const {hasChanged: hasChanged, isActive: isActive} = this.check(item);
+            const {hasChanged: hasChanged, isActive: isActive} = this._check(item);
             hasChanged && (isActive ? changeToActive.push(item) : changeToInactive.push(item));
         })), !changeToActive.length && !changeToInactive.length) return !1;
         let chartSpec;
-        this._baseChartSpec || (this._baseChartSpec = cloneDeepSpec(this._option.globalInstance.getSpec()));
+        this._baseChartSpec || (this._baseChartSpec = cloneDeepSpec(this._option.globalInstance.getSpec(), [ "data", MediaQuery.specKey ]));
         let hasChanged = !1;
-        return changeToInactive.length > 0 ? (chartSpec = cloneDeepSpec(this._baseChartSpec), 
+        return changeToInactive.length > 0 ? (chartSpec = cloneDeepSpec(this._baseChartSpec, [ "data", MediaQuery.specKey ]), 
         Array.from(this.currentActiveItems).forEach((item => {
             if (changeToInactive.includes(item)) return void this.currentActiveItems.delete(item);
-            const result = this.apply(item, chartSpec);
+            const result = this._apply(item, chartSpec);
             chartSpec = result.chartSpec;
         })), hasChanged = !0) : chartSpec = this._option.globalInstance.getSpec(), changeToActive.forEach((item => {
             this.currentActiveItems.add(item);
-            const result = this.apply(item, chartSpec);
+            const result = this._apply(item, chartSpec);
             chartSpec = result.chartSpec, hasChanged || (hasChanged = result.hasChanged);
         })), hasChanged && this._option.updateSpec(chartSpec, compile, render), !0;
     }
-    check(item) {
+    _check(item) {
         const {globalInstance: globalInstance} = this._option, isActive = checkMediaQuery(item.query, this._currentMediaInfo, globalInstance);
         return {
             isActive: isActive,
             hasChanged: isActive !== this.currentActiveItems.has(item)
         };
     }
-    apply(item, chartSpec) {
+    _apply(item, chartSpec) {
         const {globalInstance: globalInstance} = this._option, {query: query, action: action} = item;
         let hasChanged = !1;
         return array(action).forEach((actionItem => {
@@ -95,12 +96,12 @@ export class MediaQuery extends BasePlugin {
             hasChanged: hasChanged
         };
     }
-    reInit(compile, render) {
+    _reInit(compile, render) {
         let chartSpec = this._option.globalInstance.getSpec();
-        this._baseChartSpec = cloneDeepSpec(chartSpec);
+        this._baseChartSpec = cloneDeepSpec(chartSpec, [ "data", MediaQuery.specKey ]);
         let hasChanged = !1;
         this.currentActiveItems.forEach((item => {
-            const result = this.apply(item, chartSpec);
+            const result = this._apply(item, chartSpec);
             chartSpec = result.chartSpec, hasChanged || (hasChanged = result.hasChanged);
         })), hasChanged && this._option.updateSpec(chartSpec, compile, render);
     }

package/esm/plugin/chart/media-query/media-query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/chart/media-query/media-query.ts"],"names":[],"mappings":"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","file":"media-query.js","sourcesContent":["import type {\n  IMediaInfo,\n  IMediaQueryCheckResult,\n  IMediaQuerySpec,\n  IMediaQueryOption,\n  IMediaQueryItem,\n  IMediaQueryActionResult\n} from './interface';\nimport { checkMediaQuery } from './util';\nimport { executeMediaQueryAction } from './util/action';\nimport type { IChartPlugin, IChartPluginService } from '../interface';\nimport { array, cloneDeepSpec } from '../../../util';\nimport type { VChartRenderActionSource } from '../../../core/interface';\nimport { BasePlugin } from '../../base/base-plugin';\nimport { registerChartPlugin } from '../register';\n\nexport class MediaQuery extends BasePlugin implements IChartPlugin {\n  static readonly pluginType: 'chart' = 'chart';\n  static readonly specKey = 'media';\n  static readonly type: string = 'MediaQueryPlugin';\n  readonly type: string = 'MediaQueryPlugin';\n\n  protected _spec: IMediaQuerySpec;\n  protected _option: IMediaQueryOption;\n\n  /** 不带任何媒体查询的图表 spec */\n  protected _baseChartSpec: any;\n\n  /** 当前媒体信息 */\n  protected _currentMediaInfo: Partial<IMediaInfo> = {};\n\n  /** 当前正在生效的媒体查询 */\n  readonly currentActiveItems = new Set<IMediaQueryItem>();\n\n  /** 媒体查询是否已经初始化 */\n  protected _initialized: boolean = false;\n\n  constructor() {\n    super(MediaQuery.type);\n  }\n\n  onInit(service: IChartPluginService, chartSpec: any) {\n    if (!chartSpec?.[MediaQuery.specKey]) {\n      return;\n    }\n    const { globalInstance } = service;\n    this._option = {\n      globalInstance: service.globalInstance,\n      updateSpec: (spec: any, compile?: boolean, render?: boolean) => {\n        if (render) {\n          globalInstance.updateSpecSync(spec);\n        } else if (compile) {\n          globalInstance.updateSpecAndRecompile(spec, false, {\n            transformSpec: true\n          });\n        } else {\n          globalInstance.setRuntimeSpec(spec);\n        }\n      }\n    };\n    this._spec = chartSpec[MediaQuery.specKey];\n    this._initialized = true;\n  }\n\n  onBeforeResize(service: IChartPluginService, width: number, height: number) {\n    this.changeSize(width, height, true, false);\n  }\n\n  onAfterChartSpecTransform(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource) {\n    if (actionSource === 'setCurrentTheme') {\n      // 重新执行已生效的所有媒体查询\n      this.reInit(false, false);\n    }\n  }\n\n  onBeforeInitChart(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource) {\n    let resetMediaQuery: boolean;\n    let checkMediaQuery: boolean;\n\n    switch (actionSource) {\n      case 'render':\n      case 'updateModelSpec':\n        resetMediaQuery = false;\n        checkMediaQuery = true;\n        break;\n      case 'updateSpec':\n      case 'setCurrentTheme':\n        resetMediaQuery = true;\n        checkMediaQuery = false;\n        break;\n      case 'updateSpecAndRecompile':\n        resetMediaQuery = false;\n        checkMediaQuery = false;\n        break;\n    }\n\n    if (resetMediaQuery) {\n      this.dispose();\n    }\n    if (!this._initialized) {\n      // 初始化媒体查询\n      this.onInit(service, chartSpec);\n    }\n    if (resetMediaQuery || checkMediaQuery) {\n      // 触发媒体查询\n      const { width, height } = this._option.globalInstance.getCurrentSize();\n      this.changeSize(width, height, false, false);\n    }\n  }\n\n  /** 更新图表宽高信息，执行所有相关媒体查询，返回是否命中某个查询 */\n  changeSize(width: number, height: number, compile?: boolean, render?: boolean): boolean {\n    if (this._currentMediaInfo.width === width && this._currentMediaInfo.height === height) {\n      return false;\n    }\n    this._currentMediaInfo.width = width;\n    this._currentMediaInfo.height = height;\n    // 由于目前媒体查询只和图表宽高有关，这里执行所有媒体查询\n    return this._applyQueries(compile, render);\n  }\n\n  /** 执行所有媒体查询，返回是否命中某个查询 */\n  protected _applyQueries(compile?: boolean, render?: boolean): boolean {\n    // 检查所有查询的查询条件\n    const changeToActive: IMediaQueryItem[] = []; // 将会生效的查询\n    const changeToInactive: IMediaQueryItem[] = []; // 将会失效的查询\n    this._spec.forEach(item => {\n      const { hasChanged, isActive } = this.check(item);\n      if (hasChanged) {\n        if (isActive) {\n          changeToActive.push(item);\n        } else {\n          changeToInactive.push(item);\n        }\n      }\n    });\n\n    if (!changeToActive.length && !changeToInactive.length) {\n      return false;\n    }\n    if (!this._baseChartSpec) {\n      this._baseChartSpec = cloneDeepSpec(this._option.globalInstance.getSpec());\n    }\n    let chartSpec: any;\n    let hasChanged = false;\n\n    // 处理将会失效的查询：重新执行一遍当前生效的查询\n    if (changeToInactive.length > 0) {\n      chartSpec = cloneDeepSpec(this._baseChartSpec);\n      Array.from(this.currentActiveItems).forEach(item => {\n        if (changeToInactive.includes(item)) {\n          this.currentActiveItems.delete(item);\n          return;\n        }\n        const result = this.apply(item, chartSpec);\n        chartSpec = result.chartSpec;\n      });\n      hasChanged = true;\n    } else {\n      chartSpec = this._option.globalInstance.getSpec();\n    }\n\n    // 处理将会生效的查询\n    changeToActive.forEach(item => {\n      this.currentActiveItems.add(item);\n      const result = this.apply(item, chartSpec);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n\n    if (hasChanged) {\n      this._option.updateSpec(chartSpec, compile, render);\n    }\n    return true;\n  }\n\n  /** 检查媒体查询的条件是否满足 */\n  check(item: IMediaQueryItem): IMediaQueryCheckResult {\n    const { globalInstance } = this._option;\n    const isActive = checkMediaQuery(item.query, this._currentMediaInfo as IMediaInfo, globalInstance);\n    return {\n      isActive,\n      hasChanged: isActive !== this.currentActiveItems.has(item)\n    };\n  }\n\n  /** 执行一条媒体查询 */\n  apply(item: IMediaQueryItem, chartSpec: any): IMediaQueryActionResult {\n    const { globalInstance } = this._option;\n    const { query, action } = item;\n    let hasChanged = false;\n    // 执行\n    array(action).forEach(actionItem => {\n      const result = executeMediaQueryAction(actionItem, query, chartSpec, globalInstance);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n    return { chartSpec, hasChanged };\n  }\n\n  /** 重新初始化，并重新执行一遍当前生效的媒体查询 */\n  reInit(compile?: boolean, render?: boolean) {\n    let chartSpec = this._option.globalInstance.getSpec();\n    this._baseChartSpec = cloneDeepSpec(chartSpec);\n\n    let hasChanged = false;\n    this.currentActiveItems.forEach(item => {\n      const result = this.apply(item, chartSpec);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n\n    if (hasChanged) {\n      this._option.updateSpec(chartSpec, compile, render);\n    }\n  }\n\n  dispose() {\n    this._initialized = false;\n    this._spec = [];\n    this._option = undefined;\n    this._currentMediaInfo = {};\n    this.currentActiveItems.clear();\n  }\n}\n\nexport const registerMediaQuery = () => {\n  registerChartPlugin(MediaQuery);\n};\n"]}
+{"version":3,"sources":["../src/plugin/chart/media-query/media-query.ts"],"names":[],"mappings":"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","file":"media-query.js","sourcesContent":["import type {\n  IMediaInfo,\n  IMediaQueryCheckResult,\n  IMediaQuerySpec,\n  IMediaQueryOption,\n  IMediaQueryItem,\n  IMediaQueryActionResult\n} from './interface';\nimport { checkMediaQuery } from './util';\nimport { executeMediaQueryAction } from './util/action';\nimport type { IChartPlugin, IChartPluginService } from '../interface';\nimport { array, cloneDeepSpec } from '../../../util';\nimport type { VChartRenderActionSource } from '../../../core/interface';\nimport { BasePlugin } from '../../base/base-plugin';\nimport { registerChartPlugin } from '../register';\n\nexport class MediaQuery extends BasePlugin implements IChartPlugin {\n  static readonly pluginType: 'chart' = 'chart';\n  static readonly specKey = 'media';\n  static readonly type: string = 'MediaQueryPlugin';\n  readonly type: string = 'MediaQueryPlugin';\n\n  protected _spec: IMediaQuerySpec;\n  protected _option: IMediaQueryOption;\n\n  /** 不带任何媒体查询的图表 spec */\n  protected _baseChartSpec: any;\n\n  /** 当前媒体信息 */\n  protected _currentMediaInfo: Partial<IMediaInfo> = {};\n\n  /** 当前正在生效的媒体查询 */\n  readonly currentActiveItems = new Set<IMediaQueryItem>();\n\n  /** 媒体查询是否已经初始化 */\n  protected _initialized: boolean = false;\n\n  constructor() {\n    super(MediaQuery.type);\n  }\n\n  onInit(service: IChartPluginService, chartSpec: any) {\n    if (!chartSpec?.[MediaQuery.specKey]) {\n      return;\n    }\n\n    const { globalInstance } = service;\n    this._option = {\n      globalInstance: service.globalInstance,\n      updateSpec: (spec: any, compile?: boolean, render?: boolean) => {\n        if (render) {\n          globalInstance.updateSpecSync(spec);\n        } else if (compile) {\n          globalInstance.updateSpecAndRecompile(spec, false, {\n            transformSpec: true\n          });\n        } else {\n          globalInstance.setRuntimeSpec(spec);\n        }\n      }\n    };\n    this._spec = chartSpec[MediaQuery.specKey];\n    this._initialized = true;\n  }\n\n  onBeforeResize(service: IChartPluginService, width: number, height: number) {\n    if (!this._initialized) {\n      return;\n    }\n\n    this._changeSize(width, height, true, false);\n  }\n\n  onAfterChartSpecTransform(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource) {\n    if (!this._initialized) {\n      return;\n    }\n\n    if (actionSource === 'setCurrentTheme') {\n      // 重新执行已生效的所有媒体查询\n      this._reInit(false, false);\n    }\n  }\n\n  onBeforeInitChart(service: IChartPluginService, chartSpec: any, actionSource: VChartRenderActionSource) {\n    if (!this._initialized) {\n      return;\n    }\n\n    let resetMediaQuery: boolean;\n    let checkMediaQuery: boolean;\n\n    switch (actionSource) {\n      case 'render':\n      case 'updateModelSpec':\n        resetMediaQuery = false;\n        checkMediaQuery = true;\n        break;\n      case 'updateSpec':\n      case 'setCurrentTheme':\n        resetMediaQuery = true;\n        checkMediaQuery = false;\n        break;\n      case 'updateSpecAndRecompile':\n        resetMediaQuery = false;\n        checkMediaQuery = false;\n        break;\n    }\n\n    if (resetMediaQuery) {\n      this.dispose();\n    }\n    if (!this._initialized) {\n      // 初始化媒体查询\n      this.onInit(service, chartSpec);\n    }\n    if (resetMediaQuery || checkMediaQuery) {\n      // 触发媒体查询\n      const { width, height } = this._option.globalInstance.getCurrentSize();\n      this._changeSize(width, height, false, false);\n    }\n  }\n\n  /** 更新图表宽高信息，执行所有相关媒体查询，返回是否命中某个查询 */\n  protected _changeSize(width: number, height: number, compile?: boolean, render?: boolean): boolean {\n    if (this._currentMediaInfo.width === width && this._currentMediaInfo.height === height) {\n      return false;\n    }\n    this._currentMediaInfo.width = width;\n    this._currentMediaInfo.height = height;\n    // 由于目前媒体查询只和图表宽高有关，这里执行所有媒体查询\n    return this._applyQueries(compile, render);\n  }\n\n  /** 执行所有媒体查询，返回是否命中某个查询 */\n  protected _applyQueries(compile?: boolean, render?: boolean): boolean {\n    // 检查所有查询的查询条件\n    const changeToActive: IMediaQueryItem[] = []; // 将会生效的查询\n    const changeToInactive: IMediaQueryItem[] = []; // 将会失效的查询\n    this._spec.forEach(item => {\n      const { hasChanged, isActive } = this._check(item);\n      if (hasChanged) {\n        if (isActive) {\n          changeToActive.push(item);\n        } else {\n          changeToInactive.push(item);\n        }\n      }\n    });\n\n    if (!changeToActive.length && !changeToInactive.length) {\n      return false;\n    }\n    if (!this._baseChartSpec) {\n      this._baseChartSpec = cloneDeepSpec(this._option.globalInstance.getSpec(), ['data', MediaQuery.specKey]);\n    }\n    let chartSpec: any;\n    let hasChanged = false;\n\n    // 处理将会失效的查询：重新执行一遍当前生效的查询\n    if (changeToInactive.length > 0) {\n      chartSpec = cloneDeepSpec(this._baseChartSpec, ['data', MediaQuery.specKey]);\n      Array.from(this.currentActiveItems).forEach(item => {\n        if (changeToInactive.includes(item)) {\n          this.currentActiveItems.delete(item);\n          return;\n        }\n        const result = this._apply(item, chartSpec);\n        chartSpec = result.chartSpec;\n      });\n      hasChanged = true;\n    } else {\n      chartSpec = this._option.globalInstance.getSpec();\n    }\n\n    // 处理将会生效的查询\n    changeToActive.forEach(item => {\n      this.currentActiveItems.add(item);\n      const result = this._apply(item, chartSpec);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n\n    if (hasChanged) {\n      this._option.updateSpec(chartSpec, compile, render);\n    }\n    return true;\n  }\n\n  /** 检查媒体查询的条件是否满足 */\n  protected _check(item: IMediaQueryItem): IMediaQueryCheckResult {\n    const { globalInstance } = this._option;\n    const isActive = checkMediaQuery(item.query, this._currentMediaInfo as IMediaInfo, globalInstance);\n    return {\n      isActive,\n      hasChanged: isActive !== this.currentActiveItems.has(item)\n    };\n  }\n\n  /** 执行一条媒体查询 */\n  protected _apply(item: IMediaQueryItem, chartSpec: any): IMediaQueryActionResult {\n    const { globalInstance } = this._option;\n    const { query, action } = item;\n    let hasChanged = false;\n    // 执行\n    array(action).forEach(actionItem => {\n      const result = executeMediaQueryAction(actionItem, query, chartSpec, globalInstance);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n    return { chartSpec, hasChanged };\n  }\n\n  /** 重新初始化，并重新执行一遍当前生效的媒体查询 */\n  protected _reInit(compile?: boolean, render?: boolean) {\n    let chartSpec = this._option.globalInstance.getSpec();\n    this._baseChartSpec = cloneDeepSpec(chartSpec, ['data', MediaQuery.specKey]);\n\n    let hasChanged = false;\n    this.currentActiveItems.forEach(item => {\n      const result = this._apply(item, chartSpec);\n      chartSpec = result.chartSpec;\n      hasChanged ||= result.hasChanged;\n    });\n\n    if (hasChanged) {\n      this._option.updateSpec(chartSpec, compile, render);\n    }\n  }\n\n  dispose() {\n    this._initialized = false;\n    this._spec = [];\n    this._option = undefined;\n    this._currentMediaInfo = {};\n    this.currentActiveItems.clear();\n  }\n}\n\nexport const registerMediaQuery = () => {\n  registerChartPlugin(MediaQuery);\n};\n"]}

package/esm/plugin/chart/media-query/util/filter.d.ts

@@ -1,4 +1,5 @@
 import type { IVChart } from '../../../../core';
 import type { IMediaQueryAction, IMediaQueryActionFilterResult, IMediaQueryCondition, MediaQueryActionFilter, MediaQueryActionFilterType } from '../interface';
-export declare const executeMediaQueryActionFilter: <T extends Record<string, unknown>>(filterType: MediaQueryActionFilterType, filter: MediaQueryActionFilter<T>, action: IMediaQueryAction<T>, query: IMediaQueryCondition, chartSpec: any, globalInstance: IVChart) => IMediaQueryActionFilterResult;
+import type { MaybeArray } from '../../../../typings';
+export declare const executeMediaQueryActionFilter: <T extends Record<string, unknown>>(filterType: MediaQueryActionFilterType, filter: MaybeArray<MediaQueryActionFilter<T>>, action: IMediaQueryAction<T>, query: IMediaQueryCondition, chartSpec: any, globalInstance: IVChart) => IMediaQueryActionFilterResult;
 export declare const executeMediaQueryActionFilterType: <T extends Record<string, unknown>>(filterType: MediaQueryActionFilterType, chartSpec: any, globalInstance: IVChart) => IMediaQueryActionFilterResult<T>;

package/esm/plugin/chart/media-query/util/filter.js

@@ -4,14 +4,14 @@ import { Factory } from "../../../../core";
 
 import { SeriesTypeEnum } from "../../../../series/interface";
 
-import { ComponentTypeEnum, SimplifiedComponentTypeEnum, axisComponentTypes, crosshairComponentTypes, legendComponentTypes } from "../../../../component/interface";
+import { ComponentTypeEnum } from "../../../../component/interface";
 
 import { includeSpec } from "@visactor/vutils-extension";
 
 export const executeMediaQueryActionFilter = (filterType = "chart", filter, action, query, chartSpec, globalInstance) => {
     const result = executeMediaQueryActionFilterType(filterType, chartSpec, globalInstance);
     return Object.assign(Object.assign({}, result), {
-        modelInfo: result.modelInfo.filter((info => !!isNil(filter) || (isFunction(filter) ? filter(info, action, query) : includeSpec(info.spec, filter))))
+        modelInfo: result.modelInfo.filter((info => !!isNil(filter) || array(filter).some((f => isFunction(f) ? f(info, action, query) : includeSpec(info.spec, f)))))
     });
 };
 
@@ -47,36 +47,29 @@ export const executeMediaQueryActionFilterType = (filterType = "chart", chartSpe
             specIndex: i,
             type: filterType
         });
-    })); else if (Object.values(SimplifiedComponentTypeEnum).includes(filterType)) {
-        let componentTypes;
-        switch (result.modelType = "component", filterType) {
-          case SimplifiedComponentTypeEnum.axis:
-            componentTypes = axisComponentTypes, result.specKey = "axes";
-            break;
-
-          case SimplifiedComponentTypeEnum.legend:
-            componentTypes = legendComponentTypes, result.specKey = "legends";
-            break;
-
-          case SimplifiedComponentTypeEnum.crosshair:
-            componentTypes = crosshairComponentTypes, result.specKey = "crosshair";
-        }
-        const {specKey: specKey} = result, infoList = array(null !== (_d = chartSpecInfo[specKey]) && void 0 !== _d ? _d : []);
-        array(null !== (_e = chartSpec[specKey]) && void 0 !== _e ? _e : []).forEach(((componentSpec, i) => {
-            const specInfo = infoList[i];
-            (null == componentTypes ? void 0 : componentTypes.includes(specInfo.type)) && result.modelInfo.push(Object.assign(Object.assign({}, specInfo), {
-                spec: componentSpec
-            }));
-        }));
-    } else if (Object.values(ComponentTypeEnum).includes(filterType)) {
-        result.modelType = "component", result.type = filterType, result.specKey = null === (_f = Factory.getComponentInKey(filterType)) || void 0 === _f ? void 0 : _f.specKey;
-        const {specKey: specKey} = result, infoList = array(null !== (_g = chartSpecInfo[specKey]) && void 0 !== _g ? _g : []);
-        null === (_j = array(null !== (_h = chartSpec[specKey]) && void 0 !== _h ? _h : [])) || void 0 === _j || _j.forEach(((componentSpec, i) => {
+    })); else if (Object.values(ComponentTypeEnum).includes(filterType)) {
+        result.modelType = "component", result.type = filterType, result.specKey = null === (_d = Factory.getComponentInKey(filterType)) || void 0 === _d ? void 0 : _d.specKey;
+        const {specKey: specKey} = result, infoList = array(null !== (_e = chartSpecInfo[specKey]) && void 0 !== _e ? _e : []);
+        null === (_g = array(null !== (_f = chartSpec[specKey]) && void 0 !== _f ? _f : [])) || void 0 === _g || _g.forEach(((componentSpec, i) => {
             const specInfo = infoList[i];
             specInfo.type === filterType && result.modelInfo.push(Object.assign(Object.assign({}, specInfo), {
                 spec: componentSpec
             }));
         }));
+    } else {
+        const componentTypes = Factory.getComponents().filter((({cmp: cmp}) => cmp.specKey === filterType)).map((({cmp: cmp}) => cmp.type));
+        if (componentTypes.length > 0) {
+            result.modelType = "component";
+            const specKey = filterType;
+            result.specKey = specKey;
+            const infoList = array(null !== (_h = chartSpecInfo[specKey]) && void 0 !== _h ? _h : []);
+            array(null !== (_j = chartSpec[specKey]) && void 0 !== _j ? _j : []).forEach(((componentSpec, i) => {
+                const specInfo = infoList[i];
+                componentTypes.includes(specInfo.type) && result.modelInfo.push(Object.assign(Object.assign({}, specInfo), {
+                    spec: componentSpec
+                }));
+            }));
+        }
     }
     return result;
 };

package/esm/plugin/chart/media-query/util/filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/chart/media-query/util/filter.ts"],"names":[],"mappings":"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","file":"filter.js","sourcesContent":["import { array, isFunction, isNil } from '@visactor/vutils';\nimport type { IChartSpec, IVChart } from '../../../../core';\n// eslint-disable-next-line no-duplicate-imports\nimport { Factory } from '../../../../core';\nimport type {\n  IMediaQueryAction,\n  IMediaQueryActionFilterResult,\n  IMediaQueryCondition,\n  MediaQueryActionFilter,\n  MediaQueryActionFilterType\n} from '../interface';\nimport { SeriesTypeEnum } from '../../../../series/interface';\nimport {\n  ComponentTypeEnum,\n  SimplifiedComponentTypeEnum,\n  axisComponentTypes,\n  crosshairComponentTypes,\n  legendComponentTypes\n} from '../../../../component/interface';\nimport { includeSpec } from '@visactor/vutils-extension';\n\n/** 执行元素过滤器 */\nexport const executeMediaQueryActionFilter = <T extends Record<string, unknown>>(\n  filterType: MediaQueryActionFilterType = 'chart',\n  filter: MediaQueryActionFilter<T> | undefined,\n  action: IMediaQueryAction<T>,\n  query: IMediaQueryCondition,\n  chartSpec: any,\n  globalInstance: IVChart\n): IMediaQueryActionFilterResult => {\n  const result = executeMediaQueryActionFilterType<T>(filterType, chartSpec, globalInstance);\n  return {\n    ...result,\n    modelInfo: result.modelInfo.filter(info => {\n      if (isNil(filter)) {\n        return true;\n      }\n      if (isFunction(filter)) {\n        return filter(info, action, query);\n      }\n      // spec 模糊匹配\n      return includeSpec(info.spec, filter);\n    })\n  };\n};\n\n/** 执行元素过滤器的 filterType 部分的筛选 */\nexport const executeMediaQueryActionFilterType = <T extends Record<string, unknown>>(\n  filterType: MediaQueryActionFilterType = 'chart',\n  chartSpec: any,\n  globalInstance: IVChart\n): IMediaQueryActionFilterResult<T> => {\n  const result: IMediaQueryActionFilterResult<T> = {\n    modelInfo: []\n  };\n  const chartSpecInfo = globalInstance.getSpecInfo();\n\n  if (filterType === 'chart') {\n    result.isChart = true;\n    result.modelInfo.push({\n      spec: chartSpec,\n      type: 'chart'\n    });\n  } else if (filterType === 'region') {\n    result.modelType = 'region';\n    result.specKey = 'region';\n\n    chartSpec.region?.forEach((regionSpec: T, i: number) => {\n      result.modelInfo.push({\n        spec: regionSpec,\n        specPath: ['region', i],\n        specIndex: i,\n        type: 'region'\n      });\n    });\n  } else if (filterType === 'series') {\n    result.modelType = 'series';\n    result.specKey = 'series';\n\n    chartSpec.series?.forEach((seriesSpec: T, i: number) => {\n      result.modelInfo.push({\n        spec: seriesSpec,\n        specPath: ['series', i],\n        specIndex: i,\n        type: seriesSpec.type as string\n      });\n    });\n  } else if (Object.values(SeriesTypeEnum).includes(filterType as SeriesTypeEnum)) {\n    result.modelType = 'series';\n    result.specKey = 'series';\n    result.type = filterType as SeriesTypeEnum;\n\n    chartSpec.series?.forEach((seriesSpec: T, i: number) => {\n      if (seriesSpec.type === filterType) {\n        result.modelInfo.push({\n          spec: seriesSpec,\n          specPath: ['series', i],\n          specIndex: i,\n          type: filterType\n        });\n      }\n    });\n  } else if (Object.values(SimplifiedComponentTypeEnum).includes(filterType as SimplifiedComponentTypeEnum)) {\n    result.modelType = 'component';\n    let componentTypes: ComponentTypeEnum[] | undefined;\n    switch (filterType) {\n      case SimplifiedComponentTypeEnum.axis:\n        componentTypes = axisComponentTypes;\n        result.specKey = 'axes';\n        break;\n      case SimplifiedComponentTypeEnum.legend:\n        componentTypes = legendComponentTypes;\n        result.specKey = 'legends';\n        break;\n      case SimplifiedComponentTypeEnum.crosshair:\n        componentTypes = crosshairComponentTypes;\n        result.specKey = 'crosshair';\n    }\n\n    const { specKey } = result;\n    const infoList = array(chartSpecInfo[specKey] ?? []);\n    array(chartSpec[specKey] ?? []).forEach((componentSpec, i) => {\n      const specInfo = infoList[i];\n      if (componentTypes?.includes(specInfo.type as ComponentTypeEnum)) {\n        result.modelInfo.push({\n          ...specInfo,\n          spec: componentSpec\n        });\n      }\n    });\n  } else if (Object.values(ComponentTypeEnum).includes(filterType as ComponentTypeEnum)) {\n    result.modelType = 'component';\n    result.type = filterType as ComponentTypeEnum;\n    result.specKey = Factory.getComponentInKey(filterType)?.specKey as keyof IChartSpec;\n\n    const { specKey } = result;\n    const infoList = array(chartSpecInfo[specKey] ?? []);\n    array(chartSpec[specKey] ?? [])?.forEach((componentSpec, i) => {\n      const specInfo = infoList[i];\n      if (specInfo.type === filterType) {\n        result.modelInfo.push({\n          ...specInfo,\n          spec: componentSpec\n        });\n      }\n    });\n  }\n\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/plugin/chart/media-query/util/filter.ts"],"names":[],"mappings":"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","file":"filter.js","sourcesContent":["import { array, isFunction, isNil } from '@visactor/vutils';\nimport type { IChartSpec, IVChart } from '../../../../core';\n// eslint-disable-next-line no-duplicate-imports\nimport { Factory } from '../../../../core';\nimport type {\n  IMediaQueryAction,\n  IMediaQueryActionFilterResult,\n  IMediaQueryCondition,\n  MediaQueryActionFilter,\n  MediaQueryActionFilterType\n} from '../interface';\nimport { SeriesTypeEnum } from '../../../../series/interface';\nimport { ComponentTypeEnum } from '../../../../component/interface';\nimport { includeSpec } from '@visactor/vutils-extension';\nimport type { MaybeArray } from '../../../../typings';\n\n/** 执行元素过滤器 */\nexport const executeMediaQueryActionFilter = <T extends Record<string, unknown>>(\n  filterType: MediaQueryActionFilterType = 'chart',\n  filter: MaybeArray<MediaQueryActionFilter<T>> | undefined,\n  action: IMediaQueryAction<T>,\n  query: IMediaQueryCondition,\n  chartSpec: any,\n  globalInstance: IVChart\n): IMediaQueryActionFilterResult => {\n  const result = executeMediaQueryActionFilterType<T>(filterType, chartSpec, globalInstance);\n  return {\n    ...result,\n    modelInfo: result.modelInfo.filter(info => {\n      if (isNil(filter)) {\n        return true;\n      }\n      return array(filter).some(f => {\n        if (isFunction(f)) {\n          return f(info, action, query);\n        }\n        // spec 模糊匹配\n        return includeSpec(info.spec, f);\n      });\n    })\n  };\n};\n\n/** 执行元素过滤器的 filterType 部分的筛选 */\nexport const executeMediaQueryActionFilterType = <T extends Record<string, unknown>>(\n  filterType: MediaQueryActionFilterType = 'chart',\n  chartSpec: any,\n  globalInstance: IVChart\n): IMediaQueryActionFilterResult<T> => {\n  const result: IMediaQueryActionFilterResult<T> = {\n    modelInfo: []\n  };\n  const chartSpecInfo = globalInstance.getSpecInfo();\n\n  if (filterType === 'chart') {\n    result.isChart = true;\n    result.modelInfo.push({\n      spec: chartSpec,\n      type: 'chart'\n    });\n  } else if (filterType === 'region') {\n    result.modelType = 'region';\n    result.specKey = 'region';\n\n    chartSpec.region?.forEach((regionSpec: T, i: number) => {\n      result.modelInfo.push({\n        spec: regionSpec,\n        specPath: ['region', i],\n        specIndex: i,\n        type: 'region'\n      });\n    });\n  } else if (filterType === 'series') {\n    result.modelType = 'series';\n    result.specKey = 'series';\n\n    chartSpec.series?.forEach((seriesSpec: T, i: number) => {\n      result.modelInfo.push({\n        spec: seriesSpec,\n        specPath: ['series', i],\n        specIndex: i,\n        type: seriesSpec.type as string\n      });\n    });\n  } else if (Object.values(SeriesTypeEnum).includes(filterType as SeriesTypeEnum)) {\n    result.modelType = 'series';\n    result.specKey = 'series';\n    result.type = filterType as SeriesTypeEnum;\n\n    chartSpec.series?.forEach((seriesSpec: T, i: number) => {\n      if (seriesSpec.type === filterType) {\n        result.modelInfo.push({\n          spec: seriesSpec,\n          specPath: ['series', i],\n          specIndex: i,\n          type: filterType\n        });\n      }\n    });\n  } else if (Object.values(ComponentTypeEnum).includes(filterType as ComponentTypeEnum)) {\n    result.modelType = 'component';\n    result.type = filterType as ComponentTypeEnum;\n    result.specKey = Factory.getComponentInKey(filterType)?.specKey as keyof IChartSpec;\n\n    const { specKey } = result;\n    const infoList = array(chartSpecInfo[specKey] ?? []);\n    array(chartSpec[specKey] ?? [])?.forEach((componentSpec, i) => {\n      const specInfo = infoList[i];\n      if (specInfo.type === filterType) {\n        result.modelInfo.push({\n          ...specInfo,\n          spec: componentSpec\n        });\n      }\n    });\n  } else {\n    // 根据 specKey 进行匹配\n    const componentTypes = Factory.getComponents()\n      .filter(({ cmp }) => cmp.specKey === filterType)\n      .map(({ cmp }) => cmp.type);\n    if (componentTypes.length > 0) {\n      result.modelType = 'component';\n      const specKey = filterType as keyof IChartSpec;\n      result.specKey = specKey;\n\n      const infoList = array(chartSpecInfo[specKey] ?? []);\n      array(chartSpec[specKey] ?? []).forEach((componentSpec, i) => {\n        const specInfo = infoList[i];\n        if (componentTypes.includes(specInfo.type as ComponentTypeEnum)) {\n          result.modelInfo.push({\n            ...specInfo,\n            spec: componentSpec\n          });\n        }\n      });\n    }\n  }\n\n  return result;\n};\n"]}

package/esm/series/funnel/funnel.js

@@ -260,7 +260,8 @@ export class FunnelSeries extends BaseSeries {
         return !!(null == datum ? void 0 : datum[FUNNEL_TRANSFORM_LEVEL]);
     }
     _buildMarkAttributeContext() {
-        super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this);
+        super._buildMarkAttributeContext(), this._markAttributeContext.valueToPosition = this.valueToPosition.bind(this), 
+        this._markAttributeContext.getPoints = this.getPoints.bind(this), this._markAttributeContext.isTransformLevel = this.isTransformLevel.bind(this);
     }
     valueToPosition(category) {
         var _a, _b, _c;