@visactor/vgrammar-core 0.10.5 → 0.10.7

package/cjs/graph/animation/animation/grow-points.js

@@ -13,7 +13,8 @@ const vutils_1 = require("@visactor/vutils"), getCenterPoints = (element, option
         center.x += point.x, center.y += point.y;
     })), center.x /= points.length, center.y /= points.length, options && options.center && ((0, 
     vutils_1.isValidNumber)(options.center.x) && (center.x = options.center.x), (0, 
-    vutils_1.isValidNumber)(options.center.y) && (center.y = options.center.y)), points.map((() => Object.assign(center)));
+    vutils_1.isValidNumber)(options.center.y) && (center.y = options.center.y)), "area" === element.mark.markType && (center.x1 = center.x, 
+    center.y1 = center.y), points.map((() => Object.assign(center)));
 }, growPointsIn = (element, options, animationParameters) => ({
     from: {
         points: getCenterPoints(element, options)

package/cjs/graph/animation/animation/grow-points.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/grow-points.ts"],"names":[],"mappings":"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","file":"grow-points.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '@visactor/vutils';\nimport type {\n  IElement,\n  IGrowPointsOverallAnimationOptions,\n  IAnimationParameters,\n  IGrowPointsAnimationOptions,\n  TypeAnimation\n} from '../../../types';\n\nconst getCenterPoints = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points: IPointLike[] = element.getGraphicAttribute('points', false);\n  const center: IPointLike = { x: 0, y: 0 };\n  points.forEach(point => {\n    center.x += point.x;\n    center.y += point.y;\n  });\n  center.x /= points.length;\n  center.y /= points.length;\n\n  if (options && options.center) {\n    if (isValidNumber(options.center.x)) {\n      center.x = options.center.x;\n    }\n    if (isValidNumber(options.center.y)) {\n      center.y = options.center.y;\n    }\n  }\n\n  return points.map(() => Object.assign(center));\n};\n\nexport const growPointsIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: getCenterPoints(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: getCenterPoints(element, options, animationParameters) }\n  };\n};\n\n// grow points x\n\nconst changePointsX = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupRight = animationParameters.width;\n\n      if (animationParameters.group) {\n        groupRight = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n\n        (animationParameters as any).groupWidth = groupRight;\n      }\n\n      return {\n        x: groupRight,\n        y: point.y,\n        x1: groupRight,\n        y1: point.y1,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: 0,\n      y: point.y,\n      x1: 0,\n      y1: point.y1,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsXIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsX(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsXOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsX(element, options, animationParameters) }\n  };\n};\n\n// grow points y\n\nconst changePointsY = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupBottom = animationParameters.height;\n\n      if (animationParameters.group) {\n        groupBottom = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n        (animationParameters as any).groupHeight = groupBottom;\n      }\n\n      return {\n        x: point.x,\n        y: groupBottom,\n        x1: point.x1,\n        y1: groupBottom,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: point.x,\n      y: 0,\n      x1: point.x1,\n      y1: 0,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsYIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsY(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsYOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsY(element, options, animationParameters) }\n  };\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/grow-points.ts"],"names":[],"mappings":"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","file":"grow-points.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '@visactor/vutils';\nimport type {\n  IElement,\n  IGrowPointsOverallAnimationOptions,\n  IAnimationParameters,\n  IGrowPointsAnimationOptions,\n  TypeAnimation\n} from '../../../types';\n\nconst getCenterPoints = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points: IPointLike[] = element.getGraphicAttribute('points', false);\n  const center: IPointLike = { x: 0, y: 0 };\n  points.forEach(point => {\n    center.x += point.x;\n    center.y += point.y;\n  });\n  center.x /= points.length;\n  center.y /= points.length;\n\n  if (options && options.center) {\n    if (isValidNumber(options.center.x)) {\n      center.x = options.center.x;\n    }\n    if (isValidNumber(options.center.y)) {\n      center.y = options.center.y;\n    }\n  }\n\n  if (element.mark.markType === 'area') {\n    center.x1 = center.x;\n    center.y1 = center.y;\n  }\n\n  return points.map(() => Object.assign(center));\n};\n\nexport const growPointsIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: getCenterPoints(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: getCenterPoints(element, options, animationParameters) }\n  };\n};\n\n// grow points x\n\nconst changePointsX = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupRight = animationParameters.width;\n\n      if (animationParameters.group) {\n        groupRight = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n\n        (animationParameters as any).groupWidth = groupRight;\n      }\n\n      return {\n        x: groupRight,\n        y: point.y,\n        x1: groupRight,\n        y1: point.y1,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: 0,\n      y: point.y,\n      x1: 0,\n      y1: point.y1,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsXIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsX(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsXOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsX(element, options, animationParameters) }\n  };\n};\n\n// grow points y\n\nconst changePointsY = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupBottom = animationParameters.height;\n\n      if (animationParameters.group) {\n        groupBottom = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n        (animationParameters as any).groupHeight = groupBottom;\n      }\n\n      return {\n        x: point.x,\n        y: groupBottom,\n        x1: point.x1,\n        y1: groupBottom,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: point.x,\n      y: 0,\n      x1: point.x1,\n      y1: 0,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsYIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsY(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsYOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsY(element, options, animationParameters) }\n  };\n};\n"]}

package/cjs/graph/animation/animator.js

@@ -70,9 +70,10 @@ class Animator {
         const delay = timeSlice.delay, delayAfter = timeSlice.delayAfter, duration = timeSlice.duration, effects = timeSlice.effects;
         if (delay > 0 && graphicAnimate.wait(delay), effects.length < 0) graphicAnimate.wait(duration); else {
             const customAnimates = effects.map(((effect, index) => {
-                var _a;
-                const attributes = null !== (_a = effect.type ? (0, attribute_1.typeAnimationAttributes)(this.element, effect, animationParameters, parameters) : (0, 
-                attribute_1.channelAnimationAttributes)(this.element, effect, animationParameters, parameters)) && void 0 !== _a ? _a : {}, customOption = (null == attributes ? void 0 : attributes.custom) || (null == effect ? void 0 : effect.custom), customParametersOption = (null == attributes ? void 0 : attributes.customParameters) || (null == effect ? void 0 : effect.customParameters);
+                const attributes = effect.type ? (0, attribute_1.typeAnimationAttributes)(this.element, effect, animationParameters, parameters) : effect.channel ? (0, 
+                attribute_1.channelAnimationAttributes)(this.element, effect, animationParameters, parameters) : void 0;
+                if (!attributes) return null;
+                const customOption = (null == attributes ? void 0 : attributes.custom) || (null == effect ? void 0 : effect.custom), customParametersOption = (null == attributes ? void 0 : attributes.customParameters) || (null == effect ? void 0 : effect.customParameters);
                 attributes.from && Object.keys(attributes.from).length && this.unit && this.animationOptions.timeline.controlOptions.immediatelyApply && "component" !== this.element.mark.markType && this.element.getGraphicItem().setAttributes(attributes.from);
                 const isCustomAnimate = isCustomAnimateCtor(customOption);
                 return !(0, vutils_1.isNil)(customOption) && !isCustomAnimateCtor(customOption) ? new attribute_1.CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {
@@ -81,7 +82,7 @@ class Animator {
                     parameters: customParametersOption
                 }) : isCustomAnimate ? new customOption(attributes.from, attributes.to, duration, effect.easing, customParametersOption) : attributes.to ? new attribute_1.AttributeAnimate(attributes.from, attributes.to, duration, effect.easing) : void 0;
             })).filter((animate => !(0, vutils_1.isNil)(animate)));
-            1 === customAnimates.length ? graphicAnimate.play(customAnimates[0]) : graphicAnimate.play(new vrender_core_1.AnimateGroup(duration, customAnimates));
+            1 === customAnimates.length ? graphicAnimate.play(customAnimates[0]) : customAnimates.length > 1 && graphicAnimate.play(new vrender_core_1.AnimateGroup(duration, customAnimates));
         }
         delayAfter > 0 && graphicAnimate.wait(delayAfter);
     }

