@visactor/vchart 2.0.1 → 2.0.3-alpha.0

package/esm/mark/base/base-mark.d.ts

@@ -44,9 +44,6 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected _animationConfig: Partial<MarkAnimationSpec>;
     getAnimationConfig(): Partial<MarkAnimationSpec>;
     setAnimationConfig(config: Partial<MarkAnimationSpec>): void;
-    protected _disabledAnimationStates?: string[];
-    disableAnimationByState(state: string | string[]): void;
-    enableAnimationByState(state: string | string[]): void;
     private _skipBeforeLayouted;
     setSkipBeforeLayouted(skip: boolean): void;
     protected _groupKey?: string;
@@ -126,7 +123,6 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected _attrsByGroup?: Record<string, T>;
     protected _getDataByKey(data: Datum[]): GroupedData<Datum>;
     protected _getCommonContext(): {
-        compiler: import("../../compile/interface").ICompiler;
         markType: MarkTypeEnum;
         markId: number;
         modelId: number;
@@ -142,7 +138,6 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected createAnimationStateList(type: string, animationConfig: Partial<MarkAnimationSpec>): any;
     protected tryRunMorphing(graphics: IMarkGraphic[]): boolean;
     protected _runStateAnimation(graphics: IMarkGraphic[]): void;
-    protected _setAnimationState(g: IMarkGraphic): void;
     protected _runJoin(data: Datum[]): void;
     _runEncoderOfGraphic(styles: Record<string, (datum: Datum) => any>, g: IMarkGraphic, attrs?: any): any;
     _runGroupEncoder(groupStyles: Record<string, (datum: Datum) => any>): any;
@@ -184,7 +179,8 @@ export declare class BaseMark<T extends ICommonSpec> extends GrammarItem impleme
     protected _runProgressiveApplyGraphic(graphics: IMarkGraphic[]): void;
     protected _runProgressiveStep(): void;
     renderProgressive(): void;
-    hasAnimationByState(state: AnimationStateValues): boolean;
+    updateAnimationState(callback: (graphic: IMarkGraphic) => AnimationStateValues): void;
+    hasAnimationByState(state: keyof MarkAnimationSpec): boolean;
     hasAnimation(): boolean;
     runAnimation(): void;
 }

package/esm/mark/base/base-mark.js

@@ -50,9 +50,7 @@ import { AnimationStateEnum } from "../../animation/interface";
 
 import { CompilableData } from "../../compile/data/compilable-data";
 
-import { getDiffAttributesOfGraphic } from "../../util/mark";
-
-import { log } from "../../util/debug";
+import { log } from "../../util";
 
 import { morph as runMorph } from "../../compile/morph";
 
