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

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

@@ -469,7 +469,8 @@ export class BaseMark extends GrammarItem {
         this.type === mark.type && (this._product = mark.getProduct(), this._graphics = mark.getGraphics(), 
         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._dataByKey = mark._dataByKey, this._prevDataByKey = mark._prevDataByKey, 
+        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;
@@ -614,7 +615,7 @@ export class BaseMark extends GrammarItem {
         const graphicCount = newGraphics.length;
         newGraphics.forEach(((g, index) => {
             g.context.graphicCount = graphicCount, g.context.graphicIndex = index;
-        })), this._dataByKey = newGroupedData, this._graphics = newGraphics;
+        })), this._dataByKey = newGroupedData, this._graphics = newGraphics, this.needClear = !0;
     }
     _runEncoderOfGraphic(styles, g, attrs = {}) {
         return runEncoder(styles, g.context.data[0], attrs);
@@ -663,10 +664,10 @@ export class BaseMark extends GrammarItem {
                     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.setFinalAttribute(finalAttrs);
+                hasAnimation && g.setFinalAttributes(finalAttrs);
             } else {
                 const mockGraphic = g;
-                g = this._createGraphic(hasStateAnimation ? {} : finalAttrs), hasAnimation && g.setFinalAttribute(finalAttrs), 
+                g = this._createGraphic(finalAttrs), hasAnimation && g.setFinalAttributes(finalAttrs), 
                 g.context = mockGraphic.context, g.context.diffAttrs = finalAttrs;
                 const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
                 if (gIndex >= 0 && (this._graphics[gIndex] = g), null === (_a = this.renderContext) || void 0 === _a ? void 0 : _a.progressive) {
@@ -730,9 +731,9 @@ export class BaseMark extends GrammarItem {
         }));
         return this.runTransforms(transforms, data);
     }
-    _runMainTasks() {
+    renderInner() {
         var _a, _b, _c;
-        if (!this.getVisible() || this._skipBeforeLayouted && this.getCompiler().getLayoutState() === LayoutState.before) return;
+        this._updateEncoderByState();
         const data = null !== (_b = null === (_a = this._data) || void 0 === _a ? void 0 : _a.getProduct()) && void 0 !== _b ? _b : [ {} ], transformData = this._runBeforeTransform(data);
         let markData;
         if (null == transformData ? void 0 : transformData.progressive) {
@@ -749,8 +750,8 @@ export class BaseMark extends GrammarItem {
         this._runApplyGraphic(this._graphics)), this._updateAttrsOfGroup();
     }
     render() {
-        this._isCommited && (this._updateEncoderByState(), log(`render mark: ${this.getProductId()}, type is ${this.type}`), 
-        this._runMainTasks(), this.uncommit());
+        this.isCommited() && (!this.getVisible() || this._skipBeforeLayouted && this.getCompiler().getLayoutState() === LayoutState.before || (log(`render mark: ${this.getProductId()}, type is ${this.type}`), 
+        this.renderInner()), this.uncommit());
     }
     updateMarkState(key) {
         if (!this._product) return;
@@ -888,7 +889,7 @@ export class BaseMark extends GrammarItem {
         return !!this._animationConfig && Object.keys(this._animationConfig).length > 0;
     }
     runAnimation() {
-        this._runStateAnimation(this._graphics);
+        this._runStateAnimation(this.getGraphics());
     }
 }
 //# sourceMappingURL=base-mark.js.map