@visactor/vchart 1.6.2 → 1.7.0-alpha.0

package/cjs/animation/config.js

@@ -107,6 +107,7 @@ const registerLineAnimation = () => {
             type: "fadeOut"
         },
         update: [ {
+            type: "update",
             options: {
                 excludeChannels: "points"
             }

package/cjs/animation/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { TagPointsUpdate, ClipDirectionAnimate } from '@visactor/vrender-core';\nimport type { IElement } from '@visactor/vgrammar-core';\nimport type { ILineAnimationParams, LineAppearPreset } from '../series/line/animation';\nimport { linePresetAnimation } from '../series/line/animation';\nimport type { MarkAnimationSpec, ICartesianGroupAnimationParams } from './interface';\nimport { Factory } from '../core/factory';\nimport {\n  View,\n  registerScaleInAnimation,\n  registerScaleOutAnimation,\n  registerFadeInAnimation,\n  registerFadeOutAnimation,\n  registerClipInAnimation,\n  registerClipOutAnimation,\n  registerGrowAngleInAnimation,\n  registerGrowAngleOutAnimation,\n  registerGrowCenterInAnimation,\n  registerGrowCenterOutAnimation,\n  registerGrowHeightInAnimation,\n  registerGrowHeightOutAnimation,\n  registerGrowPointsInAnimation,\n  registerGrowPointsOutAnimation,\n  registerGrowPointsXInAnimation,\n  registerGrowPointsXOutAnimation,\n  registerGrowPointsYInAnimation,\n  registerGrowPointsYOutAnimation,\n  registerGrowRadiusInAnimation,\n  registerGrowRadiusOutAnimation,\n  registerGrowWidthInAnimation,\n  registerGrowWidthOutAnimation,\n  registerMoveInAnimation,\n  registerMoveOutAnimation,\n  registerRotateInAnimation,\n  registerRotateOutAnimation,\n  registerUpdateAnimation\n} from '@visactor/vgrammar-core';\n\nexport const DEFAULT_ANIMATION_CONFIG = {\n  appear: {\n    duration: 1000,\n    easing: 'cubicOut'\n  },\n  update: {\n    type: 'update',\n    duration: 300,\n    easing: 'linear'\n  },\n  enter: {\n    duration: 300,\n    easing: 'linear'\n  },\n  exit: {\n    duration: 300,\n    easing: 'linear'\n  },\n  disappear: {\n    duration: 500,\n    easing: 'cubicIn'\n  }\n};\n\nexport const ScaleInOutAnimation = {\n  appear: { type: 'scaleIn' },\n  enter: { type: 'scaleIn' },\n  exit: { type: 'scaleOut' },\n  disappear: { type: 'scaleOut' }\n};\n\nexport const FadeInOutAnimation = {\n  appear: { type: 'fadeIn' },\n  enter: { type: 'fadeIn' },\n  exit: { type: 'fadeOut' },\n  disappear: { type: 'fadeOut' }\n};\n\nexport const registerScaleInOutAnimation = () => {\n  Factory.registerAnimation('scaleInOut', () => ScaleInOutAnimation);\n};\n\nexport const registerFadeInOutAnimation = () => {\n  Factory.registerAnimation('fadeInOut', () => FadeInOutAnimation);\n};\n\nexport const registerCartesianGroupClipAnimation = () => {\n  Factory.registerAnimation('cartesianGroupClip', (params?: ICartesianGroupAnimationParams) => {\n    return {\n      appear: {\n        custom: ClipDirectionAnimate,\n        customParameters: (datum: any, element: IElement) => {\n          return {\n            animationType: 'in',\n            group: element.getGraphicItem(),\n            direction: params.direction(),\n            width: params.width(),\n            height: params.height(),\n            orient: params.orient()\n          };\n        }\n      },\n      disappear: {\n        custom: ClipDirectionAnimate,\n        customParameters: (datum: any, element: IElement) => {\n          return {\n            animationType: 'out',\n            group: element.getGraphicItem(),\n            direction: params.direction(),\n            width: params.width(),\n            height: params.height(),\n            orient: params.orient()\n          };\n        }\n      }\n    };\n  });\n};\n\nexport const registerLineAnimation = () => {\n  Factory.registerAnimation('line', (params: ILineAnimationParams, preset: LineAppearPreset) => {\n    return {\n      appear: linePresetAnimation(params, preset),\n      enter: { type: 'fadeIn' },\n      exit: { type: 'fadeOut' },\n      update: [\n        {\n          options: { excludeChannels: 'points' }\n        },\n        {\n          channel: ['points'],\n          custom: TagPointsUpdate,\n          duration: DEFAULT_ANIMATION_CONFIG.update.duration,\n          easing: DEFAULT_ANIMATION_CONFIG.update.easing\n        }\n      ],\n      disappear: { type: 'clipOut' }\n    } as MarkAnimationSpec;\n  });\n};\n\nexport const registerVGrammarAnimation = () => {\n  View.useRegisters([\n    registerClipInAnimation,\n    registerClipOutAnimation,\n    registerScaleInAnimation,\n    registerScaleOutAnimation,\n    registerFadeInAnimation,\n    registerFadeOutAnimation,\n    registerGrowAngleInAnimation,\n    registerGrowAngleOutAnimation,\n    registerGrowCenterInAnimation,\n    registerGrowCenterOutAnimation,\n    registerGrowHeightInAnimation,\n    registerGrowHeightOutAnimation,\n    registerGrowPointsInAnimation,\n    registerGrowPointsOutAnimation,\n    registerGrowPointsXInAnimation,\n    registerGrowPointsXOutAnimation,\n    registerGrowPointsYInAnimation,\n    registerGrowPointsYOutAnimation,\n    registerGrowRadiusInAnimation,\n    registerGrowRadiusOutAnimation,\n    registerGrowWidthInAnimation,\n    registerGrowWidthOutAnimation,\n    registerMoveInAnimation,\n    registerMoveOutAnimation,\n    registerRotateInAnimation,\n    registerRotateOutAnimation,\n    registerUpdateAnimation\n  ]);\n};\n"]}
+{"version":3,"sources":["../src/animation/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { TagPointsUpdate, ClipDirectionAnimate } from '@visactor/vrender-core';\nimport type { IElement } from '@visactor/vgrammar-core';\nimport type { ILineAnimationParams, LineAppearPreset } from '../series/line/animation';\nimport { linePresetAnimation } from '../series/line/animation';\nimport type { MarkAnimationSpec, ICartesianGroupAnimationParams } from './interface';\nimport { Factory } from '../core/factory';\nimport {\n  View,\n  registerScaleInAnimation,\n  registerScaleOutAnimation,\n  registerFadeInAnimation,\n  registerFadeOutAnimation,\n  registerClipInAnimation,\n  registerClipOutAnimation,\n  registerGrowAngleInAnimation,\n  registerGrowAngleOutAnimation,\n  registerGrowCenterInAnimation,\n  registerGrowCenterOutAnimation,\n  registerGrowHeightInAnimation,\n  registerGrowHeightOutAnimation,\n  registerGrowPointsInAnimation,\n  registerGrowPointsOutAnimation,\n  registerGrowPointsXInAnimation,\n  registerGrowPointsXOutAnimation,\n  registerGrowPointsYInAnimation,\n  registerGrowPointsYOutAnimation,\n  registerGrowRadiusInAnimation,\n  registerGrowRadiusOutAnimation,\n  registerGrowWidthInAnimation,\n  registerGrowWidthOutAnimation,\n  registerMoveInAnimation,\n  registerMoveOutAnimation,\n  registerRotateInAnimation,\n  registerRotateOutAnimation,\n  registerUpdateAnimation\n} from '@visactor/vgrammar-core';\n\nexport const DEFAULT_ANIMATION_CONFIG = {\n  appear: {\n    duration: 1000,\n    easing: 'cubicOut'\n  },\n  update: {\n    type: 'update',\n    duration: 300,\n    easing: 'linear'\n  },\n  enter: {\n    duration: 300,\n    easing: 'linear'\n  },\n  exit: {\n    duration: 300,\n    easing: 'linear'\n  },\n  disappear: {\n    duration: 500,\n    easing: 'cubicIn'\n  }\n};\n\nexport const ScaleInOutAnimation = {\n  appear: { type: 'scaleIn' },\n  enter: { type: 'scaleIn' },\n  exit: { type: 'scaleOut' },\n  disappear: { type: 'scaleOut' }\n};\n\nexport const FadeInOutAnimation = {\n  appear: { type: 'fadeIn' },\n  enter: { type: 'fadeIn' },\n  exit: { type: 'fadeOut' },\n  disappear: { type: 'fadeOut' }\n};\n\nexport const registerScaleInOutAnimation = () => {\n  Factory.registerAnimation('scaleInOut', () => ScaleInOutAnimation);\n};\n\nexport const registerFadeInOutAnimation = () => {\n  Factory.registerAnimation('fadeInOut', () => FadeInOutAnimation);\n};\n\nexport const registerCartesianGroupClipAnimation = () => {\n  Factory.registerAnimation('cartesianGroupClip', (params?: ICartesianGroupAnimationParams) => {\n    return {\n      appear: {\n        custom: ClipDirectionAnimate,\n        customParameters: (datum: any, element: IElement) => {\n          return {\n            animationType: 'in',\n            group: element.getGraphicItem(),\n            direction: params.direction(),\n            width: params.width(),\n            height: params.height(),\n            orient: params.orient()\n          };\n        }\n      },\n      disappear: {\n        custom: ClipDirectionAnimate,\n        customParameters: (datum: any, element: IElement) => {\n          return {\n            animationType: 'out',\n            group: element.getGraphicItem(),\n            direction: params.direction(),\n            width: params.width(),\n            height: params.height(),\n            orient: params.orient()\n          };\n        }\n      }\n    };\n  });\n};\n\nexport const registerLineAnimation = () => {\n  Factory.registerAnimation('line', (params: ILineAnimationParams, preset: LineAppearPreset) => {\n    return {\n      appear: linePresetAnimation(params, preset),\n      enter: { type: 'fadeIn' },\n      exit: { type: 'fadeOut' },\n      update: [\n        {\n          type: 'update',\n          options: { excludeChannels: 'points' }\n        },\n        {\n          channel: ['points'],\n          custom: TagPointsUpdate,\n          duration: DEFAULT_ANIMATION_CONFIG.update.duration,\n          easing: DEFAULT_ANIMATION_CONFIG.update.easing\n        }\n      ],\n      disappear: { type: 'clipOut' }\n    } as MarkAnimationSpec;\n  });\n};\n\nexport const registerVGrammarAnimation = () => {\n  View.useRegisters([\n    registerClipInAnimation,\n    registerClipOutAnimation,\n    registerScaleInAnimation,\n    registerScaleOutAnimation,\n    registerFadeInAnimation,\n    registerFadeOutAnimation,\n    registerGrowAngleInAnimation,\n    registerGrowAngleOutAnimation,\n    registerGrowCenterInAnimation,\n    registerGrowCenterOutAnimation,\n    registerGrowHeightInAnimation,\n    registerGrowHeightOutAnimation,\n    registerGrowPointsInAnimation,\n    registerGrowPointsOutAnimation,\n    registerGrowPointsXInAnimation,\n    registerGrowPointsXOutAnimation,\n    registerGrowPointsYInAnimation,\n    registerGrowPointsYOutAnimation,\n    registerGrowRadiusInAnimation,\n    registerGrowRadiusOutAnimation,\n    registerGrowWidthInAnimation,\n    registerGrowWidthOutAnimation,\n    registerMoveInAnimation,\n    registerMoveOutAnimation,\n    registerRotateInAnimation,\n    registerRotateOutAnimation,\n    registerUpdateAnimation\n  ]);\n};\n"]}

package/cjs/animation/utils.d.ts

@@ -9,9 +9,9 @@ export declare const AnimationStates: string[];
 export declare function animationConfig<Preset extends string>(defaultConfig?: MarkAnimationSpec, userConfig?: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, params?: {
     dataIndex: (datum: any) => number;
 }): MarkAnimationSpec;
-export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
+export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
 export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;
 export declare function isTimeLineAnimation(animationConfig: IAnimationConfig): boolean;
 export declare function isChannelAnimation(animationConfig: IAnimationConfig): boolean;
-export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "normal" | "state" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
 export declare function isAnimationEnabledForSeries(series: ISeries): boolean;

package/cjs/animation/utils.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 const type_1 = require("../util/type"), constant_1 = require("../constant"), config_1 = require("./config"), vutils_1 = require("@visactor/vutils"), merge_spec_1 = require("../util/spec/merge-spec");
 
 function animationConfig(defaultConfig = {}, userConfig, params) {
-    var _a;
     const config = {};
     for (let i = 0; i < exports.AnimationStates.length; i++) {
         const state = exports.AnimationStates[i];
@@ -17,17 +16,17 @@ function animationConfig(defaultConfig = {}, userConfig, params) {
             continue;
         }
         let defaultStateConfig, stateConfig;
-        if ((0, vutils_1.isArray)(defaultConfig[state]) ? defaultStateConfig = defaultConfig[state] : (defaultStateConfig = [ Object.assign(Object.assign({}, config_1.DEFAULT_ANIMATION_CONFIG[state]), defaultConfig[state]) ], 
-        "exit" === state && (defaultStateConfig[0].controlOptions = {
-            stopWhenStateChange: !0
-        })), null == userConfig ? void 0 : userConfig[state]) {
-            if ((0, vutils_1.isArray)(userConfig[state])) stateConfig = userConfig[state]; else {
-                let singleConfig = (0, merge_spec_1.mergeSpec)({}, defaultStateConfig[0], userConfig[state]);
-                isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex)), 
-                stateConfig = [ singleConfig ];
-            }
-            config[state] = stateConfig;
-        } else config[state] = defaultStateConfig;
+        (defaultStateConfig = (0, vutils_1.isArray)(defaultConfig[state]) ? defaultConfig[state] : [ Object.assign(Object.assign({}, config_1.DEFAULT_ANIMATION_CONFIG[state]), defaultConfig[state]) ], 
+        "exit" === state && defaultStateConfig.forEach((exitConfig => {
+            exitConfig.controlOptions = {
+                stopWhenStateChange: !0
+            };
+        })), null == userConfig ? void 0 : userConfig[state]) ? (stateConfig = (0, vutils_1.isArray)(userConfig[state]) ? userConfig[state] : defaultStateConfig.map(((stateConfig, i) => {
+            var _a;
+            let singleConfig = (0, merge_spec_1.mergeSpec)({}, defaultStateConfig[i], userConfig[state]);
+            return isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex)), 
+            singleConfig;
+        })), config[state] = stateConfig) : config[state] = defaultStateConfig;
     }
     return config.state = config.update, config;
 }