@@ -112,36 +110,24 @@ export class BaseMark extends GrammarItem {
     setAnimationConfig(config) {
         const defaultPrams = "group" === this.type ? {
             selfOnly: !0
-        } : {}, formatAnimationCfg = cfg => {
-            var _a;
-            const options = null !== (_a = cfg.options) && void 0 !== _a ? _a : {};
-            return Object.assign(Object.assign(Object.assign({}, defaultPrams), cfg), {
-                options: (datum, graphic, customParams) => {
-                    var _a, _b;
-                    const _options = "function" == typeof options ? options(datum, graphic, customParams) : options;
-                    if (graphic && graphic.context && graphic.context.compiler && isValid(graphic.context.modelId)) {
-                        const model = null === (_a = graphic.context.compiler.getChart()) || void 0 === _a ? void 0 : _a.getModelById(graphic.context.modelId);
+        } : {}, animationConfig = {};
+        Object.keys(config).forEach((key => {
+            const value = config[key];
+            isArray(value) ? animationConfig[key] = value.map((item => {
+                var _a;
+                const options = null !== (_a = item.options) && void 0 !== _a ? _a : {};
+                return Object.assign(Object.assign(Object.assign({}, defaultPrams), item), {
+                    options: (...args) => {
+                        var _a, _b;
+                        const _options = "function" == typeof options ? options(...args) : options;
                         return Object.assign(Object.assign({}, _options), {
-                            layoutRect: null === (_b = null == model ? void 0 : model.getLayoutRect) || void 0 === _b ? void 0 : _b.call(model)
+                            layoutRect: null === (_b = (_a = this.model).getLayoutRect) || void 0 === _b ? void 0 : _b.call(_a)
                         });
                     }
-                    return Object.assign({}, _options);
-                }
-            });
-        }, animationConfig = {};
-        Object.keys(config).forEach((key => {
-            const value = config[key];
-            isArray(value) ? animationConfig[key] = value.map(formatAnimationCfg) : isValid(value) && (animationConfig[key] = formatAnimationCfg(value));
+                });
+            })) : animationConfig[key] = Object.assign(Object.assign({}, defaultPrams), config[key]);
         })), this._animationConfig = animationConfig;
     }
-    disableAnimationByState(state) {
-        const states = array(state);
-        this._disabledAnimationStates = [ ...new Set([ ...this._disabledAnimationStates, ...states ]) ];
-    }
-    enableAnimationByState(state) {
-        const states = array(state);
-        this._disabledAnimationStates = this._disabledAnimationStates.filter((s => !states.includes(s)));
-    }
     setSkipBeforeLayouted(skip) {
         this._skipBeforeLayouted = skip;
     }
@@ -226,9 +212,9 @@ export class BaseMark extends GrammarItem {
         super(option), this.type = void 0, this.name = "mark", this._markConfig = {
             zIndex: LayoutZIndex.Mark,
             morph: !1
-        }, this._visible = !0, this.stateStyle = {}, this._unCompileChannel = {}, this._disabledAnimationStates = [], 
-        this._skipBeforeLayouted = !1, this._extensionChannel = {}, this._computeExChannel = {}, 
-        this._graphicMap = new Map, this._graphics = [], this._getEncoderOfStyle = (stateName, style) => {
+        }, this._visible = !0, this.stateStyle = {}, this._unCompileChannel = {}, this._skipBeforeLayouted = !1, 
+        this._extensionChannel = {}, this._computeExChannel = {}, this._graphicMap = new Map, 
+        this._graphics = [], this._getEncoderOfStyle = (stateName, style) => {
             if (style && stateName) {
                 const validEncoder = {};
                 return Object.keys(style).forEach((key => {
@@ -473,7 +459,6 @@ export class BaseMark extends GrammarItem {
     }
     _getCommonContext() {
         return {
-            compiler: this.getCompiler(),
             markType: this.type,
             markId: this.id,
             modelId: this.model.id,
@@ -524,17 +509,14 @@ export class BaseMark extends GrammarItem {
         this._dataByGroup = groupData(data, this._groupKeyGetter);
     }
     createAnimationStateList(type, animationConfig) {
-        var _a;
         let config = animationConfig[type];
         return config && Array.isArray(config) && (config = 1 === config.length ? config[0] : config), 
-        Array.isArray(config) ? config.map(((item, index) => {
+        Array.isArray(config) && (config = config.map(((item, index) => {
             var _a;
             return Object.assign(Object.assign({}, item), {
                 priority: null !== (_a = item.priority) && void 0 !== _a ? _a : 1 / 0
             });
-        })) : config ? Object.assign(Object.assign({}, config), {
-            priority: "normal" === type ? null !== (_a = config.priority) && void 0 !== _a ? _a : 1 / 0 : config.priority
-        }) : config;
+        }))), config;
     }
     tryRunMorphing(graphics) {
         if (this._lastMark) {
@@ -593,37 +575,29 @@ export class BaseMark extends GrammarItem {
             this._product.applyAnimationState([ "normal" ], [ normalConfig ]);
         }
     }
-    _setAnimationState(g) {
-        var _a, _b, _c;
-        const callback = ("component" === this.type ? this.model.getAnimationStateCallback() : null === (_c = null === (_b = (_a = this.model).getRegion) || void 0 === _b ? void 0 : _b.call(_a)) || void 0 === _c ? void 0 : _c.getAnimationStateCallback()) || (g => {
-            var _a;
-            const diffState = null === (_a = g.context) || void 0 === _a ? void 0 : _a.diffState;
-            return diffState === AnimationStateEnum.exit ? AnimationStateEnum.exit : diffState === AnimationStateEnum.update ? AnimationStateEnum.update : AnimationStateEnum.appear;
-        }), customizedState = callback(g);
-        g.context.animationState = null != customizedState ? customizedState : g.context.diffState, 
-        g.context.animationState === DiffState.exit && (g.context.reusing = !0, g.animates && g.animates.forEach((a => a.stop())));
-    }
     _runJoin(data) {
-        const newGroupedData = this._getDataByKey(data), prevGroupedData = this._prevDataByKey, allGraphics = [], enterGraphics = new Set(this._graphics.filter((g => g.context.diffState === DiffState.enter))), callback = (key, newData, prevData) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const newGroupedData = this._getDataByKey(data), prevGroupedData = this._prevDataByKey, newGraphics = [], enterGraphics = new Set(this._graphics.filter((g => g.context.diffState === DiffState.enter))), callback = (key, newData, prevData) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             let g, diffState;
             return isNil(newData) ? (g = this._graphicMap.get(key), g && (diffState = DiffState.exit)) : isNil(prevData) ? (g = this._graphicMap.has(key) ? this._graphicMap.get(key) : {}, 
-            diffState = DiffState.enter, g.isExiting = !1, this._graphicMap.set(key, g), allGraphics.push(g)) : (g = this._graphicMap.get(key), 
-            g && (diffState = DiffState.update, allGraphics.push(g))), g && (enterGraphics.delete(g), 
-            g.context = Object.assign(Object.assign({}, this._getCommonContext()), {
+            diffState = DiffState.enter, g.isExiting = !1, (null === (_a = g.context) || void 0 === _a ? void 0 : _a.diffState) === DiffState.exit && (g.context.reusing = !0, 
+            g.animates && g.animates.forEach((a => a.stop()))), this._graphicMap.set(key, g), 
+            newGraphics.push(g)) : (g = this._graphicMap.get(key), g && (diffState = DiffState.update, 
+            newGraphics.push(g))), g && (g.context = Object.assign(Object.assign({}, this._getCommonContext()), {
                 diffState: diffState,
-                reusing: null === (_a = g.context) || void 0 === _a ? void 0 : _a.reusing,
-                originalFieldX: null === (_b = g.context) || void 0 === _b ? void 0 : _b.originalFieldX,
-                originalFieldY: null === (_c = g.context) || void 0 === _c ? void 0 : _c.originalFieldY,
-                fieldX: null === (_d = g.context) || void 0 === _d ? void 0 : _d.fieldX,
-                fieldY: null === (_e = g.context) || void 0 === _e ? void 0 : _e.fieldY,
-                data: null != newData ? newData : null === (_f = g.context) || void 0 === _f ? void 0 : _f.data,
+                reusing: null === (_b = g.context) || void 0 === _b ? void 0 : _b.reusing,
+                originalFieldX: null === (_c = g.context) || void 0 === _c ? void 0 : _c.originalFieldX,
+                originalFieldY: null === (_d = g.context) || void 0 === _d ? void 0 : _d.originalFieldY,
+                fieldX: null === (_e = g.context) || void 0 === _e ? void 0 : _e.fieldX,
+                fieldY: null === (_f = g.context) || void 0 === _f ? void 0 : _f.fieldY,
+                animationState: diffState,
+                data: null != newData ? newData : null === (_g = g.context) || void 0 === _g ? void 0 : _g.data,
                 uniqueKey: key,
-                key: newData ? this._keyGetter(newData[0]) : null === (_g = g.context) || void 0 === _g ? void 0 : _g.key,
-                groupKey: newData ? this._groupKeyGetter(newData[0]) : null === (_h = g.context) || void 0 === _h ? void 0 : _h.groupKey,
+                key: newData ? this._keyGetter(newData[0]) : null === (_h = g.context) || void 0 === _h ? void 0 : _h.key,
+                groupKey: newData ? this._groupKeyGetter(newData[0]) : null === (_j = g.context) || void 0 === _j ? void 0 : _j.groupKey,
                 indexKey: "__VCHART_DEFAULT_DATA_INDEX",
-                stateAnimateConfig: null === (_j = this.getAnimationConfig()) || void 0 === _j ? void 0 : _j.state
-            }), this._setAnimationState(g)), g;
+                stateAnimateConfig: null === (_k = this.getAnimationConfig()) || void 0 === _k ? void 0 : _k.state
+            }), enterGraphics.delete(g)), g;
         };
         if (prevGroupedData && newGroupedData) {
             const prevMap = new Map(prevGroupedData.data);
@@ -642,10 +616,10 @@ export class BaseMark extends GrammarItem {
             this._graphicMap.delete(g.context.uniqueKey), g.parent && g.parent.removeChild(g), 
             g.release();
         }));
-        const graphicCount = allGraphics.length;
-        allGraphics.forEach(((g, index) => {
+        const graphicCount = newGraphics.length;
+        newGraphics.forEach(((g, index) => {
             g.context.graphicCount = graphicCount, g.context.graphicIndex = index;
-        })), this._dataByKey = newGroupedData, this._graphics = allGraphics, this.needClear = !0;
+        })), this._dataByKey = newGroupedData, this._graphics = newGraphics, this.needClear = !0;
     }
     _runEncoderOfGraphic(styles, g, attrs = {}) {
         return runEncoder(styles, g.context.data[0], attrs);
@@ -689,8 +663,10 @@ export class BaseMark extends GrammarItem {
             var _a;
             const finalAttrs = g.context.finalAttrs, hasStateAnimation = this.hasAnimationByState(g.context.animationState);
             if (g.setAttributes) {
-                const diffAttrs = getDiffAttributesOfGraphic(g, finalAttrs);
-                g.context.diffAttrs = diffAttrs, g.context.reusing ? (g.context.lastAttrs = g.attribute, 
+                const prevAttrs = g.getAttributes(!0), diffAttrs = {};
+                Object.keys(finalAttrs).forEach((key => {
+                    prevAttrs[key] !== finalAttrs[key] && (diffAttrs[key] = finalAttrs[key]);
+                })), g.context.diffAttrs = diffAttrs, g.context.reusing ? (g.context.lastAttrs = g.attribute, 
                 g.initAttributes({}), g.context.reusing = !1) : hasStateAnimation || (hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs)), 
                 hasAnimation && g.setFinalAttributes(finalAttrs);
             } else {
@@ -794,7 +770,7 @@ export class BaseMark extends GrammarItem {
             this._graphicMap.delete(key), g.parent && g.parent.removeChild(g), g.release && g.release();
         };
         this._graphicMap.forEach(((g, key) => {
-            if (g.context.diffState === DiffState.exit && !g.isExiting) if (g.context.animationState === DiffState.exit && this.hasAnimationByState("exit")) {
+            if (g.context.diffState === DiffState.exit && !g.isExiting) if (this.hasAnimationByState("exit")) {
                 g.isExiting = !0;
                 const animationConfig = this.getAnimationConfig();
                 if (animationConfig.exit && animationConfig.exit.length) {
@@ -903,8 +879,13 @@ export class BaseMark extends GrammarItem {
         var _a;
         (null === (_a = this.renderContext) || void 0 === _a ? void 0 : _a.beforeTransformProgressive) ? this._runBeforeProgressive() : this.renderContext.progressive && this._runProgressiveStep();
     }
+    updateAnimationState(callback) {
+        this._graphics && this._graphics.length && this._graphics.forEach((g => {
+            g.context.animationState = callback(g);
+        }));
+    }
     hasAnimationByState(state) {
-        if (!state || !this._animationConfig || !this._animationConfig[state] || this._disabledAnimationStates.includes(state)) return !1;
+        if (!state || !this._animationConfig || !this._animationConfig[state]) return !1;
         const stateAnimationConfig = this._animationConfig[state];
         return stateAnimationConfig.length > 0 || isObject(stateAnimationConfig);
     }