@visactor/vgrammar-core 0.9.1 → 0.9.3

package/es/graph/animation/animator.js

@@ -65,7 +65,7 @@ export class Animator {
         }));
     }
     animateTimeSlice(graphicAnimate, timeSlice, animationParameters, parameters) {
-        const delay = timeSlice.delay, duration = timeSlice.duration, effects = timeSlice.effects;
+        const delay = timeSlice.delay, delayAfter = timeSlice.delayAfter, duration = timeSlice.duration, effects = timeSlice.effects;
         if (delay > 0 && graphicAnimate.wait(delay), effects.length < 0) graphicAnimate.wait(duration); else {
             const customAnimates = effects.map(((effect, index) => {
                 var _a;
@@ -80,6 +80,7 @@ export class Animator {
             })).filter((animate => !isNil(animate)));
             1 === customAnimates.length ? graphicAnimate.play(customAnimates[0]) : graphicAnimate.play(new AnimateGroup(duration, customAnimates));
         }
+        delayAfter > 0 && graphicAnimate.wait(delayAfter);
     }
 }
 //# sourceMappingURL=animator.js.map

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

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

package/es/graph/animation/config.js

@@ -1,9 +1,9 @@
 import { array, isFunction, isNil, merge } from "@visactor/vutils";
 
-import { DefaultAnimationControlOptions, DefaultAnimationDelay, DefaultAnimationDuration, DefaultAnimationEasing, DefaultAnimationLoop, DefaultAnimationOneByOne, DefaultAnimationStartTime } from "../constants";
+import { DefaultAnimationControlOptions, DefaultAnimationDelay, DefaultAnimationDelayAfter, DefaultAnimationDuration, DefaultAnimationEasing, DefaultAnimationLoop, DefaultAnimationOneByOne, DefaultAnimationStartTime } from "../constants";
 
 function transformToTimelineConfig(animationConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     if (isNil(animationConfig.timeSlices)) {
         const typeConfig = animationConfig;
         return {
@@ -15,11 +15,12 @@ function transformToTimelineConfig(animationConfig) {
             timeSlices: [ {
                 duration: null !== (_e = typeConfig.duration) && void 0 !== _e ? _e : DefaultAnimationDuration,
                 delay: null !== (_f = typeConfig.delay) && void 0 !== _f ? _f : DefaultAnimationDelay,
+                delayAfter: null !== (_g = typeConfig.delayAfter) && void 0 !== _g ? _g : DefaultAnimationDelayAfter,
                 effects: [ {
                     type: typeConfig.type,
                     channel: typeConfig.channel,
                     custom: typeConfig.custom,
-                    easing: null !== (_g = typeConfig.easing) && void 0 !== _g ? _g : DefaultAnimationEasing,
+                    easing: null !== (_h = typeConfig.easing) && void 0 !== _h ? _h : DefaultAnimationEasing,
                     customParameters: typeConfig.customParameters,
                     options: typeConfig.options
                 } ]
@@ -28,16 +29,17 @@ function transformToTimelineConfig(animationConfig) {
     }
     const formattedTimeSlices = array(animationConfig.timeSlices).filter((timeSlice => timeSlice.effects && array(timeSlice.effects).filter((effect => effect.channel || effect.type)).length));
     if (formattedTimeSlices.length) return {
-        startTime: null !== (_h = animationConfig.startTime) && void 0 !== _h ? _h : DefaultAnimationStartTime,
+        startTime: null !== (_j = animationConfig.startTime) && void 0 !== _j ? _j : DefaultAnimationStartTime,
         totalTime: animationConfig.totalTime,
-        oneByOne: null !== (_j = animationConfig.oneByOne) && void 0 !== _j ? _j : DefaultAnimationOneByOne,
-        loop: null !== (_k = animationConfig.loop) && void 0 !== _k ? _k : DefaultAnimationLoop,
-        controlOptions: merge({}, DefaultAnimationControlOptions, null !== (_l = animationConfig.controlOptions) && void 0 !== _l ? _l : {}),
+        oneByOne: null !== (_k = animationConfig.oneByOne) && void 0 !== _k ? _k : DefaultAnimationOneByOne,
+        loop: null !== (_l = animationConfig.loop) && void 0 !== _l ? _l : DefaultAnimationLoop,
+        controlOptions: merge({}, DefaultAnimationControlOptions, null !== (_m = animationConfig.controlOptions) && void 0 !== _m ? _m : {}),
         timeSlices: formattedTimeSlices.map((timeSlice => {
-            var _a;
+            var _a, _b;
             return {
                 duration: timeSlice.duration,
                 delay: null !== (_a = timeSlice.delay) && void 0 !== _a ? _a : DefaultAnimationDelay,
+                delayAfter: null !== (_b = timeSlice.delayAfter) && void 0 !== _b ? _b : DefaultAnimationDelayAfter,
                 effects: array(timeSlice.effects).filter((effect => effect.channel || effect.type)).map((effect => {
                     var _a;
                     return {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/animation/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["import { array, isFunction, isNil, merge } from '@visactor/vutils';\nimport type { IElement } from '../../types';\nimport type {\n  IAnimationConfig,\n  IAnimationTimeline,\n  IAnimationTypeConfig,\n  IParsedAnimationConfig,\n  MarkFunctionValueType\n} from '../../types/animate';\nimport {\n  DefaultAnimationControlOptions,\n  DefaultAnimationDelay,\n  DefaultAnimationDuration,\n  DefaultAnimationEasing,\n  DefaultAnimationLoop,\n  DefaultAnimationOneByOne,\n  DefaultAnimationStartTime\n} from '../constants';\n\nfunction transformToTimelineConfig(animationConfig: IAnimationConfig): IAnimationTimeline {\n  if (isNil((animationConfig as IAnimationTimeline).timeSlices)) {\n    const typeConfig = animationConfig as IAnimationTypeConfig;\n    // transform type animation config into timeline animation config\n    return {\n      startTime: typeConfig.startTime ?? DefaultAnimationStartTime,\n      totalTime: typeConfig.totalTime,\n      oneByOne: typeConfig.oneByOne ?? DefaultAnimationOneByOne,\n      loop: typeConfig.loop ?? DefaultAnimationLoop,\n      controlOptions: merge({}, DefaultAnimationControlOptions, typeConfig.controlOptions ?? {}),\n      timeSlices: [\n        {\n          duration: typeConfig.duration ?? DefaultAnimationDuration,\n          delay: typeConfig.delay ?? DefaultAnimationDelay,\n          effects: [\n            {\n              type: typeConfig.type,\n              channel: typeConfig.channel,\n              custom: typeConfig.custom,\n              easing: typeConfig.easing ?? DefaultAnimationEasing,\n              customParameters: typeConfig.customParameters,\n              options: typeConfig.options\n            }\n          ]\n        }\n      ]\n    };\n  }\n\n  const timeSlices = array((animationConfig as IAnimationTimeline).timeSlices);\n  const formattedTimeSlices = timeSlices.filter(timeSlice => {\n    return timeSlice.effects && array(timeSlice.effects).filter(effect => effect.channel || effect.type).length;\n  });\n\n  if (formattedTimeSlices.length) {\n    // fill up default animation config\n    return {\n      startTime: (animationConfig as IAnimationTimeline).startTime ?? DefaultAnimationStartTime,\n      totalTime: (animationConfig as IAnimationTimeline).totalTime,\n      oneByOne: (animationConfig as IAnimationTimeline).oneByOne ?? DefaultAnimationOneByOne,\n      loop: (animationConfig as IAnimationTimeline).loop ?? DefaultAnimationLoop,\n      controlOptions: merge({}, DefaultAnimationControlOptions, animationConfig.controlOptions ?? {}),\n      timeSlices: formattedTimeSlices.map(timeSlice => {\n        return {\n          duration: timeSlice.duration,\n          delay: timeSlice.delay ?? DefaultAnimationDelay,\n          effects: array(timeSlice.effects)\n            .filter(effect => effect.channel || effect.type)\n            .map(effect => {\n              return {\n                type: effect.type,\n                channel: effect.channel,\n                custom: effect.custom,\n                easing: effect.easing ?? DefaultAnimationEasing,\n                customParameters: effect.customParameters,\n                options: effect.options\n              };\n            })\n        };\n      }),\n      partitioner: (animationConfig as IAnimationTimeline).partitioner,\n      sort: (animationConfig as IAnimationTimeline).sort\n    };\n  }\n\n  return;\n}\n\nexport function normalizeAnimationConfig(\n  config: Record<string, IAnimationConfig | IAnimationConfig[]>\n): Array<IParsedAnimationConfig> {\n  let normalizedConfig: Array<IParsedAnimationConfig> = [];\n\n  Object.keys(config).forEach(state => {\n    normalizedConfig = normalizedConfig.concat(normalizeStateAnimationConfig(state, config[state]));\n  });\n  return normalizedConfig;\n}\n\nexport function normalizeStateAnimationConfig(\n  state: string,\n  config: IAnimationConfig | IAnimationConfig[],\n  initialIndex: number = 0\n): Array<IParsedAnimationConfig> {\n  const normalizedConfig: Array<IParsedAnimationConfig> = [];\n  let index = initialIndex;\n  array(config).forEach(animationConfig => {\n    const timelineConfig = transformToTimelineConfig(animationConfig);\n    if (timelineConfig) {\n      normalizedConfig.push({\n        state,\n        id: timelineConfig.id ?? `${state}-${index}`,\n        timeline: timelineConfig,\n        originConfig: animationConfig\n      });\n      index += 1;\n    }\n  });\n  return normalizedConfig;\n}\n\nexport function invokeAnimateSpec<T>(spec: MarkFunctionValueType<T>, element: IElement, parameters: any): T {\n  if (isFunction(spec)) {\n    return spec.call(null, element.getDatum(), element, parameters);\n  }\n  return spec;\n}\n"]}
+{"version":3,"sources":["../src/graph/animation/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["import { array, isFunction, isNil, merge } from '@visactor/vutils';\nimport type { IElement } from '../../types';\nimport type {\n  IAnimationConfig,\n  IAnimationTimeline,\n  IAnimationTypeConfig,\n  IParsedAnimationConfig,\n  MarkFunctionValueType\n} from '../../types/animate';\nimport {\n  DefaultAnimationControlOptions,\n  DefaultAnimationDelay,\n  DefaultAnimationDelayAfter,\n  DefaultAnimationDuration,\n  DefaultAnimationEasing,\n  DefaultAnimationLoop,\n  DefaultAnimationOneByOne,\n  DefaultAnimationStartTime\n} from '../constants';\n\nfunction transformToTimelineConfig(animationConfig: IAnimationConfig): IAnimationTimeline {\n  if (isNil((animationConfig as IAnimationTimeline).timeSlices)) {\n    const typeConfig = animationConfig as IAnimationTypeConfig;\n    // transform type animation config into timeline animation config\n    return {\n      startTime: typeConfig.startTime ?? DefaultAnimationStartTime,\n      totalTime: typeConfig.totalTime,\n      oneByOne: typeConfig.oneByOne ?? DefaultAnimationOneByOne,\n      loop: typeConfig.loop ?? DefaultAnimationLoop,\n      controlOptions: merge({}, DefaultAnimationControlOptions, typeConfig.controlOptions ?? {}),\n      timeSlices: [\n        {\n          duration: typeConfig.duration ?? DefaultAnimationDuration,\n          delay: typeConfig.delay ?? DefaultAnimationDelay,\n          delayAfter: typeConfig.delayAfter ?? DefaultAnimationDelayAfter,\n          effects: [\n            {\n              type: typeConfig.type,\n              channel: typeConfig.channel,\n              custom: typeConfig.custom,\n              easing: typeConfig.easing ?? DefaultAnimationEasing,\n              customParameters: typeConfig.customParameters,\n              options: typeConfig.options\n            }\n          ]\n        }\n      ]\n    };\n  }\n\n  const timeSlices = array((animationConfig as IAnimationTimeline).timeSlices);\n  const formattedTimeSlices = timeSlices.filter(timeSlice => {\n    return timeSlice.effects && array(timeSlice.effects).filter(effect => effect.channel || effect.type).length;\n  });\n\n  if (formattedTimeSlices.length) {\n    // fill up default animation config\n    return {\n      startTime: (animationConfig as IAnimationTimeline).startTime ?? DefaultAnimationStartTime,\n      totalTime: (animationConfig as IAnimationTimeline).totalTime,\n      oneByOne: (animationConfig as IAnimationTimeline).oneByOne ?? DefaultAnimationOneByOne,\n      loop: (animationConfig as IAnimationTimeline).loop ?? DefaultAnimationLoop,\n      controlOptions: merge({}, DefaultAnimationControlOptions, animationConfig.controlOptions ?? {}),\n      timeSlices: formattedTimeSlices.map(timeSlice => {\n        return {\n          duration: timeSlice.duration,\n          delay: timeSlice.delay ?? DefaultAnimationDelay,\n          delayAfter: timeSlice.delayAfter ?? DefaultAnimationDelayAfter,\n          effects: array(timeSlice.effects)\n            .filter(effect => effect.channel || effect.type)\n            .map(effect => {\n              return {\n                type: effect.type,\n                channel: effect.channel,\n                custom: effect.custom,\n                easing: effect.easing ?? DefaultAnimationEasing,\n                customParameters: effect.customParameters,\n                options: effect.options\n              };\n            })\n        };\n      }),\n      partitioner: (animationConfig as IAnimationTimeline).partitioner,\n      sort: (animationConfig as IAnimationTimeline).sort\n    };\n  }\n\n  return;\n}\n\nexport function normalizeAnimationConfig(\n  config: Record<string, IAnimationConfig | IAnimationConfig[]>\n): Array<IParsedAnimationConfig> {\n  let normalizedConfig: Array<IParsedAnimationConfig> = [];\n\n  Object.keys(config).forEach(state => {\n    normalizedConfig = normalizedConfig.concat(normalizeStateAnimationConfig(state, config[state]));\n  });\n  return normalizedConfig;\n}\n\nexport function normalizeStateAnimationConfig(\n  state: string,\n  config: IAnimationConfig | IAnimationConfig[],\n  initialIndex: number = 0\n): Array<IParsedAnimationConfig> {\n  const normalizedConfig: Array<IParsedAnimationConfig> = [];\n  let index = initialIndex;\n  array(config).forEach(animationConfig => {\n    const timelineConfig = transformToTimelineConfig(animationConfig);\n    if (timelineConfig) {\n      normalizedConfig.push({\n        state,\n        id: timelineConfig.id ?? `${state}-${index}`,\n        timeline: timelineConfig,\n        originConfig: animationConfig\n      });\n      index += 1;\n    }\n  });\n  return normalizedConfig;\n}\n\nexport function invokeAnimateSpec<T>(spec: MarkFunctionValueType<T>, element: IElement, parameters: any): T {\n  if (isFunction(spec)) {\n    return spec.call(null, element.getDatum(), element, parameters);\n  }\n  return spec;\n}\n"]}

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

@@ -1,3 +1,4 @@
 import type { IElement } from '../../types';
 export declare function getLineSegmentConfigs(items: any[], points: any[], element?: IElement): any[];
 export declare function getLinePointsFromSegments(segments: any[]): any;
+export declare function parseCollectionMarkAttributes(itemNextAttrs: any): {};

package/es/graph/attributes/line.js

@@ -30,7 +30,7 @@ export function getLineSegmentConfigs(items, points, element) {
             startIndex: index
         }));
     })), segments.length >= 2 ? segments.map((entry => {
-        const res = transformAttributes(GrammarMarkType.line, entry.attrs, element);
+        const res = transformAttributes(GrammarMarkType.line, parseCollectionMarkAttributes(entry.attrs), element);
         return res.points = points.slice(entry.startIndex, isNil(entry.endIndex) ? points.length : entry.endIndex), 
         res;
     })) : null;
@@ -39,4 +39,11 @@ export function getLineSegmentConfigs(items, points, element) {
 export function getLinePointsFromSegments(segments) {
     return segments ? segments.reduce(((points, segment) => points.concat(segment.points)), []) : null;
 }
+
+export 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;
+}
 //# sourceMappingURL=line.js.map

package/es/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 } from '@visactor/vrender-core';\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 = transformAttributes(GrammarMarkType.line, entry.attrs, element) 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\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"]}
+{"version":3,"sources":["../src/graph/attributes/line.ts"],"names":[],"mappings":"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","file":"line.js","sourcesContent":["import type { IColor, IColorStop } from '@visactor/vrender-core';\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 = transformAttributes(GrammarMarkType.line, parseCollectionMarkAttributes(entry.attrs), element) 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\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"]}

package/es/graph/attributes/transform.js

@@ -16,30 +16,6 @@ function storeOriginAttributes(name, channels, graphicAttributes, nextAttrs, ele
 }
 
 export const transformsByType = {
-    [GrammarMarkType.largeRects]: [ {
-        channels: [ "x", "y", "y1", "x1", "width", "height" ],
-        transform: (graphicAttributes, nextAttrs, storedAttrs) => {
-            graphicAttributes.x = 0, graphicAttributes.y = 0;
-        }
-    } ],
-    [GrammarMarkType.largeSymbols]: [ {
-        channels: [ "x", "y", "size" ],
-        transform: (graphicAttributes, nextAttrs, storedAttrs) => {
-            graphicAttributes.x = 0, graphicAttributes.y = 0;
-        }
-    } ],
-    [GrammarMarkType.area]: [ {
-        channels: [ "x", "y", "x1", "y1" ],
-        transform: (graphicAttributes, nextAttrs, storedAttrs) => {
-            graphicAttributes.x = 0, graphicAttributes.y = 0, graphicAttributes.x1 = 0, graphicAttributes.y1 = 0;
-        }
-    } ],
-    [GrammarMarkType.line]: [ {
-        channels: [ "x", "y", "defined", "enableSegments" ],
-        transform: (graphicAttributes, nextAttrs, storedAttrs) => {
-            graphicAttributes.x = 0, graphicAttributes.y = 0;
-        }
-    } ],
     [GrammarMarkType.rect]: [ {
         channels: [ "x", "y", "x1", "y1", "width", "height" ],
         transform: (graphicAttributes, nextAttrs, storedAttrs) => {

package/es/graph/attributes/transform.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/attributes/transform.ts"],"names":[],"mappings":"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","file":"transform.js","sourcesContent":["import { has, isNil, isPlainObject, isString, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IGlyphElement } from '../../types/element';\nimport type { AttributeTransform, MarkType } from '../../types/mark';\nimport { GrammarMarkType } from '../enums';\nimport { getRulePoints } from './helpers';\nimport { commonAttributes, transformCommonAttribute } from './common';\n\nfunction storeOriginAttributes(\n  name: string,\n  channels: string[],\n  graphicAttributes: any,\n  nextAttrs: any,\n  element: IElement,\n  markName: string\n): Record<string, any> {\n  const prevStoredAttrs = (element as IGlyphElement).getGraphicAttribute(name, false, markName) ?? {};\n  const storedAttrs = {};\n  channels.forEach(channel => {\n    storedAttrs[channel] = nextAttrs[channel] ?? prevStoredAttrs[channel];\n  });\n  graphicAttributes[name] = storedAttrs;\n  return storedAttrs;\n}\n\nexport const transformsByType: Record<string, AttributeTransform[]> = {\n  [GrammarMarkType.largeRects]: [\n    {\n      channels: ['x', 'y', 'y1', 'x1', 'width', 'height'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n      }\n    }\n  ],\n  [GrammarMarkType.largeSymbols]: [\n    {\n      channels: ['x', 'y', 'size'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n      }\n    }\n  ],\n  [GrammarMarkType.area]: [\n    {\n      channels: ['x', 'y', 'x1', 'y1'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n        graphicAttributes.x1 = 0;\n        graphicAttributes.y1 = 0;\n      }\n    }\n  ],\n  [GrammarMarkType.line]: [\n    {\n      channels: ['x', 'y', 'defined', 'enableSegments'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n      }\n    }\n  ],\n  [GrammarMarkType.rect]: [\n    {\n      channels: ['x', 'y', 'x1', 'y1', 'width', 'height'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        // width\n        if (isValidNumber(nextAttrs.width) || (!isValidNumber(nextAttrs.x1) && isValidNumber(storedAttrs.width))) {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        } else if (isValidNumber(nextAttrs.x1) || (!isValidNumber(nextAttrs.width) && isValidNumber(storedAttrs.x1))) {\n          graphicAttributes.x = Math.min(storedAttrs.x, storedAttrs.x1);\n          graphicAttributes.width = Math.abs(storedAttrs.x1 - storedAttrs.x);\n        } else {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        }\n\n        // height\n        if (isValidNumber(nextAttrs.height) || (!isValidNumber(nextAttrs.y1) && isValidNumber(storedAttrs.height))) {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        } else if (isValidNumber(nextAttrs.y1) || (!isValidNumber(nextAttrs.height) && isValidNumber(storedAttrs.y1))) {\n          graphicAttributes.y = Math.min(storedAttrs.y, storedAttrs.y1);\n          graphicAttributes.height = Math.abs(storedAttrs.y1 - storedAttrs.y);\n        } else {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        }\n      },\n      storedAttrs: 'sizeAttrs'\n    }\n  ],\n  rect3d: [\n    {\n      channels: ['x', 'y', 'z', 'x1', 'y1', 'width', 'height', 'length'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        // width\n        if (isValidNumber(nextAttrs.width) || (!isValidNumber(nextAttrs.x1) && isValidNumber(storedAttrs.width))) {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        } else if (isValidNumber(nextAttrs.x1) || (!isValidNumber(nextAttrs.width) && isValidNumber(storedAttrs.x1))) {\n          graphicAttributes.x = Math.min(storedAttrs.x, storedAttrs.x1);\n          graphicAttributes.width = Math.abs(storedAttrs.x1 - storedAttrs.x);\n        } else {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        }\n\n        // height\n        if (isValidNumber(nextAttrs.height) || (!isValidNumber(nextAttrs.y1) && isValidNumber(storedAttrs.height))) {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        } else if (isValidNumber(nextAttrs.y1) || (!isValidNumber(nextAttrs.height) && isValidNumber(storedAttrs.y1))) {\n          graphicAttributes.y = Math.min(storedAttrs.y, storedAttrs.y1);\n          graphicAttributes.height = Math.abs(storedAttrs.y1 - storedAttrs.y);\n        } else {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        }\n\n        // length\n        if (isValidNumber(nextAttrs.length) || (!isValidNumber(nextAttrs.z1) && isValidNumber(storedAttrs.length))) {\n          graphicAttributes.z = Math.min(storedAttrs.z ?? 0, storedAttrs.z1 ?? Infinity);\n          graphicAttributes.length = storedAttrs.length;\n        } else if (isValidNumber(nextAttrs.z1) || (!isValidNumber(nextAttrs.length) && isValidNumber(storedAttrs.z1))) {\n          graphicAttributes.z = Math.min(storedAttrs.z, storedAttrs.z1);\n          graphicAttributes.length = Math.abs(storedAttrs.z1 - storedAttrs.z);\n        } else {\n          graphicAttributes.z = Math.min(storedAttrs.z ?? 0, storedAttrs.z1 ?? Infinity);\n          graphicAttributes.length = storedAttrs.length;\n        }\n      },\n      storedAttrs: 'sizeAttrs'\n    }\n  ],\n  [GrammarMarkType.text]: [\n    {\n      channels: ['text', 'limit', 'autoLimit', 'maxLineWidth'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        const limit = storedAttrs.limit ?? Infinity;\n        const autoLimit = storedAttrs.autoLimit ?? Infinity;\n        const maxWidth = Math.min(limit, autoLimit);\n        const isTextConfig = isPlainObject(storedAttrs.text) && !isNil(storedAttrs.text.text);\n        const text = isTextConfig ? storedAttrs.text.text : storedAttrs.text;\n\n        if (Array.isArray(text)) {\n          graphicAttributes.maxLineWidth = maxWidth === Infinity ? storedAttrs.maxLineWidth : maxWidth;\n        } else {\n          graphicAttributes.maxLineWidth = maxWidth === Infinity ? storedAttrs.maxLineWidth : maxWidth;\n        }\n\n        if (isTextConfig) {\n          if (storedAttrs.text.type === 'html') {\n            graphicAttributes.html = {\n              dom: text,\n              width: nextAttrs.width ?? maxWidth,\n              height: nextAttrs.height ?? nextAttrs.fontSize,\n              anchorType: 'position'\n            };\n            graphicAttributes.text = '';\n          } else if (storedAttrs.text.type === 'rich') {\n            graphicAttributes.textConfig = text;\n          } else {\n            graphicAttributes.text = text;\n          }\n        } else {\n          graphicAttributes.text = text;\n        }\n      },\n      storedAttrs: 'limitAttrs'\n    }\n  ],\n  [GrammarMarkType.rule]: [\n    {\n      channels: ['x', 'y', 'x1', 'y1'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        const points = getRulePoints(storedAttrs);\n        graphicAttributes.points = points;\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n      },\n      storedAttrs: 'pointAttrs'\n    }\n  ],\n  [GrammarMarkType.symbol]: [\n    {\n      channels: ['shape', 'symbolType'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.symbolType = nextAttrs.shape ?? nextAttrs.symbolType;\n      }\n    },\n    {\n      channels: ['image', 'fill', 'background'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        if (nextAttrs.image) {\n          graphicAttributes.background = nextAttrs.image;\n          graphicAttributes.fill = false;\n        } else if (storedAttrs.image) {\n          graphicAttributes.background = storedAttrs.image;\n          graphicAttributes.fill = false;\n        } else {\n          graphicAttributes.fill = storedAttrs.fill;\n          graphicAttributes.background = storedAttrs.background;\n        }\n      },\n      storedAttrs: 'imageAttrs'\n    }\n  ],\n  [GrammarMarkType.richtext]: [\n    {\n      channels: ['text', 'textConfig'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.text = null;\n\n        if (nextAttrs.text?.type === 'rich') {\n          graphicAttributes.textConfig = nextAttrs.text.text;\n        } else if (nextAttrs.textConfig?.type === 'html') {\n          graphicAttributes.html = {\n            dom: nextAttrs.textConfig.text,\n            width: nextAttrs.width,\n            height: nextAttrs.height ?? nextAttrs.fontSize,\n            anchorType: 'position'\n          };\n          graphicAttributes.text = '';\n        } else if (nextAttrs.textConfig?.type === 'rich') {\n          graphicAttributes.textConfig = nextAttrs.textConfig.text;\n        } else {\n          graphicAttributes.textConfig = nextAttrs.textConfig;\n        }\n      }\n    }\n  ]\n};\n\nexport function cloneTransformAttributes(markType: MarkType, attributes: any) {\n  const transforms = transformsByType[markType] ?? [];\n  return transforms.reduce((clonedAttributes, transform) => {\n    transform.channels.forEach(channel => {\n      if (has(attributes, channel)) {\n        clonedAttributes[channel] = attributes[channel];\n      }\n    });\n    return clonedAttributes;\n  }, {} as any);\n}\n\nexport const transformAttributes = (\n  markType: MarkType | AttributeTransform[],\n  nextAttrs: any,\n  element: IElement,\n  markName?: string\n) => {\n  const graphicAttributes = {};\n  const changedKeys = nextAttrs ? Object.keys(nextAttrs) : [];\n  const transforms: AttributeTransform[] = isString(markType)\n    ? transformsByType[markType]\n    : (markType as AttributeTransform[]);\n\n  if (transforms?.length) {\n    const tags: boolean[] = [];\n\n    changedKeys.forEach(key => {\n      let isTransformed = false;\n\n      transforms.forEach((transform, index) => {\n        if (transform.channels.includes(key)) {\n          if (!tags[index]) {\n            if (transform.storedAttrs) {\n              const storedAttrs = storeOriginAttributes(\n                transform.storedAttrs,\n                transform.channels,\n                graphicAttributes,\n                nextAttrs,\n                element,\n                markName\n              );\n              transform.transform(graphicAttributes, nextAttrs, storedAttrs);\n            } else {\n              transform.transform(graphicAttributes, nextAttrs, null);\n            }\n          }\n          // 记录一下，不重复处理\n          tags[index] = true;\n          isTransformed = true;\n        }\n      });\n\n      if (!isTransformed) {\n        if (commonAttributes.includes(key)) {\n          transformCommonAttribute(graphicAttributes, key, nextAttrs);\n        } else {\n          graphicAttributes[key] = nextAttrs[key];\n        }\n      }\n    });\n  } else {\n    changedKeys.forEach(key => {\n      if (commonAttributes.includes(key)) {\n        transformCommonAttribute(graphicAttributes, key, nextAttrs);\n      } else {\n        graphicAttributes[key] = nextAttrs[key];\n      }\n    });\n  }\n\n  return graphicAttributes;\n};\n"]}
+{"version":3,"sources":["../src/graph/attributes/transform.ts"],"names":[],"mappings":"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","file":"transform.js","sourcesContent":["import { has, isNil, isPlainObject, isString, isValidNumber } from '@visactor/vutils';\nimport type { IElement, IGlyphElement } from '../../types/element';\nimport type { AttributeTransform, MarkType } from '../../types/mark';\nimport { GrammarMarkType } from '../enums';\nimport { getRulePoints } from './helpers';\nimport { commonAttributes, transformCommonAttribute } from './common';\n\nfunction storeOriginAttributes(\n  name: string,\n  channels: string[],\n  graphicAttributes: any,\n  nextAttrs: any,\n  element: IElement,\n  markName: string\n): Record<string, any> {\n  const prevStoredAttrs = (element as IGlyphElement).getGraphicAttribute(name, false, markName) ?? {};\n  const storedAttrs = {};\n  channels.forEach(channel => {\n    storedAttrs[channel] = nextAttrs[channel] ?? prevStoredAttrs[channel];\n  });\n  graphicAttributes[name] = storedAttrs;\n  return storedAttrs;\n}\n\nexport const transformsByType: Record<string, AttributeTransform[]> = {\n  [GrammarMarkType.rect]: [\n    {\n      channels: ['x', 'y', 'x1', 'y1', 'width', 'height'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        // width\n        if (isValidNumber(nextAttrs.width) || (!isValidNumber(nextAttrs.x1) && isValidNumber(storedAttrs.width))) {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        } else if (isValidNumber(nextAttrs.x1) || (!isValidNumber(nextAttrs.width) && isValidNumber(storedAttrs.x1))) {\n          graphicAttributes.x = Math.min(storedAttrs.x, storedAttrs.x1);\n          graphicAttributes.width = Math.abs(storedAttrs.x1 - storedAttrs.x);\n        } else {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        }\n\n        // height\n        if (isValidNumber(nextAttrs.height) || (!isValidNumber(nextAttrs.y1) && isValidNumber(storedAttrs.height))) {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        } else if (isValidNumber(nextAttrs.y1) || (!isValidNumber(nextAttrs.height) && isValidNumber(storedAttrs.y1))) {\n          graphicAttributes.y = Math.min(storedAttrs.y, storedAttrs.y1);\n          graphicAttributes.height = Math.abs(storedAttrs.y1 - storedAttrs.y);\n        } else {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        }\n      },\n      storedAttrs: 'sizeAttrs'\n    }\n  ],\n  rect3d: [\n    {\n      channels: ['x', 'y', 'z', 'x1', 'y1', 'width', 'height', 'length'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        // width\n        if (isValidNumber(nextAttrs.width) || (!isValidNumber(nextAttrs.x1) && isValidNumber(storedAttrs.width))) {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        } else if (isValidNumber(nextAttrs.x1) || (!isValidNumber(nextAttrs.width) && isValidNumber(storedAttrs.x1))) {\n          graphicAttributes.x = Math.min(storedAttrs.x, storedAttrs.x1);\n          graphicAttributes.width = Math.abs(storedAttrs.x1 - storedAttrs.x);\n        } else {\n          graphicAttributes.x = Math.min(storedAttrs.x ?? 0, storedAttrs.x1 ?? Infinity);\n          graphicAttributes.width = storedAttrs.width;\n        }\n\n        // height\n        if (isValidNumber(nextAttrs.height) || (!isValidNumber(nextAttrs.y1) && isValidNumber(storedAttrs.height))) {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        } else if (isValidNumber(nextAttrs.y1) || (!isValidNumber(nextAttrs.height) && isValidNumber(storedAttrs.y1))) {\n          graphicAttributes.y = Math.min(storedAttrs.y, storedAttrs.y1);\n          graphicAttributes.height = Math.abs(storedAttrs.y1 - storedAttrs.y);\n        } else {\n          graphicAttributes.y = Math.min(storedAttrs.y ?? 0, storedAttrs.y1 ?? Infinity);\n          graphicAttributes.height = storedAttrs.height;\n        }\n\n        // length\n        if (isValidNumber(nextAttrs.length) || (!isValidNumber(nextAttrs.z1) && isValidNumber(storedAttrs.length))) {\n          graphicAttributes.z = Math.min(storedAttrs.z ?? 0, storedAttrs.z1 ?? Infinity);\n          graphicAttributes.length = storedAttrs.length;\n        } else if (isValidNumber(nextAttrs.z1) || (!isValidNumber(nextAttrs.length) && isValidNumber(storedAttrs.z1))) {\n          graphicAttributes.z = Math.min(storedAttrs.z, storedAttrs.z1);\n          graphicAttributes.length = Math.abs(storedAttrs.z1 - storedAttrs.z);\n        } else {\n          graphicAttributes.z = Math.min(storedAttrs.z ?? 0, storedAttrs.z1 ?? Infinity);\n          graphicAttributes.length = storedAttrs.length;\n        }\n      },\n      storedAttrs: 'sizeAttrs'\n    }\n  ],\n  [GrammarMarkType.text]: [\n    {\n      channels: ['text', 'limit', 'autoLimit', 'maxLineWidth'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        const limit = storedAttrs.limit ?? Infinity;\n        const autoLimit = storedAttrs.autoLimit ?? Infinity;\n        const maxWidth = Math.min(limit, autoLimit);\n        const isTextConfig = isPlainObject(storedAttrs.text) && !isNil(storedAttrs.text.text);\n        const text = isTextConfig ? storedAttrs.text.text : storedAttrs.text;\n\n        if (Array.isArray(text)) {\n          graphicAttributes.maxLineWidth = maxWidth === Infinity ? storedAttrs.maxLineWidth : maxWidth;\n        } else {\n          graphicAttributes.maxLineWidth = maxWidth === Infinity ? storedAttrs.maxLineWidth : maxWidth;\n        }\n\n        if (isTextConfig) {\n          if (storedAttrs.text.type === 'html') {\n            graphicAttributes.html = {\n              dom: text,\n              width: nextAttrs.width ?? maxWidth,\n              height: nextAttrs.height ?? nextAttrs.fontSize,\n              anchorType: 'position'\n            };\n            graphicAttributes.text = '';\n          } else if (storedAttrs.text.type === 'rich') {\n            graphicAttributes.textConfig = text;\n          } else {\n            graphicAttributes.text = text;\n          }\n        } else {\n          graphicAttributes.text = text;\n        }\n      },\n      storedAttrs: 'limitAttrs'\n    }\n  ],\n  [GrammarMarkType.rule]: [\n    {\n      channels: ['x', 'y', 'x1', 'y1'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        const points = getRulePoints(storedAttrs);\n        graphicAttributes.points = points;\n        graphicAttributes.x = 0;\n        graphicAttributes.y = 0;\n      },\n      storedAttrs: 'pointAttrs'\n    }\n  ],\n  [GrammarMarkType.symbol]: [\n    {\n      channels: ['shape', 'symbolType'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.symbolType = nextAttrs.shape ?? nextAttrs.symbolType;\n      }\n    },\n    {\n      channels: ['image', 'fill', 'background'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        if (nextAttrs.image) {\n          graphicAttributes.background = nextAttrs.image;\n          graphicAttributes.fill = false;\n        } else if (storedAttrs.image) {\n          graphicAttributes.background = storedAttrs.image;\n          graphicAttributes.fill = false;\n        } else {\n          graphicAttributes.fill = storedAttrs.fill;\n          graphicAttributes.background = storedAttrs.background;\n        }\n      },\n      storedAttrs: 'imageAttrs'\n    }\n  ],\n  [GrammarMarkType.richtext]: [\n    {\n      channels: ['text', 'textConfig'],\n      transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n        graphicAttributes.text = null;\n\n        if (nextAttrs.text?.type === 'rich') {\n          graphicAttributes.textConfig = nextAttrs.text.text;\n        } else if (nextAttrs.textConfig?.type === 'html') {\n          graphicAttributes.html = {\n            dom: nextAttrs.textConfig.text,\n            width: nextAttrs.width,\n            height: nextAttrs.height ?? nextAttrs.fontSize,\n            anchorType: 'position'\n          };\n          graphicAttributes.text = '';\n        } else if (nextAttrs.textConfig?.type === 'rich') {\n          graphicAttributes.textConfig = nextAttrs.textConfig.text;\n        } else {\n          graphicAttributes.textConfig = nextAttrs.textConfig;\n        }\n      }\n    }\n  ]\n};\n\nexport function cloneTransformAttributes(markType: MarkType, attributes: any) {\n  const transforms = transformsByType[markType] ?? [];\n  return transforms.reduce((clonedAttributes, transform) => {\n    transform.channels.forEach(channel => {\n      if (has(attributes, channel)) {\n        clonedAttributes[channel] = attributes[channel];\n      }\n    });\n    return clonedAttributes;\n  }, {} as any);\n}\n\nexport const transformAttributes = (\n  markType: MarkType | AttributeTransform[],\n  nextAttrs: any,\n  element: IElement,\n  markName?: string\n) => {\n  const graphicAttributes = {};\n  const changedKeys = nextAttrs ? Object.keys(nextAttrs) : [];\n  const transforms: AttributeTransform[] = isString(markType)\n    ? transformsByType[markType]\n    : (markType as AttributeTransform[]);\n\n  if (transforms?.length) {\n    const tags: boolean[] = [];\n\n    changedKeys.forEach(key => {\n      let isTransformed = false;\n\n      transforms.forEach((transform, index) => {\n        if (transform.channels.includes(key)) {\n          if (!tags[index]) {\n            if (transform.storedAttrs) {\n              const storedAttrs = storeOriginAttributes(\n                transform.storedAttrs,\n                transform.channels,\n                graphicAttributes,\n                nextAttrs,\n                element,\n                markName\n              );\n              transform.transform(graphicAttributes, nextAttrs, storedAttrs);\n            } else {\n              transform.transform(graphicAttributes, nextAttrs, null);\n            }\n          }\n          // 记录一下，不重复处理\n          tags[index] = true;\n          isTransformed = true;\n        }\n      });\n\n      if (!isTransformed) {\n        if (commonAttributes.includes(key)) {\n          transformCommonAttribute(graphicAttributes, key, nextAttrs);\n        } else {\n          graphicAttributes[key] = nextAttrs[key];\n        }\n      }\n    });\n  } else {\n    changedKeys.forEach(key => {\n      if (commonAttributes.includes(key)) {\n        transformCommonAttribute(graphicAttributes, key, nextAttrs);\n      } else {\n        graphicAttributes[key] = nextAttrs[key];\n      }\n    });\n  }\n\n  return graphicAttributes;\n};\n"]}

package/es/graph/constants.d.ts

@@ -15,6 +15,7 @@ export declare const ImmediateAnimationState = "VGRAMMAR_IMMEDIATE_ANIMATION";
 export declare const DefaultAnimationStartTime = 0;
 export declare const DefaultAnimationDuration = 1000;
 export declare const DefaultAnimationDelay = 0;
+export declare const DefaultAnimationDelayAfter = 0;
 export declare const DefaultAnimationLoop = false;
 export declare const DefaultAnimationOneByOne = false;
 export declare const DefaultAnimationEasing = "quintInOut";

package/es/graph/constants.js

@@ -30,6 +30,8 @@ export const DefaultAnimationDuration = 1e3;
 
 export const DefaultAnimationDelay = 0;
 
+export const DefaultAnimationDelayAfter = 0;
+
 export const DefaultAnimationLoop = !1;
 
 export const DefaultAnimationOneByOne = !1;

package/es/graph/constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAE1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;AAErG,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC;AAEhC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAmB,IAAI,CAAC;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAE/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,8BAA8B,CAAC;AAGtE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAC1C,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAC9C,MAAM,CAAC,MAAM,sBAAsB,GAAG,YAAY,CAAC;AACnD,MAAM,CAAC,MAAM,8BAA8B,GAA6B;IACtE,mBAAmB,EAAE,KAAK;IAC1B,gBAAgB,EAAE,IAAI;CACvB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,+BAA+B,CAAC","file":"constants.js","sourcesContent":["import type { IAnimationControlOptions } from '../types/animate';\nimport { GrammarMarkType } from './enums';\n\nexport const BridgeElementKey = '__vgrammar_scene_item__';\n\nexport const CollectionMarkType = [GrammarMarkType.line, GrammarMarkType.area];\n\nexport const Mark3DType = [GrammarMarkType.arc3d, GrammarMarkType.rect3d, GrammarMarkType.pyramid3d];\n\nexport const DefaultKey = 'key';\n\nexport const DefaultMarkData = [{}];\n\nexport const DefaultGroupKeys = [DefaultKey];\n\nexport const DefaultReuse = true;\nexport const DefaultMorph = true;\nexport const DefaultMorphAll = false;\nexport const DefaultSplitPath: null | 'clone' = null;\nexport const DefaultEnableExitAnimation = true;\n\nexport const ImmediateAnimationState = 'VGRAMMAR_IMMEDIATE_ANIMATION';\n\n/** default animation configs */\nexport const DefaultAnimationStartTime = 0;\nexport const DefaultAnimationDuration = 1000;\nexport const DefaultAnimationDelay = 0;\nexport const DefaultAnimationLoop = false;\nexport const DefaultAnimationOneByOne = false;\nexport const DefaultAnimationEasing = 'quintInOut';\nexport const DefaultAnimationControlOptions: IAnimationControlOptions = {\n  stopWhenStateChange: false,\n  immediatelyApply: true\n};\nexport const DefaultAnimationParameters = 'VGRAMMAR_ANIMATION_PARAMETERS';\n"]}
+{"version":3,"sources":["../src/graph/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAE1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;AAErG,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC;AAEhC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAmB,IAAI,CAAC;AACrD,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAE/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,8BAA8B,CAAC;AAGtE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAC7C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAC1C,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAC9C,MAAM,CAAC,MAAM,sBAAsB,GAAG,YAAY,CAAC;AACnD,MAAM,CAAC,MAAM,8BAA8B,GAA6B;IACtE,mBAAmB,EAAE,KAAK;IAC1B,gBAAgB,EAAE,IAAI;CACvB,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,+BAA+B,CAAC","file":"constants.js","sourcesContent":["import type { IAnimationControlOptions } from '../types/animate';\nimport { GrammarMarkType } from './enums';\n\nexport const BridgeElementKey = '__vgrammar_scene_item__';\n\nexport const CollectionMarkType = [GrammarMarkType.line, GrammarMarkType.area];\n\nexport const Mark3DType = [GrammarMarkType.arc3d, GrammarMarkType.rect3d, GrammarMarkType.pyramid3d];\n\nexport const DefaultKey = 'key';\n\nexport const DefaultMarkData = [{}];\n\nexport const DefaultGroupKeys = [DefaultKey];\n\nexport const DefaultReuse = true;\nexport const DefaultMorph = true;\nexport const DefaultMorphAll = false;\nexport const DefaultSplitPath: null | 'clone' = null;\nexport const DefaultEnableExitAnimation = true;\n\nexport const ImmediateAnimationState = 'VGRAMMAR_IMMEDIATE_ANIMATION';\n\n/** default animation configs */\nexport const DefaultAnimationStartTime = 0;\nexport const DefaultAnimationDuration = 1000;\nexport const DefaultAnimationDelay = 0;\nexport const DefaultAnimationDelayAfter = 0;\nexport const DefaultAnimationLoop = false;\nexport const DefaultAnimationOneByOne = false;\nexport const DefaultAnimationEasing = 'quintInOut';\nexport const DefaultAnimationControlOptions: IAnimationControlOptions = {\n  stopWhenStateChange: false,\n  immediatelyApply: true\n};\nexport const DefaultAnimationParameters = 'VGRAMMAR_ANIMATION_PARAMETERS';\n"]}

package/es/graph/element.d.ts

@@ -23,7 +23,7 @@ export declare class Element implements IElement {
     updateData(groupKey: string | null, data: any[], key: MarkKeySpec): MarkElementItem[];
     state(markState: MarkFunctionType<string | string[]>, parameters?: any): void;
     encodeGraphic(attrs?: any): void;
-    private _setCutomizedShape;
+    private _setCustomizedShape;
     encodeItems(items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any): void;
     protected coordinateTransformEncode(items: MarkElementItem[]): void;
     clearStates(hasAnimation?: boolean): void;

package/es/graph/element.js

@@ -14,7 +14,7 @@ import { transformAttributes } from "./attributes/transform";
 
 import { getLargeRectsPoints, getLargeSymbolsPoints, getLinePoints, isValidPointsChannel, isPointsMarkType } from "./attributes/helpers";
 
-import { getLineSegmentConfigs, getLinePointsFromSegments } from "./attributes/line";
+import { getLineSegmentConfigs, getLinePointsFromSegments, parseCollectionMarkAttributes } from "./attributes/line";
 
 import { CustomPath2D } from "@visactor/vrender-core";
 
@@ -41,14 +41,13 @@ export class Element {
     }
     initGraphicItem(attributes = {}) {
         if (this.graphicItem) return;
-        const attrs = Object.assign({}, attributes);
-        this.graphicItem = this.mark.addGraphicItem(attrs, this.groupKey), this.graphicItem && (this.graphicItem[BridgeElementKey] = this, 
-        this.mark.markType !== GrammarMarkType.component && (this.graphicItem.onBeforeAttributeUpdate = attributes => {
+        const attrTransforms = this.mark.getAttributeTransforms();
+        this.graphicItem = this.mark.addGraphicItem(attrTransforms ? {} : attributes, this.groupKey), 
+        this.graphicItem && (this.graphicItem[BridgeElementKey] = this, attrTransforms && (this.graphicItem.onBeforeAttributeUpdate = attributes => {
             if (!this.mark) return attributes;
-            return transformAttributes(this.mark.getAttributeTransforms(), attributes, this);
-        }, this.graphicItem.setAttributes(this.graphicItem.attribute)), this.clearGraphicAttributes(), 
-        this.mark.needAnimate() && (this.setPrevGraphicAttributes({}), this.setNextGraphicAttributes(attributes), 
-        this.setFinalGraphicAttributes(attributes)));
+            return transformAttributes(attrTransforms, attributes, this);
+        }, this.graphicItem.setAttributes(attributes)), this.clearGraphicAttributes(), this.mark.needAnimate() && (this.setPrevGraphicAttributes({}), 
+        this.setNextGraphicAttributes(attributes), this.setFinalGraphicAttributes(attributes)));
     }
     updateGraphicItem(config) {
         if (!this.graphicItem) return;
@@ -105,8 +104,7 @@ export class Element {
         this.states = newStateValues, !isCollectionMark && isStateChanged && this.diffState === DiffState.unChange && (this.diffState = DiffState.update);
     }
     encodeGraphic(attrs) {
-        var _a, _b;
-        this.coordinateTransformEncode(this.items), !isNil(null == attrs ? void 0 : attrs.enableSegments) && (null === (_b = null === (_a = this.items) || void 0 === _a ? void 0 : _a[0]) || void 0 === _b ? void 0 : _b.nextAttrs) && (this.items[0].nextAttrs.enableSegments = attrs.enableSegments);
+        this.coordinateTransformEncode(this.items);
         const graphicAttributes = this.transformElementItems(this.items, this.mark.markType);
         attrs && Object.assign(graphicAttributes, attrs), this.graphicItem ? (this.graphicItem.clearStates(), 
         this.graphicItem.states = {}, this.graphicItem.stateProxy = null, this.applyGraphicAttributes(graphicAttributes)) : this.initGraphicItem(graphicAttributes), 
@@ -114,16 +112,16 @@ export class Element {
         this.mark.markType === GrammarMarkType.shape && (this.graphicItem.datum = this.items[0].datum), 
         this.items.forEach((item => {
             item.nextAttrs = {};
-        })), this._setCutomizedShape();
+        })), this._setCustomizedShape();
     }
-    _setCutomizedShape() {
+    _setCustomizedShape() {
         var _a;
         if (!this.graphicItem) return;
         const setCustomizedShape = null === (_a = this.mark.getSpec()) || void 0 === _a ? void 0 : _a.setCustomizedShape;
         setCustomizedShape && (this.graphicItem.pathProxy = attrs => setCustomizedShape(this.data, attrs, new CustomPath2D));
     }
     encodeItems(items, encoders, isReentered = !1, parameters) {
-        const isCollectionMark = this.mark.isCollectionMark(), updateEncoder = encoders[BuiltInEncodeNames.update], enterEncoder = encoders[BuiltInEncodeNames.enter], exitEncoder = encoders[BuiltInEncodeNames.exit], onlyFullEncodeFirst = this.mark.isLargeMode();
+        const isCollectionMark = this.mark.isCollectionMark(), updateEncoder = encoders[BuiltInEncodeNames.update], enterEncoder = encoders[BuiltInEncodeNames.enter], exitEncoder = encoders[BuiltInEncodeNames.exit], onlyFullEncodeFirst = this.mark.isLargeMode() || isCollectionMark && !this.mark.getSpec().enableSegments;
         this.diffState === DiffState.enter ? (enterEncoder && invokeEncoderToItems(this, items, enterEncoder, parameters, onlyFullEncodeFirst), 
         updateEncoder && invokeEncoderToItems(this, items, updateEncoder, parameters, onlyFullEncodeFirst)) : this.diffState === DiffState.update ? ((isCollectionMark && enterEncoder || isReentered) && invokeEncoderToItems(this, items, enterEncoder, parameters, onlyFullEncodeFirst), 
         updateEncoder && invokeEncoderToItems(this, items, updateEncoder, parameters, onlyFullEncodeFirst)) : this.diffState === DiffState.exit && exitEncoder && (isReentered && invokeEncoderToItems(this, items, enterEncoder, parameters, onlyFullEncodeFirst), 
@@ -181,20 +179,19 @@ export class Element {
         return diffResult;
     }
     transformElementItems(items, markType, computePoints) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const item = items[0];
         if (!item.nextAttrs || 0 === Object.keys(item.nextAttrs).length) return {};
         let nextAttrs = null == item ? void 0 : item.nextAttrs;
         if (items && items.length && isNil(null === (_a = item.nextAttrs) || void 0 === _a ? void 0 : _a.points) && (!0 === computePoints || isValidPointsChannel(Object.keys(item.nextAttrs), this.mark.markType)) && isPointsMarkType(markType)) {
-            const lastPoints = this.getGraphicAttribute("points", !1), lastSegments = this.getGraphicAttribute("segments", !1), enableSegments = null !== (_b = item.nextAttrs.enableSegments) && void 0 !== _b ? _b : this.getGraphicAttribute("enableSegments", !1), itemNextAttrs = items.map((item => item.nextAttrs)), isProgressive = this.mark.isProgressive();
-            if (nextAttrs = Object.assign({}, nextAttrs), delete nextAttrs.x, delete nextAttrs.y, 
-            markType === GrammarMarkType.line || markType === GrammarMarkType.area) {
+            const lastPoints = this.getGraphicAttribute("points", !1), lastSegments = this.getGraphicAttribute("segments", !1), enableSegments = this.mark.getSpec().enableSegments, itemNextAttrs = items.map((item => item.nextAttrs)), isProgressive = this.mark.isProgressive();
+            if (nextAttrs = parseCollectionMarkAttributes(nextAttrs), markType === GrammarMarkType.line || markType === GrammarMarkType.area) {
                 const linePoints = getLinePoints(items, !0, lastPoints, markType === GrammarMarkType.area);
                 if (enableSegments && !isProgressive) {
                     const points = linePoints && 0 !== linePoints.length ? linePoints : getLinePointsFromSegments(lastSegments), segments = getLineSegmentConfigs(itemNextAttrs, points, this);
                     segments ? (nextAttrs.segments = segments, nextAttrs.points = null) : (nextAttrs.segments = null, 
                     nextAttrs.points = points);
-                } else isProgressive ? nextAttrs.segments = (null !== (_e = null === (_d = null === (_c = this.graphicItem) || void 0 === _c ? void 0 : _c.attribute) || void 0 === _d ? void 0 : _d.segments) && void 0 !== _e ? _e : []).concat([ {
+                } else isProgressive ? nextAttrs.segments = (null !== (_d = null === (_c = null === (_b = this.graphicItem) || void 0 === _b ? void 0 : _b.attribute) || void 0 === _c ? void 0 : _c.segments) && void 0 !== _d ? _d : []).concat([ {
                     points: linePoints
                 } ]) : (nextAttrs.points = linePoints, nextAttrs.segments = null);
             } else markType === GrammarMarkType.largeRects ? nextAttrs.points = getLargeRectsPoints(items, !0, lastPoints) : markType === GrammarMarkType.largeSymbols && (nextAttrs.points = getLargeSymbolsPoints(items, !0, lastPoints));