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

package/dist/index.es.js

@@ -11309,16 +11309,90 @@ 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;
+        }
+        let fromAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs
+            ? (_a = this.transientFromAttrsBeforePreventAnimate) !== null && _a !== void 0 ? _a : null
+            : 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(rawDiffAttrs, diffAttrs) {
+        const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate;
+        if (!transientFromAttrs || this.transientFromAttrsBeforePreventAnimateDiffAttrs !== rawDiffAttrs) {
+            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/diff.js

@@ -8,5 +8,4 @@ export function diff(oldAttrs, newAttrs, getAttr) {
         void 0 !== value && (diffObj[key] = value);
     }
     return diffObj;
-}
-//# sourceMappingURL=diff.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/rect-utils.js

@@ -17,4 +17,4 @@ export const normalizeRectAttributes = attribute => {
         height: height
     };
 };
-//# sourceMappingURL=rect-utils.js.map
+//# sourceMappingURL=rect-utils.js.map

package/es/common/render-area.js

@@ -61,4 +61,4 @@ function drawAreaBlock(path, topList, bottomList, params) {
     }
     path.closePath();
 }
-//# sourceMappingURL=render-area.js.map
+//# sourceMappingURL=render-area.js.map

package/es/common/render-command-list.js

@@ -6,4 +6,4 @@ export function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy
         commandFuncs[command[0]](command, context, x, y, sx, sy, z);
     }
 }
-//# sourceMappingURL=render-command-list.js.map
+//# sourceMappingURL=render-command-list.js.map

package/es/common/render-curve.js

@@ -93,4 +93,4 @@ export function drawIncrementalAreaSegments(path, lastSeg, segments, params) {
         path.closePath();
     }));
 }
-//# sourceMappingURL=render-curve.js.map
+//# sourceMappingURL=render-curve.js.map

package/es/common/render-utils.js

@@ -11,4 +11,4 @@ export function drawSegItem(ctx, curve, endPercent, params) {
         ctx.lineTo(offsetX + p.x, offsetY + p.y, offsetZ);
     }
 }
-//# sourceMappingURL=render-utils.js.map
+//# sourceMappingURL=render-utils.js.map

package/es/common/seg-context.js

@@ -90,5 +90,4 @@ export class ReflectSegContext extends SegContext {
     clear() {
         return super.clear();
     }
-}
-//# sourceMappingURL=seg-context.js.map
+}

package/es/common/simplify.js

@@ -30,4 +30,4 @@ export function flatten_simplify(points, tolerance, highestQuality) {
     if (points.length <= 10) return points;
     return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
 }
-//# sourceMappingURL=simplify.js.map
+//# sourceMappingURL=simplify.js.map

package/es/common/sort.js

@@ -94,4 +94,4 @@ export function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     !1)), reverse);
     return result;
 }
-//# sourceMappingURL=sort.js.map
+//# sourceMappingURL=sort.js.map

package/es/common/split-path.js

@@ -248,4 +248,4 @@ export const splitPath = (path, count) => {
     }
     return res;
 };
-//# sourceMappingURL=split-path.js.map
+//# sourceMappingURL=split-path.js.map

package/es/common/store.js

@@ -1,2 +1,2 @@
 class StageStore {}
-//# sourceMappingURL=store.js.map
+//# sourceMappingURL=store.js.map

package/es/common/text.js

@@ -24,4 +24,4 @@ export function textAttributesToStyle(attrs) {
     attrs.underline ? style["text-decoration"] = "underline" : attrs.lineThrough && (style["text-decoration"] = "line-through"), 
     attrs.fill && isString(attrs.fill) && (style.color = attrs.fill), style;
 }
-//# sourceMappingURL=text.js.map
+//# sourceMappingURL=text.js.map

package/es/common/utils.js

@@ -148,4 +148,4 @@ export const calculateLineHeight = (lineHeight, fontSize) => {
     const _lh = _calculateLineHeight(lineHeight, fontSize);
     return isNaN(_lh) ? _lh : Math.max(fontSize, _lh);
 };
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/es/core/camera.js

