@visactor/vrender-core 1.1.0-alpha.12 → 1.1.0-alpha.14

package/dist/index.es.js

@@ -11309,16 +11309,102 @@ class Graphic extends Node {
         this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1;
     }
     setAttributesAndPreventAnimate(params, forceUpdateTag = false, context, ignorePriority) {
+        if (!params) {
+            return;
+        }
+        const keys = Object.keys(params);
+        this.captureTransientFromAttrsBeforePreventAnimate(params, keys, context);
         this.visitTrackedAnimates(animate => {
             if (animate.priority === Infinity && !ignorePriority) {
                 return;
             }
-            Object.keys(params).forEach(key => {
-                animate.preventAttr(key);
-            });
+            animate.preventAttrs(keys);
         });
         this.applyTransientAttributes(params, forceUpdateTag, context);
     }
+    captureTransientFromAttrsBeforePreventAnimate(params, keys, context) {
+        var _a;
+        const graphicContext = this.context;
+        const diffAttrs = graphicContext === null || graphicContext === void 0 ? void 0 : graphicContext.diffAttrs;
+        const updateType = context === null || context === void 0 ? void 0 : context.type;
+        if (!keys.length ||
+            !graphicContext ||
+            !diffAttrs ||
+            updateType === AttributeUpdateType.STATE ||
+            (updateType != null &&
+                updateType >= AttributeUpdateType.ANIMATE_BIND &&
+                updateType <= AttributeUpdateType.ANIMATE_END)) {
+            return;
+        }
+        const sameDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs;
+        let fromAttrs = sameDiffAttrs
+            ? (_a = this.transientFromAttrsBeforePreventAnimate) !== null && _a !== void 0 ? _a : 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];
+            if (!Object.prototype.hasOwnProperty.call(diffAttrs, key)) {
+                continue;
+            }
+            const previousValue = this.attribute[key];
+            const nextValue = params[key];
+            if (isEqual(previousValue, nextValue)) {
+                continue;
+            }
+            fromAttrs !== null && fromAttrs !== void 0 ? fromAttrs : (fromAttrs = {});
+            fromAttrs[key] = cloneAttributeValue(previousValue);
+            captured = true;
+        }
+        if (captured) {
+            this.transientFromAttrsBeforePreventAnimate = fromAttrs;
+            this.transientFromAttrsBeforePreventAnimateDiffAttrs = diffAttrs;
+        }
+    }
+    consumeTransientFromAttrsBeforePreventAnimate(diffAttrs) {
+        const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate;
+        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) {
+            if (!Object.prototype.hasOwnProperty.call(transientFromAttrs, key)) {
+                continue;
+            }
+            if (Object.prototype.hasOwnProperty.call(diffAttrs, key)) {
+                fromAttrs !== null && fromAttrs !== void 0 ? fromAttrs : (fromAttrs = {});
+                fromAttrs[key] = transientFromAttrs[key];
+                continue;
+            }
+            remaining = true;
+        }
+        if (remaining) {
+            const nextTransientFromAttrs = {};
+            for (const key in transientFromAttrs) {
+                if (Object.prototype.hasOwnProperty.call(transientFromAttrs, key) &&
+                    !Object.prototype.hasOwnProperty.call(diffAttrs, key)) {
+                    nextTransientFromAttrs[key] = transientFromAttrs[key];
+                }
+            }
+            this.transientFromAttrsBeforePreventAnimate = nextTransientFromAttrs;
+        }
+        else {
+            this.transientFromAttrsBeforePreventAnimate = null;
+            this.transientFromAttrsBeforePreventAnimateDiffAttrs = null;
+        }
+        return fromAttrs;
+    }
     setAttributes(params, forceUpdateTag = false, context) {
         if (!params) {
             return;

package/es/common/canvas-utils.js

@@ -51,5 +51,4 @@ function createConicGradient(context, color, x, y, w, h) {
     return color.stops.forEach((stop => {
         canvasGradient.addColorStop(stop.offset, stop.color);
     })), canvasGradient.GetPattern ? canvasGradient.GetPattern(w + x, h + y, undefined) : canvasGradient;
-}
-//# sourceMappingURL=canvas-utils.js.map
+}

package/es/common/event-transformer.js

@@ -113,4 +113,5 @@ export function mapToCanvasPointForCanvas(nativeEvent) {
         x: nativeEvent._canvasX || 0,
         y: nativeEvent._canvasY || 0
     };
-}
+}
+//# sourceMappingURL=event-transformer.js.map

