@visactor/vgrammar-core 0.14.0-alpha.2 → 0.14.0-alpha.4

package/cjs/glyph/wave.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerWaveGlyph = void 0;
 
-const factory_1 = require("../core/factory"), graphic_1 = require("../graph/mark/graphic"), registerWaveGlyph = () => {
+const factory_1 = require("../core/factory"), graphic_1 = require("../graph/mark/graphic"), glyph_1 = require("../view/glyph"), registerWaveGlyph = () => {
     factory_1.Factory.registerGlyph("wave", {
         wave0: "area",
         wave1: "area",
@@ -60,7 +60,8 @@ const factory_1 = require("../core/factory"), graphic_1 = require("../graph/mark
             curveType: "monotoneX",
             fillOpacity: .33
         }
-    }))), (0, graphic_1.registerGlyphGraphic)(), (0, graphic_1.registerAreaGraphic)();
+    }))), (0, glyph_1.registerGlyphMark)(), (0, graphic_1.registerGlyphGraphic)(), (0, 
+    graphic_1.registerAreaGraphic)();
 };
 
 exports.registerWaveGlyph = registerWaveGlyph;

package/cjs/glyph/wave.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/glyph/wave.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,mDAAkF;AAE3E,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,aAAa,CAAkB,MAAM,EAAE;QAC7C,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;KACd,CAAC;SACC,sBAAsB,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACrF,MAAM,YAAY,GAAiB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACxE,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,OAAO,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,GAAG,UAAU,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;QAC5G,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,OAAO;YACL,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;YACtC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;YACtC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;SACvC,CAAC;IACJ,CAAC,CAAC;SACD,sBAAsB,CAAC,GAAG,EAAE;QAC3B,OAAO;YACL,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,EAAE;YACjD,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE;YACpD,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,6BAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAnCW,QAAA,iBAAiB,qBAmC5B","file":"wave.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport type { WaveEncoderSpec } from '../types';\nimport { registerAreaGraphic, registerGlyphGraphic } from '../graph/mark/graphic';\n\nexport const registerWaveGlyph = () => {\n  Factory.registerGlyph<WaveEncoderSpec>('wave', {\n    wave0: 'area',\n    wave1: 'area',\n    wave2: 'area'\n  })\n    .registerChannelEncoder('wave', (channel, encodeValue, encodeValues, datum, element) => {\n      const originPoints: IPointLike[] = new Array(21).fill(0).map((v, index) => {\n        const waveHeight = index % 2 === 0 ? 20 : 0;\n        return { x: -500 + 50 * index, y: encodeValues.y + waveHeight, y1: encodeValues.y + encodeValues.height };\n      });\n      const points0 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 100, y: point.y, y1: point.y1 };\n      });\n      const points1 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 200 - 40, y: point.y, y1: point.y1 };\n      });\n      const points2 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 300 - 20, y: point.y, y1: point.y1 };\n      });\n      return {\n        wave0: { points: points0, x: 0, y: 0 },\n        wave1: { points: points1, x: 0, y: 0 },\n        wave2: { points: points2, x: 0, y: 0 }\n      };\n    })\n    .registerDefaultEncoder(() => {\n      return {\n        wave0: { curveType: 'monotoneX', fillOpacity: 1 },\n        wave1: { curveType: 'monotoneX', fillOpacity: 0.66 },\n        wave2: { curveType: 'monotoneX', fillOpacity: 0.33 }\n      };\n    });\n  registerGlyphGraphic();\n  registerAreaGraphic();\n};\n"]}
+{"version":3,"sources":["../src/glyph/wave.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,mDAAkF;AAClF,yCAAkD;AAE3C,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,aAAa,CAAkB,MAAM,EAAE;QAC7C,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;KACd,CAAC;SACC,sBAAsB,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACrF,MAAM,YAAY,GAAiB,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACxE,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,OAAO,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,GAAG,UAAU,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;QAC5G,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC3E,CAAC,CAAC,CAAC;QACH,OAAO;YACL,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;YACtC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;YACtC,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;SACvC,CAAC;IACJ,CAAC,CAAC;SACD,sBAAsB,CAAC,GAAG,EAAE;QAC3B,OAAO;YACL,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,EAAE;YACjD,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE;YACpD,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IACL,IAAA,yBAAiB,GAAE,CAAC;IACpB,IAAA,8BAAoB,GAAE,CAAC;IACvB,IAAA,6BAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AApCW,QAAA,iBAAiB,qBAoC5B","file":"wave.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport { Factory } from '../core/factory';\nimport type { WaveEncoderSpec } from '../types';\nimport { registerAreaGraphic, registerGlyphGraphic } from '../graph/mark/graphic';\nimport { registerGlyphMark } from '../view/glyph';\n\nexport const registerWaveGlyph = () => {\n  Factory.registerGlyph<WaveEncoderSpec>('wave', {\n    wave0: 'area',\n    wave1: 'area',\n    wave2: 'area'\n  })\n    .registerChannelEncoder('wave', (channel, encodeValue, encodeValues, datum, element) => {\n      const originPoints: IPointLike[] = new Array(21).fill(0).map((v, index) => {\n        const waveHeight = index % 2 === 0 ? 20 : 0;\n        return { x: -500 + 50 * index, y: encodeValues.y + waveHeight, y1: encodeValues.y + encodeValues.height };\n      });\n      const points0 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 100, y: point.y, y1: point.y1 };\n      });\n      const points1 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 200 - 40, y: point.y, y1: point.y1 };\n      });\n      const points2 = originPoints.map(point => {\n        return { x: point.x + encodeValue * 300 - 20, y: point.y, y1: point.y1 };\n      });\n      return {\n        wave0: { points: points0, x: 0, y: 0 },\n        wave1: { points: points1, x: 0, y: 0 },\n        wave2: { points: points2, x: 0, y: 0 }\n      };\n    })\n    .registerDefaultEncoder(() => {\n      return {\n        wave0: { curveType: 'monotoneX', fillOpacity: 1 },\n        wave1: { curveType: 'monotoneX', fillOpacity: 0.66 },\n        wave2: { curveType: 'monotoneX', fillOpacity: 0.33 }\n      };\n    });\n  registerGlyphMark();\n  registerGlyphGraphic();\n  registerAreaGraphic();\n};\n"]}