@@ -77,7 +76,8 @@ function isChannelAnimation(animationConfig) {
 
 function uniformAnimationConfig(config, ctx) {
     return config ? (traverseSpec(config = (0, vutils_1.cloneDeep)(config), (node => {
-        if ((0, type_1.isFunction)(node) && node.prototype.constructor !== node) {
+        var _a;
+        if ((0, type_1.isFunction)(node) && (null === (_a = node.prototype) || void 0 === _a ? void 0 : _a.constructor) !== node) {
             return (...args) => node(...args, ctx);
         }
         return node;

package/cjs/animation/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type {\n  IElement,\n  IAnimationTypeConfig,\n  IStateAnimationConfig,\n  IAnimationTimeline\n} from '@visactor/vgrammar-core';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { cloneDeep, isArray, isObject, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface/type';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport type { ISeries } from '../series';\nimport type { ISeriesSpec } from '../typings';\nimport type { ISeriesMarkAttributeContext } from '../compile/mark';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec = {},\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n      // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n      // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n      if (state === 'exit') {\n        defaultStateConfig[0].controlOptions = { stopWhenStateChange: true };\n      }\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      let singleConfig: IAnimationConfig = mergeSpec({}, defaultStateConfig[0], userConfig[state]) as IAnimationConfig;\n\n      if (isChannelAnimation(singleConfig)) {\n        // `type` and `channel` is conflict, and `type` has a higher priority.\n        // here if user configured `channel`, we should remove `type` which will come from default animation config\n        delete (singleConfig as IAnimationTypeConfig).type;\n      }\n\n      if (singleConfig.oneByOne) {\n        singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n      }\n\n      stateConfig = [singleConfig];\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  const userConfig = {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n  return uniformAnimationConfig(userConfig, ctx);\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string) {\n  if (spec.animation === false) {\n    return false;\n  }\n\n  if (spec.morph?.enable === false) {\n    return false;\n  }\n\n  const appearAnimationEnabled = (spec.animationAppear?.[markName] ?? spec.animationAppear) !== false;\n  const updateAnimationEnabled = (spec.animationUpdate?.[markName] ?? spec.animationUpdate) !== false;\n\n  if (!appearAnimationEnabled || !updateAnimationEnabled) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n\nexport function uniformAnimationConfig<Preset extends string>(\n  config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  if (!config) {\n    return config;\n  }\n  config = cloneDeep(config);\n  traverseSpec(config, (node: any) => {\n    // 将函数转换为 vchart 代理的函数\n    // 这里可能会传自定义动画的构造函数，不能被代理\n    if (isFunction(node) && node.prototype.constructor !== node) {\n      const name = (...args: any) => {\n        return node(...args, ctx);\n      };\n      return name;\n    }\n    return node;\n  });\n\n  return config;\n}\n\nfunction traverseSpec(spec: any, transform: (node: any, key: string | number) => any) {\n  if (isArray(spec)) {\n    spec.forEach((i: any, index: number) => {\n      spec[index] = transform(spec[index], index);\n      traverseSpec(spec[index], transform);\n    });\n  } else if (isObject(spec)) {\n    for (const key in spec) {\n      spec[key] = transform(spec[key], key);\n      traverseSpec(spec[key], transform);\n    }\n  }\n}\n\nexport function isAnimationEnabledForSeries(series: ISeries) {\n  return series.getSpec().animation !== false && isValid(series.getRegion().animate);\n}\n"]}
+{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type {\n  IElement,\n  IAnimationTypeConfig,\n  IStateAnimationConfig,\n  IAnimationTimeline\n} from '@visactor/vgrammar-core';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { cloneDeep, isArray, isObject, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface/type';\nimport { mergeSpec } from '../util/spec/merge-spec';\nimport type { ISeries } from '../series';\nimport type { ISeriesSpec } from '../typings';\nimport type { ISeriesMarkAttributeContext } from '../compile/mark';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec = {},\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n    }\n    // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n    // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n    if (state === 'exit') {\n      defaultStateConfig.forEach(exitConfig => {\n        exitConfig.controlOptions = { stopWhenStateChange: true };\n      });\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      stateConfig = defaultStateConfig.map((stateConfig, i) => {\n        let singleConfig: IAnimationConfig = mergeSpec(\n          {},\n          defaultStateConfig[i],\n          userConfig[state]\n        ) as IAnimationConfig;\n        if (isChannelAnimation(singleConfig)) {\n          // `type` and `channel` is conflict, and `type` has a higher priority.\n          // here if user configured `channel`, we should remove `type` which will come from default animation config\n          delete (singleConfig as IAnimationTypeConfig).type;\n        }\n\n        if (singleConfig.oneByOne) {\n          singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n        }\n        return singleConfig;\n      });\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  const userConfig = {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n  return uniformAnimationConfig(userConfig, ctx);\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string) {\n  if (spec.animation === false) {\n    return false;\n  }\n\n  if (spec.morph?.enable === false) {\n    return false;\n  }\n\n  const appearAnimationEnabled = (spec.animationAppear?.[markName] ?? spec.animationAppear) !== false;\n  const updateAnimationEnabled = (spec.animationUpdate?.[markName] ?? spec.animationUpdate) !== false;\n\n  if (!appearAnimationEnabled || !updateAnimationEnabled) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n\nexport function uniformAnimationConfig<Preset extends string>(\n  config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>,\n  ctx: ISeriesMarkAttributeContext\n) {\n  if (!config) {\n    return config;\n  }\n  config = cloneDeep(config);\n  traverseSpec(config, (node: any) => {\n    // 将函数转换为 vchart 代理的函数\n    // 这里可能会传自定义动画的构造函数，不能被代理\n    if (isFunction(node) && node.prototype?.constructor !== node) {\n      const name = (...args: any) => {\n        return node(...args, ctx);\n      };\n      return name;\n    }\n    return node;\n  });\n\n  return config;\n}\n\nfunction traverseSpec(spec: any, transform: (node: any, key: string | number) => any) {\n  if (isArray(spec)) {\n    spec.forEach((i: any, index: number) => {\n      spec[index] = transform(spec[index], index);\n      traverseSpec(spec[index], transform);\n    });\n  } else if (isObject(spec)) {\n    for (const key in spec) {\n      spec[key] = transform(spec[key], key);\n      traverseSpec(spec[key], transform);\n    }\n  }\n}\n\nexport function isAnimationEnabledForSeries(series: ISeries) {\n  return series.getSpec().animation !== false && isValid(series.getRegion().animate);\n}\n"]}

package/cjs/chart/base-chart.d.ts

@@ -1,7 +1,7 @@
 import { ChartData } from './chart-meta/data';
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues } from '../typings';
-import type { LayoutCallBack } from '../layout/interface';
-import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../typings';
+import type { ILayoutItem, LayoutCallBack } from '../layout/interface';
+import type { ILayoutModelState, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
 import type { ISeries } from '../series/interface';
 import type { IRegion } from '../region/interface';
@@ -82,7 +82,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     onLayoutStart(option: IChartLayoutOption): void;
     onLayoutEnd(option: IChartLayoutOption): void;
     onEvaluateEnd(option: IChartEvaluateOption): void;
-    getLayoutElements(): (IComponent | IRegion | ISeries)[];
+    getLayoutElements(): ILayoutItem[];
     getRegionsInIndex: (index?: number[]) => IRegion[];
     getAllRegions: () => IRegion[];
     getRegionsInIds: (ids: number[]) => IRegion[];

package/cjs/chart/base-chart.js

@@ -101,10 +101,15 @@ class BaseChart extends compilable_base_1.CompilableBase {
             if (userId) return this._series.find((r => r.userId === userId));
         }, this.getSeriesInUserIdOrIndex = (user_ids, index) => this.getAllSeries().filter((s => (null == user_ids ? void 0 : user_ids.length) ? s.userId && user_ids.includes(s.userId) : !(null == index ? void 0 : index.length) || index.includes(s.getSpecIndex()))), 
         this.getComponentByIndex = (key, index) => {
-            const components = this._components.filter((c => c.specKey === key));
+            const components = this._components.filter((c => {
+                var _a;
+                return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
+            }));
             if (components && 0 !== components.length) return components[index];
-        }, this.getComponentsByKey = key => this._components.filter((c => c.specKey === key)), 
-        this.getComponentByUserId = userId => {
+        }, this.getComponentsByKey = key => this._components.filter((c => {
+            var _a;
+            return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
+        })), this.getComponentByUserId = userId => {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
         }, this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : (0, 
@@ -166,8 +171,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
     createRegion(regionSpec) {
         regionSpec && regionSpec.forEach(((s, i) => {
             const region = factory_1.Factory.createRegion("region", s, Object.assign(Object.assign({}, this._modelOption), {
-                specIndex: i,
-                specKey: "region"
+                specIndex: i
             }));
             region && (region.created(), this._regions.push(region));
         }));
@@ -185,7 +189,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
             const series = factory_1.Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), {
                 region: region,
                 specIndex: index,
-                specKey: "series",
                 globalScale: this._globalScale,
                 getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
                 sourceDataList: this._chartData.dataList
@@ -214,20 +217,24 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getComponentByUserId: this.getComponentByUserId,
             getComponentsByKey: this.getComponentsByKey
         }));
-        component && (0, util_1.array)(component).forEach((c => {
+        if (!component) return !1;
+        const components = (0, util_1.isArray)(component) ? component : [ component ];
+        return !!components.length && (components.forEach((c => {
             c.created(), this._components.push(c);
-        }));
+        })), !0);
     }
     createComponent(spec) {
+        var _a;
         const components = factory_1.Factory.getComponents();
-        let cartesianAxis, polarAxis;
+        let cartesianAxis, polarAxis, geoCoordinate;
         const noAxisComponents = [];
         for (let index = 0; index < components.length; index++) {
-            const component = components[index];
-            component.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = component : component.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = component : noAxisComponents.push(component);
+            const {cmp: cmp, alwaysCheck: alwaysCheck} = components[index];
+            cmp.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = cmp : cmp.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = cmp : cmp.type === interface_1.ComponentTypeEnum.geoCoordinate ? geoCoordinate = cmp : (alwaysCheck || spec[null !== (_a = cmp.specKey) && void 0 !== _a ? _a : cmp.type]) && noAxisComponents.push(cmp);
         }
-        cartesianAxis && this._createComponent(cartesianAxis, spec), polarAxis && this._createComponent(polarAxis, spec), 
-        noAxisComponents.forEach((C => {
+        let hasInitAxis = !1;
+        cartesianAxis && (hasInitAxis = this._createComponent(cartesianAxis, spec)), polarAxis && !hasInitAxis && (hasInitAxis = this._createComponent(polarAxis, spec)), 
+        geoCoordinate && !hasInitAxis && this._createComponent(geoCoordinate, spec), noAxisComponents.forEach((C => {
             this._createComponent(C, spec);
         }));
     }
@@ -247,7 +254,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if ((0, vutils_1.isFunction)(filter)) return this.getAllModels().find((m => filter(m)));
         let index = 0;
         return this.getAllModels().find((m => {
-            if (m.specKey === filter.type) {
+            var _a;
+            if ((null !== (_a = m.specKey) && void 0 !== _a ? _a : m.type) === filter.type) {
                 if (index === filter.index) return !0;
                 index++;
             }
@@ -297,10 +305,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this.getLayoutElements().forEach((element => element.onLayoutEnd(option)));
     }
     onEvaluateEnd(option) {
-        this.getLayoutElements().forEach((element => element.onEvaluateEnd(option)));
+        [ ...this._components, ...this._regions, ...this._series ].forEach((element => element.onEvaluateEnd(option)));
     }
     getLayoutElements() {
-        return [ ...this._components, ...this._regions, ...this._series ];
+        return this.getAllModels().map((i => i.layout)).filter((i => !!i));
     }
     getModelById(id) {
         const model = this._idMap.get(id);
@@ -433,12 +441,12 @@ class BaseChart extends compilable_base_1.CompilableBase {
     updateComponentSpec(result) {
         const componentCache = {};
         this._components.forEach((c => {
-            var _a;
-            const cmpSpec = null !== (_a = this._spec[c.specKey]) && void 0 !== _a ? _a : {};
-            (0, util_1.isArray)(cmpSpec) ? (componentCache[c.specKey] = componentCache[c.specKey] || {
+            var _a, _b;
+            const compSpecKey = null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type, cmpSpec = null !== (_b = this._spec[compSpecKey]) && void 0 !== _b ? _b : {};
+            (0, util_1.isArray)(cmpSpec) ? (componentCache[compSpecKey] = componentCache[compSpecKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
-            }, componentCache[c.specKey].componentCount++, (0, util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : (0, 
+            }, componentCache[compSpecKey].componentCount++, (0, util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : (0, 
             util_3.mergeUpdateResult)(result, c.updateSpec(cmpSpec));
         }));
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
@@ -507,7 +515,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._layoutRect.x = this.padding.left, this._layoutRect.y = this.padding.top, this._event.emit(constant_1.ChartEvent.layoutRectUpdate, {});
     }
     setCurrentTheme(reInit = !0) {
-        this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
+        this.updateChartConfig({
+            change: !0,
+            reMake: !1
+        }, this._spec), this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
         this.setRegionTheme(reInit), this.setComponentTheme(reInit), this.setSeriesTheme(reInit);
     }
     setRegionTheme(reInit = !0) {
@@ -526,7 +537,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }))));
     }
     clear() {
-        this.getLayoutElements().forEach((i => {
+        this.getAllModels().forEach((i => {
             var _a;
             return null === (_a = i.clear) || void 0 === _a ? void 0 : _a.call(i);
         }));