package/cjs/graph/animation/animator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animator.ts"],"names":[],"mappings":"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","file":"animator.js","sourcesContent":["import { isNil, isValidNumber } from '@visactor/vutils';\nimport type { IAnimate as IGraphicAnimate } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { ACustomAnimate, Animate, AnimateGroup, AnimateMode } from '@visactor/vrender-core';\nimport type {\n  IAnimationChannelInterpolator,\n  IAnimationCustomConstructor,\n  IAnimationTimeline,\n  IAnimator,\n  IAnimatorOptions,\n  IAnimationUnit,\n  IAnimationParameters,\n  IAnimationTimeSlice,\n  IElement,\n  IAnimationEffect\n} from '../../types';\nimport { AttributeAnimate, channelAnimationAttributes, CustomInterpolator, typeAnimationAttributes } from './attribute';\n\nAnimate.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;\n\nlet GlobalAnimatorId = 0;\n\nconst isCustomAnimateCtor = (custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor) => {\n  return !isNil(custom) && custom.prototype instanceof ACustomAnimate;\n};\n\nexport class Animator implements IAnimator {\n  id: number = GlobalAnimatorId++;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean = false;\n\n  private unit: IAnimationUnit;\n  private runnings: IGraphicAnimate[] = [];\n  private callbackFunction: (...args: any[]) => any;\n\n  constructor(\n    element: IElement,\n    unit: IAnimationUnit,\n    animationOptions: {\n      state: string;\n      timeline: IAnimationTimeline;\n      id: string;\n    }\n  ) {\n    this.element = element;\n    this.animationOptions = animationOptions;\n    this.unit = unit;\n  }\n\n  callback(callbackFunction: (...args: any[]) => void): this {\n    this.callbackFunction = callbackFunction;\n    return this;\n  }\n\n  animate(animationParameters: IAnimationParameters, parameters: any): this {\n    this.isAnimating = true;\n\n    this.animateElement(animationParameters, parameters);\n\n    // if no valid running, end animating immediately\n    if (this.runnings.length === 0) {\n      this.animationEnd();\n    }\n    return this;\n  }\n\n  stop(stopState: 'start' | 'end' = 'end', invokeCallback: boolean = true): this {\n    // FIXME: wait for VRender to fix 'end' parameter\n    this.runnings.forEach(running => running.stop(stopState));\n    this.animationEnd(invokeCallback);\n    return this;\n  }\n\n  pause(): this {\n    this.runnings.forEach(running => running.pause());\n    return this;\n  }\n\n  resume(): this {\n    this.runnings.forEach(running => running.resume());\n    return this;\n  }\n\n  startAt(startTime: number): this {\n    this.runnings.forEach(running => {\n      const initialDelay = this.unit.initialDelay;\n      running.startAt(initialDelay + startTime);\n    });\n    return this;\n  }\n\n  getTotalAnimationTime() {\n    const timeLineDuration = this.unit.initialDelay + this.unit.loopDuration * this.unit.loopCount;\n    return this.unit.totalTime ?? timeLineDuration;\n  }\n\n  getEndAttributes() {\n    return this.runnings.reduce((attributes, running) => {\n      return Object.assign(attributes, running.getEndProps());\n    }, {} as Record<string, any>);\n  }\n\n  private animationEnd(invokeCallback: boolean = true) {\n    this.isAnimating = false;\n    this.runnings = null;\n    if (invokeCallback) {\n      this.callbackFunction?.call(null);\n    }\n  }\n\n  private animateElement(animationParameters: IAnimationParameters, parameters: any) {\n    const graphicItem = this.element.getGraphicItem();\n\n    if (!graphicItem) {\n      return;\n    }\n\n    const graphicAnimate: IGraphicAnimate = graphicItem.animate();\n    this.runnings.push(graphicAnimate);\n    // initialDelay is only used at first loop\n    graphicAnimate.startAt(this.unit.initialDelay);\n    // execute loop animation\n    graphicAnimate.wait(this.unit.loopDelay);\n    this.unit.timeSlices.forEach(timeSlice => {\n      this.animateTimeSlice(graphicAnimate, timeSlice, animationParameters, parameters);\n    });\n    graphicAnimate.wait(this.unit.loopDelayAfter);\n\n    graphicAnimate.loop(this.unit.loopCount - 1);\n\n    if (isValidNumber(this.unit.totalTime)) {\n      // FIXME: use VRender api instead after VRender refactor is finished\n      setTimeout(() => {\n        if (graphicAnimate) {\n          graphicAnimate.stop('end');\n        }\n      }, this.unit.totalTime);\n    }\n\n    graphicAnimate.onEnd(() => {\n      this.runnings = this.runnings.filter(running => running !== graphicAnimate);\n      if (this.runnings.length === 0) {\n        this.animationEnd();\n      }\n    });\n  }\n\n  private animateTimeSlice(\n    graphicAnimate: IGraphicAnimate,\n    timeSlice: IAnimationTimeSlice,\n    animationParameters: IAnimationParameters,\n    parameters: any\n  ) {\n    const delay = timeSlice.delay as number;\n    const delayAfter = timeSlice.delayAfter as number;\n    const duration = timeSlice.duration as number;\n    const effects = timeSlice.effects as IAnimationEffect[];\n\n    // wait in loop animation before animation starts\n    if (delay > 0) {\n      graphicAnimate.wait(delay);\n    }\n\n    if (effects.length < 0) {\n      graphicAnimate.wait(duration);\n    } else {\n      const customAnimates = effects\n        .map((effect, index) => {\n          const attributes =\n            (effect.type\n              ? typeAnimationAttributes(this.element, effect, animationParameters, parameters)\n              : channelAnimationAttributes(this.element, effect, animationParameters, parameters)) ?? {};\n          const customOption = attributes?.custom || effect?.custom;\n          const customParametersOption = attributes?.customParameters || effect?.customParameters;\n\n          if (\n            attributes.from &&\n            Object.keys(attributes.from).length &&\n            this.unit &&\n            this.animationOptions.timeline.controlOptions.immediatelyApply &&\n            this.element.mark.markType !== 'component'\n          ) {\n            this.element.getGraphicItem().setAttributes(attributes.from);\n          }\n\n          const isCustomAnimate = isCustomAnimateCtor(customOption);\n          const isCustomInterpolator = !isNil(customOption) && !isCustomAnimateCtor(customOption);\n\n          if (isCustomInterpolator) {\n            return new CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {\n              interpolator: customOption as IAnimationChannelInterpolator,\n              element: this.element,\n              parameters: customParametersOption\n            });\n          } else if (isCustomAnimate) {\n            return new (customOption as IAnimationCustomConstructor)(\n              attributes.from,\n              attributes.to,\n              duration,\n              effect.easing,\n              customParametersOption\n            );\n          } else if (attributes.to) {\n            return new AttributeAnimate(attributes.from, attributes.to, duration, effect.easing);\n          }\n        })\n        .filter(animate => !isNil(animate));\n\n      if (customAnimates.length === 1) {\n        graphicAnimate.play(customAnimates[0]);\n      } else {\n        graphicAnimate.play(new AnimateGroup(duration, customAnimates));\n      }\n    }\n\n    if (delayAfter > 0) {\n      graphicAnimate.wait(delayAfter);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/graph/animation/animator.ts"],"names":[],"mappings":"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","file":"animator.js","sourcesContent":["import { isNil, isValidNumber } from '@visactor/vutils';\nimport type { IAnimate as IGraphicAnimate } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { ACustomAnimate, Animate, AnimateGroup, AnimateMode } from '@visactor/vrender-core';\nimport type {\n  IAnimationChannelInterpolator,\n  IAnimationCustomConstructor,\n  IAnimationTimeline,\n  IAnimator,\n  IAnimatorOptions,\n  IAnimationUnit,\n  IAnimationParameters,\n  IAnimationTimeSlice,\n  IElement,\n  IAnimationEffect\n} from '../../types';\nimport { AttributeAnimate, channelAnimationAttributes, CustomInterpolator, typeAnimationAttributes } from './attribute';\n\nAnimate.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;\n\nlet GlobalAnimatorId = 0;\n\nconst isCustomAnimateCtor = (custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor) => {\n  return !isNil(custom) && custom.prototype instanceof ACustomAnimate;\n};\n\nexport class Animator implements IAnimator {\n  id: number = GlobalAnimatorId++;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean = false;\n\n  private unit: IAnimationUnit;\n  private runnings: IGraphicAnimate[] = [];\n  private callbackFunction: (...args: any[]) => any;\n\n  constructor(\n    element: IElement,\n    unit: IAnimationUnit,\n    animationOptions: {\n      state: string;\n      timeline: IAnimationTimeline;\n      id: string;\n    }\n  ) {\n    this.element = element;\n    this.animationOptions = animationOptions;\n    this.unit = unit;\n  }\n\n  callback(callbackFunction: (...args: any[]) => void): this {\n    this.callbackFunction = callbackFunction;\n    return this;\n  }\n\n  animate(animationParameters: IAnimationParameters, parameters: any): this {\n    this.isAnimating = true;\n\n    this.animateElement(animationParameters, parameters);\n\n    // if no valid running, end animating immediately\n    if (this.runnings.length === 0) {\n      this.animationEnd();\n    }\n    return this;\n  }\n\n  stop(stopState: 'start' | 'end' = 'end', invokeCallback: boolean = true): this {\n    // FIXME: wait for VRender to fix 'end' parameter\n    this.runnings.forEach(running => running.stop(stopState));\n    this.animationEnd(invokeCallback);\n    return this;\n  }\n\n  pause(): this {\n    this.runnings.forEach(running => running.pause());\n    return this;\n  }\n\n  resume(): this {\n    this.runnings.forEach(running => running.resume());\n    return this;\n  }\n\n  startAt(startTime: number): this {\n    this.runnings.forEach(running => {\n      const initialDelay = this.unit.initialDelay;\n      running.startAt(initialDelay + startTime);\n    });\n    return this;\n  }\n\n  getTotalAnimationTime() {\n    const timeLineDuration = this.unit.initialDelay + this.unit.loopDuration * this.unit.loopCount;\n    return this.unit.totalTime ?? timeLineDuration;\n  }\n\n  getEndAttributes() {\n    return this.runnings.reduce((attributes, running) => {\n      return Object.assign(attributes, running.getEndProps());\n    }, {} as Record<string, any>);\n  }\n\n  private animationEnd(invokeCallback: boolean = true) {\n    this.isAnimating = false;\n    this.runnings = null;\n    if (invokeCallback) {\n      this.callbackFunction?.call(null);\n    }\n  }\n\n  private animateElement(animationParameters: IAnimationParameters, parameters: any) {\n    const graphicItem = this.element.getGraphicItem();\n\n    if (!graphicItem) {\n      return;\n    }\n\n    const graphicAnimate: IGraphicAnimate = graphicItem.animate();\n    this.runnings.push(graphicAnimate);\n    // initialDelay is only used at first loop\n    graphicAnimate.startAt(this.unit.initialDelay);\n    // execute loop animation\n    graphicAnimate.wait(this.unit.loopDelay);\n    this.unit.timeSlices.forEach(timeSlice => {\n      this.animateTimeSlice(graphicAnimate, timeSlice, animationParameters, parameters);\n    });\n    graphicAnimate.wait(this.unit.loopDelayAfter);\n\n    graphicAnimate.loop(this.unit.loopCount - 1);\n\n    if (isValidNumber(this.unit.totalTime)) {\n      // FIXME: use VRender api instead after VRender refactor is finished\n      setTimeout(() => {\n        if (graphicAnimate) {\n          graphicAnimate.stop('end');\n        }\n      }, this.unit.totalTime);\n    }\n\n    graphicAnimate.onEnd(() => {\n      this.runnings = this.runnings.filter(running => running !== graphicAnimate);\n      if (this.runnings.length === 0) {\n        this.animationEnd();\n      }\n    });\n  }\n\n  private animateTimeSlice(\n    graphicAnimate: IGraphicAnimate,\n    timeSlice: IAnimationTimeSlice,\n    animationParameters: IAnimationParameters,\n    parameters: any\n  ) {\n    const delay = timeSlice.delay as number;\n    const delayAfter = timeSlice.delayAfter as number;\n    const duration = timeSlice.duration as number;\n    const effects = timeSlice.effects as IAnimationEffect[];\n\n    // wait in loop animation before animation starts\n    if (delay > 0) {\n      graphicAnimate.wait(delay);\n    }\n\n    if (effects.length < 0) {\n      graphicAnimate.wait(duration);\n    } else {\n      const customAnimates = effects\n        .map((effect, index) => {\n          const attributes = effect.type\n            ? typeAnimationAttributes(this.element, effect, animationParameters, parameters)\n            : effect.channel\n            ? channelAnimationAttributes(this.element, effect, animationParameters, parameters)\n            : undefined;\n\n          if (!attributes) {\n            return null;\n          }\n          const customOption = attributes?.custom || effect?.custom;\n          const customParametersOption = attributes?.customParameters || effect?.customParameters;\n\n          if (\n            attributes.from &&\n            Object.keys(attributes.from).length &&\n            this.unit &&\n            this.animationOptions.timeline.controlOptions.immediatelyApply &&\n            this.element.mark.markType !== 'component'\n          ) {\n            this.element.getGraphicItem().setAttributes(attributes.from);\n          }\n\n          const isCustomAnimate = isCustomAnimateCtor(customOption);\n          const isCustomInterpolator = !isNil(customOption) && !isCustomAnimateCtor(customOption);\n\n          if (isCustomInterpolator) {\n            return new CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {\n              interpolator: customOption as IAnimationChannelInterpolator,\n              element: this.element,\n              parameters: customParametersOption\n            });\n          } else if (isCustomAnimate) {\n            return new (customOption as IAnimationCustomConstructor)(\n              attributes.from,\n              attributes.to,\n              duration,\n              effect.easing,\n              customParametersOption\n            );\n          } else if (attributes.to) {\n            return new AttributeAnimate(attributes.from, attributes.to, duration, effect.easing);\n          }\n        })\n        .filter(animate => !isNil(animate));\n\n      if (customAnimates.length === 1) {\n        graphicAnimate.play(customAnimates[0]);\n      } else if (customAnimates.length > 1) {\n        graphicAnimate.play(new AnimateGroup(duration, customAnimates));\n      }\n    }\n\n    if (delayAfter > 0) {\n      graphicAnimate.wait(delayAfter);\n    }\n  }\n}\n"]}

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.10.5";
+export declare const version = "0.10.7";
 export * from './graph';
 export * from './interactions';
 export { View } from './view';

package/cjs/index.js

@@ -18,7 +18,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.vglobal = exports.ThemeManager = exports.SIGNAL_VIEW_BOX = exports.SIGNAL_WIDTH = exports.SIGNAL_VIEW_WIDTH = exports.SIGNAL_VIEW_HEIGHT = exports.SIGNAL_PADDING = exports.SIGNAL_HEIGHT = exports.SIGNAL_AUTOFIT = exports.Factory = exports.GrammarBase = exports.invokeFunctionType = exports.parseFunctionType = exports.registerCoordinate = exports.Coordinate = exports.registerScale = exports.Scale = exports.View = exports.version = void 0, 
-exports.version = "0.10.5", __exportStar(require("./graph"), exports), __exportStar(require("./interactions"), exports);
+exports.version = "0.10.7", __exportStar(require("./graph"), exports), __exportStar(require("./interactions"), exports);
 
 var view_1 = require("./view");
 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,0CAAwB;AAExB,iDAA+B;AAE/B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,sCAAoD;AAA3C,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC7B,gDAAmE;AAA1D,wGAAA,UAAU,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACvC,qCAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,0GAAA,kBAAkB,OAAA;AAC9C,oDAAkD;AAAzC,2GAAA,WAAW,OAAA;AACpB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAyC;AAAhC,kGAAA,OAAO,OAAA;AAChB,8CAQ0B;AAPxB,2GAAA,cAAc,OAAA;AACd,0GAAA,aAAa,OAAA;AACb,2GAAA,cAAc,OAAA;AACd,+GAAA,kBAAkB,OAAA;AAClB,8GAAA,iBAAiB,OAAA;AACjB,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AAGjB,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB,0CAAwB;AACxB,8CAA4B;AAC5B,+CAA6B;AAC7B,8DAA4C;AAE5C,uDAAiD;AAAxC,uGAAA,OAAO,OAAA;AAChB,wCAAsB;AACtB,iDAA+B;AAC/B,wDAAsC;AACtC,4DAA0C;AAC1C,uDAAqC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.10.5\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,0CAAwB;AAExB,iDAA+B;AAE/B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,sCAAoD;AAA3C,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC7B,gDAAmE;AAA1D,wGAAA,UAAU,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACvC,qCAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,0GAAA,kBAAkB,OAAA;AAC9C,oDAAkD;AAAzC,2GAAA,WAAW,OAAA;AACpB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAyC;AAAhC,kGAAA,OAAO,OAAA;AAChB,8CAQ0B;AAPxB,2GAAA,cAAc,OAAA;AACd,0GAAA,aAAa,OAAA;AACb,2GAAA,cAAc,OAAA;AACd,+GAAA,kBAAkB,OAAA;AAClB,8GAAA,iBAAiB,OAAA;AACjB,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AAGjB,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB,0CAAwB;AACxB,8CAA4B;AAC5B,+CAA6B;AAC7B,8DAA4C;AAE5C,uDAAiD;AAAxC,uGAAA,OAAO,OAAA;AAChB,wCAAsB;AACtB,iDAA+B;AAC/B,wDAAsC;AACtC,4DAA0C;AAC1C,uDAAqC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.10.7\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}

package/cjs/interactions/brush-filter.js

@@ -31,4 +31,5 @@ class BrushFilter extends brush_base_1.BrushBase {
     }
 }
 
