@visactor/vgrammar-core 0.13.12 → 0.14.0-alpha.1

package/es/graph/animation/animation/move.js

@@ -2,13 +2,13 @@ import { isFunction, isValidNumber } from "@visactor/vutils";
 
 export const moveIn = (element, options, animationParameters) => {
     var _a, _b;
-    const {offset: offset = 0, orient: orient, direction: direction, point: pointOpt, excludeChannels: excludeChannels = []} = null != options ? options : {};
+    const {offset: offset = 0, orient: orient, direction: direction, point: pointOpt} = null != options ? options : {};
     let changedX = 0, changedY = 0;
     "negative" === orient && (animationParameters.group ? (changedX = null !== (_a = animationParameters.groupWidth) && void 0 !== _a ? _a : animationParameters.group.getBounds().width(), 
     changedY = null !== (_b = animationParameters.groupHeight) && void 0 !== _b ? _b : animationParameters.group.getBounds().height(), 
     animationParameters.groupWidth = changedX, animationParameters.groupHeight = changedY) : (changedX = animationParameters.width, 
     changedY = animationParameters.height)), changedX += offset, changedY += offset;
-    const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt, fromX = point && isValidNumber(point.x) ? point.x : changedX, fromY = point && isValidNumber(point.y) ? point.y : changedY, finalAttrsX = excludeChannels.includes("x") ? element.getGraphicAttribute("x") : element.getFinalAnimationAttribute("x"), finalAttrsY = excludeChannels.includes("y") ? element.getGraphicAttribute("y") : element.getFinalAnimationAttribute("y");
+    const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt, fromX = point && isValidNumber(point.x) ? point.x : changedX, fromY = point && isValidNumber(point.y) ? point.y : changedY, finalAttrs = element.getFinalGraphicAttributes();
     switch (direction) {
       case "x":
         return {
@@ -16,7 +16,7 @@ export const moveIn = (element, options, animationParameters) => {
                 x: fromX
             },
             to: {
-                x: finalAttrsX
+                x: null == finalAttrs ? void 0 : finalAttrs.x
             }
         };
 
@@ -26,7 +26,7 @@ export const moveIn = (element, options, animationParameters) => {
                 y: fromY
             },
             to: {
-                y: finalAttrsY
+                y: null == finalAttrs ? void 0 : finalAttrs.y
             }
         };
 
@@ -37,8 +37,8 @@ export const moveIn = (element, options, animationParameters) => {
                 y: fromY
             },
             to: {
-                x: finalAttrsX,
-                y: finalAttrsY
+                x: null == finalAttrs ? void 0 : finalAttrs.x,
+                y: null == finalAttrs ? void 0 : finalAttrs.y
             }
         };
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/move.ts"],"names":[],"mappings":"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","file":"move.js","sourcesContent":["import { isFunction, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IMoveAnimationOptions, IAnimationParameters, TypeAnimation } from '../../../types';\n\n// When user did not provide proper x/y value, move animation will never work properly,\n//  due to that, default x/y value won't be set.\n\nexport const moveIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IMoveAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const { offset = 0, orient, direction, point: pointOpt, excludeChannels = [] } = options ?? {};\n  let changedX = 0;\n  let changedY = 0;\n\n  if (orient === 'negative') {\n    // consider the offset of group\n    if (animationParameters.group) {\n      changedX = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n      changedY = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n      (animationParameters as any).groupWidth = changedX;\n      (animationParameters as any).groupHeight = changedY;\n    } else {\n      changedX = animationParameters.width;\n      changedY = animationParameters.height;\n    }\n  }\n\n  changedX += offset;\n  changedY += offset;\n  const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt;\n  const fromX = point && isValidNumber(point.x) ? point.x : changedX;\n  const fromY = point && isValidNumber(point.y) ? point.y : changedY;\n  const finalAttrsX = excludeChannels.includes('x')\n    ? element.getGraphicAttribute('x')\n    : element.getFinalAnimationAttribute('x');\n  const finalAttrsY = excludeChannels.includes('y')\n    ? element.getGraphicAttribute('y')\n    : element.getFinalAnimationAttribute('y');\n\n  switch (direction) {\n    case 'x':\n      return {\n        from: { x: fromX },\n        to: { x: finalAttrsX }\n      };\n    case 'y':\n      return {\n        from: { y: fromY },\n        to: { y: finalAttrsY }\n      };\n    case 'xy':\n    default:\n      return {\n        from: { x: fromX, y: fromY },\n        to: {\n          x: finalAttrsX,\n          y: finalAttrsY\n        }\n      };\n  }\n};\n\nexport const moveOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IMoveAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const { offset = 0, orient, direction, point: pointOpt } = options ?? {};\n\n  // consider the offset of group\n  const groupBounds = animationParameters.group ? animationParameters.group.getBounds() : null;\n  const groupWidth = groupBounds?.width() ?? animationParameters.width;\n  const groupHeight = groupBounds?.height() ?? animationParameters.height;\n  const changedX = (orient === 'negative' ? groupWidth : 0) + offset;\n  const changedY = (orient === 'negative' ? groupHeight : 0) + offset;\n  const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt;\n  const fromX = point && isValidNumber(point.x) ? point.x : changedX;\n  const fromY = point && isValidNumber(point.y) ? point.y : changedY;\n\n  switch (direction) {\n    case 'x':\n      return {\n        from: { x: element.getGraphicAttribute('x', true) },\n        to: { x: fromX }\n      };\n    case 'y':\n      return {\n        from: { y: element.getGraphicAttribute('y', true) },\n        to: { y: fromY }\n      };\n    case 'xy':\n    default:\n      return {\n        from: {\n          x: element.getGraphicAttribute('x', true),\n          y: element.getGraphicAttribute('y', true)\n        },\n        to: { x: fromX, y: fromY }\n      };\n  }\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/move.ts"],"names":[],"mappings":"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","file":"move.js","sourcesContent":["import { isFunction, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IMoveAnimationOptions, IAnimationParameters, TypeAnimation } from '../../../types';\n\n// When user did not provide proper x/y value, move animation will never work properly,\n//  due to that, default x/y value won't be set.\n\nexport const moveIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IMoveAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const { offset = 0, orient, direction, point: pointOpt } = options ?? {};\n  let changedX = 0;\n  let changedY = 0;\n\n  if (orient === 'negative') {\n    // consider the offset of group\n    if (animationParameters.group) {\n      changedX = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width();\n      changedY = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height();\n\n      (animationParameters as any).groupWidth = changedX;\n      (animationParameters as any).groupHeight = changedY;\n    } else {\n      changedX = animationParameters.width;\n      changedY = animationParameters.height;\n    }\n  }\n\n  changedX += offset;\n  changedY += offset;\n  const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt;\n  const fromX = point && isValidNumber(point.x) ? point.x : changedX;\n  const fromY = point && isValidNumber(point.y) ? point.y : changedY;\n  const finalAttrs = element.getFinalGraphicAttributes();\n\n  switch (direction) {\n    case 'x':\n      return {\n        from: { x: fromX },\n        to: { x: finalAttrs?.x }\n      };\n    case 'y':\n      return {\n        from: { y: fromY },\n        to: { y: finalAttrs?.y }\n      };\n    case 'xy':\n    default:\n      return {\n        from: { x: fromX, y: fromY },\n        to: {\n          x: finalAttrs?.x,\n          y: finalAttrs?.y\n        }\n      };\n  }\n};\n\nexport const moveOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IMoveAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const { offset = 0, orient, direction, point: pointOpt } = options ?? {};\n\n  // consider the offset of group\n  const groupBounds = animationParameters.group ? animationParameters.group.getBounds() : null;\n  const groupWidth = groupBounds?.width() ?? animationParameters.width;\n  const groupHeight = groupBounds?.height() ?? animationParameters.height;\n  const changedX = (orient === 'negative' ? groupWidth : 0) + offset;\n  const changedY = (orient === 'negative' ? groupHeight : 0) + offset;\n  const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt;\n  const fromX = point && isValidNumber(point.x) ? point.x : changedX;\n  const fromY = point && isValidNumber(point.y) ? point.y : changedY;\n\n  switch (direction) {\n    case 'x':\n      return {\n        from: { x: element.getGraphicAttribute('x', true) },\n        to: { x: fromX }\n      };\n    case 'y':\n      return {\n        from: { y: element.getGraphicAttribute('y', true) },\n        to: { y: fromY }\n      };\n    case 'xy':\n    default:\n      return {\n        from: {\n          x: element.getGraphicAttribute('x', true),\n          y: element.getGraphicAttribute('y', true)\n        },\n        to: { x: fromX, y: fromY }\n      };\n  }\n};\n"]}

