@visactor/react-vchart 2.0.23-alpha.2 → 2.0.23-alpha.3

package/build/index.js

@@ -51954,7 +51954,8 @@
         this._option.layout = layout, null === (_a = this._chart) || void 0 === _a || _a.setLayout(layout);
       }
       reLayout() {
-        this._chart && this._compiler && !this._isReleased && (this._chart.resetLayoutItemTag(), this._chart.setLayoutTag(!0, null, !1), this._compiler.render(), this._chart.onEvaluateEnd());
+        var _a, _b, _c;
+        null === (_a = this._chart) || void 0 === _a || _a.resetLayoutItemTag(), null === (_b = this._chart) || void 0 === _b || _b.setLayoutTag(!0, null, !1), null === (_c = this._compiler) || void 0 === _c || _c.render();
       }
       getCompiler() {
         return this._compiler;
@@ -60578,44 +60579,29 @@
           visible: this._getInvalidDefined.bind(this)
         }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series));
       }
-      _updateSymbolGraphicPosition() {
-        var _a;
-        const graphics = null === (_a = this._symbolMark) || void 0 === _a ? void 0 : _a.getGraphics();
-        graphics && graphics.length && graphics.forEach(graphicItem => {
-          var _a, _b;
-          const datum = null === (_b = null === (_a = null == graphicItem ? void 0 : graphicItem.context) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0],
-            newPosition = this.dataToPosition(datum);
-          newPosition && graphicItem && graphicItem.setAttributes({
-            x: newPosition.x,
-            y: newPosition.y
+      handleZoom(e) {
+        var _a, _b, _c, _d;
+        this.getMarksWithoutRoot().forEach(mark => {
+          if (!mark) return;
+          const graphics = mark.getGraphics();
+          graphics && graphics.length && graphics.forEach((graphicItem, i) => {
+            var _a, _b;
+            const datum = null === (_b = null === (_a = null == graphicItem ? void 0 : graphicItem.context) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0],
+              newPosition = this.dataToPosition(datum);
+            newPosition && graphicItem && graphicItem.translateTo(newPosition.x, newPosition.y);
           });
         });
-      }
-      _ensureLabelGraphicPostMatrix() {
-        var _a, _b;
-        const labelGraphic = null === (_b = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent()) || void 0 === _b ? void 0 : _b.getComponent();
-        return labelGraphic && !labelGraphic.attribute.postMatrix && labelGraphic.setAttributes({
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && (null == e ? void 0 : e.scale) && (null == e ? void 0 : e.scaleCenter) && ((null === (_d = labelGroup.attribute) || void 0 === _d ? void 0 : _d.postMatrix) || labelGroup.setAttributes({
           postMatrix: new Matrix()
-        }), labelGraphic;
-      }
-      handleZoom(e) {
-        const {
-          scale: scale,
-          scaleCenter: scaleCenter
-        } = e;
-        if (1 === scale) return;
-        this._updateSymbolGraphicPosition();
-        const labelGraphic = this._ensureLabelGraphicPostMatrix();
-        labelGraphic && labelGraphic.scale(scale, scale, scaleCenter);
+        }), labelGroup.scale(e.scale, e.scale, e.scaleCenter));
       }
       handlePan(e) {
-        const {
-          delta: delta
-        } = e;
-        if (0 === (null == delta ? void 0 : delta[0]) && 0 === (null == delta ? void 0 : delta[1])) return;
-        this._updateSymbolGraphicPosition();
-        const labelGraphic = this._ensureLabelGraphicPostMatrix();
-        labelGraphic && labelGraphic.translate(delta[0], delta[1]);
+        this.handleZoom(e);
       }
       getDefaultShapeType() {
         return "circle";
@@ -61639,7 +61625,7 @@
         super.release(), this._areaCache.clear(), this._nameMap = {}, this._mapViewData = null;
       }
       handleZoom(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const {
           scale: scale,
           scaleCenter: scaleCenter
@@ -61649,11 +61635,17 @@
         pathGroup && (pathGroup.attribute.postMatrix || pathGroup.setAttributes({
           postMatrix: new Matrix()
         }), pathGroup.scale(scale, scale, scaleCenter));
-        const vgrammarLabel = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
-        vgrammarLabel && vgrammarLabel.renderInner();
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && scale && scaleCenter && ((null === (_d = labelGroup.attribute) || void 0 === _d ? void 0 : _d.postMatrix) || labelGroup.setAttributes({
+          postMatrix: new Matrix()
+        }), labelGroup.scale(scale, scale, scaleCenter));
       }
       handlePan(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const {
           delta: delta
         } = e;
@@ -61662,8 +61654,14 @@
         pathGroup && (pathGroup.attribute.postMatrix || pathGroup.setAttributes({
           postMatrix: new Matrix()
         }), pathGroup.translate(delta[0], delta[1]));
-        const vgrammarLabel = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
-        vgrammarLabel && vgrammarLabel.renderInner();
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && delta && ((null === (_d = labelGroup.attribute) || void 0 === _d ? void 0 : _d.postMatrix) || labelGroup.setAttributes({
+          postMatrix: new Matrix()
+        }), labelGroup.translate(delta[0], delta[1]));
       }
       getDatumCenter(datum) {
         var _a, _b, _c, _d;
@@ -77159,7 +77157,7 @@
         return [this._legendComponent];
       }
       clear() {
-        super.clear(), this._cacheAttrs = null, this._preSelectedData = null;
+        super.clear(), this._legendComponent = null, this._cacheAttrs = null, this._preSelectedData = null;
       }
     }
     BaseLegend.specKey = "legends";