@visactor/vchart 2.0.1-alpha.2 → 2.0.1-alpha.4

package/cjs/mark/base/base-mark.js

@@ -72,24 +72,37 @@ class BaseMark extends grammar_item_1.GrammarItem {
     setAnimationConfig(config) {
         const defaultPrams = "group" === this.type ? {
             selfOnly: !0
-        } : {}, animationConfig = {};
-        Object.keys(config).forEach((key => {
-            const value = config[key];
-            (0, vutils_1.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;
+        } : {}, 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 && (0, vutils_1.isValid)(graphic.context.modelId)) {
+                        const model = null === (_a = graphic.context.compiler.getChart()) || void 0 === _a ? void 0 : _a.getModelById(graphic.context.modelId);
                         return Object.assign(Object.assign({}, _options), {
-                            layoutRect: null === (_b = (_a = this.model).getLayoutRect) || void 0 === _b ? void 0 : _b.call(_a)
+                            layoutRect: null === (_b = null == model ? void 0 : model.getLayoutRect) || void 0 === _b ? void 0 : _b.call(model)
                         });
                     }
-                });
-            })) : animationConfig[key] = Object.assign(Object.assign({}, defaultPrams), config[key]);
+                    return Object.assign({}, _options);
+                }
+            });
+        }, animationConfig = {};
+        Object.keys(config).forEach((key => {
+            const value = config[key];
+            (0, vutils_1.isArray)(value) ? animationConfig[key] = value.map(formatAnimationCfg) : (0, 
+            vutils_1.isValid)(value) && (animationConfig[key] = formatAnimationCfg(value));
         })), this._animationConfig = animationConfig;
     }
+    disableAnimationByState(state) {
+        const states = (0, vutils_1.array)(state);
+        this._disabledAnimationStates = [ ...new Set([ ...this._disabledAnimationStates, ...states ]) ];
+    }
+    enableAnimationByState(state) {
+        const states = (0, vutils_1.array)(state);
+        this._disabledAnimationStates = this._disabledAnimationStates.filter((s => !states.includes(s)));
+    }
     setSkipBeforeLayouted(skip) {
         this._skipBeforeLayouted = skip;
     }
@@ -175,9 +188,9 @@ class BaseMark extends grammar_item_1.GrammarItem {
         super(option), this.type = void 0, this.name = "mark", this._markConfig = {
             zIndex: layout_1.LayoutZIndex.Mark,
             morph: !1
-        }, this._visible = !0, this.stateStyle = {}, this._unCompileChannel = {}, 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._disabledAnimationStates = [], 
+        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 => {
@@ -426,6 +439,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
     }
     _getCommonContext() {
         return {
+            compiler: this.getCompiler(),
             markType: this.type,
             markId: this.id,
             modelId: this.model.id,
@@ -441,7 +455,7 @@ class BaseMark extends grammar_item_1.GrammarItem {
         this._graphicMap = mark._graphicMap, this._graphicMap.forEach((g => {
             g.context = Object.assign(Object.assign({}, g.context), this._getCommonContext());
         })), this._dataByKey = mark._dataByKey, this._prevDataByKey = mark._prevDataByKey, 
-        this.needClear = mark.needClear, this._aniamtionStateCallback = mark._aniamtionStateCallback);
+        this.needClear = mark.needClear);
     }
     _parseProgressiveContext(data) {
         const enableProgressive = this._markConfig.progressiveStep > 0 && this._markConfig.progressiveThreshold > 0 && this._markConfig.progressiveStep < this._markConfig.progressiveThreshold, large = this._markConfig.large && this._markConfig.largeThreshold > 0 && data.length >= this._markConfig.largeThreshold;
@@ -546,7 +560,12 @@ class BaseMark extends grammar_item_1.GrammarItem {
         }
     }
     _setAnimationState(g) {
-        const customizedState = this._aniamtionStateCallback ? this._aniamtionStateCallback(g) : void 0;
+        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 === interface_3.AnimationStateEnum.exit ? interface_3.AnimationStateEnum.exit : diffState === interface_3.AnimationStateEnum.update ? interface_3.AnimationStateEnum.update : interface_3.AnimationStateEnum.appear;
+        }), customizedState = callback(g);
         g.context.animationState = null != customizedState ? customizedState : g.context.diffState, 
         g.context.animationState === enum_1.DiffState.exit && (g.context.reusing = !0, g.animates && g.animates.forEach((a => a.stop())));
     }
@@ -853,11 +872,8 @@ class BaseMark extends grammar_item_1.GrammarItem {
         var _a;
         (null === (_a = this.renderContext) || void 0 === _a ? void 0 : _a.beforeTransformProgressive) ? this._runBeforeProgressive() : this.renderContext.progressive && this._runProgressiveStep();
     }
-    updateAnimationState(callback) {
-        this._aniamtionStateCallback = callback;
-    }
     hasAnimationByState(state) {
-        if (!state || !this._animationConfig || !this._animationConfig[state]) return !1;
+        if (!state || !this._animationConfig || !this._animationConfig[state] || this._disabledAnimationStates.includes(state)) return !1;
         const stateAnimationConfig = this._animationConfig[state];
         return stateAnimationConfig.length > 0 || (0, vutils_1.isObject)(stateAnimationConfig);
     }