-exports.BrushFilter = BrushFilter, BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
+exports.BrushFilter = BrushFilter, BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
+//# sourceMappingURL=brush-filter.js.map

package/cjs/interactions/element-highlight-by-group.js

@@ -48,5 +48,4 @@ ElementHighlightByGroup.defaultOptions = {
     blurState: enums_1.InteractionStateEnum.blur,
     trigger: "pointerover",
     resetTrigger: "pointerout"
-};
-//# sourceMappingURL=element-highlight-by-group.js.map
+};

package/cjs/interactions/index.js

@@ -383,4 +383,5 @@ const registerFishEye = () => {
     factory_1.Factory.registerInteraction(fish_eye_1.FishEye.type, fish_eye_1.FishEye);
 };
 
-exports.registerFishEye = registerFishEye;
+exports.registerFishEye = registerFishEye;
+//# sourceMappingURL=index.js.map

package/cjs/interactions/legend-filter.js

@@ -30,4 +30,4 @@ class LegendFilter extends filter_1.Filter {
 }
 
 exports.LegendFilter = LegendFilter, LegendFilter.type = "legend-filter", LegendFilter.defaultOptions = {};
-//# sourceMappingURL=legend-filter.js.map
+//# sourceMappingURL=legend-filter.js.map

package/cjs/interactions/player-filter.js