package/cjs/graph/animation/animation/update.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.update = void 0;
 
-const vutils_1 = require("@visactor/vutils"), vgrammar_util_1 = require("@visactor/vgrammar-util"), BUILT_IN_EXCLUDE_CHANNELS = {
+const vutils_1 = require("@visactor/vutils"), BUILT_IN_EXCLUDE_CHANNELS = {
     symbol: [ "_mo_hide_", "visible" ]
 }, update = (element, options, animationParameters) => {
     const from = Object.assign({}, element.getPrevGraphicAttributes()), to = Object.assign({}, element.getNextGraphicAttributes());
@@ -14,7 +14,7 @@ const vutils_1 = require("@visactor/vutils"), vgrammar_util_1 = require("@visact
     })), 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 => {
-        (0, vgrammar_util_1.isEqual)(key, from, to) && (delete from[key], delete to[key]);
+        (0, vutils_1.isEqual)(from[key], to[key]) && (delete from[key], delete to[key]);
     }));
     const final = element.getFinalGraphicAttributes();
     return Object.keys(from).forEach((key => {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/animation/update.ts"],"names":[],"mappings":";;;AAAA,6CAAyD;AACzD,2DAAkE;AAQlE,MAAM,yBAAyB,GAAG;IAChC,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEK,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,IAAA,cAAK,EAAC,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,IAAA,uBAAY,EAAC,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,IAAA,cAAK,EAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAClB,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,IAAA,gBAAO,EAAC,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;AAzCW,QAAA,MAAM,UAyCjB","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,6CAAyD;AAQzD,MAAM,yBAAyB,GAAG;IAChC,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;CACjC,CAAC;AAEK,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,IAAA,cAAK,EAAC,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,IAAA,gBAAO,EAAC,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,IAAA,cAAK,EAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE;YAClB,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,IAAA,gBAAO,EAAC,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;AAzCW,QAAA,MAAM,UAyCjB","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/cjs/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/cjs/graph/animation/morph.js

@@ -2,173 +2,86 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Morph = void 0;
+}), exports.morph = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), util_1 = require("../../parse/util"), differ_1 = require("../mark/differ"), enums_1 = require("../enums"), EmptyKey = Symbol.for("key");
-
-class Morph {
-    diffGrammar(prevGrammars, nextGrammars) {
-        return (0, differ_1.diffSingle)(prevGrammars, nextGrammars, (grammar => {
-            var _a;
-            return null !== (_a = grammar.id()) && void 0 !== _a ? _a : Symbol();
+const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), util_1 = require("../../parse/util"), differ_1 = require("../mark/differ"), 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 = (0, util_1.invokeFunctionType)(runningConfig.animation.delay, parameters, morphData, morphElements), duration = (0, 
+    util_1.invokeFunctionType)(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = (0, 
+    util_1.invokeFunctionType)(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = (0, 
+    util_1.invokeFunctionType)(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = (0, 
+    vutils_1.isValidNumber)(oneByOne) && oneByOne > 0 ? index => (0, vutils_1.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 ? (0, 
+    vrender_core_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 && (0, vrender_core_1.multiToOneMorph)(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
+        delay: delay,
+        duration: duration,
+        easing: easing,
+        onEnd: onEnd,
+        individualDelay: individualDelay,
+        splitPath: splitPath
+    }) : (0, vrender_core_1.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 (!(0, vutils_1.isNil)(config.morphElementKey)) {
+        const getter = (0, util_1.parseField)(config.morphElementKey);
+        mark.elements && mark.elements.forEach((el => {
+            el.morphKey = getter(el.getDatum());
         }));
     }
-    diffMark(prevMarks, nextMarks, runningConfig) {
-        const diffResult = {
-            enter: [],
-            exit: [],
-            update: []
-        };
-        let prevDiffMarks = [], nextDiffMarks = [];
-        prevMarks.forEach((mark => {
-            mark.markType !== enums_1.GrammarMarkType.group && (runningConfig.morph && mark.getMorphConfig().morph || runningConfig.morphAll || runningConfig.reuse) ? prevDiffMarks.push(mark) : diffResult.exit.push({
-                prev: [ mark ]
-            });
-        })), nextMarks.forEach((mark => {
-            mark.markType !== enums_1.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 = (0, differ_1.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 = (0, differ_1.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);
-        }));
-        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 (!(0, vutils_1.isNil)(config.morphElementKey)) {
-            const getter = (0, util_1.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 = (0, differ_1.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 => {
+}, 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 = (0, differ_1.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 = (0, differ_1.groupData)(prev, (datum => {
-            var _a;
-            return null !== (_a = prevKey(datum)) && void 0 !== _a ? _a : EmptyKey;
-        })), nextGroup = (0, differ_1.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 = (0, util_1.invokeFunctionType)(runningConfig.animation.delay, parameters, morphData, morphElements), duration = (0, 
-        util_1.invokeFunctionType)(runningConfig.animation.duration, parameters, morphData, morphElements), oneByOne = (0, 
-        util_1.invokeFunctionType)(runningConfig.animation.oneByOne, parameters, morphData, morphElements), splitPath = (0, 
-        util_1.invokeFunctionType)(runningConfig.animation.splitPath, parameters, morphData, morphElements), individualDelay = (0, 
-        vutils_1.isValidNumber)(oneByOne) && oneByOne > 0 ? index => (0, vutils_1.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 ? (0, 
-        vrender_core_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 && (0, vrender_core_1.multiToOneMorph)(prev.map((element => element.getGraphicItem())), next[0].getGraphicItem(), {
-            delay: delay,
-            duration: duration,
-            easing: easing,
-            onEnd: onEnd,
-            individualDelay: individualDelay,
-            splitPath: splitPath
-        }) : (0, vrender_core_1.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;
+    }));
+};
 
-exports.Morph = Morph;
+exports.morph = morph;
 //# sourceMappingURL=morph.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/morph.ts"],"names":[],"mappings":"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","file":"morph.js","sourcesContent":["import { morphPath, multiToOneMorph, oneToMultiMorph } from '@visactor/vrender-core';\nimport { isNil, isNumber, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IGrammarBase, IMark, IRunningConfig, MarkSpec } from '../../types';\nimport type { DiffResult } from '../../types/base';\nimport type { IMorph, MorphData, MorphElements } from '../../types/morph';\nimport { invokeFunctionType, parseField } from '../../parse/util';\nimport { diffMultiple, diffSingle, groupData } from '../mark/differ';\nimport { GrammarMarkType } from '../enums';\n\nconst EmptyKey = Symbol.for('key');\n\nexport class Morph implements IMorph {\n  diffGrammar<U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]): DiffResult<U, U> {\n    const key = (grammar: U) => grammar.id() ?? Symbol();\n    return diffSingle(prevGrammars, nextGrammars, key);\n  }\n\n  diffMark(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig): DiffResult<IMark[], IMark[]> {\n    const diffResult: DiffResult<IMark[], IMark[]> = {\n      enter: [],\n      exit: [],\n      update: []\n    };\n\n    let prevDiffMarks: IMark[] = [];\n    let nextDiffMarks: IMark[] = [];\n\n    // filter out marks & specs which will not morph\n    prevMarks.forEach(mark => {\n      if (\n        // group mark does not support reusing or morphing\n        mark.markType !== GrammarMarkType.group &&\n        ((runningConfig.morph && mark.getMorphConfig().morph) || runningConfig.morphAll || runningConfig.reuse)\n      ) {\n        prevDiffMarks.push(mark);\n      } else {\n        diffResult.exit.push({ prev: [mark] });\n      }\n    });\n    nextMarks.forEach(mark => {\n      if (\n        mark.markType !== GrammarMarkType.group &&\n        ((runningConfig.morph && mark.getMorphConfig().morph) || runningConfig.morphAll || runningConfig.reuse)\n      ) {\n        nextDiffMarks.push(mark);\n      } else {\n        diffResult.enter.push({ next: [mark] });\n      }\n    });\n\n    // 1. match by custom key\n    const keyDiffResult = this.diffUpdateByGroup(\n      prevDiffMarks,\n      nextDiffMarks,\n      mark => mark.getMorphConfig().morphKey,\n      mark => mark.getMorphConfig().morphKey\n    );\n    prevDiffMarks = keyDiffResult.prev;\n    nextDiffMarks = keyDiffResult.next;\n    diffResult.update = diffResult.update.concat(keyDiffResult.update);\n\n    // 2. match by name\n    const nameDiffResult = this.diffUpdateByGroup(\n      prevDiffMarks,\n      nextDiffMarks,\n      mark => mark.id(),\n      mark => mark.id()\n    );\n    prevDiffMarks = nameDiffResult.prev;\n    nextDiffMarks = nameDiffResult.next;\n    diffResult.update = diffResult.update.concat(nameDiffResult.update);\n\n    // 3. match by index\n\n    // FIXME: mark index cannot be get before executing, index is decided by remove/order for now\n    const prevParentGroup = groupData(prevDiffMarks, mark => mark.group?.id?.());\n    const nextParentGroup = groupData(nextDiffMarks, mark => mark.group?.id?.());\n\n    Object.keys(nextParentGroup).forEach(groupName => {\n      const prevChildren = prevParentGroup.data.get(groupName);\n      const nextChildren = nextParentGroup.data.get(groupName);\n      if (prevChildren && nextChildren) {\n        for (let i = 0; i < Math.max(prevChildren.length, nextChildren.length); i += 1) {\n          const prevChild = prevChildren[i];\n          const nextChild = nextChildren[i];\n          if (prevChild && nextChild) {\n            diffResult.update.push({ prev: [prevChild], next: [nextChild] });\n          } else if (prevChild) {\n            diffResult.exit.push({ prev: [prevChild] });\n          } else if (nextChild) {\n            diffResult.enter.push({ next: [nextChild] });\n          }\n        }\n\n        prevDiffMarks = prevDiffMarks.filter(mark => !prevChildren.includes(mark));\n        nextDiffMarks = nextDiffMarks.filter(mark => !nextChildren.includes(mark));\n      }\n    });\n\n    // 4. handle unmatched marks\n    prevDiffMarks.forEach(mark => diffResult.exit.push({ prev: [mark] }));\n    nextDiffMarks.forEach(mark => diffResult.enter.push({ next: [mark] }));\n\n    return diffResult;\n  }\n\n  private _appendMorphKeyToElements(mark: IMark) {\n    const config = mark.getMorphConfig();\n\n    if (!isNil(config.morphElementKey)) {\n      const getter = parseField(config.morphElementKey);\n\n      if (mark.elements) {\n        mark.elements.forEach(el => {\n          (el as any).morphKey = getter(el.getDatum());\n        });\n      }\n    }\n  }\n\n  morph(prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) {\n    const prevElements = prevMarks.reduce((elements, mark) => {\n      this._appendMorphKeyToElements(mark);\n\n      return elements.concat(mark.elements);\n    }, [] as IElement[]);\n    const nextElements = nextMarks.reduce((elements, mark) => {\n      this._appendMorphKeyToElements(mark);\n\n      return elements.concat(mark.elements);\n    }, [] as IElement[]);\n\n    const key = (element: IElement) => (element as any).morphKey ?? element.key;\n    const diffResult = diffMultiple(prevElements, nextElements, key);\n\n    // disable normal animations of previous marks\n    prevMarks.forEach(mark => mark.animate?.disable?.());\n    nextMarks.forEach(mark => mark.animate?.disable?.());\n\n    const parameters = prevMarks.concat(nextMarks).reduce((parameters, mark) => {\n      Object.assign(parameters, mark.parameters());\n      return parameters;\n    }, {});\n\n    let morphCount = 0;\n    const onMorphEnd = () => {\n      morphCount -= 1;\n      if (morphCount === 0) {\n        nextMarks.forEach(mark => {\n          mark.animate?.enable?.();\n        });\n      }\n    };\n    // no animation for exit result\n    diffResult.enter.forEach(diff => {\n      diff.next.forEach(element => {\n        this.doMorph([], [element], runningConfig, onMorphEnd, parameters);\n      });\n      morphCount += 1;\n    });\n    diffResult.update.forEach(diff => {\n      const divideCount = Math.min(diff.prev.length, diff.next.length);\n      const prevDivide = this.divideElements(diff.prev, divideCount);\n      const nextDivide = this.divideElements(diff.next, divideCount);\n      for (let i = 0; i < divideCount; i++) {\n        this.doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters);\n        morphCount += 1;\n      }\n    });\n  }\n\n  private diffUpdateByGroup<U extends IMark | MarkSpec, V extends IMark | MarkSpec>(\n    prev: U[],\n    next: V[],\n    prevKey: (datum: U) => symbol | string,\n    nextKey: (datum: V) => symbol | string\n  ) {\n    const prevGroup = groupData(prev, datum => prevKey(datum) ?? EmptyKey);\n    const nextGroup = groupData(next, datum => nextKey(datum) ?? EmptyKey);\n\n    let prevAfterDiff = prev;\n    let nextAfterDiff = next;\n    const update: { prev: U[]; next: V[] }[] = [];\n    nextGroup.keys.forEach(key => {\n      if (key !== EmptyKey) {\n        const prevKeyData = prevGroup.data.get(key);\n        const nextKeyData = nextGroup.data.get(key);\n        if (prevKeyData && nextKeyData) {\n          update.push({ prev: prevKeyData, next: nextKeyData });\n          prevAfterDiff = prevAfterDiff.filter(datum => !prevKeyData.includes(datum));\n          nextAfterDiff = nextAfterDiff.filter(datum => !nextKeyData.includes(datum));\n        }\n      }\n    });\n    return {\n      prev: prevAfterDiff,\n      next: nextAfterDiff,\n      update\n    };\n  }\n\n  private doMorph(\n    prev: IElement[],\n    next: IElement[],\n    runningConfig: IRunningConfig,\n    onEnd: () => void,\n    parameters: any\n  ) {\n    const morphData: MorphData = {\n      prev: prev.map(element => element.getDatum()),\n      next: next.map(element => element.getDatum())\n    };\n    const morphElements: MorphElements = {\n      prev: prev.slice(),\n      next: next.slice()\n    };\n    const easing = runningConfig.animation.easing;\n    const delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements);\n    const duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements);\n    const oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements);\n    const splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements);\n    const individualDelay =\n      isValidNumber(oneByOne) && oneByOne > 0\n        ? (index: number) => {\n            if (isNumber(oneByOne)) {\n              return index * oneByOne;\n            } else if (oneByOne === true) {\n              return index * duration;\n            }\n            return 0;\n          }\n        : undefined;\n\n    // if no previous item, still execute morph animation\n    if ((prev.length === 1 || prev.length === 0) && next.length === 1) {\n      morphPath(prev[0]?.getGraphicItem?.(), next[0].getGraphicItem(), { delay, duration, easing, onEnd });\n    } else if (prev.length === 1 && next.length > 1) {\n      oneToMultiMorph(\n        prev[0].getGraphicItem(),\n        next.map(element => element.getGraphicItem()),\n        { delay, duration, easing, onEnd, individualDelay, splitPath }\n      );\n    } else if (prev.length > 1 && next.length === 1) {\n      multiToOneMorph(\n        prev.map(element => element.getGraphicItem()),\n        next[0].getGraphicItem(),\n        { delay, duration, easing, onEnd, individualDelay, splitPath }\n      );\n    }\n  }\n\n  private divideElements(elements: IElement[], count: number) {\n    const divideLength = Math.floor(elements.length / count);\n    return new Array(count).fill(0).map((i, index) => {\n      return elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1));\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/graph/animation/morph.ts"],"names":[],"mappings":"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","file":"morph.js","sourcesContent":["import { morphPath, multiToOneMorph, oneToMultiMorph } from '@visactor/vrender-core';\nimport { isNil, isNumber, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IMark, IRunningConfig } from '../../types';\nimport type { MorphData, MorphElements } from '../../types/morph';\nimport { invokeFunctionType, parseField } from '../../parse/util';\nimport { diffMultiple } from '../mark/differ';\n\nconst doMorph = (\n  prev: IElement[],\n  next: IElement[],\n  runningConfig: IRunningConfig,\n  onEnd: () => void,\n  parameters: any\n) => {\n  const morphData: MorphData = {\n    prev: prev.map(element => element.getDatum()),\n    next: next.map(element => element.getDatum())\n  };\n  const morphElements: MorphElements = {\n    prev: prev.slice(),\n    next: next.slice()\n  };\n  const easing = runningConfig.animation.easing;\n  const delay = invokeFunctionType(runningConfig.animation.delay, parameters, morphData, morphElements);\n  const duration = invokeFunctionType(runningConfig.animation.duration, parameters, morphData, morphElements);\n  const oneByOne = invokeFunctionType(runningConfig.animation.oneByOne, parameters, morphData, morphElements);\n  const splitPath = invokeFunctionType(runningConfig.animation.splitPath, parameters, morphData, morphElements);\n  const individualDelay =\n    isValidNumber(oneByOne) && (oneByOne as number) > 0\n      ? (index: number) => {\n          if (isNumber(oneByOne)) {\n            return index * (oneByOne as number);\n          } else if (oneByOne === true) {\n            return index * duration;\n          }\n          return 0;\n        }\n      : undefined;\n\n  // if no previous item, still execute morph animation\n  if ((prev.length === 1 || prev.length === 0) && next.length === 1) {\n    morphPath(prev[0]?.getGraphicItem?.(), next[0].getGraphicItem(), { delay, duration, easing, onEnd });\n  } else if (prev.length === 1 && next.length > 1) {\n    oneToMultiMorph(\n      prev[0].getGraphicItem(),\n      next.map(element => element.getGraphicItem()),\n      { delay, duration, easing, onEnd, individualDelay, splitPath }\n    );\n  } else if (prev.length > 1 && next.length === 1) {\n    multiToOneMorph(\n      prev.map(element => element.getGraphicItem()),\n      next[0].getGraphicItem(),\n      { delay, duration, easing, onEnd, individualDelay, splitPath }\n    );\n  }\n};\n\nconst divideElements = (elements: IElement[], count: number) => {\n  const divideLength = Math.floor(elements.length / count);\n  return new Array(count).fill(0).map((i, index) => {\n    return elements.slice(divideLength * index, index === count - 1 ? elements.length : divideLength * (index + 1));\n  });\n};\n\nconst appendMorphKeyToElements = (mark: IMark) => {\n  const config = mark.getMorphConfig();\n\n  if (!isNil(config.morphElementKey)) {\n    const getter = parseField(config.morphElementKey);\n\n    if (mark.elements) {\n      mark.elements.forEach(el => {\n        (el as any).morphKey = getter(el.getDatum());\n      });\n    }\n  }\n};\n\nexport const morph = (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => {\n  const prevElements = prevMarks.reduce((elements, mark) => {\n    appendMorphKeyToElements(mark);\n\n    return elements.concat(mark.elements);\n  }, [] as IElement[]);\n  const nextElements = nextMarks.reduce((elements, mark) => {\n    appendMorphKeyToElements(mark);\n\n    return elements.concat(mark.elements);\n  }, [] as IElement[]);\n\n  const key = (element: IElement) => (element as any).morphKey ?? element.key;\n  const diffResult = diffMultiple(prevElements, nextElements, key);\n\n  // disable normal animations of previous marks\n  prevMarks.forEach(mark => mark.animate?.disable?.());\n  nextMarks.forEach(mark => mark.animate?.disable?.());\n\n  const parameters = prevMarks.concat(nextMarks).reduce((parameters, mark) => {\n    Object.assign(parameters, mark.parameters());\n    return parameters;\n  }, {});\n\n  let morphCount = 0;\n  const onMorphEnd = () => {\n    morphCount -= 1;\n    if (morphCount === 0) {\n      nextMarks.forEach(mark => {\n        mark.animate?.enable?.();\n      });\n    }\n  };\n  // no animation for exit result\n  diffResult.enter.forEach(diff => {\n    diff.next.forEach(element => {\n      doMorph([], [element], runningConfig, onMorphEnd, parameters);\n    });\n    morphCount += 1;\n  });\n  diffResult.update.forEach(diff => {\n    const divideCount = Math.min(diff.prev.length, diff.next.length);\n    const prevDivide = divideElements(diff.prev, divideCount);\n    const nextDivide = divideElements(diff.next, divideCount);\n    for (let i = 0; i < divideCount; i++) {\n      doMorph(prevDivide[i], nextDivide[i], runningConfig, onMorphEnd, parameters);\n      morphCount += 1;\n    }\n  });\n};\n"]}

package/cjs/graph/attributes/line.d.ts

@@ -4,3 +4,4 @@ export declare function getLineSegmentConfigs(items: any[], points: any[], eleme
 export declare function getConnectLineSegmentConfigs(items: any[], points: IPointLike[], element?: IElement): any[];
 export declare function getLinePointsFromSegments(segments: any[]): any;
 export declare function parseCollectionMarkAttributes(itemNextAttrs: any): {};
+export declare function removeSegmentAttrs(itemNextAttrs: any, element?: IElement): any;

package/cjs/graph/attributes/line.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.parseCollectionMarkAttributes = exports.getLinePointsFromSegments = exports.getConnectLineSegmentConfigs = exports.getLineSegmentConfigs = void 0;
+}), exports.removeSegmentAttrs = exports.parseCollectionMarkAttributes = exports.getLinePointsFromSegments = exports.getConnectLineSegmentConfigs = exports.getLineSegmentConfigs = void 0;
 
 const vutils_1 = require("@visactor/vutils"), isStopsEqual = (prev, next) => {
     var _a, _b;
@@ -77,11 +77,23 @@ function getLinePointsFromSegments(segments) {
 
 function parseCollectionMarkAttributes(itemNextAttrs) {
     const result = {};
-    return itemNextAttrs ? (Object.keys(itemNextAttrs).forEach((key => {
-        "x" !== key && "y" !== key && "x1" !== key && "y1" !== key && "defined" !== key && "size" !== key && "width" !== key && "height" !== key && "context" !== key && (result[key] = itemNextAttrs[key]);
-    })), result) : result;
+    if (!itemNextAttrs) return result;
+    const skipKeys = [ "x", "y", "x1", "y1", "defined", "size", "width", "height", "context" ];
+    return Object.keys(itemNextAttrs).forEach((key => {
+        skipKeys.includes(key) || (result[key] = itemNextAttrs[key]);
+    })), result;
+}
+
+function removeSegmentAttrs(itemNextAttrs, element) {
+    var _a;
+    if (!itemNextAttrs || !itemNextAttrs.segments || !itemNextAttrs.segments.length) return itemNextAttrs;
+    const segmentKeys = "area" === (null === (_a = null == element ? void 0 : element.mark) || void 0 === _a ? void 0 : _a.markType) ? [ "fillOpacity", "strokeOpacity" ] : [ "strokeOpacity" ], result = {};
+    return Object.keys(itemNextAttrs).forEach((key => {
+        segmentKeys.includes(key) || (result[key] = itemNextAttrs[key]);
+    })), result;
 }
 
 exports.getLineSegmentConfigs = getLineSegmentConfigs, exports.getConnectLineSegmentConfigs = getConnectLineSegmentConfigs, 
-exports.getLinePointsFromSegments = getLinePointsFromSegments, exports.parseCollectionMarkAttributes = parseCollectionMarkAttributes;
+exports.getLinePointsFromSegments = getLinePointsFromSegments, exports.parseCollectionMarkAttributes = parseCollectionMarkAttributes, 
+exports.removeSegmentAttrs = removeSegmentAttrs;
 //# sourceMappingURL=line.js.map

package/cjs/graph/attributes/line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/attributes/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IColor, IColorStop, ISegment } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\nimport { isNil, isString } from '@visactor/vutils';\nimport { transformAttributes } from './transform';\nimport { GrammarMarkType } from '../enums';\nimport type { IElement } from '../../types';\n\nconst isStopsEqual = (prev: IColorStop[], next: IColorStop[]) => {\n  if (prev === next) {\n    return true;\n  }\n  const prevLength = (prev && prev.length) ?? 0;\n  const nextLength = (next && next.length) ?? 0;\n\n  if (prevLength !== nextLength || prevLength === 0) {\n    return false;\n  }\n\n  return prev.every((prevEntry, prevIndex) => {\n    return (\n      (!prevEntry && !next[prevIndex]) ||\n      (prevEntry &&\n        next[prevIndex] &&\n        prevEntry.color === next[prevIndex].color &&\n        prevEntry.offset === next[prevIndex].offset)\n    );\n  });\n};\n\nconst isColorAttrEqual = (prev: IColor, next: IColor) => {\n  if (prev === next) {\n    return true;\n  }\n\n  if (typeof prev !== typeof next) {\n    return false;\n  }\n\n  if (isString(prev)) {\n    return false;\n  }\n\n  if (prev.gradient !== (next as any).gradient) {\n    return false;\n  }\n\n  const prevKeys = Object.keys(prev);\n  const nextKeys = Object.keys(next);\n\n  if (prevKeys.length !== nextKeys.length) {\n    return false;\n  }\n\n  return prevKeys.every(key => {\n    if (key === 'stops') {\n      return isStopsEqual(prev[key], next[key]);\n    }\n\n    return prev[key] === next[key];\n  });\n};\n\nconst isLineDashEqual = (prev: number[], next: number[]) => {\n  if (prev.length !== next.length) {\n    return false;\n  }\n\n  if (prev.join('-') === next.join('-')) {\n    return true;\n  }\n\n  return false;\n};\n\nconst isSegmentAttrEqual = (prev: any, next: any, key: string) => {\n  if (isNil(prev) && isNil(next)) {\n    return true;\n  }\n\n  if (isNil(prev)) {\n    return false;\n  }\n\n  if (isNil(next)) {\n    return false;\n  }\n\n  if (key === 'lineDash') {\n    return isLineDashEqual(prev, next);\n  }\n\n  if (key === 'stroke' || key === 'fill') {\n    return isColorAttrEqual(prev, next);\n  }\n\n  return prev === next;\n};\n\nconst fillAttrs = ['fill', 'fillOpacity', 'background', 'texture', 'texturePadding', 'textureSize', 'textureColor'];\nconst strokeAttrs = [\n  'stroke',\n  'strokeOpacity',\n  'lineDash',\n  'lineDashOffset',\n  'lineCap',\n  'lineJoin',\n  'lineWidth',\n  'miterLimit'\n];\nconst areaAttrs = fillAttrs.concat(strokeAttrs);\n\n/**\n * 生成用于渲染的点数组\n * @param {*} item\n * @returns {IPointLike[]}\n */\nexport function getLineSegmentConfigs(items: any[], points: any[], element?: IElement) {\n  if (!items || items.length <= 1) {\n    return null;\n  }\n\n  const checkAttributes = element?.mark?.markType === 'area' ? areaAttrs : strokeAttrs;\n\n  const segments: any[] = [];\n  let prevSegmentAttrs: any = null;\n\n  items.forEach((item, index) => {\n    if (\n      !prevSegmentAttrs ||\n      !checkAttributes.every(key => {\n        return isSegmentAttrEqual(prevSegmentAttrs[key], item[key], key);\n      })\n    ) {\n      if (segments.length) {\n        segments[segments.length - 1].endIndex = index;\n      }\n\n      prevSegmentAttrs = item;\n      segments.push({\n        attrs: prevSegmentAttrs,\n        startIndex: index\n      });\n    }\n  });\n\n  if (segments.length >= 2) {\n    return segments.map(entry => {\n      const res = parseCollectionMarkAttributes(entry.attrs) as any;\n\n      res.points = points.slice(entry.startIndex, isNil(entry.endIndex) ? points.length : entry.endIndex);\n      return res;\n    });\n  }\n\n  return null;\n}\n\n/**\n * get the segments for connectNulls\n * @param {*} item\n * @returns {IPointLike[]}\n */\nexport function getConnectLineSegmentConfigs(items: any[], points: IPointLike[], element?: IElement) {\n  if (!items || items.length <= 1) {\n    return null;\n  }\n  const enableSegments = element ? element.mark.getSpec().enableSegments : false;\n  let segments: { isConnect?: boolean; points: any[]; items: any[] }[] = [];\n  let point: IPointLike = null;\n  let isPrevDefined: boolean;\n  let curSegment: { isConnect?: boolean; points: any[]; items: any[] };\n\n  items.forEach((item, index) => {\n    point = points[index];\n\n    if (point && point.defined !== false) {\n      if (!isPrevDefined) {\n        // start a segment\n        curSegment = {\n          items: [],\n          points: []\n        };\n        segments.push(curSegment);\n      }\n\n      curSegment.points.push(point);\n      curSegment.items.push(item);\n\n      if (isPrevDefined === false) {\n        curSegment.isConnect = true;\n\n        curSegment = {\n          items: [],\n          points: []\n        };\n        segments.push(curSegment);\n      }\n\n      isPrevDefined = true;\n    } else {\n      isPrevDefined = false;\n    }\n  });\n\n  segments = segments.filter(seg => seg.points.length > 0);\n\n  if (segments.length >= 2) {\n    const res: ISegment[] = [];\n\n    segments.forEach(entry => {\n      if (entry.isConnect) {\n        res.push({\n          points: entry.points,\n          isConnect: true\n        } as ISegment);\n        return;\n      } else if (enableSegments) {\n        const subSegments = getLineSegmentConfigs(entry.items, entry.points, element);\n\n        if (subSegments) {\n          subSegments.forEach(subSeg => {\n            res.push(subSeg);\n          });\n\n          return;\n        }\n      }\n\n      const seg = parseCollectionMarkAttributes(entry.items[0]) as any;\n      seg.points = entry.points;\n\n      res.push(seg);\n    });\n\n    return res;\n  } else if (enableSegments) {\n    return getLineSegmentConfigs(items, points, element);\n  }\n\n  return null;\n}\n\nexport function getLinePointsFromSegments(segments: any[]) {\n  if (!segments) {\n    return null;\n  }\n  return segments.reduce((points, segment) => {\n    return points.concat(segment.points);\n  }, []);\n}\n\nexport function parseCollectionMarkAttributes(itemNextAttrs: any) {\n  const result = {};\n\n  if (!itemNextAttrs) {\n    return result;\n  }\n\n  Object.keys(itemNextAttrs).forEach(key => {\n    if (\n      key === 'x' ||\n      key === 'y' ||\n      key === 'x1' ||\n      key === 'y1' ||\n      key === 'defined' ||\n      key === 'size' ||\n      key === 'width' ||\n      key === 'height' ||\n      key === 'context'\n    ) {\n      return;\n    }\n    result[key] = itemNextAttrs[key];\n  });\n\n  return result;\n}\n"]}
+{"version":3,"sources":["../src/graph/attributes/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IColor, IColorStop, ISegment } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\nimport { isNil, isString } from '@visactor/vutils';\nimport type { IElement } from '../../types';\n\nconst isStopsEqual = (prev: IColorStop[], next: IColorStop[]) => {\n  if (prev === next) {\n    return true;\n  }\n  const prevLength = (prev && prev.length) ?? 0;\n  const nextLength = (next && next.length) ?? 0;\n\n  if (prevLength !== nextLength || prevLength === 0) {\n    return false;\n  }\n\n  return prev.every((prevEntry, prevIndex) => {\n    return (\n      (!prevEntry && !next[prevIndex]) ||\n      (prevEntry &&\n        next[prevIndex] &&\n        prevEntry.color === next[prevIndex].color &&\n        prevEntry.offset === next[prevIndex].offset)\n    );\n  });\n};\n\nconst isColorAttrEqual = (prev: IColor, next: IColor) => {\n  if (prev === next) {\n    return true;\n  }\n\n  if (typeof prev !== typeof next) {\n    return false;\n  }\n\n  if (isString(prev)) {\n    return false;\n  }\n\n  if (prev.gradient !== (next as any).gradient) {\n    return false;\n  }\n\n  const prevKeys = Object.keys(prev);\n  const nextKeys = Object.keys(next);\n\n  if (prevKeys.length !== nextKeys.length) {\n    return false;\n  }\n\n  return prevKeys.every(key => {\n    if (key === 'stops') {\n      return isStopsEqual(prev[key], next[key]);\n    }\n\n    return prev[key] === next[key];\n  });\n};\n\nconst isLineDashEqual = (prev: number[], next: number[]) => {\n  if (prev.length !== next.length) {\n    return false;\n  }\n\n  if (prev.join('-') === next.join('-')) {\n    return true;\n  }\n\n  return false;\n};\n\nconst isSegmentAttrEqual = (prev: any, next: any, key: string) => {\n  if (isNil(prev) && isNil(next)) {\n    return true;\n  }\n\n  if (isNil(prev)) {\n    return false;\n  }\n\n  if (isNil(next)) {\n    return false;\n  }\n\n  if (key === 'lineDash') {\n    return isLineDashEqual(prev, next);\n  }\n\n  if (key === 'stroke' || key === 'fill') {\n    return isColorAttrEqual(prev, next);\n  }\n\n  return prev === next;\n};\n\nconst fillAttrs = ['fill', 'fillOpacity', 'background', 'texture', 'texturePadding', 'textureSize', 'textureColor'];\nconst strokeAttrs = [\n  'stroke',\n  'strokeOpacity',\n  'lineDash',\n  'lineDashOffset',\n  'lineCap',\n  'lineJoin',\n  'lineWidth',\n  'miterLimit'\n];\nconst areaAttrs = fillAttrs.concat(strokeAttrs);\n\n/**\n * 生成用于渲染的点数组\n * @param {*} item\n * @returns {IPointLike[]}\n */\nexport function getLineSegmentConfigs(items: any[], points: any[], element?: IElement) {\n  if (!items || items.length <= 1) {\n    return null;\n  }\n\n  const checkAttributes = element?.mark?.markType === 'area' ? areaAttrs : strokeAttrs;\n\n  const segments: any[] = [];\n  let prevSegmentAttrs: any = null;\n\n  items.forEach((item, index) => {\n    if (\n      !prevSegmentAttrs ||\n      !checkAttributes.every(key => {\n        return isSegmentAttrEqual(prevSegmentAttrs[key], item[key], key);\n      })\n    ) {\n      if (segments.length) {\n        segments[segments.length - 1].endIndex = index;\n      }\n\n      prevSegmentAttrs = item;\n      segments.push({\n        attrs: prevSegmentAttrs,\n        startIndex: index\n      });\n    }\n  });\n\n  if (segments.length >= 2) {\n    return segments.map(entry => {\n      const res = parseCollectionMarkAttributes(entry.attrs) as any;\n\n      res.points = points.slice(entry.startIndex, isNil(entry.endIndex) ? points.length : entry.endIndex);\n      return res;\n    });\n  }\n\n  return null;\n}\n\n/**\n * get the segments for connectNulls\n * @param {*} item\n * @returns {IPointLike[]}\n */\nexport function getConnectLineSegmentConfigs(items: any[], points: IPointLike[], element?: IElement) {\n  if (!items || items.length <= 1) {\n    return null;\n  }\n  const enableSegments = element ? element.mark.getSpec().enableSegments : false;\n  let segments: { isConnect?: boolean; points: any[]; items: any[] }[] = [];\n  let point: IPointLike = null;\n  let isPrevDefined: boolean;\n  let curSegment: { isConnect?: boolean; points: any[]; items: any[] };\n\n  items.forEach((item, index) => {\n    point = points[index];\n\n    if (point && point.defined !== false) {\n      if (!isPrevDefined) {\n        // start a segment\n        curSegment = {\n          items: [],\n          points: []\n        };\n        segments.push(curSegment);\n      }\n\n      curSegment.points.push(point);\n      curSegment.items.push(item);\n\n      if (isPrevDefined === false) {\n        curSegment.isConnect = true;\n\n        curSegment = {\n          items: [],\n          points: []\n        };\n        segments.push(curSegment);\n      }\n\n      isPrevDefined = true;\n    } else {\n      isPrevDefined = false;\n    }\n  });\n\n  segments = segments.filter(seg => seg.points.length > 0);\n\n  if (segments.length >= 2) {\n    const res: ISegment[] = [];\n\n    segments.forEach(entry => {\n      if (entry.isConnect) {\n        res.push({\n          points: entry.points,\n          isConnect: true\n        } as ISegment);\n        return;\n      } else if (enableSegments) {\n        const subSegments = getLineSegmentConfigs(entry.items, entry.points, element);\n\n        if (subSegments) {\n          subSegments.forEach(subSeg => {\n            res.push(subSeg);\n          });\n\n          return;\n        }\n      }\n\n      const seg = parseCollectionMarkAttributes(entry.items[0]) as any;\n      seg.points = entry.points;\n\n      res.push(seg);\n    });\n\n    return res;\n  } else if (enableSegments) {\n    return getLineSegmentConfigs(items, points, element);\n  }\n\n  return null;\n}\n\nexport function getLinePointsFromSegments(segments: any[]) {\n  if (!segments) {\n    return null;\n  }\n  return segments.reduce((points, segment) => {\n    return points.concat(segment.points);\n  }, []);\n}\n\nexport function parseCollectionMarkAttributes(itemNextAttrs: any) {\n  const result = {};\n\n  if (!itemNextAttrs) {\n    return result;\n  }\n\n  const skipKeys = ['x', 'y', 'x1', 'y1', 'defined', 'size', 'width', 'height', 'context'];\n\n  Object.keys(itemNextAttrs).forEach(key => {\n    if (skipKeys.includes(key)) {\n      return;\n    }\n    result[key] = itemNextAttrs[key];\n  });\n\n  return result;\n}\n\nexport function removeSegmentAttrs(itemNextAttrs: any, element?: IElement) {\n  if (!itemNextAttrs || !itemNextAttrs.segments || !itemNextAttrs.segments.length) {\n    return itemNextAttrs;\n  }\n\n  // TODO 现在非常hack\n  const segmentKeys = element?.mark?.markType === 'area' ? ['fillOpacity', 'strokeOpacity'] : ['strokeOpacity'];\n  const result = {};\n  Object.keys(itemNextAttrs).forEach(key => {\n    if (segmentKeys.includes(key)) {\n      return;\n    }\n    result[key] = itemNextAttrs[key];\n  });\n\n  return result;\n}\n"]}

package/cjs/graph/canvas-renderer.d.ts

@@ -1,8 +1,8 @@
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IColor, Stage } from '@visactor/vrender-core';
-import { Gesture } from '@visactor/vrender-kits';
 import type { IViewOptions, IView, IViewEventConfig } from '../types';
 import type { IRenderer } from '../types/renderer';
+import type { Gesture } from '@visactor/vrender-kits';
 export default class CanvasRenderer implements IRenderer {
     private _width;
     private _height;

package/cjs/graph/canvas-renderer.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const vutils_1 = require("@visactor/vutils"), vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), enums_1 = require("./enums");
+const vutils_1 = require("@visactor/vutils"), vrender_core_1 = require("@visactor/vrender-core"), enums_1 = require("./enums"), factory_1 = require("../core/factory");
 
 class CanvasRenderer {
     constructor(view) {
@@ -110,10 +110,10 @@ class CanvasRenderer {
         stage.enableIncrementalAutoRender(), this._viewBox = viewOptions.viewBox, this._view.emit(enums_1.HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE), 
         this._view.emit(enums_1.HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER);
         const layer = null !== (_c = viewOptions.layer) && void 0 !== _c ? _c : stage.defaultLayer;
-        if (this._view.emit(enums_1.HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER), (null === (_d = this._eventConfig) || void 0 === _d ? void 0 : _d.drag) && (this._dragController = new vrender_kits_1.DragNDrop(stage)), 
-        null === (_e = this._eventConfig) || void 0 === _e ? void 0 : _e.gesture) {
+        if (this._view.emit(enums_1.HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER), (null === (_d = this._eventConfig) || void 0 === _d ? void 0 : _d.drag) && factory_1.Factory.getStageEventPlugin("drag") && (this._dragController = new (factory_1.Factory.getStageEventPlugin("drag"))(stage)), 
+        (null === (_e = this._eventConfig) || void 0 === _e ? void 0 : _e.gesture) && factory_1.Factory.getStageEventPlugin("gesture")) {
             const gestureConfig = (0, vutils_1.isObject)(this._eventConfig.gesture) ? this._eventConfig.gesture : {};
-            this._gestureController = new vrender_kits_1.Gesture(stage, gestureConfig);
+            this._gestureController = new (factory_1.Factory.getStageEventPlugin("gesture"))(stage, gestureConfig);
         }
         return {
             stage: stage,