@visactor/vchart 2.0.3-alpha.0 → 2.0.3-alpha.1

package/cjs/core/vchart.js

@@ -135,7 +135,7 @@ class VChart {
         }, this._renderSync = (option = {}) => {
             var _a;
             const self = this;
-            return this._beforeRender(option) ? (this._updateAnimateState(!0), null === (_a = this._compiler) || void 0 === _a || _a.render(option.morphConfig), 
+            return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.render(option.morphConfig), 
             this._updateAnimateState(!1), this._afterRender(), self) : self;
         }, this._updateSpec = (spec, forceMerge = !1, userUpdateOptions) => {
             var _a;
@@ -173,9 +173,8 @@ class VChart {
                     [key]: theme
                 }, this._currentTheme.colorScheme, this._currentTheme.token)[key]);
             })), this._cachedProcessedTheme[cacheKey] = theme, theme;
-        }, this._option = Object.assign(Object.assign(Object.assign({}, this._option), {
-            animation: !1 !== spec.animation
-        }), options), (null == options ? void 0 : options.optimize) && (this._option.optimize = Object.assign(Object.assign({}, this._option.optimize), options.optimize)), 
+        }, (0, util_1.removeUndefined)(options), this._option = Object.assign(Object.assign({}, this._option), options), 
+        (null == options ? void 0 : options.optimize) && (this._option.optimize = Object.assign(Object.assign({}, this._option.optimize), options.optimize)), 
         this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
         const _k = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _k, restOptions = __rest(_k, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = (0, 
         env_1.isTrueBrowser)(mode);
@@ -299,15 +298,15 @@ class VChart {
         return !!updateSpecResult && (this._reCompile(updateSpecResult), this._beforeRender(option));
     }
     _reCompile(updateResult, morphConfig) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(), 
         this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), 
         updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), 
-        updateResult.reMake) null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(), 
+        updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(), 
         this._userEvents.forEach((e => {
             var _a;
             return null === (_a = this._event) || void 0 === _a ? void 0 : _a.on(e.eType, e.query, e.handler);
-        })), updateResult.reSize && this._doResize(); else if (updateResult.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
+        }))) : updateResult.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
             chart: this._chart,
             vChart: this
         }), null === (_e = this._compiler) || void 0 === _e || _e.compile({
@@ -315,7 +314,11 @@ class VChart {
             vChart: this
         })), updateResult.reSize) {
             const {width: width, height: height} = this.getCurrentSize();
-            this._chart.onResize(width, height, !1), this._compiler.resize(width, height, !1);
+            this._currentSize = {
+                width: width,
+                height: height
+            }, null === (_f = this._chart) || void 0 === _f || _f.onResize(width, height, !1), 
+            null === (_g = this._compiler) || void 0 === _g || _g.resize(width, height, !1);
         }
     }
     _beforeRender(option = {}) {
@@ -361,14 +364,17 @@ class VChart {
         }));
     }
     _updateAnimateState(initial) {
-        if (this._option.animation) {
+        var _a, _b;
+        if (this.isAnimationEnable()) {
             const updateGraphicAnimationState = graphic => {
                 var _a;
                 const diffState = null === (_a = graphic.context) || void 0 === _a ? void 0 : _a.diffState;
-                return initial ? "exit" === diffState ? void 0 : interface_1.AnimationStateEnum.appear : diffState;
+                return initial ? "exit" === diffState ? interface_1.AnimationStateEnum.none : interface_1.AnimationStateEnum.appear : diffState;
             };
-            this._compiler.getRootMarks().forEach((mark => {
-                mark.updateAnimationState(updateGraphicAnimationState);
+            null === (_a = this._chart) || void 0 === _a || _a.getAllRegions().forEach((region => {
+                region.updateAnimateStateCallback(updateGraphicAnimationState);
+            })), null === (_b = this._chart) || void 0 === _b || _b.getAllComponents().forEach((component => {
+                component.updateAnimateStateCallback(updateGraphicAnimationState);
             }));
         }
     }
@@ -411,14 +417,13 @@ class VChart {
     }
     updateDataSync(id, data, parserOptions, userUpdateOptions) {
         return (0, util_1.isNil)(this._dataSet) ? this : this._chart ? (this._chart.updateData(id, data, !0, parserOptions), 
-        this._compiler.render(), (null == userUpdateOptions ? void 0 : userUpdateOptions.reAnimate) && (this.stopAnimation(), 
-        this._updateAnimateState(!0)), this) : (this._spec.data = (0, util_1.array)(this._spec.data), 
-        this._updateDataById(id, data, parserOptions), this);
+        (null == userUpdateOptions ? void 0 : userUpdateOptions.reAnimate) && (this.stopAnimation(), 
+        this._updateAnimateState(!0)), this._compiler.render(), this) : (this._spec.data = (0, 
+        util_1.array)(this._spec.data), this._updateDataById(id, data, parserOptions), this);
     }
     updateFullDataSync(data, reRender = !0, userUpdateOptions) {
-        if (this._chart) return this._chart.updateFullData(data), reRender && (this._compiler.render(), 
-        (null == userUpdateOptions ? void 0 : userUpdateOptions.reAnimate) && (this.stopAnimation(), 
-        this._updateAnimateState(!0))), this;
+        if (this._chart) return this._chart.updateFullData(data), reRender && ((null == userUpdateOptions ? void 0 : userUpdateOptions.reAnimate) && (this.stopAnimation(), 
+        this._updateAnimateState(!0)), this._compiler.render()), this;
         const prevData = (0, util_1.array)(this._spec.data);
         return (0, util_1.array)(data).forEach((d => {
             const {id: id, values: values, parser: parser, fields: fields} = d, preDV = prevData.find((dv => dv.name === id));
@@ -765,9 +770,22 @@ class VChart {
         var _a;
         return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.setDimensionIndex(value, opt);
     }
-    stopAnimation() {}
-    pauseAnimation() {}
-    resumeAnimation() {}
+    stopAnimation() {
+        var _a;
+        null === (_a = this.getStage()) || void 0 === _a || _a.stopAnimation(!0);
+    }
+    reRunNormalAnimation() {
+        var _a;
+        null === (_a = this.getStage()) || void 0 === _a || _a.reApplyAnimationState("normal", !0);
+    }
+    pauseAnimation() {
+        var _a;
+        null === (_a = this.getStage()) || void 0 === _a || _a.pauseAnimation(!0);
+    }
+    resumeAnimation() {
+        var _a;
+        null === (_a = this.getStage()) || void 0 === _a || _a.resumeAnimation(!0);
+    }
     convertDatumToPosition(datum, dataLinkInfo = {}, isRelativeToCanvas = !1, checkInViewData) {
         var _a;
         if (!this._chart) return null;
@@ -862,6 +880,9 @@ class VChart {
     _getMode() {
         return this._option.mode || common_1.RenderModeEnum["desktop-browser"];
     }
+    isAnimationEnable() {
+        return "animation" in this._option ? !!this._option.animation : !1 !== this._spec.animation;
+    }
     _getChartOption(type) {
         return {
             type: type,
@@ -875,7 +896,6 @@ class VChart {
             modeParams: this._option.modeParams,
             getCompiler: () => this._compiler,
             viewBox: this._viewBox,
-            animation: this._option.animation,
             getTheme: this.getTheme,
             getSpecInfo: () => {
                 var _a;