@@ -29,4 +29,4 @@ class PlayerFilter extends filter_1.Filter {
 }
 
 exports.PlayerFilter = PlayerFilter, PlayerFilter.type = "player-filter", PlayerFilter.defaultOptions = {};
-//# sourceMappingURL=player-filter.js.map
+//# sourceMappingURL=player-filter.js.map

package/cjs/interactions/roll-up.js

@@ -44,4 +44,4 @@ exports.RollUp = RollUp, RollUp.type = "roll-up", RollUp.defaultOptions = {
     trigger: "click",
     resetTrigger: "empty"
 };
-//# sourceMappingURL=roll-up.js.map
+//# sourceMappingURL=roll-up.js.map

package/cjs/interactions/scrollbar-filter.js

@@ -51,4 +51,4 @@ class ScrollbarFilter extends filter_1.Filter {
 
 exports.ScrollbarFilter = ScrollbarFilter, ScrollbarFilter.type = "scrollbar-filter", 
 ScrollbarFilter.defaultOptions = {};
-//# sourceMappingURL=scrollbar-filter.js.map
+//# sourceMappingURL=scrollbar-filter.js.map

package/cjs/interactions/slider-filter.js

@@ -29,4 +29,4 @@ class SliderFilter extends filter_1.Filter {
 }
 
 exports.SliderFilter = SliderFilter, SliderFilter.type = "slider-filter", SliderFilter.defaultOptions = {};
-//# sourceMappingURL=slider-filter.js.map
+//# sourceMappingURL=slider-filter.js.map

package/cjs/interactions/tooltip.js

@@ -59,4 +59,4 @@ exports.Tooltip = Tooltip, Tooltip.type = "tooltip", Tooltip.defaultOptions = {
     trigger: "pointermove",
     resetTrigger: "pointerleave"
 };
-//# sourceMappingURL=tooltip.js.map
+//# sourceMappingURL=tooltip.js.map

package/cjs/interactions/utils.js

@@ -10,4 +10,4 @@ const generateFilterValue = options => options.filterField ? el => {
 } : el => el[options.filterType];
 
 exports.generateFilterValue = generateFilterValue;
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/cjs/parse/coordinate.js

@@ -67,4 +67,4 @@ function configureCoordinate(spec, coordinate, parameters) {
 
 exports.createCoordinate = createCoordinate, exports.parseCoordinate = parseCoordinate, 
 exports.configureCoordinate = configureCoordinate;
-//# sourceMappingURL=coordinate.js.map
+//# sourceMappingURL=coordinate.js.map

package/cjs/parse/event.js

@@ -33,4 +33,4 @@ const parseEventSelector = (selector, source = constants_1.EVENT_SOURCE_VIEW) =>
 };
 
 exports.parseEventSelector = parseEventSelector;
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/cjs/parse/mark.js

@@ -22,4 +22,4 @@ function parseEncodeType(encoder, view) {
 }
 
 exports.isScaleEncode = isScaleEncode, exports.isFieldEncode = isFieldEncode, exports.parseEncodeType = parseEncodeType;
-//# sourceMappingURL=mark.js.map
+//# sourceMappingURL=mark.js.map

package/cjs/parse/option.js

@@ -17,4 +17,4 @@ const parseOptions = (options, params) => options ? (0, vutils_1.isObject)(optio
 }), {}) : options.map((option => (0, exports.parseOptionValue)(option, params))) : options;
 
 exports.parseOptions = parseOptions;
-//# sourceMappingURL=option.js.map
+//# sourceMappingURL=option.js.map

package/cjs/parse/scale.js

@@ -362,5 +362,4 @@ function configureScale(spec, scale, parameters) {
 }
 
 exports.createScale = createScale, exports.parseScaleDomainRange = parseScaleDomainRange, 
-exports.parseScaleConfig = parseScaleConfig, exports.configureScale = configureScale;
-//# sourceMappingURL=scale.js.map
+exports.parseScaleConfig = parseScaleConfig, exports.configureScale = configureScale;

package/cjs/parse/transform.js

@@ -100,4 +100,4 @@ const vutils_1 = require("@visactor/vutils"), factory_1 = require("../core/facto
 };
 
 exports.parseTransformSpec = parseTransformSpec;
-//# sourceMappingURL=transform.js.map
+//# sourceMappingURL=transform.js.map

package/cjs/parse/util.js

@@ -79,4 +79,4 @@ exports.parseField = parseField;
 const parseColor = color => (0, vutils_1.isString)(color) && vutils_1.Color.parseColorString(color) ? color : null;
 
 exports.parseColor = parseColor;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/cjs/parse/view.js

@@ -106,4 +106,4 @@ const normalizeRunningConfig = runningConfig => {
 };
 
 exports.normalizeRunningConfig = normalizeRunningConfig;
-//# sourceMappingURL=view.js.map
+//# sourceMappingURL=view.js.map

package/cjs/transforms/mark/mark-overlap.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.transform = void 0;
 
-const vutils_1 = require("@visactor/vutils");
+const vutils_1 = require("@visactor/vutils"), HIDE_KEY = "_mo_hide_";
 
 function reset(elements) {
     return elements.forEach((element => {
-        element.setGraphicAttribute("visible", !0);
+        element.getGraphicAttribute("HIDE_KEY") && (element.setGraphicAttribute("visible", !0), 
+        element.setGraphicAttribute(HIDE_KEY, !1));
     })), elements;
 }
 
@@ -18,9 +19,10 @@ function overlapX(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = (0, vutils_1.isNil)(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastX = currentX, 
-            lastR = r;
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
         }));
     }
 }
@@ -31,9 +33,10 @@ function overlapY(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = (0, vutils_1.isNil)(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentY = element.getGraphicAttribute("y");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, 
-            lastR = r;
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }
 }
@@ -45,10 +48,11 @@ function overlapXY(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = (0, vutils_1.isNil)(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x"), currentY = element.getGraphicAttribute("y");
             useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, 
-            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, 
-            lastR = r;
+            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }
 }

package/cjs/transforms/mark/mark-overlap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    element.setGraphicAttribute('visible', true);\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = elements.slice().sort((a, b) => {\n      return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n    });\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}
+{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\n\nconst HIDE_KEY = '_mo_hide_';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    const hide = element.getGraphicAttribute('HIDE_KEY');\n\n    if (hide) {\n      element.setGraphicAttribute('visible', true);\n      element.setGraphicAttribute(HIDE_KEY, false);\n    }\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = elements.slice().sort((a, b) => {\n      return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n    });\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}

