@visactor/vrender-core 1.1.0-alpha.5 → 1.1.0-alpha.6

package/dist/index.es.js

@@ -10859,6 +10859,22 @@ class Graphic extends Node {
         });
         return snapshot;
     }
+    buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch) {
+        const targetAttrs = cloneAttributeValue(resolvedStateAttrs);
+        if (!previousResolvedStatePatch) {
+            return targetAttrs;
+        }
+        const snapshot = this.buildStaticAttributeSnapshot();
+        Object.keys(previousResolvedStatePatch).forEach(key => {
+            if (Object.prototype.hasOwnProperty.call(targetAttrs, key)) {
+                return;
+            }
+            targetAttrs[key] = Object.prototype.hasOwnProperty.call(snapshot, key)
+                ? cloneAttributeValue(snapshot[key])
+                : this.getDefaultAttribute(key);
+        });
+        return targetAttrs;
+    }
     syncObjectToSnapshot(target, snapshot) {
         const delta = new Map();
         const keySet = new Set([...Object.keys(target), ...Object.keys(snapshot)]);
@@ -11668,6 +11684,9 @@ class Graphic extends Node {
             return;
         }
         const previousStates = this.currentStates ? this.currentStates.slice() : [];
+        const previousResolvedStatePatch = this.resolvedStatePatch
+            ? cloneAttributeValue(this.resolvedStatePatch)
+            : undefined;
         const stateResolveBaseAttrs = ((_a = this.baseAttributes) !== null && _a !== void 0 ? _a : this.attribute);
         const stateModel = this.createStateModel();
         (_b = this.stateEngine) === null || _b === void 0 ? void 0 : _b.setResolveContext(this, stateResolveBaseAttrs);
@@ -11693,7 +11712,7 @@ class Graphic extends Node {
         });
         if (hasAnimation) {
             this._syncFinalAttributeFromStaticTruth();
-            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation);
+            this.applyStateAttrs(this.buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch), transition.states, hasAnimation);
         }
         else {
             this.stopStateAnimates();

package/es/canvas/constants.js

@@ -1,4 +1,3 @@
 export const CanvasFactory = Symbol.for("CanvasFactory");
 
-export const Context2dFactory = Symbol.for("Context2dFactory");
-//# sourceMappingURL=constants.js.map
+export const Context2dFactory = Symbol.for("Context2dFactory");

package/es/color-string/index.js

@@ -2,4 +2,5 @@ export * from "./interpolate";
 
 export * from "./store";
 
-export * from "./colorName";
+export * from "./colorName";
+//# sourceMappingURL=index.js.map

package/es/graphic/graphic.d.ts

@@ -149,6 +149,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     };
     protected recomputeCurrentStatePatch(): void;
     protected buildStaticAttributeSnapshot(): Partial<T>;
+    protected buildStateAnimationTargetAttrs(resolvedStateAttrs: Partial<T>, previousResolvedStatePatch?: Partial<T>): Partial<T>;
     protected syncObjectToSnapshot(target: Record<string, any>, snapshot: Record<string, any>): AttributeDelta;
     protected _syncAttribute(): AttributeDelta;
     protected _syncFinalAttributeFromStaticTruth(): void;

package/es/graphic/graphic.js

@@ -297,6 +297,14 @@ export class Graphic extends Node {
             "deep" === this.stateMergeMode && isPlainObjectValue(previousValue) && isPlainObjectValue(nextValue) ? snapshot[key] = deepMergeAttributeValue(previousValue, nextValue) : snapshot[key] = cloneAttributeValue(nextValue);
         })), snapshot) : snapshot;
     }
+    buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch) {
+        const targetAttrs = cloneAttributeValue(resolvedStateAttrs);
+        if (!previousResolvedStatePatch) return targetAttrs;
+        const snapshot = this.buildStaticAttributeSnapshot();
+        return Object.keys(previousResolvedStatePatch).forEach((key => {
+            Object.prototype.hasOwnProperty.call(targetAttrs, key) || (targetAttrs[key] = Object.prototype.hasOwnProperty.call(snapshot, key) ? cloneAttributeValue(snapshot[key]) : this.getDefaultAttribute(key));
+        })), targetAttrs;
+    }
     syncObjectToSnapshot(target, snapshot) {
         const delta = new Map;
         return new Set([ ...Object.keys(target), ...Object.keys(snapshot) ]).forEach((key => {
@@ -778,7 +786,7 @@ export class Graphic extends Node {
     useStates(states, hasAnimation) {
         var _a, _b, _c, _d, _e;
         if (!states.length) return void this.clearStates(hasAnimation);
-        const previousStates = this.currentStates ? this.currentStates.slice() : [], stateResolveBaseAttrs = null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute, stateModel = this.createStateModel();
+        const previousStates = this.currentStates ? this.currentStates.slice() : [], previousResolvedStatePatch = this.resolvedStatePatch ? cloneAttributeValue(this.resolvedStatePatch) : void 0, stateResolveBaseAttrs = null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute, stateModel = this.createStateModel();
         null === (_b = this.stateEngine) || void 0 === _b || _b.setResolveContext(this, stateResolveBaseAttrs);
         const transition = stateModel.useStates(states);
         if (!transition.changed && this.sameStateNames(previousStates, transition.states)) return;
@@ -789,7 +797,7 @@ export class Graphic extends Node {
         null === (_e = getStageStatePerfMonitor(this.stage)) || void 0 === _e || _e.recordEvent("state-commit", {
             graphicId: this._uid,
             targetStates: [ ...transition.states ]
-        }), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation)) : (this.stopStateAnimates(), 
+        }), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), this.applyStateAttrs(this.buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch), transition.states, hasAnimation)) : (this.stopStateAnimates(), 
         this._restoreAttributeFromStaticTruth({
             type: AttributeUpdateType.STATE
         }), this._emitCustomEvent("afterStateUpdate", {