package/es/common/explicit-binding.js

@@ -7,4 +7,4 @@ export function resolveContainerBinding(container, serviceIdentifier) {
     if (null == instance) throw new Error(`No binding found for ${describeServiceIdentifier(serviceIdentifier)}.`);
     return instance;
 }
-//# sourceMappingURL=explicit-binding.js.map
+//# sourceMappingURL=explicit-binding.js.map

package/es/common/generator.js

@@ -5,4 +5,4 @@ export class Generator {
 }
 
 Generator.auto_increment_id = 0;
-//# sourceMappingURL=generator.js.map
+//# sourceMappingURL=generator.js.map

package/es/common/matrix.js

@@ -118,4 +118,4 @@ export function transformMat4(out, a, m) {
     return w = w || 1, out[0] = (m[0] * x + m[4] * y + m[8] * z + m[12]) / w, out[1] = (m[1] * x + m[5] * y + m[9] * z + m[13]) / w, 
     out[2] = (m[2] * x + m[6] * y + m[10] * z + m[14]) / w, out;
 }
-//# sourceMappingURL=matrix.js.map
+//# sourceMappingURL=matrix.js.map

package/es/common/morphing-utils.js

@@ -189,4 +189,4 @@ export function bezierCurversToPath(bezierCurves) {
     }
     return path;
 }
-//# sourceMappingURL=morphing-utils.js.map
+//# sourceMappingURL=morphing-utils.js.map

package/es/common/path-svg.js

@@ -55,4 +55,4 @@ export function parseSvgPath(str) {
     } else result.push(currCommandData);
     return result;
 }
-//# sourceMappingURL=path-svg.js.map
+//# sourceMappingURL=path-svg.js.map

package/es/common/performance-raf.js

@@ -26,4 +26,4 @@ export class PerformanceRAF {
         }));
     }
 }
-//# sourceMappingURL=performance-raf.js.map
+//# sourceMappingURL=performance-raf.js.map

package/es/common/polygon.js

@@ -38,4 +38,4 @@ function getProportionPoint(point, segment, length, dx, dy) {
         y: point.y - dy * factor
     };
 }
-//# sourceMappingURL=polygon.js.map
+//# sourceMappingURL=polygon.js.map

package/es/entries/app-context.js

@@ -83,4 +83,4 @@ export class AppContext {
         };
     }
 }
-//# sourceMappingURL=app-context.js.map
+//# sourceMappingURL=app-context.js.map

package/es/entries/browser.js