package/es/graph/animation/animation/grow-points.js

@@ -8,7 +8,8 @@ const getCenterPoints = (element, options, animationParameters) => {
     return points.forEach((point => {
         center.x += point.x, center.y += point.y;
     })), center.x /= points.length, center.y /= points.length, options && options.center && (isValidNumber(options.center.x) && (center.x = options.center.x), 
-    isValidNumber(options.center.y) && (center.y = options.center.y)), points.map((() => Object.assign(center)));
+    isValidNumber(options.center.y) && (center.y = options.center.y)), "area" === element.mark.markType && (center.x1 = center.x, 
+    center.y1 = center.y), points.map((() => Object.assign(center)));
 };
 
 export const growPointsIn = (element, options, animationParameters) => ({

package/es/graph/animation/animation/grow-points.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/grow-points.ts"],"names":[],"mappings":"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","file":"grow-points.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '@visactor/vutils';\nimport type {\n  IElement,\n  IGrowPointsOverallAnimationOptions,\n  IAnimationParameters,\n  IGrowPointsAnimationOptions,\n  TypeAnimation\n} from '../../../types';\n\nconst getCenterPoints = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points: IPointLike[] = element.getGraphicAttribute('points', false);\n  const center: IPointLike = { x: 0, y: 0 };\n  points.forEach(point => {\n    center.x += point.x;\n    center.y += point.y;\n  });\n  center.x /= points.length;\n  center.y /= points.length;\n\n  if (options && options.center) {\n    if (isValidNumber(options.center.x)) {\n      center.x = options.center.x;\n    }\n    if (isValidNumber(options.center.y)) {\n      center.y = options.center.y;\n    }\n  }\n\n  return points.map(() => Object.assign(center));\n};\n\nexport const growPointsIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: getCenterPoints(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: getCenterPoints(element, options, animationParameters) }\n  };\n};\n\n// grow points x\n\nconst changePointsX = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupRight = animationParameters.width;\n\n      if (animationParameters.group) {\n        groupRight = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n\n        (animationParameters as any).groupWidth = groupRight;\n      }\n\n      return {\n        x: groupRight,\n        y: point.y,\n        x1: groupRight,\n        y1: point.y1,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: 0,\n      y: point.y,\n      x1: 0,\n      y1: point.y1,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsXIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsX(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsXOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsX(element, options, animationParameters) }\n  };\n};\n\n// grow points y\n\nconst changePointsY = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupBottom = animationParameters.height;\n\n      if (animationParameters.group) {\n        groupBottom = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n        (animationParameters as any).groupHeight = groupBottom;\n      }\n\n      return {\n        x: point.x,\n        y: groupBottom,\n        x1: point.x1,\n        y1: groupBottom,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: point.x,\n      y: 0,\n      x1: point.x1,\n      y1: 0,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsYIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsY(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsYOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsY(element, options, animationParameters) }\n  };\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/grow-points.ts"],"names":[],"mappings":"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","file":"grow-points.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isValidNumber } from '@visactor/vutils';\nimport type {\n  IElement,\n  IGrowPointsOverallAnimationOptions,\n  IAnimationParameters,\n  IGrowPointsAnimationOptions,\n  TypeAnimation\n} from '../../../types';\n\nconst getCenterPoints = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points: IPointLike[] = element.getGraphicAttribute('points', false);\n  const center: IPointLike = { x: 0, y: 0 };\n  points.forEach(point => {\n    center.x += point.x;\n    center.y += point.y;\n  });\n  center.x /= points.length;\n  center.y /= points.length;\n\n  if (options && options.center) {\n    if (isValidNumber(options.center.x)) {\n      center.x = options.center.x;\n    }\n    if (isValidNumber(options.center.y)) {\n      center.y = options.center.y;\n    }\n  }\n\n  if (element.mark.markType === 'area') {\n    center.x1 = center.x;\n    center.y1 = center.y;\n  }\n\n  return points.map(() => Object.assign(center));\n};\n\nexport const growPointsIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: getCenterPoints(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsOverallAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: getCenterPoints(element, options, animationParameters) }\n  };\n};\n\n// grow points x\n\nconst changePointsX = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupRight = animationParameters.width;\n\n      if (animationParameters.group) {\n        groupRight = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n\n        (animationParameters as any).groupWidth = groupRight;\n      }\n\n      return {\n        x: groupRight,\n        y: point.y,\n        x1: groupRight,\n        y1: point.y1,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: 0,\n      y: point.y,\n      x1: 0,\n      y1: point.y1,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsXIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsX(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsXOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsX(element, options, animationParameters) }\n  };\n};\n\n// grow points y\n\nconst changePointsY = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const points = element.getGraphicAttribute('points', false);\n  return points.map((point: IPointLike) => {\n    if (options && options.orient === 'negative') {\n      let groupBottom = animationParameters.height;\n\n      if (animationParameters.group) {\n        groupBottom = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n        (animationParameters as any).groupHeight = groupBottom;\n      }\n\n      return {\n        x: point.x,\n        y: groupBottom,\n        x1: point.x1,\n        y1: groupBottom,\n        defined: point.defined !== false\n      } as IPointLike;\n    }\n    return {\n      x: point.x,\n      y: 0,\n      x1: point.x1,\n      y1: 0,\n      defined: point.defined !== false\n    } as IPointLike;\n  });\n};\n\nexport const growPointsYIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: changePointsY(element, options, animationParameters) },\n    to: { points: element.getGraphicAttribute('points', false) }\n  };\n};\n\nexport const growPointsYOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IGrowPointsAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  return {\n    from: { points: element.getGraphicAttribute('points', true) },\n    to: { points: changePointsY(element, options, animationParameters) }\n  };\n};\n"]}

package/es/graph/animation/animator.js

@@ -68,8 +68,9 @@ export class Animator {
         const delay = timeSlice.delay, delayAfter = timeSlice.delayAfter, duration = timeSlice.duration, effects = timeSlice.effects;
         if (delay > 0 && graphicAnimate.wait(delay), effects.length < 0) graphicAnimate.wait(duration); else {
             const customAnimates = effects.map(((effect, index) => {
-                var _a;
-                const attributes = null !== (_a = effect.type ? typeAnimationAttributes(this.element, effect, animationParameters, parameters) : channelAnimationAttributes(this.element, effect, animationParameters, parameters)) && void 0 !== _a ? _a : {}, customOption = (null == attributes ? void 0 : attributes.custom) || (null == effect ? void 0 : effect.custom), customParametersOption = (null == attributes ? void 0 : attributes.customParameters) || (null == effect ? void 0 : effect.customParameters);
+                const attributes = effect.type ? typeAnimationAttributes(this.element, effect, animationParameters, parameters) : effect.channel ? channelAnimationAttributes(this.element, effect, animationParameters, parameters) : void 0;
+                if (!attributes) return null;
+                const customOption = (null == attributes ? void 0 : attributes.custom) || (null == effect ? void 0 : effect.custom), customParametersOption = (null == attributes ? void 0 : attributes.customParameters) || (null == effect ? void 0 : effect.customParameters);
                 attributes.from && Object.keys(attributes.from).length && this.unit && this.animationOptions.timeline.controlOptions.immediatelyApply && "component" !== this.element.mark.markType && this.element.getGraphicItem().setAttributes(attributes.from);
                 const isCustomAnimate = isCustomAnimateCtor(customOption);
                 return !isNil(customOption) && !isCustomAnimateCtor(customOption) ? new CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {
@@ -78,7 +79,7 @@ export class Animator {
                     parameters: customParametersOption
                 }) : isCustomAnimate ? new customOption(attributes.from, attributes.to, duration, effect.easing, customParametersOption) : attributes.to ? new AttributeAnimate(attributes.from, attributes.to, duration, effect.easing) : void 0;
             })).filter((animate => !isNil(animate)));
-            1 === customAnimates.length ? graphicAnimate.play(customAnimates[0]) : graphicAnimate.play(new AnimateGroup(duration, customAnimates));
+            1 === customAnimates.length ? graphicAnimate.play(customAnimates[0]) : customAnimates.length > 1 && graphicAnimate.play(new AnimateGroup(duration, customAnimates));
         }
         delayAfter > 0 && graphicAnimate.wait(delayAfter);
     }

