@visactor/vrender-animate 1.0.8-alpha.1 → 1.0.8-alpha.2

package/dist/index.es.js

@@ -556,8 +556,6 @@ class Step {
     }
     stop() {
     }
-    release() {
-    }
 }
 class WaitStep extends Step {
     constructor(type, props, duration, easing) {
@@ -592,7 +590,6 @@ class DefaultTimeline extends EventEmitter {
         this._totalDuration = 0;
         this._startTime = 0;
         this._currentTime = 0;
-        this._animationEndFlag = true;
         this.id = Generator.GenAutoIncrementId();
         this.paused = false;
     }
@@ -640,10 +637,6 @@ class DefaultTimeline extends EventEmitter {
         if (this.paused) {
             return;
         }
-        if (this._animationEndFlag) {
-            this._animationEndFlag = false;
-            this.emit('animationStart');
-        }
         const scaledDelta = delta * this._playSpeed;
         this._currentTime += scaledDelta;
         this.forEachAccessAnimate((animate, i) => {
@@ -655,7 +648,6 @@ class DefaultTimeline extends EventEmitter {
             }
         });
         if (this._animateCount === 0) {
-            this._animationEndFlag = true;
             this.emit('animationEnd');
         }
     }
@@ -776,14 +768,6 @@ class Animate {
     }
     bind(target) {
         this.target = target;
-        if (!this.target.animates) {
-            this.target.animates = new Map();
-        }
-        this.target.animates.set(this.id, this);
-        this.onRemove(() => {
-            this.stop();
-            this.target.animates.delete(this.id);
-        });
         if (this.target.onAnimateBind && !this.slience) {
             this.target.onAnimateBind(this);
         }
@@ -987,9 +971,6 @@ class Animate {
         this._onFrame = [];
         this._onEnd = [];
         this._onRemove = [];
-        this.forEachStep(step => {
-            step.release();
-        });
     }
     getDuration() {
         return this._duration;
@@ -1124,13 +1105,6 @@ class Animate {
     getLoop() {
         return this._loopCount;
     }
-    forEachStep(cb) {
-        let step = this._firstStep;
-        while (step) {
-            cb(step);
-            step = step.next;
-        }
-    }
 }
 
 const performanceRAF = new PerformanceRAF();
@@ -1211,10 +1185,10 @@ class DefaultTicker extends EventEmitter {
         this.interval = 16;
         this.status = STATUS.INITIAL;
         application.global.hooks.onSetEnv.tap('graph-ticker', () => {
-            this.initHandler(false);
+            this.initHandler();
         });
         if (application.global.env) {
-            this.initHandler(false);
+            this.initHandler();
         }
     }
     addTimeline(timeline) {
@@ -1226,13 +1200,10 @@ class DefaultTicker extends EventEmitter {
     getTimelines() {
         return this.timelines;
     }
-    initHandler(force = false) {
-        this.setupTickHandler(force);
+    initHandler() {
+        this.setupTickHandler();
     }
-    setupTickHandler(force = false) {
-        if (!force && this.tickerHandler) {
-            return true;
-        }
+    setupTickHandler() {
         const handler = new RAFTickHandler();
         if (this.tickerHandler) {
             this.tickerHandler.release();
@@ -1312,7 +1283,7 @@ class DefaultTicker extends EventEmitter {
     }
     stop() {
         this.status = STATUS.INITIAL;
-        this.setupTickHandler(true);
+        this.setupTickHandler();
         this.lastFrameTime = -1;
     }
     trySyncTickStatus() {
@@ -1332,8 +1303,7 @@ class DefaultTicker extends EventEmitter {
         this.lastFrameTime = -1;
     }
     checkSkip(delta) {
-        var _a, _b, _c;
-        if (((_c = (_b = (_a = this.stage) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.optimize) === null || _c === void 0 ? void 0 : _c.tickRenderMode) === 'performance') {
+        if (this.stage.params.optimize.tickRenderMode === 'performance') {
             return false;
         }
         const skip = delta < this.interval + (Math.random() - 0.5) * 2 * this._jitter;
@@ -1801,7 +1771,10 @@ class AnimateExecutor {
     _handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic) {
         var _a, _b, _c, _d;
         if (custom && customType) {
-            const customParams = Object.assign({ width: graphic.stage.width, height: graphic.stage.height, group: this._target.parent }, this.resolveValue(customParameters, graphic));
+            const customParams = this.resolveValue(customParameters, graphic, {
+                width: graphic.stage.width,
+                height: graphic.stage.height
+            });
             const objOptions = isFunction(options)
                 ? options.call(null, (_b = (customParams && ((_a = customParams.data) === null || _a === void 0 ? void 0 : _a[0]))) !== null && _b !== void 0 ? _b : (_d = (_c = graphic.context) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d[0], graphic, customParams)
                 : options;
@@ -2129,14 +2102,6 @@ class AnimationStateManager {
         });
         this.stateList = null;
     }
-    reApplyState(state) {
-        var _a;
-        const stateInfo = (_a = this.stateList) === null || _a === void 0 ? void 0 : _a.find(stateInfo => stateInfo.state === state);
-        if (stateInfo) {
-            stateInfo.executor.stop();
-            stateInfo.executor.execute(stateInfo.animationConfig);
-        }
-    }
 }
 
 class GraphicStateExtension {
@@ -2180,28 +2145,14 @@ class GraphicStateExtension {
         this._getAnimationStateManager(this).applyUnhighlightState(animationConfig, callback);
         return this;
     }
-    stopAnimationState(state, type, deep = false) {
+    stopAnimationState(state, type) {
         this._getAnimationStateManager(this).stopState(state, type);
-        if (deep && this.isContainer) {
-            this.forEachChildren((child) => {
-                child.stopAnimationState(state, type, deep);
-            });
-        }
         return this;
     }
     clearAnimationStates() {
         this._getAnimationStateManager(this).clearState();
         return this;
     }
-    reApplyAnimationState(state, deep = false) {
-        this._getAnimationStateManager(this).reApplyState(state);
-        if (deep && this.isContainer) {
-            this.forEachChildren((child) => {
-                child.reApplyAnimationState(state, deep);
-            });
-        }
-        return this;
-    }
     static extend(graphic) {
         const extension = new GraphicStateExtension();
         extension._getAnimationStateManager(graphic);
@@ -2218,6 +2169,9 @@ class AnimateExtension {
     }
     animate(params) {
         var _a, _b, _c;
+        if (!this.animates) {
+            this.animates = new Map();
+        }
         const animate = new Animate(params === null || params === void 0 ? void 0 : params.id, (_b = (_a = params === null || params === void 0 ? void 0 : params.timeline) !== null && _a !== void 0 ? _a : (this.stage && this.stage.getTimeline())) !== null && _b !== void 0 ? _b : defaultTimeline, params === null || params === void 0 ? void 0 : params.slience);
         animate.bind(this);
         if (params) {
@@ -2226,6 +2180,11 @@ class AnimateExtension {
             onEnd != null && animate.onEnd(onEnd);
             onRemove != null && animate.onRemove(onRemove);
         }
+        this.animates.set(animate.id, animate);
+        animate.onRemove(() => {
+            animate.stop();
+            this.animates.delete(animate.id);
+        });
         (_c = this.stage) === null || _c === void 0 ? void 0 : _c.ticker.start();
         return animate;
     }
@@ -2270,30 +2229,6 @@ class AnimateExtension {
         }
         return this.attribute[key];
     }
-    pauseAnimation(deep = false) {
-        this.animates && this.animates.forEach(animate => animate.pause());
-        if (deep && this.isContainer) {
-            this.forEachChildren((child) => {
-                child.pauseAnimation(deep);
-            });
-        }
-    }
-    resumeAnimation(deep = false) {
-        this.animates && this.animates.forEach(animate => animate.resume());
-        if (deep && this.isContainer) {
-            this.forEachChildren((child) => {
-                child.resumeAnimation(deep);
-            });
-        }
-    }
-    stopAnimation(deep = false) {
-        this.animates && this.animates.forEach(animate => animate.stop());
-        if (deep && this.isContainer) {
-            this.forEachChildren((child) => {
-                child.stopAnimation(deep);
-            });
-        }
-    }
 }
 
 function registerAnimate() {
@@ -2307,8 +2242,6 @@ class ACustomAnimate extends Step {
         this.type = 'customAnimate';
         this.customFrom = customFrom;
         this.params = params;
-        this.from = customFrom;
-        this.to = customTo;
     }
     update(end, ratio, out) {
         this.onStart();
@@ -2335,70 +2268,6 @@ class AComponentAnimate extends ACustomAnimate {
         this._animator && this._animator.stop();
     }
 }
-class AStageAnimate extends ACustomAnimate {
-    constructor(customFrom, customTo, duration, easing, params) {
-        super(customFrom, customTo, duration, easing, params);
-        this.willCallBeforeStageRender = true;
-        this.willCallAfterStageRender = true;
-        this._beforeStageRender = () => {
-            if (!this.willCallBeforeStageRender) {
-                return;
-            }
-            this.willCallBeforeStageRender = false;
-            const stage = this.target.stage;
-            const canvas = stage.window.getContext().canvas.nativeCanvas;
-            const outputCanvas = this.beforeStageRender(stage, canvas);
-            if (outputCanvas) {
-                this.renderToStage(stage, outputCanvas);
-            }
-        };
-        this._afterStageRender = () => {
-            if (!this.willCallAfterStageRender) {
-                return;
-            }
-            this.willCallAfterStageRender = false;
-            const stage = this.target.stage;
-            const canvas = stage.window.getContext().canvas.nativeCanvas;
-            const outputCanvas = this.afterStageRender(stage, canvas);
-            if (outputCanvas) {
-                this.renderToStage(stage, outputCanvas);
-            }
-        };
-        this.props = {};
-    }
-    beforeStageRender(stage, canvas) {
-        return false;
-    }
-    afterStageRender(stage, canvas) {
-        return false;
-    }
-    onFirstRun() {
-        super.onFirstRun();
-        this.target.stage.setBeforeRender(this._beforeStageRender);
-        this.target.stage.setAfterRender(this._afterStageRender);
-        this.target.stage.disableDirtyBounds();
-    }
-    stop() {
-        super.stop();
-        this.target.stage.removeBeforeRender(this._beforeStageRender);
-        this.target.stage.removeAfterRender(this._afterStageRender);
-    }
-    onUpdate(end, ratio, out) {
-        super.onUpdate(end, ratio, out);
-        this.willCallBeforeStageRender = true;
-        this.willCallAfterStageRender = true;
-    }
-    renderToStage(stage, canvas) {
-        const stageCanvas = stage.window.getContext().canvas.nativeCanvas;
-        const ctx = stageCanvas.getContext('2d');
-        if (!ctx) {
-            return false;
-        }
-        ctx.clearRect(0, 0, stageCanvas.width, stageCanvas.height);
-        ctx.drawImage(canvas, 0, 0);
-        return stageCanvas;
-    }
-}
 
 class ComponentAnimator {
     constructor(component) {
@@ -4047,7 +3916,7 @@ class GrowCenterIn extends ACustomAnimate {
         super(from, to, duration, easing, params);
     }
     onBind() {
-        var _a, _b, _c;
+        var _a, _b;
         super.onBind();
         const { from, to } = growCenterIn(this.target, this.params.options, this.params);
         const fromAttrs = (_b = (_a = this.target.context) === null || _a === void 0 ? void 0 : _a.lastAttrs) !== null && _b !== void 0 ? _b : from;
@@ -4059,9 +3928,7 @@ class GrowCenterIn extends ACustomAnimate {
         if (finalAttribute) {
             this.target.setAttributes(finalAttribute);
         }
-        if (((_c = this.params.controlOptions) === null || _c === void 0 ? void 0 : _c.immediatelyApply) !== false) {
-            this.target.setAttributes(fromAttrs);
-        }
+        this.target.setAttributes(fromAttrs);
     }
     onEnd(cb) {
         super.onEnd(cb);
@@ -4157,7 +4024,7 @@ class GrowHeightIn extends ACustomAnimate {
         super(from, to, duration, easing, params);
     }
     onBind() {
-        var _a, _b, _c;
+        var _a, _b;
         super.onBind();
         const { from, to } = growHeightIn(this.target, this.params.options, this.params);
         const fromAttrs = (_b = (_a = this.target.context) === null || _a === void 0 ? void 0 : _a.lastAttrs) !== null && _b !== void 0 ? _b : from;
@@ -4169,9 +4036,7 @@ class GrowHeightIn extends ACustomAnimate {
         if (finalAttribute) {
             this.target.setAttributes(finalAttribute);
         }
-        if (((_c = this.params.controlOptions) === null || _c === void 0 ? void 0 : _c.immediatelyApply) !== false) {
-            this.target.setAttributes(fromAttrs);
-        }
+        this.target.setAttributes(fromAttrs);
     }
     onEnd(cb) {
         super.onEnd(cb);
@@ -6622,14 +6487,15 @@ const moveIn = (graphic, options, animationParameters) => {
     const point = isFunction(pointOpt)
         ? pointOpt.call(null, (_d = (_c = graphic.context) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d[0], graphic, animationParameters)
         : pointOpt;
-    const finalAttrsX = graphic.getGraphicAttribute('x');
-    const finalAttrsY = graphic.getGraphicAttribute('y');
-    const fromX = excludeChannels.includes('x') ? finalAttrsX : point && isValidNumber(point.x) ? point.x : changedX;
-    const fromY = excludeChannels.includes('y') ? finalAttrsY : point && isValidNumber(point.y) ? point.y : changedY;
+    const fromX = point && isValidNumber(point.x) ? point.x : changedX;
+    const fromY = point && isValidNumber(point.y) ? point.y : changedY;
+    const finalAttrs = graphic.getFinalAttribute();
+    const finalAttrsX = excludeChannels.includes('x') ? graphic.attribute.x : finalAttrs.x;
+    const finalAttrsY = excludeChannels.includes('y') ? graphic.attribute.y : finalAttrs.y;
     switch (direction) {
         case 'x':
             return {
-                from: { x: excludeChannels.includes('x') ? finalAttrsX : fromX },
+                from: { x: fromX },
                 to: { x: finalAttrsX }
             };
         case 'y':
@@ -6649,35 +6515,34 @@ const moveIn = (graphic, options, animationParameters) => {
     }
 };
 const moveOut = (graphic, options, animationParameters) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const { offset = 0, orient, direction, point: pointOpt } = options !== null && options !== void 0 ? options : {};
-    const groupBounds = animationParameters.group ? animationParameters.group.AABBBounds : null;
-    const groupWidth = (_a = groupBounds.width()) !== null && _a !== void 0 ? _a : animationParameters.width;
-    const groupHeight = (_b = groupBounds.height()) !== null && _b !== void 0 ? _b : animationParameters.height;
+    const groupWidth = (_b = (_a = options.layoutRect) === null || _a === void 0 ? void 0 : _a.width) !== null && _b !== void 0 ? _b : graphic.stage.viewWidth;
+    const groupHeight = (_d = (_c = options.layoutRect) === null || _c === void 0 ? void 0 : _c.height) !== null && _d !== void 0 ? _d : graphic.stage.viewHeight;
     const changedX = (orient === 'negative' ? groupWidth : 0) + offset;
     const changedY = (orient === 'negative' ? groupHeight : 0) + offset;
     const point = isFunction(pointOpt)
-        ? pointOpt.call(null, (_d = (_c = graphic.context) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d[0], graphic, animationParameters)
+        ? pointOpt.call(null, (_f = (_e = graphic.context) === null || _e === void 0 ? void 0 : _e.data) === null || _f === void 0 ? void 0 : _f[0], graphic, animationParameters)
         : pointOpt;
     const fromX = point && isValidNumber(point.x) ? point.x : changedX;
     const fromY = point && isValidNumber(point.y) ? point.y : changedY;
     switch (direction) {
         case 'x':
             return {
-                from: { x: graphic.getGraphicAttribute('x') },
+                from: { x: graphic.attribute.x },
                 to: { x: fromX }
             };
         case 'y':
             return {
-                from: { y: graphic.getGraphicAttribute('y') },
+                from: { y: graphic.attribute.y },
                 to: { y: fromY }
             };
         case 'xy':
         default:
             return {
                 from: {
-                    x: graphic.getGraphicAttribute('x'),
-                    y: graphic.getGraphicAttribute('y')
+                    x: graphic.attribute.x,
+                    y: graphic.attribute.y
                 },
                 to: { x: fromX, y: fromY }
             };
@@ -6877,10 +6742,6 @@ class FromTo extends ACustomAnimate {
             });
         this.target.setAttributes(this.from);
     }
-    deleteSelfAttr(key) {
-        super.deleteSelfAttr(key);
-        delete this.from[key];
-    }
     update(end, ratio, out) {
         this.onStart();
         if (!this.props || !this.propKeys) {
@@ -7198,4 +7059,4 @@ const registerCustomAnimate = () => {
     AnimateExecutor.registerBuiltInAnimate('streamLight', StreamLight);
 };
 
-export { AComponentAnimate, ACustomAnimate, AStageAnimate, Animate, AnimateExecutor, Step as AnimateStep, AnimationStateManager, AnimationStateStore, AnimationStates, AnimationTransitionRegistry, ClipAngleAnimate, ClipDirectionAnimate, ClipGraphicAnimate, ClipIn, ClipOut, ClipRadiusAnimate, ComponentAnimator, DefaultTicker, DefaultTimeline, Easing, FadeIn, FadeOut, FromTo, GraphicStateExtension, GroupFadeIn, GroupFadeOut, GrowAngleIn, GrowAngleOut, GrowCenterIn, GrowCenterOut, GrowHeightIn, GrowHeightOut, GrowIn, GrowOut, GrowPointsIn, GrowPointsOut, GrowPointsXIn, GrowPointsXOut, GrowPointsYIn, GrowPointsYOut, GrowRadiusIn, GrowRadiusOut, GrowWidthIn, GrowWidthOut, IncreaseCount, InputRichText, InputText, LabelItemAppear, LabelItemDisappear, ManualTicker, MorphingPath, MotionPath, MoveIn, MoveOut, MoveRotateIn, MoveRotateOut, MoveScaleIn, MoveScaleOut, MultiToOneMorphingPath, OutputRichText, PoptipAppear, PoptipDisappear, PulseAnimate, RotateBySphereAnimate, RotateIn, RotateOut, ScaleIn, ScaleOut, SlideIn, SlideOut, SlideOutRichText, SlideRichText, SpinIn, SpinOut, State, StreamLight, StrokeIn, StrokeOut, TagPointsUpdate, Update, createComponentAnimator, generatorPathEasingFunc, morphPath, multiToOneMorph, oneToMultiMorph, registerAnimate, registerCustomAnimate, transitionRegistry };
+export { AComponentAnimate, ACustomAnimate, Animate, AnimateExecutor, Step as AnimateStep, AnimationStateManager, AnimationStateStore, AnimationStates, AnimationTransitionRegistry, ClipAngleAnimate, ClipDirectionAnimate, ClipGraphicAnimate, ClipIn, ClipOut, ClipRadiusAnimate, ComponentAnimator, DefaultTicker, DefaultTimeline, FadeIn, FadeOut, FromTo, GraphicStateExtension, GroupFadeIn, GroupFadeOut, GrowAngleIn, GrowAngleOut, GrowCenterIn, GrowCenterOut, GrowHeightIn, GrowHeightOut, GrowIn, GrowOut, GrowPointsIn, GrowPointsOut, GrowPointsXIn, GrowPointsXOut, GrowPointsYIn, GrowPointsYOut, GrowRadiusIn, GrowRadiusOut, GrowWidthIn, GrowWidthOut, IncreaseCount, InputRichText, InputText, LabelItemAppear, LabelItemDisappear, ManualTicker, MorphingPath, MotionPath, MoveIn, MoveOut, MoveRotateIn, MoveRotateOut, MoveScaleIn, MoveScaleOut, MultiToOneMorphingPath, OutputRichText, PoptipAppear, PoptipDisappear, PulseAnimate, RotateBySphereAnimate, RotateIn, RotateOut, ScaleIn, ScaleOut, SlideIn, SlideOut, SlideOutRichText, SlideRichText, SpinIn, SpinOut, State, StreamLight, StrokeIn, StrokeOut, TagPointsUpdate, Update, createComponentAnimator, generatorPathEasingFunc, morphPath, multiToOneMorph, oneToMultiMorph, registerAnimate, registerCustomAnimate, transitionRegistry };

package/es/animate-extension.d.ts

@@ -19,7 +19,4 @@ export declare class AnimateExtension {
     executeAnimations(configs: IAnimationConfig[]): this;
     protected getFinalAttribute(): Record<string, any>;
     getGraphicAttribute(key: string, prev?: boolean): any;
-    pauseAnimation(deep?: boolean): void;
-    resumeAnimation(deep?: boolean): void;
-    stopAnimation(deep?: boolean): void;
 }

package/es/animate-extension.js

@@ -12,13 +12,16 @@ export class AnimateExtension {
     }
     animate(params) {
         var _a, _b, _c;
+        this.animates || (this.animates = new Map);
         const animate = new Animate(null == params ? void 0 : params.id, null !== (_b = null !== (_a = null == params ? void 0 : params.timeline) && void 0 !== _a ? _a : this.stage && this.stage.getTimeline()) && void 0 !== _b ? _b : defaultTimeline, null == params ? void 0 : params.slience);
         if (animate.bind(this), params) {
             const {onStart: onStart, onEnd: onEnd, onRemove: onRemove} = params;
             null != onStart && animate.onStart(onStart), null != onEnd && animate.onEnd(onEnd), 
             null != onRemove && animate.onRemove(onRemove);
         }
-        return null === (_c = this.stage) || void 0 === _c || _c.ticker.start(), animate;
+        return this.animates.set(animate.id, animate), animate.onRemove((() => {
+            animate.stop(), this.animates.delete(animate.id);
+        })), null === (_c = this.stage) || void 0 === _c || _c.ticker.start(), animate;
     }
     createTimeline() {
         return new DefaultTimeline;
@@ -49,19 +52,4 @@ export class AnimateExtension {
     getGraphicAttribute(key, prev = !1) {
         return !prev && this.finalAttribute ? this.finalAttribute[key] : this.attribute[key];
     }
-    pauseAnimation(deep = !1) {
-        this.animates && this.animates.forEach((animate => animate.pause())), deep && this.isContainer && this.forEachChildren((child => {
-            child.pauseAnimation(deep);
-        }));
-    }
-    resumeAnimation(deep = !1) {
-        this.animates && this.animates.forEach((animate => animate.resume())), deep && this.isContainer && this.forEachChildren((child => {
-            child.resumeAnimation(deep);
-        }));
-    }
-    stopAnimation(deep = !1) {
-        this.animates && this.animates.forEach((animate => animate.stop())), deep && this.isContainer && this.forEachChildren((child => {
-            child.stopAnimation(deep);
-        }));
-    }
 }

package/es/animate-extension.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animate-extension.ts"],"names":[],"mappings":"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","file":"animate-extension.js","sourcesContent":["// 1. 支持animate函数\n// 2. 支持animates map\n// 2. 支持animatedAttribute 为所有动画的最终结果（loop为INFINITY的动画不算）\n// 3. 支持finalAttribute 为所有动画的最终结果（animatedAttribute 合并了 graphic.attribute之后的最终结果）\n// 3. 重载Graphic的getAttributes方法，根据参数getAttributes(final = true)返回finalAttribute = {}; merge(finalAttribute, graphic.attribute, animatedAttribute)，\n// animatedAttribute为所有动画的最终结果（loop为INFINITY的动画不算）\n\nimport type { IGraphicAnimateParams, IAnimate } from '@visactor/vrender-core';\nimport { Animate } from './animate';\nimport { DefaultTimeline, defaultTimeline } from './timeline';\nimport { DefaultTicker } from './ticker/default-ticker';\nimport type { IAnimationConfig } from './executor/executor';\nimport { AnimateExecutor } from './executor/animate-executor';\n\n// 基于性能考虑，每次调用animate函数，都会设置animatedAttribute为null，每次getAttributes(true)会根据animatedAttribute属性判断是否需要重新计算animatedAttribute。\nexport class AnimateExtension {\n  declare finalAttribute: Record<string, any>;\n  _animateExecutor: AnimateExecutor | null;\n\n  declare animates: Map<string | number, IAnimate>;\n\n  getAttributes(final: boolean = false) {\n    if (final && this.finalAttribute) {\n      return this.finalAttribute;\n    }\n    return (this as any).attribute;\n  }\n\n  animate(params?: IGraphicAnimateParams) {\n    const animate = new Animate(\n      params?.id,\n      params?.timeline ?? ((this as any).stage && (this as any).stage.getTimeline()) ?? defaultTimeline,\n      params?.slience\n    );\n\n    animate.bind(this as any);\n    if (params) {\n      const { onStart, onEnd, onRemove } = params;\n      onStart != null && animate.onStart(onStart);\n      onEnd != null && animate.onEnd(onEnd);\n      onRemove != null && animate.onRemove(onRemove);\n    }\n\n    // TODO 考虑性能问题\n    (this as any).stage?.ticker.start();\n\n    return animate;\n  }\n\n  createTimeline() {\n    return new DefaultTimeline();\n  }\n\n  createTicker(stage: any) {\n    return new DefaultTicker(stage);\n  }\n\n  setFinalAttributes(finalAttribute: Record<string, any>) {\n    if (!this.finalAttribute) {\n      this.finalAttribute = {};\n    }\n    Object.assign(this.finalAttribute, finalAttribute);\n  }\n\n  initFinalAttributes(finalAttribute: Record<string, any>) {\n    this.finalAttribute = finalAttribute;\n  }\n\n  initAnimateExecutor(): void {\n    if (!this._animateExecutor) {\n      this._animateExecutor = new AnimateExecutor(this as any);\n    }\n  }\n\n  /**\n   * Apply animation configuration to the component\n   * @param config Animation configuration\n   * @returns This component instance\n   */\n  executeAnimation(config: IAnimationConfig): this {\n    this.initAnimateExecutor();\n    this._animateExecutor.execute(config);\n    return this;\n  }\n\n  /**\n   * Apply animations to multiple components\n   * @param configs Animation configurations\n   * @returns This component instance\n   */\n  executeAnimations(configs: IAnimationConfig[]): this {\n    this.initAnimateExecutor();\n    configs.forEach(config => {\n      this._animateExecutor.execute(config);\n    });\n    return this;\n  }\n\n  protected getFinalAttribute() {\n    return this.finalAttribute;\n  }\n\n  // TODO prev是兼容原本VGrammar函数的一个参数，用于动画中获取上一次属性，目前的逻辑中应该不需要，直接去当前帧的属性即可\n  getGraphicAttribute(key: string, prev: boolean = false) {\n    if (!prev && this.finalAttribute) {\n      return this.finalAttribute[key];\n    }\n    return (this as any).attribute[key];\n  }\n\n  pauseAnimation(deep: boolean = false) {\n    this.animates && this.animates.forEach(animate => animate.pause());\n    if (deep && (this as any).isContainer) {\n      (this as any).forEachChildren((child: any) => {\n        child.pauseAnimation(deep);\n      });\n    }\n  }\n\n  resumeAnimation(deep: boolean = false) {\n    this.animates && this.animates.forEach(animate => animate.resume());\n    if (deep && (this as any).isContainer) {\n      (this as any).forEachChildren((child: any) => {\n        child.resumeAnimation(deep);\n      });\n    }\n  }\n\n  stopAnimation(deep: boolean = false) {\n    this.animates && this.animates.forEach(animate => animate.stop());\n    if (deep && (this as any).isContainer) {\n      (this as any).forEachChildren((child: any) => {\n        child.stopAnimation(deep);\n      });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/animate-extension.ts"],"names":[],"mappings":"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","file":"animate-extension.js","sourcesContent":["// 1. 支持animate函数\n// 2. 支持animates map\n// 2. 支持animatedAttribute 为所有动画的最终结果（loop为INFINITY的动画不算）\n// 3. 支持finalAttribute 为所有动画的最终结果（animatedAttribute 合并了 graphic.attribute之后的最终结果）\n// 3. 重载Graphic的getAttributes方法，根据参数getAttributes(final = true)返回finalAttribute = {}; merge(finalAttribute, graphic.attribute, animatedAttribute)，\n// animatedAttribute为所有动画的最终结果（loop为INFINITY的动画不算）\n\nimport type { IGraphicAnimateParams, IAnimate } from '@visactor/vrender-core';\nimport { Animate } from './animate';\nimport { DefaultTimeline, defaultTimeline } from './timeline';\nimport { DefaultTicker } from './ticker/default-ticker';\nimport type { IAnimationConfig } from './executor/executor';\nimport { AnimateExecutor } from './executor/animate-executor';\n\n// 基于性能考虑，每次调用animate函数，都会设置animatedAttribute为null，每次getAttributes(true)会根据animatedAttribute属性判断是否需要重新计算animatedAttribute。\nexport class AnimateExtension {\n  declare finalAttribute: Record<string, any>;\n  _animateExecutor: AnimateExecutor | null;\n\n  declare animates: Map<string | number, IAnimate>;\n\n  getAttributes(final: boolean = false) {\n    if (final && this.finalAttribute) {\n      return this.finalAttribute;\n    }\n    return (this as any).attribute;\n  }\n\n  animate(params?: IGraphicAnimateParams) {\n    if (!this.animates) {\n      this.animates = new Map();\n    }\n    const animate = new Animate(\n      params?.id,\n      params?.timeline ?? ((this as any).stage && (this as any).stage.getTimeline()) ?? defaultTimeline,\n      params?.slience\n    );\n\n    animate.bind(this as any);\n    if (params) {\n      const { onStart, onEnd, onRemove } = params;\n      onStart != null && animate.onStart(onStart);\n      onEnd != null && animate.onEnd(onEnd);\n      onRemove != null && animate.onRemove(onRemove);\n    }\n    this.animates.set(animate.id, animate);\n    animate.onRemove(() => {\n      animate.stop();\n      this.animates.delete(animate.id);\n    });\n\n    // TODO 考虑性能问题\n    (this as any).stage?.ticker.start();\n\n    return animate;\n  }\n\n  createTimeline() {\n    return new DefaultTimeline();\n  }\n\n  createTicker(stage: any) {\n    return new DefaultTicker(stage);\n  }\n\n  setFinalAttributes(finalAttribute: Record<string, any>) {\n    if (!this.finalAttribute) {\n      this.finalAttribute = {};\n    }\n    Object.assign(this.finalAttribute, finalAttribute);\n  }\n\n  initFinalAttributes(finalAttribute: Record<string, any>) {\n    this.finalAttribute = finalAttribute;\n  }\n\n  initAnimateExecutor(): void {\n    if (!this._animateExecutor) {\n      this._animateExecutor = new AnimateExecutor(this as any);\n    }\n  }\n\n  /**\n   * Apply animation configuration to the component\n   * @param config Animation configuration\n   * @returns This component instance\n   */\n  executeAnimation(config: IAnimationConfig): this {\n    this.initAnimateExecutor();\n    this._animateExecutor.execute(config);\n    return this;\n  }\n\n  /**\n   * Apply animations to multiple components\n   * @param configs Animation configurations\n   * @returns This component instance\n   */\n  executeAnimations(configs: IAnimationConfig[]): this {\n    this.initAnimateExecutor();\n    configs.forEach(config => {\n      this._animateExecutor.execute(config);\n    });\n    return this;\n  }\n\n  protected getFinalAttribute() {\n    return this.finalAttribute;\n  }\n\n  // TODO prev是兼容原本VGrammar函数的一个参数，用于动画中获取上一次属性，目前的逻辑中应该不需要，直接去当前帧的属性即可\n  getGraphicAttribute(key: string, prev: boolean = false) {\n    if (!prev && this.finalAttribute) {\n      return this.finalAttribute[key];\n    }\n    return (this as any).attribute[key];\n  }\n}\n"]}

package/es/animate.d.ts

@@ -65,5 +65,4 @@ export declare class Animate implements IAnimate {
     updateDuration(): void;
     getTotalDuration(): number;
     getLoop(): number;
-    protected forEachStep(cb: (step: IStep) => void): void;
 }

package/es/animate.js

@@ -28,10 +28,7 @@ export class Animate {
         return this._timeline;
     }
     bind(target) {
-        return this.target = target, this.target.animates || (this.target.animates = new Map), 
-        this.target.animates.set(this.id, this), this.onRemove((() => {
-            this.stop(), this.target.animates.delete(this.id);
-        })), this.target.onAnimateBind && !this.slience && this.target.onAnimateBind(this), 
+        return this.target = target, this.target.onAnimateBind && !this.slience && this.target.onAnimateBind(this), 
         this.target.animationAttribute || (this.target.animationAttribute = {}), this;
     }
     to(props, duration = 300, easing = "linear") {
@@ -133,9 +130,7 @@ export class Animate {
     }
     release() {
         this.status = AnimateStatus.END, this._onRemove && this._onRemove.forEach((cb => cb())), 
-        this._onStart = [], this._onFrame = [], this._onEnd = [], this._onRemove = [], this.forEachStep((step => {
-            step.release();
-        }));
+        this._onStart = [], this._onFrame = [], this._onEnd = [], this._onRemove = [];
     }
     getDuration() {
         return this._duration;
@@ -211,9 +206,5 @@ export class Animate {
     getLoop() {
         return this._loopCount;
     }
-    forEachStep(cb) {
-        let step = this._firstStep;
-        for (;step; ) cb(step), step = step.next;
-    }
 }
 //# sourceMappingURL=animate.js.map