@@ -33,4 +33,4 @@ export class BrowserEntry {
 export function createBrowserApp(options = {}) {
     return new BrowserEntry(options);
 }
-//# sourceMappingURL=browser.js.map
+//# sourceMappingURL=browser.js.map

package/es/entries/index.js

@@ -11,4 +11,4 @@ export * from "./miniapp";
 export * from "./runtime-installer";
 
 export { createBrowserApp as createApp } from "./browser";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/entries/miniapp.js

@@ -9,4 +9,4 @@ export class MiniappEntry extends BrowserEntry {
 export function createMiniappApp(options = {}) {
     return new MiniappEntry(options);
 }
-//# sourceMappingURL=miniapp.js.map
+//# sourceMappingURL=miniapp.js.map

package/es/entries/node.js

@@ -9,4 +9,4 @@ export class NodeEntry extends BrowserEntry {
 export function createNodeApp(options = {}) {
     return new NodeEntry(options);
 }
-//# sourceMappingURL=node.js.map
+//# sourceMappingURL=node.js.map

package/es/entries/runtime-installer.js

@@ -127,4 +127,4 @@ export function installRuntimePickersToApp(app, serviceIdentifier) {
     const pickers = bindingContext.getAll(serviceIdentifier);
     app.registry.picker.clear(), registerRuntimeEntries(((key, picker) => app.registry.picker.register(key, picker)), pickers, "runtime-picker");
 }
-//# sourceMappingURL=runtime-installer.js.map
+//# sourceMappingURL=runtime-installer.js.map

package/es/entries/types.js

@@ -1,2 +1,2 @@
 export { };
-//# sourceMappingURL=types.js.map
+//# sourceMappingURL=types.js.map

package/es/graphic/graphic.d.ts

@@ -52,6 +52,8 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     static mixin(source: Dict<any>): void;
     _events?: any;
     context?: Record<string, any>;
+    private transientFromAttrsBeforePreventAnimate?;
+    private transientFromAttrsBeforePreventAnimateDiffAttrs?;
     static userSymbolMap: Record<string, ISymbolClass>;
     onBeforeAttributeUpdate?: (val: any, attributes: Partial<T>, key: null | string | string[], context?: ISetAttributeContext) => T | undefined;
     parent: any;
@@ -189,6 +191,8 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     containsPoint(x: number, y: number, mode: IContainPointMode, picker?: IPickerService): boolean;
     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(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

@@ -555,12 +555,43 @@ export class Graphic extends Node {
         this.widthWithoutTransform = aabbBounds.x2 - aabbBounds.x1, this.heightWithoutTransform = aabbBounds.y2 - aabbBounds.y1;
     }
     setAttributesAndPreventAnimate(params, forceUpdateTag = !1, context, ignorePriority) {
-        this.visitTrackedAnimates((animate => {
-            (animate.priority !== 1 / 0 || ignorePriority) && Object.keys(params).forEach((key => {
-                animate.preventAttr(key);
-            }));
+        if (!params) return;
+        const keys = Object.keys(params);
+        this.captureTransientFromAttrsBeforePreventAnimate(params, keys, context), this.visitTrackedAnimates((animate => {
+            (animate.priority !== 1 / 0 || ignorePriority) && animate.preventAttrs(keys);
         })), 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;
+        const sameDiffAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs;
+        let fromAttrs = sameDiffAttrs && null !== (_a = this.transientFromAttrsBeforePreventAnimate) && void 0 !== _a ? _a : 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;
+            const previousValue = this.attribute[key], nextValue = params[key];
+            isEqual(previousValue, nextValue) || (null != fromAttrs || (fromAttrs = {}), fromAttrs[key] = cloneAttributeValue(previousValue), 
+            captured = !0);
+        }
+        captured && (this.transientFromAttrsBeforePreventAnimate = fromAttrs, this.transientFromAttrsBeforePreventAnimateDiffAttrs = diffAttrs);
+    }
+    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);
+        if (remaining) {
+            const nextTransientFromAttrs = {};
+            for (const key in transientFromAttrs) Object.prototype.hasOwnProperty.call(transientFromAttrs, key) && !Object.prototype.hasOwnProperty.call(diffAttrs, key) && (nextTransientFromAttrs[key] = transientFromAttrs[key]);
+            this.transientFromAttrsBeforePreventAnimate = nextTransientFromAttrs;
+        } else this.transientFromAttrsBeforePreventAnimate = null, this.transientFromAttrsBeforePreventAnimateDiffAttrs = null;
+        return fromAttrs;
+    }
     setAttributes(params, forceUpdateTag = !1, context) {
         params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background && this.loadImage(params.background, !0), 
         isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic),