@visactor/vrender-core 1.1.0-alpha.13 → 1.1.0-alpha.15

package/dist/index.es.js

@@ -11323,12 +11323,11 @@ class Graphic extends Node {
         this.applyTransientAttributes(params, forceUpdateTag, context);
     }
     captureTransientFromAttrsBeforePreventAnimate(params, keys, context) {
-        var _a;
+        var _a, _b;
         const graphicContext = this.context;
-        const diffAttrs = graphicContext === null || graphicContext === void 0 ? void 0 : graphicContext.diffAttrs;
+        const diffAttrs = (_a = graphicContext === null || graphicContext === void 0 ? void 0 : graphicContext.diffAttrs) !== null && _a !== void 0 ? _a : params;
         const updateType = context === null || context === void 0 ? void 0 : context.type;
         if (!keys.length ||
-            !graphicContext ||
             !diffAttrs ||
             updateType === AttributeUpdateType.STATE ||
             (updateType != null &&
@@ -11336,9 +11335,14 @@ class Graphic extends Node {
                 updateType <= AttributeUpdateType.ANIMATE_END)) {
             return;
         }
-        let fromAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs
-            ? (_a = this.transientFromAttrsBeforePreventAnimate) !== null && _a !== void 0 ? _a : null
+        const sameDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs;
+        let fromAttrs = sameDiffAttrs
+            ? (_b = this.transientFromAttrsBeforePreventAnimate) !== null && _b !== void 0 ? _b : null
             : null;
+        if (!sameDiffAttrs) {
+            this.transientFromAttrsBeforePreventAnimate = null;
+            this.transientFromAttrsBeforePreventAnimateDiffAttrs = null;
+        }
         let captured = false;
         for (let i = 0; i < keys.length; i++) {
             const key = keys[i];
@@ -11359,11 +11363,18 @@ class Graphic extends Node {
             this.transientFromAttrsBeforePreventAnimateDiffAttrs = diffAttrs;
         }
     }
-    consumeTransientFromAttrsBeforePreventAnimate(rawDiffAttrs, diffAttrs) {
+    consumeTransientFromAttrsBeforePreventAnimate(diffAttrs) {
         const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate;
-        if (!transientFromAttrs || this.transientFromAttrsBeforePreventAnimateDiffAttrs !== rawDiffAttrs) {
+        const sourceDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs;
+        if (!transientFromAttrs || !sourceDiffAttrs) {
             return null;
         }
+        for (const key in diffAttrs) {
+            if (Object.prototype.hasOwnProperty.call(diffAttrs, key) &&
+                (!Object.prototype.hasOwnProperty.call(sourceDiffAttrs, key) || !isEqual(sourceDiffAttrs[key], diffAttrs[key]))) {
+                return null;
+            }
+        }
         let fromAttrs = null;
         let remaining = false;
         for (const key in transientFromAttrs) {

package/es/graphic/graphic.d.ts

@@ -192,7 +192,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     protected setWidthHeightWithoutTransform(aabbBounds: IAABBBounds): void;
     setAttributesAndPreventAnimate(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext, ignorePriority?: boolean): void;
     protected captureTransientFromAttrsBeforePreventAnimate(params: Partial<T>, keys: string[], context?: ISetAttributeContext): void;
-    protected consumeTransientFromAttrsBeforePreventAnimate(rawDiffAttrs: Record<string, any>, diffAttrs: Record<string, any>): Record<string, any> | null;
+    protected consumeTransientFromAttrsBeforePreventAnimate(diffAttrs: Record<string, any>): Record<string, any> | null;
     setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     _setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     setAttribute(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;

package/es/graphic/graphic.js

@@ -562,10 +562,13 @@ export class Graphic extends Node {
         })), this.applyTransientAttributes(params, forceUpdateTag, context);
     }
     captureTransientFromAttrsBeforePreventAnimate(params, keys, context) {
-        var _a;
-        const graphicContext = this.context, diffAttrs = null == graphicContext ? void 0 : graphicContext.diffAttrs, updateType = null == context ? void 0 : context.type;
-        if (!keys.length || !graphicContext || !diffAttrs || updateType === AttributeUpdateType.STATE || null != updateType && updateType >= AttributeUpdateType.ANIMATE_BIND && updateType <= AttributeUpdateType.ANIMATE_END) return;
-        let fromAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs && null !== (_a = this.transientFromAttrsBeforePreventAnimate) && void 0 !== _a ? _a : null, captured = !1;
+        var _a, _b;
+        const graphicContext = this.context, diffAttrs = null !== (_a = null == graphicContext ? void 0 : graphicContext.diffAttrs) && void 0 !== _a ? _a : params, updateType = null == context ? void 0 : context.type;
+        if (!keys.length || !diffAttrs || updateType === AttributeUpdateType.STATE || null != updateType && updateType >= AttributeUpdateType.ANIMATE_BIND && updateType <= AttributeUpdateType.ANIMATE_END) return;
+        const sameDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs;
+        let fromAttrs = sameDiffAttrs && null !== (_b = this.transientFromAttrsBeforePreventAnimate) && void 0 !== _b ? _b : null;
+        sameDiffAttrs || (this.transientFromAttrsBeforePreventAnimate = null, this.transientFromAttrsBeforePreventAnimateDiffAttrs = null);
+        let captured = !1;
         for (let i = 0; i < keys.length; i++) {
             const key = keys[i];
             if (!Object.prototype.hasOwnProperty.call(diffAttrs, key)) continue;
@@ -575,9 +578,10 @@ export class Graphic extends Node {
         }
         captured && (this.transientFromAttrsBeforePreventAnimate = fromAttrs, this.transientFromAttrsBeforePreventAnimateDiffAttrs = diffAttrs);
     }
-    consumeTransientFromAttrsBeforePreventAnimate(rawDiffAttrs, diffAttrs) {
-        const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate;
-        if (!transientFromAttrs || this.transientFromAttrsBeforePreventAnimateDiffAttrs !== rawDiffAttrs) return null;
+    consumeTransientFromAttrsBeforePreventAnimate(diffAttrs) {
+        const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate, sourceDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs;
+        if (!transientFromAttrs || !sourceDiffAttrs) return null;
+        for (const key in diffAttrs) if (Object.prototype.hasOwnProperty.call(diffAttrs, key) && (!Object.prototype.hasOwnProperty.call(sourceDiffAttrs, key) || !isEqual(sourceDiffAttrs[key], diffAttrs[key]))) return null;
         let fromAttrs = null, remaining = !1;
         for (const key in transientFromAttrs) Object.prototype.hasOwnProperty.call(transientFromAttrs, key) && (Object.prototype.hasOwnProperty.call(diffAttrs, key) ? (null != fromAttrs || (fromAttrs = {}), 
         fromAttrs[key] = transientFromAttrs[key]) : remaining = !0);