package/es/graph/animation/animation/rotate.js

@@ -1,16 +1,16 @@
 import { isNumberClose, isValidNumber } from "@visactor/vutils";
 
 export const rotateIn = (element, options, animationParameters) => {
-    var _a;
-    const attributeAngle = null !== (_a = element.getFinalAnimationAttribute("angle")) && void 0 !== _a ? _a : 0;
+    var _a, _b;
+    const finalAngle = null !== (_b = null === (_a = element.getFinalGraphicAttributes()) || void 0 === _a ? void 0 : _a.angle) && void 0 !== _b ? _b : 0;
     let angle = 0;
-    return angle = isNumberClose(attributeAngle / (2 * Math.PI), 0) ? Math.round(attributeAngle / (2 * Math.PI)) * Math.PI * 2 : isValidNumber(null == options ? void 0 : options.angle) ? options.angle : "anticlockwise" === (null == options ? void 0 : options.orient) ? Math.ceil(attributeAngle / (2 * Math.PI)) * Math.PI * 2 : Math.floor(attributeAngle / (2 * Math.PI)) * Math.PI * 2, 
+    return angle = isNumberClose(finalAngle / (2 * Math.PI), 0) ? Math.round(finalAngle / (2 * Math.PI)) * Math.PI * 2 : isValidNumber(null == options ? void 0 : options.angle) ? options.angle : "anticlockwise" === (null == options ? void 0 : options.orient) ? Math.ceil(finalAngle / (2 * Math.PI)) * Math.PI * 2 : Math.floor(finalAngle / (2 * Math.PI)) * Math.PI * 2, 
     {
         from: {
             angle: angle
         },
         to: {
-            angle: attributeAngle
+            angle: finalAngle
         }
     };
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/rotate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGhE,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAC/C,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;;IACF,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,0BAA0B,CAAC,OAAO,CAAC,mCAAI,CAAC,CAAC;IAExE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,aAAa,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QACpD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAClE;SAAM,IAAI,aAAa,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,EAAE;QACxC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,eAAe,EAAE;QAC9C,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KACjE;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAClE;IACD,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE;QACf,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE;KAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAA4B,CAChD,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;;IACF,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,mCAAI,CAAC,CAAC;IACnE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,aAAa,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QAChD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;SAAM,IAAI,aAAa,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,EAAE;QACxC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,eAAe,EAAE;QAC9C,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC7D;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;IACD,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE;QAC3B,EAAE,EAAE,EAAE,KAAK,EAAE;KACd,CAAC;AACJ,CAAC,CAAC","file":"rotate.js","sourcesContent":["import { isNumberClose, isValidNumber } from '@visactor/vutils';\nimport type { IAnimationParameters, IRotateAnimationOptions, TypeAnimation, IElement } from '../../../types';\n\nexport const rotateIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IRotateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const attributeAngle = element.getFinalAnimationAttribute('angle') ?? 0;\n\n  let angle = 0;\n  if (isNumberClose(attributeAngle / (Math.PI * 2), 0)) {\n    angle = Math.round(attributeAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else if (isValidNumber(options?.angle)) {\n    angle = options.angle;\n  } else if (options?.orient === 'anticlockwise') {\n    angle = Math.ceil(attributeAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else {\n    angle = Math.floor(attributeAngle / (Math.PI * 2)) * Math.PI * 2;\n  }\n  return {\n    from: { angle },\n    to: { angle: attributeAngle }\n  };\n};\n\nexport const rotateOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IRotateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const finalAngle = element.getGraphicAttribute('angle', true) ?? 0;\n  let angle = 0;\n  if (isNumberClose(finalAngle / (Math.PI * 2), 0)) {\n    angle = Math.round(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else if (isValidNumber(options?.angle)) {\n    angle = options.angle;\n  } else if (options?.orient === 'anticlockwise') {\n    angle = Math.ceil(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else {\n    angle = Math.floor(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  }\n  return {\n    from: { angle: finalAngle },\n    to: { angle }\n  };\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/rotate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGhE,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAC/C,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;;IACF,MAAM,UAAU,GAAG,MAAA,MAAA,OAAO,CAAC,yBAAyB,EAAE,0CAAE,KAAK,mCAAI,CAAC,CAAC;IAEnE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,aAAa,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QAChD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;SAAM,IAAI,aAAa,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,EAAE;QACxC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,eAAe,EAAE;QAC9C,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC7D;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;IACD,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE;QACf,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAA4B,CAChD,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;;IACF,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,mCAAI,CAAC,CAAC;IACnE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,aAAa,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QAChD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;SAAM,IAAI,aAAa,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,EAAE;QACxC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACvB;SAAM,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,eAAe,EAAE;QAC9C,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC7D;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;KAC9D;IACD,OAAO;QACL,IAAI,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE;QAC3B,EAAE,EAAE,EAAE,KAAK,EAAE;KACd,CAAC;AACJ,CAAC,CAAC","file":"rotate.js","sourcesContent":["import { isNumberClose, isValidNumber } from '@visactor/vutils';\nimport type { IAnimationParameters, IRotateAnimationOptions, TypeAnimation, IElement } from '../../../types';\n\nexport const rotateIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IRotateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const finalAngle = element.getFinalGraphicAttributes()?.angle ?? 0;\n\n  let angle = 0;\n  if (isNumberClose(finalAngle / (Math.PI * 2), 0)) {\n    angle = Math.round(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else if (isValidNumber(options?.angle)) {\n    angle = options.angle;\n  } else if (options?.orient === 'anticlockwise') {\n    angle = Math.ceil(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else {\n    angle = Math.floor(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  }\n  return {\n    from: { angle },\n    to: { angle: finalAngle }\n  };\n};\n\nexport const rotateOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IRotateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const finalAngle = element.getGraphicAttribute('angle', true) ?? 0;\n  let angle = 0;\n  if (isNumberClose(finalAngle / (Math.PI * 2), 0)) {\n    angle = Math.round(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else if (isValidNumber(options?.angle)) {\n    angle = options.angle;\n  } else if (options?.orient === 'anticlockwise') {\n    angle = Math.ceil(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  } else {\n    angle = Math.floor(finalAngle / (Math.PI * 2)) * Math.PI * 2;\n  }\n  return {\n    from: { angle: finalAngle },\n    to: { angle }\n  };\n};\n"]}

package/es/graph/animation/animation/scale.js

@@ -1,6 +1,6 @@
 export const scaleIn = (element, options, animationParameters) => {
     var _a, _b, _c, _d;
-    const attrs = element.getFinalAnimationAttributes();
+    const finalAttrs = element.getFinalGraphicAttributes();
     switch (null == options ? void 0 : options.direction) {
       case "x":
         return {
@@ -8,7 +8,7 @@ export const scaleIn = (element, options, animationParameters) => {
                 scaleX: 0
             },
             to: {
-                scaleX: null !== (_a = null == attrs ? void 0 : attrs.scaleX) && void 0 !== _a ? _a : 1
+                scaleX: null !== (_a = null == finalAttrs ? void 0 : finalAttrs.scaleX) && void 0 !== _a ? _a : 1
             }
         };
 
@@ -18,7 +18,7 @@ export const scaleIn = (element, options, animationParameters) => {
                 scaleY: 0
             },
             to: {
-                scaleY: null !== (_b = null == attrs ? void 0 : attrs.scaleY) && void 0 !== _b ? _b : 1
+                scaleY: null !== (_b = null == finalAttrs ? void 0 : finalAttrs.scaleY) && void 0 !== _b ? _b : 1
             }
         };
 
@@ -29,8 +29,8 @@ export const scaleIn = (element, options, animationParameters) => {
                 scaleY: 0
             },
             to: {
-                scaleX: null !== (_c = null == attrs ? void 0 : attrs.scaleX) && void 0 !== _c ? _c : 1,
-                scaleY: null !== (_d = null == attrs ? void 0 : attrs.scaleY) && void 0 !== _d ? _d : 1
+                scaleX: null !== (_c = null == finalAttrs ? void 0 : finalAttrs.scaleX) && void 0 !== _c ? _c : 1,
+                scaleY: null !== (_d = null == finalAttrs ? void 0 : finalAttrs.scaleY) && void 0 !== _d ? _d : 1
             }
         };
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/scale.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,OAAO,GAA4B,CAC9C,OAAiB,EACjB,OAA+B,EAC/B,mBAAyC,EACzC,EAAE;;IACF,MAAM,KAAK,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC;IAEpD,QAAQ,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;QAC1B,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;gBACnB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,CAAC,EAAE;aACnC,CAAC;QACJ,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;gBACnB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,CAAC,EAAE;aACnC,CAAC;QACJ,KAAK,IAAI,CAAC;QACV;YACE,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;gBAC9B,EAAE,EAAE;oBACF,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,CAAC;oBAC1B,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,mCAAI,CAAC;iBAC3B;aACF,CAAC;KACL;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAC/C,OAAiB,EACjB,OAA+B,EAC/B,mBAAyC,EACzC,EAAE;;IACF,QAAQ,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;QAC1B,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC,EAAE;gBAClE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;aAClB,CAAC;QACJ,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC,EAAE;gBAClE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;aAClB,CAAC;QACJ,KAAK,IAAI,CAAC;QACV;YACE,OAAO;gBACL,IAAI,EAAE;oBACJ,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC;oBACxD,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC;iBACzD;gBACD,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;aAC7B,CAAC;KACL;AACH,CAAC,CAAC","file":"scale.js","sourcesContent":["import type { IElement, IScaleAnimationOptions, IAnimationParameters, TypeAnimation } from '../../../types';\n\n// TODO: negative direction, need support from VRender\n\nexport const scaleIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IScaleAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const attrs = element.getFinalAnimationAttributes();\n\n  switch (options?.direction) {\n    case 'x':\n      return {\n        from: { scaleX: 0 },\n        to: { scaleX: attrs?.scaleX ?? 1 }\n      };\n    case 'y':\n      return {\n        from: { scaleY: 0 },\n        to: { scaleY: attrs?.scaleY ?? 1 }\n      };\n    case 'xy':\n    default:\n      return {\n        from: { scaleX: 0, scaleY: 0 },\n        to: {\n          scaleX: attrs?.scaleX ?? 1,\n          scaleY: attrs?.scaleY ?? 1\n        }\n      };\n  }\n};\n\nexport const scaleOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IScaleAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  switch (options?.direction) {\n    case 'x':\n      return {\n        from: { scaleX: element.getGraphicAttribute('scaleX', true) ?? 1 },\n        to: { scaleX: 0 }\n      };\n    case 'y':\n      return {\n        from: { scaleY: element.getGraphicAttribute('scaleY', true) ?? 1 },\n        to: { scaleY: 0 }\n      };\n    case 'xy':\n    default:\n      return {\n        from: {\n          scaleX: element.getGraphicAttribute('scaleX', true) ?? 1,\n          scaleY: element.getGraphicAttribute('scaleY', true) ?? 1\n        },\n        to: { scaleX: 0, scaleY: 0 }\n      };\n  }\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/scale.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,OAAO,GAA4B,CAC9C,OAAiB,EACjB,OAA+B,EAC/B,mBAAyC,EACzC,EAAE;;IACF,MAAM,UAAU,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAEvD,QAAQ,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;QAC1B,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;gBACnB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,mCAAI,CAAC,EAAE;aACxC,CAAC;QACJ,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;gBACnB,EAAE,EAAE,EAAE,MAAM,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,mCAAI,CAAC,EAAE;aACxC,CAAC;QACJ,KAAK,IAAI,CAAC;QACV;YACE,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;gBAC9B,EAAE,EAAE;oBACF,MAAM,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,mCAAI,CAAC;oBAC/B,MAAM,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,mCAAI,CAAC;iBAChC;aACF,CAAC;KACL;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAC/C,OAAiB,EACjB,OAA+B,EAC/B,mBAAyC,EACzC,EAAE;;IACF,QAAQ,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;QAC1B,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC,EAAE;gBAClE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;aAClB,CAAC;QACJ,KAAK,GAAG;YACN,OAAO;gBACL,IAAI,EAAE,EAAE,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC,EAAE;gBAClE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;aAClB,CAAC;QACJ,KAAK,IAAI,CAAC;QACV;YACE,OAAO;gBACL,IAAI,EAAE;oBACJ,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC;oBACxD,MAAM,EAAE,MAAA,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,mCAAI,CAAC;iBACzD;gBACD,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;aAC7B,CAAC;KACL;AACH,CAAC,CAAC","file":"scale.js","sourcesContent":["import type { IElement, IScaleAnimationOptions, IAnimationParameters, TypeAnimation } from '../../../types';\n\n// TODO: negative direction, need support from VRender\n\nexport const scaleIn: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IScaleAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const finalAttrs = element.getFinalGraphicAttributes();\n\n  switch (options?.direction) {\n    case 'x':\n      return {\n        from: { scaleX: 0 },\n        to: { scaleX: finalAttrs?.scaleX ?? 1 }\n      };\n    case 'y':\n      return {\n        from: { scaleY: 0 },\n        to: { scaleY: finalAttrs?.scaleY ?? 1 }\n      };\n    case 'xy':\n    default:\n      return {\n        from: { scaleX: 0, scaleY: 0 },\n        to: {\n          scaleX: finalAttrs?.scaleX ?? 1,\n          scaleY: finalAttrs?.scaleY ?? 1\n        }\n      };\n  }\n};\n\nexport const scaleOut: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IScaleAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  switch (options?.direction) {\n    case 'x':\n      return {\n        from: { scaleX: element.getGraphicAttribute('scaleX', true) ?? 1 },\n        to: { scaleX: 0 }\n      };\n    case 'y':\n      return {\n        from: { scaleY: element.getGraphicAttribute('scaleY', true) ?? 1 },\n        to: { scaleY: 0 }\n      };\n    case 'xy':\n    default:\n      return {\n        from: {\n          scaleX: element.getGraphicAttribute('scaleX', true) ?? 1,\n          scaleY: element.getGraphicAttribute('scaleY', true) ?? 1\n        },\n        to: { scaleX: 0, scaleY: 0 }\n      };\n  }\n};\n"]}

package/es/graph/animation/animation/update.js

@@ -1,7 +1,5 @@
 import { array, isNil, isEqual } from "@visactor/vutils";
 
-import { isEqual as isEmptyByKey } from "@visactor/vgrammar-util";
-
 const BUILT_IN_EXCLUDE_CHANNELS = {
     symbol: [ "_mo_hide_", "visible" ]
 };
@@ -14,7 +12,7 @@ export const update = (element, options, animationParameters) => {
     })), element.mark && element.mark.markType && (excludeChannels = BUILT_IN_EXCLUDE_CHANNELS[element.mark.markType]) && excludeChannels.forEach((key => {
         delete from[key], delete to[key];
     })), Object.keys(to).forEach((key => {
-        isEmptyByKey(key, from, to) && (delete from[key], delete to[key]);
+        isEqual(from[key], to[key]) && (delete from[key], delete to[key]);
     }));
     const final = element.getFinalGraphicAttributes();
     return Object.keys(from).forEach((key => {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAQlE,MAAM,yBAAyB,GAAG;IAChC,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAA4B,CAC7C,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACjE,IAAI,OAAO,EAAE;QACX,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IACD,IAAI,eAAyB,CAAC;IAC9B,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,GAAG,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE;QACjH,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC5B,IAAI,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAElD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC9B,IAAI,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAClB,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;gBACvD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;iBAAM;gBACL,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;aACtB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC,CAAC","file":"update.js","sourcesContent":["import { array, isNil, isEqual } from '@visactor/vutils';\nimport { isEqual as isEmptyByKey } from '@visactor/vgrammar-util';\nimport type { IElement } from '../../../types';\nimport type { IAnimationParameters, TypeAnimation } from '../../../types/animate';\n\nexport interface IUpdateAnimationOptions {\n  excludeChannels: string[];\n}\n\nconst BUILT_IN_EXCLUDE_CHANNELS = {\n  symbol: ['_mo_hide_', 'visible']\n};\n\nexport const update: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IUpdateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const from = Object.assign({}, element.getPrevGraphicAttributes());\n  const to = Object.assign({}, element.getNextGraphicAttributes());\n  if (options) {\n    array(options.excludeChannels).forEach(key => {\n      delete from[key];\n      delete to[key];\n    });\n  }\n  let excludeChannels: string[];\n  if (element.mark && element.mark.markType && (excludeChannels = BUILT_IN_EXCLUDE_CHANNELS[element.mark.markType])) {\n    excludeChannels.forEach(key => {\n      delete from[key];\n      delete to[key];\n    });\n  }\n\n  Object.keys(to).forEach(key => {\n    if (isEmptyByKey(key, from, to)) {\n      delete from[key];\n      delete to[key];\n    }\n  });\n\n  const final = element.getFinalGraphicAttributes();\n\n  Object.keys(from).forEach(key => {\n    if (isNil(to[key])) {\n      if (isNil(final[key]) || isEqual(from[key], final[key])) {\n        delete from[key];\n      } else {\n        to[key] = final[key];\n      }\n    }\n  });\n\n  return { from, to };\n};\n"]}
+{"version":3,"sources":["../src/graph/animation/animation/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAQzD,MAAM,yBAAyB,GAAG;IAChC,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAA4B,CAC7C,OAAiB,EACjB,OAAgC,EAChC,mBAAyC,EACzC,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAAC;IACjE,IAAI,OAAO,EAAE;QACX,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IACD,IAAI,eAAyB,CAAC;IAC9B,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,GAAG,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE;QACjH,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC5B,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAElD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC9B,IAAI,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAClB,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;gBACvD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;iBAAM;gBACL,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;aACtB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC,CAAC","file":"update.js","sourcesContent":["import { array, isNil, isEqual } from '@visactor/vutils';\nimport type { IElement } from '../../../types';\nimport type { IAnimationParameters, TypeAnimation } from '../../../types/animate';\n\nexport interface IUpdateAnimationOptions {\n  excludeChannels: string[];\n}\n\nconst BUILT_IN_EXCLUDE_CHANNELS = {\n  symbol: ['_mo_hide_', 'visible']\n};\n\nexport const update: TypeAnimation<IElement> = (\n  element: IElement,\n  options: IUpdateAnimationOptions,\n  animationParameters: IAnimationParameters\n) => {\n  const from = Object.assign({}, element.getPrevGraphicAttributes());\n  const to = Object.assign({}, element.getNextGraphicAttributes());\n  if (options) {\n    array(options.excludeChannels).forEach(key => {\n      delete from[key];\n      delete to[key];\n    });\n  }\n  let excludeChannels: string[];\n  if (element.mark && element.mark.markType && (excludeChannels = BUILT_IN_EXCLUDE_CHANNELS[element.mark.markType])) {\n    excludeChannels.forEach(key => {\n      delete from[key];\n      delete to[key];\n    });\n  }\n\n  Object.keys(to).forEach(key => {\n    if (isEqual(from[key], to[key])) {\n      delete from[key];\n      delete to[key];\n    }\n  });\n\n  const final = element.getFinalGraphicAttributes();\n\n  Object.keys(from).forEach(key => {\n    if (isNil(to[key])) {\n      if (isNil(final[key]) || isEqual(from[key], final[key])) {\n        delete from[key];\n      } else {\n        to[key] = final[key];\n      }\n    }\n  });\n\n  return { from, to };\n};\n"]}

package/es/graph/animation/animator.js

@@ -8,7 +8,7 @@ Animate.mode |= AnimateMode.SET_ATTR_IMMEDIATELY;
 
 let GlobalAnimatorId = 0;
 
-const isCustomAnimateCtor = custom => !isNil(custom) && !isNil(custom.prototype) && (custom.prototype instanceof ACustomAnimate || "onBind" in custom.prototype && "onStart" in custom.prototype && "onEnd" in custom.prototype && "onUpdate" in custom.prototype);
+const isCustomAnimateCtor = custom => !isNil(custom) && (custom.prototype instanceof ACustomAnimate || "onBind" in custom.prototype && "onStart" in custom.prototype && "onEnd" in custom.prototype && "onUpdate" in custom.prototype);
 
 export class Animator {
     constructor(element, unit, animationOptions) {

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  if (isNil(custom) || isNil(custom.prototype)) {\n    return false;\n  }\n  return (\n    custom.prototype instanceof ACustomAnimate ||\n    // similar to ACustomAnimate, apply for different vrender version\n    ('onBind' in custom.prototype &&\n      'onStart' in custom.prototype &&\n      'onEnd' in custom.prototype &&\n      'onUpdate' in custom.prototype)\n  );\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              : effect.channel\n              ? channelAnimationAttributes(this.element, effect, animationParameters, parameters)\n              : undefined) ?? {};\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"]}
+{"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  if (isNil(custom)) {\n    return false;\n  }\n  return (\n    custom.prototype instanceof ACustomAnimate ||\n    // similar to ACustomAnimate, apply for different vrender version\n    ('onBind' in custom.prototype &&\n      'onStart' in custom.prototype &&\n      'onEnd' in custom.prototype &&\n      'onUpdate' in custom.prototype)\n  );\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              : effect.channel\n              ? channelAnimationAttributes(this.element, effect, animationParameters, parameters)\n              : undefined) ?? {};\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/graph/animation/morph.d.ts

@@ -1,12 +1,2 @@
-import type { IGrammarBase, IMark, IRunningConfig } from '../../types';
-import type { DiffResult } from '../../types/base';
-import type { IMorph } from '../../types/morph';
-export declare class Morph implements IMorph {
-    diffGrammar<U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]): DiffResult<U, U>;
-    diffMark(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig): DiffResult<IMark[], IMark[]>;
-    private _appendMorphKeyToElements;
-    morph(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig): void;
-    private diffUpdateByGroup;
-    private doMorph;
-    private divideElements;
-}
+import type { IMark, IRunningConfig } from '../../types';
+export declare const morph: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => void;

package/es/graph/animation/morph.js

@@ -4,168 +4,81 @@ import { isNil, isNumber, isValidNumber } from "@visactor/vutils";
 
 import { invokeFunctionType, parseField } from "../../parse/util";
 
-import { diffMultiple, diffSingle, groupData } from "../mark/differ";
+import { diffMultiple } from "../mark/differ";
 
-import { GrammarMarkType } from "../enums";
-
-const EmptyKey = Symbol.for("key");
-
-export class Morph {
-    diffGrammar(prevGrammars, nextGrammars) {
-        return diffSingle(prevGrammars, nextGrammars, (grammar => {
-            var _a;
-            return null !== (_a = grammar.id()) && void 0 !== _a ? _a : Symbol();
-        }));
-    }
-    diffMark(prevMarks, nextMarks, runningConfig) {
-        const diffResult = {
-            enter: [],
-            exit: [],
-            update: []
-        };
-        let prevDiffMarks = [], nextDiffMarks = [];
-        prevMarks.forEach((mark => {
-            mark.markType !== GrammarMarkType.group && (runningConfig.morph && mark.getMorphConfig().morph || runningConfig.morphAll || runningConfig.reuse) ? prevDiffMarks.push(mark) : diffResult.exit.push({
-                prev: [ mark ]
-            });
-        })), nextMarks.forEach((mark => {
-            mark.markType !== GrammarMarkType.group && (runningConfig.morph && mark.getMorphConfig().morph || runningConfig.morphAll || runningConfig.reuse) ? nextDiffMarks.push(mark) : diffResult.enter.push({
-                next: [ mark ]
-            });
-        }));
-        const keyDiffResult = this.diffUpdateByGroup(prevDiffMarks, nextDiffMarks, (mark => mark.getMorphConfig().morphKey), (mark => mark.getMorphConfig().morphKey));
-        prevDiffMarks = keyDiffResult.prev, nextDiffMarks = keyDiffResult.next, diffResult.update = diffResult.update.concat(keyDiffResult.update);
-        const nameDiffResult = this.diffUpdateByGroup(prevDiffMarks, nextDiffMarks, (mark => mark.id()), (mark => mark.id()));
-        prevDiffMarks = nameDiffResult.prev, nextDiffMarks = nameDiffResult.next, diffResult.update = diffResult.update.concat(nameDiffResult.update);
-        const prevParentGroup = groupData(prevDiffMarks, (mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.group) || void 0 === _a ? void 0 : _a.id) || void 0 === _b ? void 0 : _b.call(_a);
-        })), nextParentGroup = groupData(nextDiffMarks, (mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.group) || void 0 === _a ? void 0 : _a.id) || void 0 === _b ? void 0 : _b.call(_a);
+const doMorph = (prev, next, runningConfig, onEnd, parameters) => {
+    var _a, _b;
+    const morphData = {
+        prev: prev.map((element => element.getDatum())),
+        next: next.map((element => element.getDatum()))
+    }, morphElements = {
+        prev: prev.slice(),
+        next: next.slice()
+    }, easing = runningConfig.animation.easing, delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements), duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = isValidNumber(oneByOne) && oneByOne > 0 ? index => isNumber(oneByOne) ? index * oneByOne : !0 === oneByOne ? index * duration : 0 : void 0;
+    1 !== prev.length && 0 !== prev.length || 1 !== next.length ? 1 === prev.length && next.length > 1 ? oneToMultiMorph(prev[0].getGraphicItem(), next.map((element => element.getGraphicItem())), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd,
+        individualDelay: individualDelay,
+        splitPath: splitPath
+    }) : prev.length > 1 && 1 === next.length && multiToOneMorph(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd,
+        individualDelay: individualDelay,
+        splitPath: splitPath
+    }) : morphPath(null === (_b = null === (_a = prev[0]) || void 0 === _a ? void 0 : _a.getGraphicItem) || void 0 === _b ? void 0 : _b.call(_a), next[0].getGraphicItem(), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd
+    });
+}, divideElements = (elements, count) => {
+    const divideLength = Math.floor(elements.length / count);
+    return new Array(count).fill(0).map(((i, index) => elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1))));
+}, appendMorphKeyToElements = mark => {
+    const config = mark.getMorphConfig();
+    if (!isNil(config.morphElementKey)) {
+        const getter = parseField(config.morphElementKey);
+        mark.elements && mark.elements.forEach((el => {
+            el.morphKey = getter(el.getDatum());
         }));
-        return Object.keys(nextParentGroup).forEach((groupName => {
-            const prevChildren = prevParentGroup.data.get(groupName), nextChildren = nextParentGroup.data.get(groupName);
-            if (prevChildren && nextChildren) {
-                for (let i = 0; i < Math.max(prevChildren.length, nextChildren.length); i += 1) {
-                    const prevChild = prevChildren[i], nextChild = nextChildren[i];
-                    prevChild && nextChild ? diffResult.update.push({
-                        prev: [ prevChild ],
-                        next: [ nextChild ]
-                    }) : prevChild ? diffResult.exit.push({
-                        prev: [ prevChild ]
-                    }) : nextChild && diffResult.enter.push({
-                        next: [ nextChild ]
-                    });
-                }
-                prevDiffMarks = prevDiffMarks.filter((mark => !prevChildren.includes(mark))), nextDiffMarks = nextDiffMarks.filter((mark => !nextChildren.includes(mark)));
-            }
-        })), prevDiffMarks.forEach((mark => diffResult.exit.push({
-            prev: [ mark ]
-        }))), nextDiffMarks.forEach((mark => diffResult.enter.push({
-            next: [ mark ]
-        }))), diffResult;
-    }
-    _appendMorphKeyToElements(mark) {
-        const config = mark.getMorphConfig();
-        if (!isNil(config.morphElementKey)) {
-            const getter = parseField(config.morphElementKey);
-            mark.elements && mark.elements.forEach((el => {
-                el.morphKey = getter(el.getDatum());
-            }));
-        }
     }
-    morph(prevMarks, nextMarks, runningConfig) {
-        const prevElements = prevMarks.reduce(((elements, mark) => (this._appendMorphKeyToElements(mark), 
-        elements.concat(mark.elements))), []), nextElements = nextMarks.reduce(((elements, mark) => (this._appendMorphKeyToElements(mark), 
-        elements.concat(mark.elements))), []), diffResult = diffMultiple(prevElements, nextElements, (element => {
-            var _a;
-            return null !== (_a = element.morphKey) && void 0 !== _a ? _a : element.key;
-        }));
-        prevMarks.forEach((mark => {
-            var _a, _b;
-            return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
-        })), nextMarks.forEach((mark => {
+};
+
+export const morph = (prevMarks, nextMarks, runningConfig) => {
+    const prevElements = prevMarks.reduce(((elements, mark) => (appendMorphKeyToElements(mark), 
+    elements.concat(mark.elements))), []), nextElements = nextMarks.reduce(((elements, mark) => (appendMorphKeyToElements(mark), 
+    elements.concat(mark.elements))), []), diffResult = diffMultiple(prevElements, nextElements, (element => {
+        var _a;
+        return null !== (_a = element.morphKey) && void 0 !== _a ? _a : element.key;
+    }));
+    prevMarks.forEach((mark => {
+        var _a, _b;
+        return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
+    })), nextMarks.forEach((mark => {
+        var _a, _b;
+        return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
+    }));
+    const parameters = prevMarks.concat(nextMarks).reduce(((parameters, mark) => (Object.assign(parameters, mark.parameters()), 
+    parameters)), {});
+    let morphCount = 0;
+    const onMorphEnd = () => {
+        morphCount -= 1, 0 === morphCount && nextMarks.forEach((mark => {
             var _a, _b;
-            return null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.disable) || void 0 === _b ? void 0 : _b.call(_a);
-        }));
-        const parameters = prevMarks.concat(nextMarks).reduce(((parameters, mark) => (Object.assign(parameters, mark.parameters()), 
-        parameters)), {});
-        let morphCount = 0;
-        const onMorphEnd = () => {
-            morphCount -= 1, 0 === morphCount && nextMarks.forEach((mark => {
-                var _a, _b;
-                null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
-            }));
-        };
-        diffResult.enter.forEach((diff => {
-            diff.next.forEach((element => {
-                this.doMorph([], [ element ], runningConfig, onMorphEnd, parameters);
-            })), morphCount += 1;
-        })), diffResult.update.forEach((diff => {
-            const divideCount = Math.min(diff.prev.length, diff.next.length), prevDivide = this.divideElements(diff.prev, divideCount), nextDivide = this.divideElements(diff.next, divideCount);
-            for (let i = 0; i < divideCount; i++) this.doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters), 
-            morphCount += 1;
-        }));
-    }
-    diffUpdateByGroup(prev, next, prevKey, nextKey) {
-        const prevGroup = groupData(prev, (datum => {
-            var _a;
-            return null !== (_a = prevKey(datum)) && void 0 !== _a ? _a : EmptyKey;
-        })), nextGroup = groupData(next, (datum => {
-            var _a;
-            return null !== (_a = nextKey(datum)) && void 0 !== _a ? _a : EmptyKey;
+            null === (_b = null === (_a = mark.animate) || void 0 === _a ? void 0 : _a.enable) || void 0 === _b || _b.call(_a);
         }));
-        let prevAfterDiff = prev, nextAfterDiff = next;
-        const update = [];
-        return nextGroup.keys.forEach((key => {
-            if (key !== EmptyKey) {
-                const prevKeyData = prevGroup.data.get(key), nextKeyData = nextGroup.data.get(key);
-                prevKeyData && nextKeyData && (update.push({
-                    prev: prevKeyData,
-                    next: nextKeyData
-                }), prevAfterDiff = prevAfterDiff.filter((datum => !prevKeyData.includes(datum))), 
-                nextAfterDiff = nextAfterDiff.filter((datum => !nextKeyData.includes(datum))));
-            }
-        })), {
-            prev: prevAfterDiff,
-            next: nextAfterDiff,
-            update: update
-        };
-    }
-    doMorph(prev, next, runningConfig, onEnd, parameters) {
-        var _a, _b;
-        const morphData = {
-            prev: prev.map((element => element.getDatum())),
-            next: next.map((element => element.getDatum()))
-        }, morphElements = {
-            prev: prev.slice(),
-            next: next.slice()
-        }, easing = runningConfig.animation.easing, delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements), duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = isValidNumber(oneByOne) && oneByOne > 0 ? index => isNumber(oneByOne) ? index * oneByOne : !0 === oneByOne ? index * duration : 0 : void 0;
-        1 !== prev.length && 0 !== prev.length || 1 !== next.length ? 1 === prev.length && next.length > 1 ? oneToMultiMorph(prev[0].getGraphicItem(), next.map((element => element.getGraphicItem())), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd,
-            individualDelay: individualDelay,
-            splitPath: splitPath
-        }) : prev.length > 1 && 1 === next.length && multiToOneMorph(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd,
-            individualDelay: individualDelay,
-            splitPath: splitPath
-        }) : morphPath(null === (_b = null === (_a = prev[0]) || void 0 === _a ? void 0 : _a.getGraphicItem) || void 0 === _b ? void 0 : _b.call(_a), next[0].getGraphicItem(), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd
-        });
-    }
-    divideElements(elements, count) {
-        const divideLength = Math.floor(elements.length / count);
-        return new Array(count).fill(0).map(((i, index) => elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1))));
-    }
-}
+    };
+    diffResult.enter.forEach((diff => {
+        diff.next.forEach((element => {
+            doMorph([], [ element ], runningConfig, onMorphEnd, parameters);
+        })), morphCount += 1;
+    })), diffResult.update.forEach((diff => {
+        const divideCount = Math.min(diff.prev.length, diff.next.length), prevDivide = divideElements(diff.prev, divideCount), nextDivide = divideElements(diff.next, divideCount);
+        for (let i = 0; i < divideCount; i++) doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters), 
+        morphCount += 1;
+    }));
+};
 //# sourceMappingURL=morph.js.map