package/es/graph/animation/animator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animator.ts"],"names":[],"mappings":"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","file":"animator.js","sourcesContent":["import { isNil, isValidNumber } from '@visactor/vutils';\nimport type { IAnimate as IGraphicAnimate } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { ACustomAnimate, Animate, AnimateGroup, AnimateMode } from '@visactor/vrender-core';\nimport type {\n  IAnimationChannelInterpolator,\n  IAnimationCustomConstructor,\n  IAnimationTimeline,\n  IAnimator,\n  IAnimatorOptions,\n  IAnimationUnit,\n  IAnimationParameters,\n  IAnimationTimeSlice,\n  IElement,\n  IAnimationEffect\n} from '../../types';\nimport { AttributeAnimate, channelAnimationAttributes, CustomInterpolator, typeAnimationAttributes } from './attribute';\n\nAnimate.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;\n\nlet GlobalAnimatorId = 0;\n\nconst isCustomAnimateCtor = (custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor) => {\n  return !isNil(custom) && custom.prototype instanceof ACustomAnimate;\n};\n\nexport class Animator implements IAnimator {\n  id: number = GlobalAnimatorId++;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean = false;\n\n  private unit: IAnimationUnit;\n  private runnings: IGraphicAnimate[] = [];\n  private callbackFunction: (...args: any[]) => any;\n\n  constructor(\n    element: IElement,\n    unit: IAnimationUnit,\n    animationOptions: {\n      state: string;\n      timeline: IAnimationTimeline;\n      id: string;\n    }\n  ) {\n    this.element = element;\n    this.animationOptions = animationOptions;\n    this.unit = unit;\n  }\n\n  callback(callbackFunction: (...args: any[]) => void): this {\n    this.callbackFunction = callbackFunction;\n    return this;\n  }\n\n  animate(animationParameters: IAnimationParameters, parameters: any): this {\n    this.isAnimating = true;\n\n    this.animateElement(animationParameters, parameters);\n\n    // if no valid running, end animating immediately\n    if (this.runnings.length === 0) {\n      this.animationEnd();\n    }\n    return this;\n  }\n\n  stop(stopState: 'start' | 'end' = 'end', invokeCallback: boolean = true): this {\n    // FIXME: wait for VRender to fix 'end' parameter\n    this.runnings.forEach(running => running.stop(stopState));\n    this.animationEnd(invokeCallback);\n    return this;\n  }\n\n  pause(): this {\n    this.runnings.forEach(running => running.pause());\n    return this;\n  }\n\n  resume(): this {\n    this.runnings.forEach(running => running.resume());\n    return this;\n  }\n\n  startAt(startTime: number): this {\n    this.runnings.forEach(running => {\n      const initialDelay = this.unit.initialDelay;\n      running.startAt(initialDelay + startTime);\n    });\n    return this;\n  }\n\n  getTotalAnimationTime() {\n    const timeLineDuration = this.unit.initialDelay + this.unit.loopDuration * this.unit.loopCount;\n    return this.unit.totalTime ?? timeLineDuration;\n  }\n\n  getEndAttributes() {\n    return this.runnings.reduce((attributes, running) => {\n      return Object.assign(attributes, running.getEndProps());\n    }, {} as Record<string, any>);\n  }\n\n  private animationEnd(invokeCallback: boolean = true) {\n    this.isAnimating = false;\n    this.runnings = null;\n    if (invokeCallback) {\n      this.callbackFunction?.call(null);\n    }\n  }\n\n  private animateElement(animationParameters: IAnimationParameters, parameters: any) {\n    const graphicItem = this.element.getGraphicItem();\n\n    if (!graphicItem) {\n      return;\n    }\n\n    const graphicAnimate: IGraphicAnimate = graphicItem.animate();\n    this.runnings.push(graphicAnimate);\n    // initialDelay is only used at first loop\n    graphicAnimate.startAt(this.unit.initialDelay);\n    // execute loop animation\n    graphicAnimate.wait(this.unit.loopDelay);\n    this.unit.timeSlices.forEach(timeSlice => {\n      this.animateTimeSlice(graphicAnimate, timeSlice, animationParameters, parameters);\n    });\n    graphicAnimate.wait(this.unit.loopDelayAfter);\n\n    graphicAnimate.loop(this.unit.loopCount - 1);\n\n    if (isValidNumber(this.unit.totalTime)) {\n      // FIXME: use VRender api instead after VRender refactor is finished\n      setTimeout(() => {\n        if (graphicAnimate) {\n          graphicAnimate.stop('end');\n        }\n      }, this.unit.totalTime);\n    }\n\n    graphicAnimate.onEnd(() => {\n      this.runnings = this.runnings.filter(running => running !== graphicAnimate);\n      if (this.runnings.length === 0) {\n        this.animationEnd();\n      }\n    });\n  }\n\n  private animateTimeSlice(\n    graphicAnimate: IGraphicAnimate,\n    timeSlice: IAnimationTimeSlice,\n    animationParameters: IAnimationParameters,\n    parameters: any\n  ) {\n    const delay = timeSlice.delay as number;\n    const delayAfter = timeSlice.delayAfter as number;\n    const duration = timeSlice.duration as number;\n    const effects = timeSlice.effects as IAnimationEffect[];\n\n    // wait in loop animation before animation starts\n    if (delay > 0) {\n      graphicAnimate.wait(delay);\n    }\n\n    if (effects.length < 0) {\n      graphicAnimate.wait(duration);\n    } else {\n      const customAnimates = effects\n        .map((effect, index) => {\n          const attributes =\n            (effect.type\n              ? typeAnimationAttributes(this.element, effect, animationParameters, parameters)\n              : channelAnimationAttributes(this.element, effect, animationParameters, parameters)) ?? {};\n          const customOption = attributes?.custom || effect?.custom;\n          const customParametersOption = attributes?.customParameters || effect?.customParameters;\n\n          if (\n            attributes.from &&\n            Object.keys(attributes.from).length &&\n            this.unit &&\n            this.animationOptions.timeline.controlOptions.immediatelyApply &&\n            this.element.mark.markType !== 'component'\n          ) {\n            this.element.getGraphicItem().setAttributes(attributes.from);\n          }\n\n          const isCustomAnimate = isCustomAnimateCtor(customOption);\n          const isCustomInterpolator = !isNil(customOption) && !isCustomAnimateCtor(customOption);\n\n          if (isCustomInterpolator) {\n            return new CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {\n              interpolator: customOption as IAnimationChannelInterpolator,\n              element: this.element,\n              parameters: customParametersOption\n            });\n          } else if (isCustomAnimate) {\n            return new (customOption as IAnimationCustomConstructor)(\n              attributes.from,\n              attributes.to,\n              duration,\n              effect.easing,\n              customParametersOption\n            );\n          } else if (attributes.to) {\n            return new AttributeAnimate(attributes.from, attributes.to, duration, effect.easing);\n          }\n        })\n        .filter(animate => !isNil(animate));\n\n      if (customAnimates.length === 1) {\n        graphicAnimate.play(customAnimates[0]);\n      } else {\n        graphicAnimate.play(new AnimateGroup(duration, customAnimates));\n      }\n    }\n\n    if (delayAfter > 0) {\n      graphicAnimate.wait(delayAfter);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/graph/animation/animator.ts"],"names":[],"mappings":"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","file":"animator.js","sourcesContent":["import { isNil, isValidNumber } from '@visactor/vutils';\nimport type { IAnimate as IGraphicAnimate } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { ACustomAnimate, Animate, AnimateGroup, AnimateMode } from '@visactor/vrender-core';\nimport type {\n  IAnimationChannelInterpolator,\n  IAnimationCustomConstructor,\n  IAnimationTimeline,\n  IAnimator,\n  IAnimatorOptions,\n  IAnimationUnit,\n  IAnimationParameters,\n  IAnimationTimeSlice,\n  IElement,\n  IAnimationEffect\n} from '../../types';\nimport { AttributeAnimate, channelAnimationAttributes, CustomInterpolator, typeAnimationAttributes } from './attribute';\n\nAnimate.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;\n\nlet GlobalAnimatorId = 0;\n\nconst isCustomAnimateCtor = (custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor) => {\n  return !isNil(custom) && custom.prototype instanceof ACustomAnimate;\n};\n\nexport class Animator implements IAnimator {\n  id: number = GlobalAnimatorId++;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean = false;\n\n  private unit: IAnimationUnit;\n  private runnings: IGraphicAnimate[] = [];\n  private callbackFunction: (...args: any[]) => any;\n\n  constructor(\n    element: IElement,\n    unit: IAnimationUnit,\n    animationOptions: {\n      state: string;\n      timeline: IAnimationTimeline;\n      id: string;\n    }\n  ) {\n    this.element = element;\n    this.animationOptions = animationOptions;\n    this.unit = unit;\n  }\n\n  callback(callbackFunction: (...args: any[]) => void): this {\n    this.callbackFunction = callbackFunction;\n    return this;\n  }\n\n  animate(animationParameters: IAnimationParameters, parameters: any): this {\n    this.isAnimating = true;\n\n    this.animateElement(animationParameters, parameters);\n\n    // if no valid running, end animating immediately\n    if (this.runnings.length === 0) {\n      this.animationEnd();\n    }\n    return this;\n  }\n\n  stop(stopState: 'start' | 'end' = 'end', invokeCallback: boolean = true): this {\n    // FIXME: wait for VRender to fix 'end' parameter\n    this.runnings.forEach(running => running.stop(stopState));\n    this.animationEnd(invokeCallback);\n    return this;\n  }\n\n  pause(): this {\n    this.runnings.forEach(running => running.pause());\n    return this;\n  }\n\n  resume(): this {\n    this.runnings.forEach(running => running.resume());\n    return this;\n  }\n\n  startAt(startTime: number): this {\n    this.runnings.forEach(running => {\n      const initialDelay = this.unit.initialDelay;\n      running.startAt(initialDelay + startTime);\n    });\n    return this;\n  }\n\n  getTotalAnimationTime() {\n    const timeLineDuration = this.unit.initialDelay + this.unit.loopDuration * this.unit.loopCount;\n    return this.unit.totalTime ?? timeLineDuration;\n  }\n\n  getEndAttributes() {\n    return this.runnings.reduce((attributes, running) => {\n      return Object.assign(attributes, running.getEndProps());\n    }, {} as Record<string, any>);\n  }\n\n  private animationEnd(invokeCallback: boolean = true) {\n    this.isAnimating = false;\n    this.runnings = null;\n    if (invokeCallback) {\n      this.callbackFunction?.call(null);\n    }\n  }\n\n  private animateElement(animationParameters: IAnimationParameters, parameters: any) {\n    const graphicItem = this.element.getGraphicItem();\n\n    if (!graphicItem) {\n      return;\n    }\n\n    const graphicAnimate: IGraphicAnimate = graphicItem.animate();\n    this.runnings.push(graphicAnimate);\n    // initialDelay is only used at first loop\n    graphicAnimate.startAt(this.unit.initialDelay);\n    // execute loop animation\n    graphicAnimate.wait(this.unit.loopDelay);\n    this.unit.timeSlices.forEach(timeSlice => {\n      this.animateTimeSlice(graphicAnimate, timeSlice, animationParameters, parameters);\n    });\n    graphicAnimate.wait(this.unit.loopDelayAfter);\n\n    graphicAnimate.loop(this.unit.loopCount - 1);\n\n    if (isValidNumber(this.unit.totalTime)) {\n      // FIXME: use VRender api instead after VRender refactor is finished\n      setTimeout(() => {\n        if (graphicAnimate) {\n          graphicAnimate.stop('end');\n        }\n      }, this.unit.totalTime);\n    }\n\n    graphicAnimate.onEnd(() => {\n      this.runnings = this.runnings.filter(running => running !== graphicAnimate);\n      if (this.runnings.length === 0) {\n        this.animationEnd();\n      }\n    });\n  }\n\n  private animateTimeSlice(\n    graphicAnimate: IGraphicAnimate,\n    timeSlice: IAnimationTimeSlice,\n    animationParameters: IAnimationParameters,\n    parameters: any\n  ) {\n    const delay = timeSlice.delay as number;\n    const delayAfter = timeSlice.delayAfter as number;\n    const duration = timeSlice.duration as number;\n    const effects = timeSlice.effects as IAnimationEffect[];\n\n    // wait in loop animation before animation starts\n    if (delay > 0) {\n      graphicAnimate.wait(delay);\n    }\n\n    if (effects.length < 0) {\n      graphicAnimate.wait(duration);\n    } else {\n      const customAnimates = effects\n        .map((effect, index) => {\n          const attributes = effect.type\n            ? typeAnimationAttributes(this.element, effect, animationParameters, parameters)\n            : effect.channel\n            ? channelAnimationAttributes(this.element, effect, animationParameters, parameters)\n            : undefined;\n\n          if (!attributes) {\n            return null;\n          }\n          const customOption = attributes?.custom || effect?.custom;\n          const customParametersOption = attributes?.customParameters || effect?.customParameters;\n\n          if (\n            attributes.from &&\n            Object.keys(attributes.from).length &&\n            this.unit &&\n            this.animationOptions.timeline.controlOptions.immediatelyApply &&\n            this.element.mark.markType !== 'component'\n          ) {\n            this.element.getGraphicItem().setAttributes(attributes.from);\n          }\n\n          const isCustomAnimate = isCustomAnimateCtor(customOption);\n          const isCustomInterpolator = !isNil(customOption) && !isCustomAnimateCtor(customOption);\n\n          if (isCustomInterpolator) {\n            return new CustomInterpolator(attributes.from, attributes.to, duration, effect.easing, {\n              interpolator: customOption as IAnimationChannelInterpolator,\n              element: this.element,\n              parameters: customParametersOption\n            });\n          } else if (isCustomAnimate) {\n            return new (customOption as IAnimationCustomConstructor)(\n              attributes.from,\n              attributes.to,\n              duration,\n              effect.easing,\n              customParametersOption\n            );\n          } else if (attributes.to) {\n            return new AttributeAnimate(attributes.from, attributes.to, duration, effect.easing);\n          }\n        })\n        .filter(animate => !isNil(animate));\n\n      if (customAnimates.length === 1) {\n        graphicAnimate.play(customAnimates[0]);\n      } else if (customAnimates.length > 1) {\n        graphicAnimate.play(new AnimateGroup(duration, customAnimates));\n      }\n    }\n\n    if (delayAfter > 0) {\n      graphicAnimate.wait(delayAfter);\n    }\n  }\n}\n"]}

package/es/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.10.5";
+export declare const version = "0.10.7";
 export * from './graph';
 export * from './interactions';
 export { View } from './view';

package/es/index.js

@@ -1,4 +1,4 @@
-export const version = "0.10.5";
+export const version = "0.10.7";
 
 export * from "./graph";
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,SAAS,CAAC;AAExB,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.10.5\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,SAAS,CAAC;AAExB,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,6BAA6B,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,cAAc,OAAO,CAAC;AACtB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.10.7\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from './view/constants';\n\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}

package/es/interactions/brush-filter.js

@@ -29,4 +29,5 @@ export class BrushFilter extends BrushBase {
     }
 }
 
-BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
+BrushFilter.type = "brush-filter", BrushFilter.defaultOptions = {};
+//# sourceMappingURL=brush-filter.js.map

package/es/interactions/drill-down.js

@@ -42,5 +42,4 @@ export class DrillDown extends BrushBase {
 DrillDown.type = "drill-down", DrillDown.defaultOptions = {
     brush: !1,
     trigger: "click"
-};
-//# sourceMappingURL=drill-down.js.map
+};

package/es/interactions/element-select.js

@@ -58,4 +58,4 @@ ElementSelect.type = "element-select", ElementSelect.defaultOptions = {
     state: InteractionStateEnum.selected,
     trigger: "click"
 };
-//# sourceMappingURL=element-select.js.map
+//# sourceMappingURL=element-select.js.map

package/es/interactions/filter.js

@@ -28,4 +28,4 @@ export class Filter extends BaseInteraction {
 }
 
 Filter.defaultOptions = {};
-//# sourceMappingURL=filter.js.map
+//# sourceMappingURL=filter.js.map

package/es/interactions/fish-eye.js

@@ -96,4 +96,4 @@ FishEye.type = "fish-eye", FishEye.defaultOptions = {
     distortionY: 2,
     throttle: 100
 };
-//# sourceMappingURL=fish-eye.js.map
+//# sourceMappingURL=fish-eye.js.map

package/es/interactions/index.js

@@ -145,4 +145,5 @@ export const registerViewRoam = () => {
 
 export const registerFishEye = () => {
     Factory.registerInteraction(FishEye.type, FishEye);
-};
+};
+//# sourceMappingURL=index.js.map

package/es/interactions/legend-filter.js

@@ -29,4 +29,4 @@ export class LegendFilter extends Filter {
 }
 
 LegendFilter.type = "legend-filter", LegendFilter.defaultOptions = {};
-//# sourceMappingURL=legend-filter.js.map
+//# sourceMappingURL=legend-filter.js.map

package/es/interactions/player-filter.js

@@ -29,4 +29,4 @@ export class PlayerFilter extends Filter {
 }
 
 PlayerFilter.type = "player-filter", PlayerFilter.defaultOptions = {};
-//# sourceMappingURL=player-filter.js.map
+//# sourceMappingURL=player-filter.js.map

package/es/interactions/roll-up.js

@@ -42,4 +42,4 @@ RollUp.type = "roll-up", RollUp.defaultOptions = {
     trigger: "click",
     resetTrigger: "empty"
 };
-//# sourceMappingURL=roll-up.js.map
+//# sourceMappingURL=roll-up.js.map

package/es/interactions/scrollbar-filter.js

@@ -47,4 +47,4 @@ export class ScrollbarFilter extends Filter {
 }
 
 ScrollbarFilter.type = "scrollbar-filter", ScrollbarFilter.defaultOptions = {};
-//# sourceMappingURL=scrollbar-filter.js.map
+//# sourceMappingURL=scrollbar-filter.js.map

package/es/interactions/slider-filter.js

@@ -26,4 +26,4 @@ export class SliderFilter extends Filter {
 }
 
 SliderFilter.type = "slider-filter", SliderFilter.defaultOptions = {};
-//# sourceMappingURL=slider-filter.js.map
+//# sourceMappingURL=slider-filter.js.map

package/es/interactions/tooltip.js

@@ -55,4 +55,4 @@ Tooltip.type = "tooltip", Tooltip.defaultOptions = {
     trigger: "pointermove",
     resetTrigger: "pointerleave"
 };
-//# sourceMappingURL=tooltip.js.map
+//# sourceMappingURL=tooltip.js.map

package/es/interactions/utils.js

@@ -2,4 +2,4 @@ export const generateFilterValue = options => options.filterField ? el => {
     var _a;
     return null === (_a = el.getDatum()) || void 0 === _a ? void 0 : _a[options.filterField];
 } : el => el[options.filterType];
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/es/parse/coordinate.js

@@ -62,4 +62,4 @@ export function configureCoordinate(spec, coordinate, parameters) {
     }
     coordinate.applyTransforms(transforms);
 }
-//# sourceMappingURL=coordinate.js.map
+//# sourceMappingURL=coordinate.js.map

package/es/parse/event.js

@@ -24,4 +24,4 @@ export const parseEventSelector = (selector, source = EVENT_SOURCE_VIEW) => {
     } else 1 === splitArr.length && (spec.type = selector, spec.source = source);
     return spec;
 };
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/es/parse/mark.js

@@ -16,4 +16,4 @@ export function parseEncodeType(encoder, view) {
     return encoder.scale && (dependencies = isGrammar(encoder.scale) ? [ encoder.scale ] : array(view.getScaleById(encoder.scale))), 
     dependencies.concat(parseFunctionType(encoder, view));
 }
-//# sourceMappingURL=mark.js.map
+//# sourceMappingURL=mark.js.map

package/es/parse/option.js

@@ -8,4 +8,4 @@ export const parseOptions = (options, params) => options ? isObject(options) ? O
     const option = options[key];
     return res[key] = parseOptionValue(option, params), res;
 }), {}) : options.map((option => parseOptionValue(option, params))) : options;
-//# sourceMappingURL=option.js.map
+//# sourceMappingURL=option.js.map

package/es/parse/scale.js

@@ -343,5 +343,4 @@ export function configureScale(spec, scale, parameters) {
       case "quantile":
         scale.rescale();
     }
-}
-//# sourceMappingURL=scale.js.map
+}

package/es/parse/transform.js

@@ -99,4 +99,4 @@ export const parseTransformSpec = (spec, view) => {
     }
     return null;
 };
-//# sourceMappingURL=transform.js.map
+//# sourceMappingURL=transform.js.map

package/es/parse/util.js

@@ -62,4 +62,4 @@ export const isGrammar = el => el && !isNil(el.grammarType);
 export const parseField = field => isFunction(field) ? field : datum => datum[field];
 
 export const parseColor = color => isString(color) && Color.parseColorString(color) ? color : null;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/es/parse/view.js

@@ -96,4 +96,4 @@ export const normalizeRunningConfig = runningConfig => {
         enableExitAnimation: enableExitAnimation
     };
 };
-//# sourceMappingURL=view.js.map
+//# sourceMappingURL=view.js.map

package/es/semantic-marks/cell.js

@@ -66,4 +66,4 @@ Cell.markType = GrammarMarkType.cell;
 export const registerCellMark = () => {
     Factory.registerMark(GrammarMarkType.cell, Cell);
 };
-//# sourceMappingURL=cell.js.map
+//# sourceMappingURL=cell.js.map

package/es/semantic-marks/interval.js

@@ -92,4 +92,4 @@ Interval.markType = GrammarMarkType.interval;
 export const registerIntervalMark = () => {
     Factory.registerMark(GrammarMarkType.interval, Interval);
 };
-//# sourceMappingURL=interval.js.map
+//# sourceMappingURL=interval.js.map

package/es/semantic-marks/text.js

@@ -21,4 +21,4 @@ export class Text extends Mark {
 }
 
 Text.markType = GrammarMarkType.text;
-//# sourceMappingURL=text.js.map
+//# sourceMappingURL=text.js.map

package/es/transforms/mark/mark-overlap.js

@@ -1,8 +1,11 @@
 import { isNil } from "@visactor/vutils";
 
+const HIDE_KEY = "_mo_hide_";
+
 function reset(elements) {
     return elements.forEach((element => {
-        element.setGraphicAttribute("visible", !0);
+        element.getGraphicAttribute("HIDE_KEY") && (element.setGraphicAttribute("visible", !0), 
+        element.setGraphicAttribute(HIDE_KEY, !1));
     })), elements;
 }
 
@@ -12,9 +15,10 @@ function overlapX(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = isNil(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastX = currentX, 
-            lastR = r;
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
         }));
     }
 }
@@ -25,9 +29,10 @@ function overlapY(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = isNil(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentY = element.getGraphicAttribute("y");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, 
-            lastR = r;
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }
 }
@@ -39,10 +44,11 @@ function overlapXY(elements, delta, deltaMul, useRadius) {
         const useDeltaMul = isNil(delta);
         let itemDelta = delta;
         elements.forEach((element => {
+            if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x"), currentY = element.getGraphicAttribute("y");
             useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, 
-            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || element.setGraphicAttribute("visible", !1) : lastY = currentY, 
-            lastR = r;
+            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }
 }

package/es/transforms/mark/mark-overlap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    element.setGraphicAttribute('visible', true);\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = elements.slice().sort((a, b) => {\n      return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n    });\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}
+{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\n\nconst HIDE_KEY = '_mo_hide_';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    const hide = element.getGraphicAttribute('HIDE_KEY');\n\n    if (hide) {\n      element.setGraphicAttribute('visible', true);\n      element.setGraphicAttribute(HIDE_KEY, false);\n    }\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = elements.slice().sort((a, b) => {\n      return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n    });\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-core",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "VGrammar is a visual grammar library",
   "keywords": [
     "grammar",
@@ -24,12 +24,12 @@
     "dist"
   ],
   "dependencies": {
-    "@visactor/vgrammar-coordinate": "0.10.5",
-    "@visactor/vgrammar-util": "0.10.5",
+    "@visactor/vgrammar-coordinate": "0.10.7",
+    "@visactor/vgrammar-util": "0.10.7",
     "@visactor/vscale": "~0.17.3",
-    "@visactor/vrender-core": "~0.17.8",
-    "@visactor/vrender-kits": "~0.17.8",
-    "@visactor/vrender-components": "~0.17.8",
+    "@visactor/vrender-core": "~0.17.11",
+    "@visactor/vrender-kits": "~0.17.11",
+    "@visactor/vrender-components": "~0.17.11",
     "@visactor/vutils": "~0.17.3",
     "@visactor/vdataset": "~0.17.3"
   },
@@ -44,10 +44,10 @@
     "ts-jest": "~29.1.0",
     "@types/jest": "~29.5.0",
     "typescript": "4.9.5",
-    "@internal/bundler": "0.0.1",
+    "@internal/ts-config": "0.0.1",
     "@internal/eslint-config": "0.0.1",
-    "@internal/jest-config": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/bundler": "0.0.1",
+    "@internal/jest-config": "0.0.1"
   },
   "publishConfig": {
     "access": "public",