@@ -66,4 +66,4 @@ export class OrthoCamera {
 export const registerOrthoCamera = () => {
     Factory.registerPlugin("OrthoCamera", OrthoCamera);
 };
-//# sourceMappingURL=camera.js.map
+//# sourceMappingURL=camera.js.map

package/es/core/constants.js

@@ -9,4 +9,4 @@ export const StaticLayerHandlerContribution = Symbol.for("StaticLayerHandlerCont
 export const DynamicLayerHandlerContribution = Symbol.for("DynamicLayerHandlerContribution");
 
 export const VirtualLayerHandlerContribution = Symbol.for("VirtualLayerHandlerContribution");
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/es/core/core-modules.js

@@ -21,4 +21,4 @@ export function bindCoreModules({bind: bind}) {
 }
 
 export default bindCoreModules;
-//# sourceMappingURL=core-modules.js.map
+//# sourceMappingURL=core-modules.js.map

package/es/core/global-module.js

@@ -1 +1,3 @@
+
+
 //# sourceMappingURL=global-module.js.map

package/es/core/global.js

@@ -222,4 +222,4 @@ export class DefaultGlobal extends EventListenerManager {
         return this._env || this.setEnv("browser"), this.envContribution.copyToClipBoard(text);
     }
 }
-//# sourceMappingURL=global.js.map
+//# sourceMappingURL=global.js.map

package/es/core/graphic-utils.js

@@ -162,4 +162,4 @@ export class DefaultTransformUtil {
         return this;
     }
 }
-//# sourceMappingURL=graphic-utils.js.map
+//# sourceMappingURL=graphic-utils.js.map

package/es/core/index.js

@@ -15,4 +15,4 @@ export * from "./layer-service";
 export * from "./constants";
 
 export * from "../interface/core";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/core/layer-service.js

@@ -75,4 +75,5 @@ export class DefaultLayerService {
     }
 }
 
-DefaultLayerService.idprefix = "visactor_layer", DefaultLayerService.prefix_count = 0;
+DefaultLayerService.idprefix = "visactor_layer", DefaultLayerService.prefix_count = 0;
+//# sourceMappingURL=layer-service.js.map

package/es/core/layer.js

@@ -112,4 +112,4 @@ export class Layer extends Group {
         }, params)), this.afterDrawCbs.forEach((c => c(this)));
     }
 }
-//# sourceMappingURL=layer.js.map
+//# sourceMappingURL=layer.js.map

package/es/core/light.js

@@ -23,4 +23,4 @@ export class DirectionalLight {
 export const registerDirectionalLight = () => {
     Factory.registerPlugin("DirectionalLight", DirectionalLight);
 };
-//# sourceMappingURL=light.js.map
+//# sourceMappingURL=light.js.map

package/es/core/stage.js

@@ -605,4 +605,4 @@ export class Stage extends Group {
         this.renderService.reInit(), this.pickerService.reInit();
     }
 }
-//# sourceMappingURL=stage.js.map
+//# sourceMappingURL=stage.js.map

package/es/core/window.js

@@ -150,4 +150,4 @@ export class DefaultWindow extends EventListenerManager {
         return this._handler.getTopLeft(baseWindow);
     }
 }
-//# sourceMappingURL=window.js.map
+//# sourceMappingURL=window.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(rawDiffAttrs: Record<string, any>, 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,39 @@ 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;
+        let fromAttrs = this.transientFromAttrsBeforePreventAnimateDiffAttrs === diffAttrs && null !== (_a = this.transientFromAttrsBeforePreventAnimate) && void 0 !== _a ? _a : null, 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(rawDiffAttrs, diffAttrs) {
+        const transientFromAttrs = this.transientFromAttrsBeforePreventAnimate;
+        if (!transientFromAttrs || this.transientFromAttrsBeforePreventAnimateDiffAttrs !== rawDiffAttrs) 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),